Re: fglrx-installer 8.8.25

[Alexandru Fomin <yo3fxy at spymac dot com>]

Marko Friedemann wrote:
> Yes, WooHOO! :)

yupee .. ok I have enhanced a little the amd_extra patch;
 it should install usr/X11R6/lib (32bit libGL & dri) in
 /emul/ia32-linux/usr/X11R6/lib and take care of the
 diversion for you ...

in the README.Debian we should also add an example on how
 to setup the LIBGL_DRIVER_PATH & co variables, so that
 the 32bit apps/games run successfully on amd64.

Tnx for testing,

Alex.

--- rules-orig	2005-01-19 17:51:03.000000000 +0200
+++ rules	2005-01-20 10:58:28.000000000 +0200
@@ -95,6 +95,9 @@
 	find usr/X11R6/include \
 	     usr/X11R6/lib \
 	     usr/share usr/src     -type f | xargs chmod -x
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	find usr/X11R6/lib64 -type f | xargs chmod -x
+endif
 	find lib -not -name "*.sh" -type f | xargs chmod -x
 	find lib      -name "*.sh" -type f | xargs chmod +x
 
@@ -130,6 +133,11 @@
 		usr/X11R6/bin \
 		usr/X11R6/lib \
 		usr/X11R6/lib/modules
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	dh_installdirs -p$(PKG_driver) \
+		emul/ia32-linux/usr/X11R6/lib \
+		emul/ia32-linux/usr/X11R6/lib/modules
+endif
 	dh_installdirs -p$(PKG_driver_dev) \
 		usr/X11R6 \
 		usr/X11R6/include \
@@ -152,10 +160,21 @@
 	dh_install
 
 	dh_install -p$(PKG_driver) "usr/X11R6/bin/fgl*"      "usr/X11R6/bin"
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	dh_install -p$(PKG_driver) "usr/X11R6/lib64/*.so*"     "usr/X11R6/lib"
+	dh_install -p$(PKG_driver) "usr/X11R6/lib64/modules/*" "usr/X11R6/lib/modules"
+	dh_install -p$(PKG_driver) "usr/X11R6/lib/*.so*"     "emul/ia32-linux/usr/X11R6/lib"
+	dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*" "emul/ia32-linux/usr/X11R6/lib/modules"
+else
 	dh_install -p$(PKG_driver) "usr/X11R6/lib/*.so*"     "usr/X11R6/lib"
 	dh_install -p$(PKG_driver) "usr/X11R6/lib/modules/*" "usr/X11R6/lib/modules"
+endif
 
+ifeq ($(DEB_BUILD_ARCH),amd64)
+	dh_install -p$(PKG_driver_dev) "usr/X11R6/lib64/*.a"   "usr/X11R6/lib"
+else
 	dh_install -p$(PKG_driver_dev) "usr/X11R6/lib/*.a"   "usr/X11R6/lib"
+endif
 	dh_install -p$(PKG_driver_dev) "usr/X11R6/include/*" "usr/X11R6/include"
 	dh_install -p$(PKG_driver_dev) "usr/include/*"       "usr/include"
 
--- postrm-orig	2005-01-20 10:59:25.000000000 +0200
+++ postrm	2005-01-20 10:44:09.000000000 +0200
@@ -19,6 +19,14 @@
 		--divert /usr/share/fglrx/diversions/libGL.so.1.2 \
 		--rename /usr/X11R6/lib/libGL.so.1.2
 
+	realarch=`uname -m`
+	if [ "${realarch}" = "amd64" ]
+	then
+		dpkg-divert --remove --package fglrx-driver \
+			--divert /usr/share/fglrx/diversions/libGL.so.1.2_32b \
+			--rename /emul/ia32-linux/usr/X11R6/lib/libGL.so.1.2
+	fi
+
 	if [ -d /usr/share/fglrx/diversions ]; then
 		rmdir /usr/share/fglrx/diversions || true
 	fi
--- preinst-orig	2005-01-20 10:59:07.000000000 +0200
+++ preinst	2005-01-20 10:43:54.000000000 +0200
@@ -20,6 +20,14 @@
 	dpkg-divert --add --package fglrx-driver \
 		--divert /usr/share/fglrx/diversions/libGL.so.1.2 \
 		--rename /usr/X11R6/lib/libGL.so.1.2
+
+	realarch=`uname -m`
+	if [ "${realarch}" = "amd64" ]
+	then
+		dpkg-divert --add --package fglrx-driver \
+			--divert /usr/share/fglrx/diversions/libGL.so.1.2_32b \
+			--rename /emul/ia32-linux/usr/X11R6/lib/libGL.so.1.2
+	fi
     ;;
 
     upgrade)