Merge lp:~andrikos/ubuntu/quantal/fglrx-installer/fix-switch-to-igpu into lp:ubuntu/quantal/fglrx-installer

[Nick Andrik]

There is also another wrong path in debian/rules and another missing path in debian/10fglrx.in for when using iGPU in hybrid intel/fglrx systems.

The problem is described in Comment #69 of Bug #1068404 :
https://bugs.launchpad.net/ubuntu/+source/fglrx-installer-updates/+bug/1068404/comments/69

Commit 95 is already merged, this comment and merge proposal refer to commits 96 and 97.

[lp:~andrikos/ubuntu/quantal/fglrx-installer/fix-switch-to-igpu]

97. By Nick Andrik on 2012-12-08

* debian/rules:
  - Fixed wrong path which prevented OpenGL operation for iGPU in amd64
    hybrid systems
* debian/10fglrx.in:
  - Added missing path which prevented OpenGL operation for iGPU in amd64
    hybrid systems

[Alberto Milone (albertomilone)]

committed upstream with some changes:
http://www.phorogit.com/index.php?p=fglrx-packaging.git&a=commitdiff&h=c864a5807ca4db4b98ab27450e5bb77c0faa219b&hb=9eaed4a5fee3d67c8ca8cd026189f8cc461a532a

review: Approve

[Nick Andrik (andrikos)]

Thanks!

[Nick Andrik (andrikos)]

Alberto, could you please include (LP: #1068404) in your changelog for the fix of mesa/glx paths?
Thanks!

=== modified file 'debian/10fglrx.in'
--- debian/10fglrx.in	2011-06-23 18:42:40 +0000
+++ debian/10fglrx.in	2012-12-08 21:50:24 +0000
@@ -1,7 +1,7 @@
 LIBGL_DRIVERS_PATH=/#PKGLIBDIR#/dri
 if [ `uname -m` = 'x86_64' ]; then
   if [ -d /#PKGLIBDIR32#/dri ]; then
-    LIBGL_DRIVERS_PATH=${LIBGL_DRIVERS_PATH}:/#PKGLIBDIR32#/dri
+    LIBGL_DRIVERS_PATH=${LIBGL_DRIVERS_PATH}:/#PKGLIBDIR32#/dri:/usr/lib/#DEB_HOST_MULTIARCH#/dri:/usr/lib/#OTHER_ARCH#/dri
     if [ ! -z $LD_LIBRARY_PATH ]; then
 	LD_LIBRARY_PATH=$LD_LIBRARY_PATH:
     fi

=== modified file 'debian/changelog'
--- debian/changelog	2012-09-29 20:47:10 +0000
+++ debian/changelog	2012-12-08 21:50:24 +0000
@@ -1,3 +1,21 @@
+fglrx-installer (2:9.000-0ubuntu3+andrik4) quantal; urgency=low
+
+  * debian/rules:
+    - Fixed wrong path which prevented OpenGL operation for iGPU in amd64
+      hybrid systems
+  * debian/10fglrx.in:
+    - Added missing path which prevented OpenGL operation for iGPU in amd64
+      hybrid systems
+
+ -- Nick Andrik <[e-mail]>  Sat, 08 Dec 2012 22:44:48 +0100
+
+fglrx-installer (2:9.000-0ubuntu3+andrik1) quantal; urgency=low
+
+  * debian/10fglrx.in:
+    - Added missing path which prevented hybrid operation
+
+ -- Nick Andrik <[e-mail]>  Tue, 30 Oct 2012 03:36:41 +0100
+
 fglrx-installer (2:9.000-0ubuntu3) quantal; urgency=low
 
   * debian/rules:

=== modified file 'debian/rules'
--- debian/rules	2012-09-29 20:47:10 +0000
+++ debian/rules	2012-12-08 21:50:24 +0000
@@ -371,7 +371,7 @@
 	echo "/usr/lib/$(DEB_HOST_MULTIARCH)/mesa" >		"$(CURDIR)/debian/$(PKG_driver)/$(PX_ld_so_conf)"
 	echo "/$(PX_libdir)" >>	"$(CURDIR)/debian/$(PKG_driver)/$(PX_ld_so_conf)"
 ifeq ($(DEB_HOST_ARCH),amd64)
-	echo "/usr/$(OTHER_ARCH)/mesa" >>	"$(CURDIR)/debian/$(PKG_driver)/$(PX_ld_so_conf)"
+	echo "/usr/lib/$(OTHER_ARCH)/mesa" >>	"$(CURDIR)/debian/$(PKG_driver)/$(PX_ld_so_conf)"
 	echo "/$(PX_libdir32)" >>	"$(CURDIR)/debian/$(PKG_driver)/$(PX_ld_so_conf)"
 endif