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

[Nick Andrik]

Fixes a problem when users would use amdcccle to switch to the integrated GPU.

For ATI/intel hybrid systems, this fix has no point unless this problem is addressed first:
https://code.launchpad.net/~andrikos/ubuntu/quantal/xserver-xorg-video-intel/fix-ati-hybrid

[Christopher M. Penalver (penalvch)]

This patch, based on Nick's PPA, has not been shown to work for the original reporter as per http://ati.cchtml.com/show_bug.cgi?id=624 .

Review -> Disapprove

review: Disapprove (suitability)

[Christopher M. Penalver (penalvch)]

The previously mentioned Review: Disapprove was assessed for a different bug report https://bugs.launchpad.net/fglrx/+bug/1068661 . However, because the same branch was linked to two different bug reports, my intending Disapprove for only one report, flowed to both.

Review -> Abstain

review: Abstain (suitability)

[Alberto Milone (albertomilone)]

This is fixed upstream in phorogit:
http://www.phorogit.com/index.php?p=fglrx-packaging.git&a=commitdiff&h=a1d481315f8ffffcd3ca67f9d6c581f1cf44b9fa&hb=8bf73d7de86f2ee105ece1daa2a143e9c55cb255

[Nick Andrik (andrikos)]

Fine then. Any possibility that it will be included in the precise
fglrx packages (at least the -updates ones)?
This is necessary for switching GPU in hybrid intel/fglrx systems

Thanks,
Nick

--
=Do-
N.AND

[Alberto Milone (albertomilone)]

Sure

[Nick Andrik (andrikos)]

Thanks!

[Alberto Milone (albertomilone)]

This is also merged in raring. I'll upload to precise-proposed soon. Thanks!

review: Approve

=== modified file 'debian/10fglrx.in'
--- debian/10fglrx.in	2011-06-23 18:42:40 +0000
+++ debian/10fglrx.in	2012-11-05 20:37:21 +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
     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-11-05 20:37:21 +0000
@@ -1,3 +1,10 @@
+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: