Re: fglrx-installer 8.8.25 for AMD64 and X.Org (experimental)

[Alexandru Fomin <yo3fxy at spymac dot com>]

Hi all,

based on the Ubuntu packages and Daniel Stone's work,
 I think the next patch is a more elegant way to deal
 with this.

see attached patch ... I don't know if we should test first
 if LIBGL_DRIVER_PATH is already set, but if anyone can think
 of a reason, we can add extra intelligence to the script.


Peter Nelson wrote:
> Flavio Stanchina wrote:
>
> > I've been busy hacking a fglrx release with experimental support for 
> > the AMD64 architecture and for the X.Org server. Have a look here:
> > http://www.stanchina.net/~flavio/debian-experimental/fglrx-experimental.html 
> >
> >
> > I used Alexandru's patches as found in the mailing list and Peter's 
> > patch as found here:
> > http://lists.debian.org/debian-amd64/2005/01/msg00481.html
> >
> > The "limbo" directory contains Alexandru's patches: if you find that 
> > any of them are needed, please let me know.
> >
> > If someone builds AMD64 packages and places them in some publicly 
> > available place, please let me know and I'll add a link on my page.
> The AMD64 packages build as expected and work.  The only thing is that 
> there still needs to be a link '/usr/X11R6/lib64 -> lib', but I'm not 
> sure where to cleanly add this into the rules.  Also I didn't use any of 
> Alexandru's patches and it seems to work fine.
>
> My debs are available from:
> http://rufus.hackish.org/~rufus/files/fglrx/
>
> -Peter

diff -Nurp fglrx-installer-8.8.25.orig/debian/fglrx.xsession fglrx-installer-8.8.25/debian/fglrx.xsession
--- fglrx-installer-8.8.25.orig/debian/fglrx.xsession	1970-01-01 02:00:00.000000000 +0200
+++ fglrx-installer-8.8.25/debian/fglrx.xsession	2005-01-30 00:57:51.835018920 +0200
@@ -0,0 +1,8 @@
+
+if [ `uname -m` = 'x86_64' ]; then
+	LIBGL_DRIVER_PATH=/usr/X11R6/lib/modules/dri
+	if [ -d /emul/ia32-linux/usr/X11R6/lib/modules/dri ]; then
+	LIBGL_DRIVER_PATH=${LIBGL_DRIVER_PATH}:/emul/ia32-linux/usr/X11R6/lib/modules/dri
+	fi
+	export LIBGL_DRIVER_PATH
+fi
diff -Nurp fglrx-installer-8.8.25.orig/debian/rules fglrx-installer-8.8.25/debian/rules
--- fglrx-installer-8.8.25.orig/debian/rules	2005-01-29 16:44:31.000000000 +0200
+++ fglrx-installer-8.8.25/debian/rules	2005-01-30 00:55:51.917249192 +0200
@@ -142,6 +142,7 @@ binary: build
 ifeq ($(DEB_BUILD_ARCH),amd64)
 	# the amd64 package includes 32bit compatibility libraries
 	dh_installdirs -p$(PKG_driver) \
+		etc/X11/Xsession.d \
 		emul/ia32-linux/usr/X11R6/lib \
 		emul/ia32-linux/usr/X11R6/lib/modules
 endif
@@ -174,6 +175,7 @@ ifeq ($(DEB_BUILD_ARCH),amd64)
 	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"
+	dh_install -p$(PKG_driver) "debian/fglrx.xsession"   "etc/X11/Xsession.d/70fglrx_32bit_dri"
 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"