-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Hi @all,
I prepared a patch, which result I can not test anymore (because of unsupported hardware.........). @Goswin: What do you say to it? @pkg-fglrx: Could anyone test it out if fglrx still works on amd64 or force another person to do so? :) - -- /* Mit freundlichem Gruß / With kind regards, Patrick Matthäi GNU/Linux Debian Developer E-Mail: [email protected] [email protected] Comment: Always if we think we are right, we were maybe wrong. */ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAkphsyQACgkQ2XA5inpabMe3ugCfVpNif9e755dl6Ynnp8god1w1 +XkAnjG1vFgwJ7q/x1wsDNgvlXWOJiKY =hee5 -----END PGP SIGNATURE-----
Index: debian/control =================================================================== --- debian/control (Revision 243) +++ debian/control (Arbeitskopie) @@ -4,7 +4,7 @@ Maintainer: Fglrx packaging team <[email protected]> Uploaders: Romain Beauxis <[email protected]>, Bertrand Marc <[email protected]>, Patrick Matthäi <[email protected]> -Build-Depends: debhelper (>= 7), dpatch, bzip2, ia32-libs (>> 2.7) [amd64], libx11-6, libxext6, +Build-Depends: debhelper (>= 7), dpatch, bzip2, libx11-6, libxext6, libgl1-mesa-glx, libxrandr2, libice6, libsm6, libfontconfig1, libxi6, libxcursor1, xsltproc, rpl, docbook-xml (>= 4.4), docbook-xsl (>= 1.70.1), libxinerama-dev Standards-Version: 3.8.2 @@ -16,7 +16,7 @@ Package: fglrx-driver Architecture: i386 amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, xserver-xorg (>= 1:7.4+1), laptop-detect -Recommends: fglrx-modules | fglrx-source (= ${binary:Version}), fglrx-glx, fglrx-glx-ia32 [amd64], fglrx-atieventsd +Recommends: fglrx-modules | fglrx-source (= ${binary:Version}), fglrx-glx, fglrx-atieventsd Provides: xserver-xorg-video-5 Suggests: fglrx-control Description: non-free AMD/ATI r6xx - r7xx display driver @@ -39,7 +39,8 @@ Package: fglrx-glx Architecture: i386 amd64 Depends: ${misc:Depends}, ${shlibs:Depends}, fglrx-driver (= ${binary:Version}) -Conflicts: nvidia-glx +Recommends: ia32-fglrx-glx [amd64], ia32-apt-get [amd64] +Conflicts: nvidia-glx, fglrx-glx-ia32 Description: proprietary libGL for the non-free AMD/ATI r6xx - r7xx display driver Display driver for the ATI recent Radeon and FireGL graphics cards. . @@ -48,20 +49,6 @@ This driver is not free. As an alternative, you may try the newest free driver xserver-xorg-video-radeonhd. -Package: fglrx-glx-ia32 -Architecture: amd64 -Depends: ${misc:Depends}, ${shlibs:Depends}, fglrx-driver (= ${binary:Version}) -Pre-Depends: libc6-i386 (>= 2.9-18) -Conflicts: nvidia-glx-ia32 -Description: proprietary libGL for the non-free AMD/ATI display driver (ia32 libs) - Display driver for the ATI recent Radeon and FireGL graphics cards. - . - This package provides the proprietary 32 bit libGL shipped by ATI for - emulated userspace on amd64. - . - This driver is not free. As an alternative, you may try the newest free - driver xserver-xorg-video-radeonhd. - Package: fglrx-source Section: non-free/kernel Architecture: i386 amd64 Index: debian/fglrx-glx-ia32.postinst =================================================================== --- debian/fglrx-glx-ia32.postinst (Revision 243) +++ debian/fglrx-glx-ia32.postinst (Arbeitskopie) @@ -1,22 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002-2006 Flavio Stanchina -# Licensed under the GNU General Public License, version 2. - -set -e - -# summary of how this script can be called: -# * <postinst> 'configure' <most-recently-configured-version> -# * <old-postinst> 'abort-upgrade' <new-version> -# * <conflictor's-postinst> 'abort-remove' 'in-favour' <package> <new-version> -# * <postinst> 'abort-remove' -# * <deconfigured's-postinst> 'abort-deconfigure' 'in-favour' <failed-install-package> <version> 'removing' <conflicting-package> <version> -# -# For details see /usr/share/doc/packaging-manual/ - -case "$1" in - configure) - ldconfig - ;; -esac - -#DEBHELPER# Index: debian/fglrx-glx-ia32.preinst =================================================================== --- debian/fglrx-glx-ia32.preinst (Revision 243) +++ debian/fglrx-glx-ia32.preinst (Arbeitskopie) @@ -1,36 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002-2006 Flavio Stanchina -# Licensed under the GNU General Public License, version 2. - -set -e - -# summary of how this script can be called: -# * <new-preinst> 'install' -# * <new-preinst> 'install' <old-version> -# * <new-preinst> 'upgrade' <old-version> -# * <old-preinst> 'abort-upgrade' <new-version> -# -# For details see /usr/share/doc/packaging-manual/ - -case "$1" in - install) - # Remove old diversion if needed. - dpkg-divert --list | grep fglrx | grep ia32 | \ - grep 'local diversion of' | cut -d' ' -f4 | \ - grep 'libGL.so' | \ - while read i; do \ - dpkg-divert --rename --remove "$i"; done 2> /dev/null - dpkg-divert --list | grep fglrx-driver | grep ia32 | \ - grep "^diversion of" | cut -d' ' -f3 | \ - grep 'libGL.so' | \ - while read i; do \ - dpkg-divert --package fglrx-driver --rename --remove "$i"; done 2> /dev/null - # Add new diversions. - mkdir -p /usr/lib32/fglrx/diversions - dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1.2 --rename /usr/lib32/libGL.so.1.2 - dpkg-divert --package fglrx-glx-ia32 --divert /usr/lib32/fglrx/diversions/libGL.so.1 --rename /usr/lib32/libGL.so.1 - ;; -esac - - -#DEBHELPER# Index: debian/fglrx-glx.postinst =================================================================== --- debian/fglrx-glx.postinst (Revision 243) +++ debian/fglrx-glx.postinst (Arbeitskopie) @@ -14,8 +14,12 @@ # For details see /usr/share/doc/packaging-manual/ case "$1" in - configure) - ldconfig + configure) + ldconfig + IA32_RENAME_LIST="/etc/ia32-libs-tools/rename.list" + if [ -f ${IA32_RENAME_LIST} ] ; then + echo 'fglrx-glx +' >> ${IA32_RENAME_LIST} + fi ;; esac Index: debian/fglrx-glx.preinst =================================================================== --- debian/fglrx-glx.preinst (Revision 243) +++ debian/fglrx-glx.preinst (Arbeitskopie) @@ -26,9 +26,16 @@ while read i; do \ dpkg-divert --package fglrx-driver --rename --remove "$i"; done 2> /dev/null # Add new diversion. - mkdir -p /usr/lib/fglrx/diversions - dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions/libGL.so.1.2 --rename /usr/lib/libGL.so.1.2 - dpkg-divert --package fglrx-glx --divert /usr/lib/fglrx/diversions/libGL.so.1 --rename /usr/lib/libGL.so.1 + if [ "$(dpkg --print-architecture)" = "i386" ]; then + LIBDIR=/usr/lib + PKG=fglrx-glx + else + LIBDIR=/usr/lib32 + PKG=ia32-fglrx-glx + fi + mkdir -p $LIBDIR/fglrx/diversions + dpkg-divert --package $PKG --divert $LIBDIR/fglrx/diversions/libGL.so.1.2 --rename $LIBDIR/libGL.so.1.2 + dpkg-divert --package $PKG --divert $LIBDIR/fglrx/diversions/libGL.so.1 --rename $LIBDIR/libGL.so.1 ;; esac Index: debian/fglrx-glx-ia32.lintian-overrides =================================================================== --- debian/fglrx-glx-ia32.lintian-overrides (Revision 243) +++ debian/fglrx-glx-ia32.lintian-overrides (Arbeitskopie) @@ -1,6 +0,0 @@ -fglrx-glx-ia32: shlib-with-non-pic-code usr/lib32/libGL.so.1.2 -fglrx-glx-ia32: no-shlibs-control-file usr/lib32/libGL.so.1.2 -fglrx-glx-ia32: no-symbols-control-file usr/lib32/libGL.so.1.2 -fglrx-glx-ia32: shlib-with-executable-stack usr/lib32/libGL.so.1.2 -fglrx-glx-ia32: shlib-calls-exit usr/lib32/libGL.so.1.2 -fglrx-glx-ia32: no-upstream-changelog Index: debian/fglrx-glx-ia32.postrm =================================================================== --- debian/fglrx-glx-ia32.postrm (Revision 243) +++ debian/fglrx-glx-ia32.postrm (Arbeitskopie) @@ -1,35 +0,0 @@ -#!/bin/sh -# Copyright (C) 2002-2006 Flavio Stanchina -# Licensed under the GNU General Public License, version 2. - -set -e - -# summary of how this script can be called: -# * <postrm> 'remove' -# * <postrm> 'purge' -# * <old-postrm> 'upgrade' <new-version> -# * <new-postrm> 'failed-upgrade' <old-version> -# * <new-postrm> 'abort-install' -# * <new-postrm> 'abort-install' <old-version> -# * <new-postrm> 'abort-upgrade' <old-version> -# * <disappearer's-postrm> 'disappear' <r>overwrit>r> <new-version> -# for details, see /usr/share/doc/packaging-manual/ - -case "$1" in - - remove|purge|disappear) - dpkg-divert --list | grep fglrx | grep ia32 | grep 'local diversion of' | cut -d' ' -f4 | while read i; do \ - dpkg-divert --rename --remove "$i"; done 2>/dev/null - dpkg-divert --list | grep fglrx-glx-ia32 | grep "^diversion of" | cut -d' ' -f3 | while read i; do \ - dpkg-divert --package fglrx-glx-ia32 --rename --remove "$i"; done 2>/dev/null - dpkg-divert --list | grep fglrx-driver | grep ia32 | grep "^diversion of" | cut -d' ' -f3 | while read i; do \ - dpkg-divert --package fglrx-driver --rename --remove "$i"; done 2>/dev/null - ldconfig - ;; - - *) - exit 0 - ;; -esac - -#DEBHELPER# Index: debian/rules =================================================================== --- debian/rules (Revision 243) +++ debian/rules (Arbeitskopie) @@ -41,7 +41,6 @@ # Package names PKG_driver := fglrx-driver PKG_glx := fglrx-glx -PKG_glx_ia32 := fglrx-glx-ia32 PKG_kernel_src := fglrx-kernel-src PKG_source := fglrx-source PKG_control := fglrx-control @@ -110,9 +109,6 @@ rpl -v -e '/usr/X11R6/lib64/modules/dri\0' \ '/usr/lib/dri\0!!!!!!!!!!!!!!!!' \ debian/$(PKG_glx)/usr/lib/libGL.so.1.2 - rpl -v -e '/usr/X11R6/lib/modules/dri\0' \ - '/usr/lib32/dri\0!!!!!!!!!!!!' \ - debian/$(PKG_glx_ia32)/usr/lib32/libGL.so.1.2 else rpl -v -e '/usr/X11R6/lib/modules/dri\0' \ '/usr/lib/dri\0!!!!!!!!!!!!!!' \ @@ -120,7 +116,6 @@ endif # Create symlinks to shared libs; fixes a lintian error. /sbin/ldconfig -n debian/$(PKG_glx)/usr/lib - /sbin/ldconfig -n debian/$(PKG_glx_ia32)/usr/lib32 /sbin/ldconfig -n debian/$(PKG_driver)/usr/lib chmod -x debian/$(PKG_driver)/etc/ati/* chmod +x debian/$(PKG_daemon)/etc/ati/authatieventsd.sh @@ -154,10 +149,6 @@ dh_gencontrol -p$(PKG_daemon) dh_gencontrol -p$(PKG_amdcccle) dh_gencontrol -p$(PKG_kernel_src) -ifeq ($(DEB_BUILD_ARCH),amd64) - dh_gencontrol -p$(PKG_glx_ia32) - dh_builddeb -p$(PKG_glx_ia32) -endif dh_builddeb -p$(PKG_driver) dh_builddeb -p$(PKG_control) dh_builddeb -p$(PKG_glx) Index: debian/fglrx-glx-ia32.install =================================================================== --- debian/fglrx-glx-ia32.install (Revision 243) +++ debian/fglrx-glx-ia32.install (Arbeitskopie) @@ -1,2 +0,0 @@ -arch/x86/usr/X11R6/lib/libGL* usr/lib32/ -arch/x86/usr/X11R6/lib/modules/dri/* usr/lib32/dri/
fglrx_ia32.diff.sig
Description: Binary data
