commit: c67a2388792fa99eb9f6b985475be69805a6cdc4 Author: Emil Karlson <jekarlson <AT> gmail <DOT> com> AuthorDate: Fri Apr 25 21:17:23 2014 +0000 Commit: Emil Karlson <jekarlson <AT> gmail <DOT> com> CommitDate: Fri Apr 25 21:17:23 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/x11.git;a=commit;h=c67a2388
x11-drivers/ati-drivers: version bump Remove unused patches Drop old ebuilds Improve multilib-build compatibility Bump multilib-build version of the ebuild --- profiles/package.mask | 2 +- ...3.9-r1.ebuild => ati-drivers-14.4_rc-r1.ebuild} | 98 +++++++++----- ...3.2_beta7.ebuild => ati-drivers-14.4_rc.ebuild} | 141 +++++++++++---------- .../files/ati-drivers-13.8-proc-permissions.diff | 13 -- .../files/ati-powermode-opt-path-2.patch | 42 ------ 5 files changed, 138 insertions(+), 158 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 87cf4a1..71a5c73 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -128,5 +128,5 @@ =x11-proto/xproto-9999 #mask until new multilib is enabled -=x11-drivers/ati-drivers-13.9-r1 =x11-drivers/ati-drivers-13.12-r1 +=x11-drivers/ati-drivers-14.4_rc-r1 diff --git a/x11-drivers/ati-drivers/ati-drivers-13.9-r1.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild similarity index 86% rename from x11-drivers/ati-drivers/ati-drivers-13.9-r1.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild index 0ea20da..3bf4b6b 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.9-r1.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc-r1.ebuild @@ -8,9 +8,11 @@ inherit eutils multilib-build linux-info linux-mod toolchain-funcs versionator p DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" SLOT="1" -DRIVERS_URI="https://www2.ati.com/drivers/linux/amd-catalyst-13.9-linux-x86.x86_64.zip"; +# Uses javascript for download YESSSS +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/linux-amd-catalyst-14.4-rc-v1.0-apr17.zip"; XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"; SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" FOLDER_PREFIX="common/" @@ -19,14 +21,36 @@ IUSE="debug +modules qt4 static-libs pax_kernel" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" -RESTRICT="bindist test" +RESTRICT="bindist test fetch" RDEPEND=" - <=x11-base/xorg-server-1.14.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid x11-apps/xauth + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXrandr + x11-libs/libXrender + virtual/glu + abi_x86_32? ( + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) + || ( + ( + x11-libs/libX11[abi_x86_32] + x11-libs/libXext[abi_x86_32] + x11-libs/libXinerama[abi_x86_32] + x11-libs/libXrandr[abi_x86_32] + x11-libs/libXrender[abi_x86_32] + ) + app-emulation/emul-linux-x86-xlibs + ) + ) qt4? ( x11-libs/libICE x11-libs/libSM @@ -89,6 +113,8 @@ QA_PRESTRIPPED=" usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 usr/lib\(32\|64\)\?/libaticaldd.so usr/lib\(32\|64\)\?/dri/fglrx_dri.so + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so " QA_SONAME=" @@ -129,40 +155,41 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" -ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause - kernel to reject loading the fglrx module with - \"ERROR: could not insert 'fglrx': Exec format error.\" - You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." - -_check_kernel_config() { - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi - - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - fi +pkg_nofetch() { + einfo "The driver package" + einfo "Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" + einfo "needs to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; - if use amd64 && ! linux_chkconfig_present COMPAT; then - die "CONFIG_COMPAT must be enabled for amd64 kernels." - fi } pkg_pretend() { + local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" + use amd64 && CONFIG_CHECK+=" COMPAT" + + local ERROR_MTRR="CONFIG_MTRR required for direct rendering." + local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct + rendering to work." + local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire + as GPL-only. This prevents ${P} from compiling with an error like this: + FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" + local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause + kernel to reject loading the fglrx module with + \"ERROR: could not insert 'fglrx': Exec format error.\" + You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." + local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." + # workaround until bug 365543 is solved if use modules; then linux-info_pkg_setup require_configured_kernel - _check_kernel_config + kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL" + check_extra_config + if ! linux_chkconfig_present AGP && \ + ! linux_chkconfig_present PCIEPORTBUS; then + ewarn "You don't have AGP and/or PCIe support enabled in the kernel" + ewarn "Direct rendering will not work." + fi fi if ! has XT ${PAX_MARKINGS} && use pax_kernel; then @@ -227,7 +254,7 @@ src_unpack() { else RUN="${DISTDIR}/${DRIVERS_DISTFILE}" fi - sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die + sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die fi mkdir xvba_sdk @@ -283,7 +310,7 @@ src_prepare() { # Compile fix for kernel typesafe uid types #469160 epatch "${FILESDIR}/typesafe-kuid.diff" - epatch "${FILESDIR}/ati-drivers-13.6-linux-3.10-proc.diff" + epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch" # Fix #483400 epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" @@ -358,6 +385,11 @@ src_install() { # amd64 are installed in src_install-libs. Everything else # (including libraries only available in native 64bit on amd64) # goes in here. + + # There used to be some code here that tried to detect running + # under a "native multilib" portage ((precursor of) + # http://dev.gentoo.org/~kanaka/auto-multilib/). I removed that, it + # should just work (only doing some duplicate work). --marienz multilib_foreach_abi src_install-libs # This is sorted by the order the files occur in the source tree. @@ -384,7 +416,7 @@ src_install() { insinto /etc/ati exeinto /etc/ati # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} + doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default} doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh # include. diff --git a/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild b/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild similarity index 82% rename from x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild rename to x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild index 777450b..e7f3e91 100644 --- a/x11-drivers/ati-drivers/ati-drivers-13.2_beta7.ebuild +++ b/x11-drivers/ati-drivers/ati-drivers-14.4_rc.ebuild @@ -8,27 +8,23 @@ inherit eutils multilib linux-info linux-mod toolchain-funcs versionator pax-uti DESCRIPTION="Ati precompiled drivers for Radeon Evergreen (HD5000 Series) and newer chipsets" HOMEPAGE="http://www.amd.com"; -MY_V=( $(get_version_components) ) -#RUN="${WORKDIR}/amd-driver-installer-9.00-x86.x86_64.run" +RUN="${WORKDIR}/fglrx-14.10/amd-driver-installer-14.10-x86.x86_64.run" SLOT="1" -[[ "${MY_V[2]}" =~ beta.* ]] && BETADIR="beta/" -if [[ legacy != ${SLOT} ]]; then - DRIVERS_URI="http://www2.ati.com/drivers/${BETADIR}amd-driver-installer-catalyst-${PV/_beta/-beta}-linux-x86.x86_64.zip"; -else - DRIVERS_URI="http://www2.ati.com/drivers/legacy/amd-driver-installer-catalyst-$(get_version_component_range 1-2)-$(get_version_component_range 3)-legacy-linux-x86.x86_64.zip" -fi +# Uses javascript for download YESSSS +#DRIVERS_URI="http://www2.ati.com/drivers/linux/amd-catalyst-13.12-linux-x86.x86_64.zip"; +DRIVERS_URI="http://dev.gentooexperimental.org/~scarabeus/linux-amd-catalyst-14.4-rc-v1.0-apr17.zip"; XVBA_SDK_URI="http://developer.amd.com/wordpress/media/2012/10/xvba-sdk-0.74-404001.tar.gz"; SRC_URI="${DRIVERS_URI} ${XVBA_SDK_URI}" FOLDER_PREFIX="common/" -IUSE="debug +modules multilib qt4 static-libs disable-watermark pax_kernel" +IUSE="debug +modules multilib qt4 static-libs pax_kernel" LICENSE="AMD GPL-2 QPL-1.0" KEYWORDS="-* ~amd64 ~x86" -RESTRICT="bindist test" +RESTRICT="bindist test fetch" RDEPEND=" - <=x11-base/xorg-server-1.13.49[-minimal] + <=x11-base/xorg-server-1.15.49[-minimal] >=app-admin/eselect-opengl-1.0.7 app-admin/eselect-opencl sys-power/acpid @@ -40,8 +36,20 @@ RDEPEND=" x11-libs/libXrender virtual/glu multilib? ( - app-emulation/emul-linux-x86-opengl - app-emulation/emul-linux-x86-xlibs + || ( + virtual/glu[abi_x86_32] + app-emulation/emul-linux-x86-opengl + ) + || ( + ( + x11-libs/libX11[abi_x86_32] + x11-libs/libXext[abi_x86_32] + x11-libs/libXinerama[abi_x86_32] + x11-libs/libXrandr[abi_x86_32] + x11-libs/libXrender[abi_x86_32] + ) + app-emulation/emul-linux-x86-xlibs + ) ) qt4? ( x11-libs/libICE @@ -105,6 +113,8 @@ QA_PRESTRIPPED=" usr/lib\(32\|64\)\?/libAMDXvBA.so.1.0 usr/lib\(32\|64\)\?/libaticaldd.so usr/lib\(32\|64\)\?/dri/fglrx_dri.so + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 + usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libamdocl\(32\|64\).so " QA_SONAME=" @@ -145,37 +155,47 @@ QA_DT_HASH=" usr/lib\(32\|64\)\?/OpenCL/vendors/amd/libOpenCL.so.1 " -CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" -use amd64 && CONFIG_CHECK="${CONFIG_CHECK} COMPAT" -ERROR_MTRR="CONFIG_MTRR required for direct rendering." -ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct - rendering to work." -ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire - as GPL-only. This prevents ${P} from compiling with an error like this: - FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" -ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause - kernel to reject loading the fglrx module with - \"ERROR: could not insert 'fglrx': Exec format error.\" - You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." - -_check_kernel_config() { - if ! linux_chkconfig_present AGP && \ - ! linux_chkconfig_present PCIEPORTBUS; then - ewarn "You don't have AGP and/or PCIe support enabled in the kernel" - ewarn "Direct rendering will not work." - fi +pkg_nofetch() { + einfo "The driver package" + einfo "Linux_AMD_Catalyst_14.3_Beta_V1.0_B22_March12_2014.zip" + einfo "needs to be downloaded manually from" + einfo "http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; - kernel_is ge 2 6 37 && kernel_is le 2 6 38 && if ! linux_chkconfig_present BKL ; then - die "CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." - fi } pkg_pretend() { + local CONFIG_CHECK="~MTRR ~!DRM ACPI PCI_MSI !LOCKDEP !PAX_KERNEXEC_PLUGIN_METHOD_OR" + use amd64 && CONFIG_CHECK+=" COMPAT" + + local ERROR_MTRR="CONFIG_MTRR required for direct rendering." + local ERROR_DRM="CONFIG_DRM must be disabled or compiled as a module and not loaded for direct + rendering to work." + local ERROR_LOCKDEP="CONFIG_LOCKDEP (lock tracking) exports the symbol lock_acquire + as GPL-only. This prevents ${P} from compiling with an error like this: + FATAL: modpost: GPL-incompatible module fglrx.ko uses GPL-only symbol 'lock_acquire'" + local ERROR_PAX_KERNEXEC_PLUGIN_METHOD_OR="This config option will cause + kernel to reject loading the fglrx module with + \"ERROR: could not insert 'fglrx': Exec format error.\" + You may want to try CONFIG_PAX_KERNEXEC_PLUGIN_METHOD_BTS instead." + local ERROR_BKL="CONFIG_BKL must be enabled for kernels 2.6.37-2.6.38." + # workaround until bug 365543 is solved if use modules; then linux-info_pkg_setup require_configured_kernel - _check_kernel_config + kernel_is ge 2 6 37 && kernel_is le 2 6 38 && CONFIG_CHECK+=" BKL" + check_extra_config + if ! linux_chkconfig_present AGP && \ + ! linux_chkconfig_present PCIEPORTBUS; then + ewarn "You don't have AGP and/or PCIe support enabled in the kernel" + ewarn "Direct rendering will not work." + fi + fi + + if ! has XT ${PAX_MARKINGS} && use pax_kernel; then + ewarn "You have disabled xattr pax markings for portage." + ewarn "This will likely cause programs using ati-drivers provided" + ewarn "libraries to be killed kernel." fi } @@ -234,12 +254,16 @@ src_unpack() { else RUN="${DISTDIR}/${DRIVERS_DISTFILE}" fi - sh ${RUN} --extract "${S}" 2>&1 > /dev/null || die + sh "${RUN}" --extract "${S}" 2>&1 > /dev/null || die fi mkdir xvba_sdk cd xvba_sdk unpack ${XVBA_SDK_DISTFILE} + + mkdir -p "${WORKDIR}/extra" || die "mkdir extra failed" + cd "${WORKDIR}/extra" + tar -xf "../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz" } src_prepare() { @@ -280,16 +304,16 @@ src_prepare() { # first hunk applied upstream second (x32 related) was not epatch "${FILESDIR}"/ati-drivers-x32_something_something.patch - # compile fix for linux-3.7 - # https://bugs.gentoo.org/show_bug.cgi?id=438516 - epatch "${FILESDIR}/ati-drivers-vm-reserverd.patch" - # compile fix for AGP-less kernel, bug #435322 epatch "${FILESDIR}"/ati-drivers-12.9-KCL_AGP_FindCapsRegisters-stub.patch - # Use ACPI_DEVICE_HANDLE wrapper to make driver build on linux-3.8 - # see https://bugs.gentoo.org/show_bug.cgi?id=448216 - epatch "${FILESDIR}/ati-drivers-kernel-3.8-acpihandle.patch" + # Compile fix for kernel typesafe uid types #469160 + epatch "${FILESDIR}/typesafe-kuid.diff" + + epatch "${FILESDIR}/ati-drivers-13.8-beta-include-seq_file.patch" + + # Fix #483400 + epatch "${FILESDIR}/fgl_glxgears-do-not-include-glATI.patch" # Compile fix, https://bugs.gentoo.org/show_bug.cgi?id=454870 use pax_kernel && epatch "${FILESDIR}/const-notifier-block.patch" @@ -309,22 +333,6 @@ src_prepare() { sed -i -e 's/__SMP__/CONFIG_SMP/' *.c *h || die "SMP sed failed" sed -i -e 's/ifdef MODVERSIONS/ifdef CONFIG_MODVERSIONS/' *.c *.h \ || die "MODVERSIONS sed failed" - cd "${S}" - - mkdir extra || die "mkdir extra failed" - cd extra - unpack ./../${FOLDER_PREFIX}usr/src/ati/fglrx_sample_source.tgz - - # Get rid of watermark. Oldest known reference: - # http://phoronix.com/forums/showthread.php?19875-Unsupported-Hardware-watermark - if use disable-watermark; then - ebegin "Disabling watermark" - driver="${MY_BASE_DIR}"/usr/X11R6/${PKG_LIBDIR}/modules/drivers/fglrx_drv.so - for x in $(objdump -d ${driver}|awk '/call/&&/EnableLogo/{print "\\x"$2"\\x"$3"\\x"$4"\\x"$5"\\x"$6}'); do - sed -i "s/${x/x5b/\x5b}/\x90\x90\x90\x90\x90/g" ${driver} || break 1 - done - eend $? || die "Disabling watermark failed" - fi } src_compile() { @@ -417,7 +425,7 @@ src_install() { insinto /etc/ati exeinto /etc/ati # Everything except for the authatieventsd.sh script. - doins ${FOLDER_PREFIX}etc/ati/{logo*,control,atiogl.xml,signature,amdpcsdb.default} + doins ${FOLDER_PREFIX}etc/ati/{logo*,control,signature,amdpcsdb.default} doexe ${FOLDER_PREFIX}etc/ati/authatieventsd.sh # include. @@ -556,12 +564,7 @@ src_install-libs() { doheader xvba_sdk/include/amdxvba.h if use pax_kernel; then - pax-mark Cm "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" - eqawarn "You have set USE=pax_kernel meaning that you intend to run" - eqawarn "${PN} under a PaX enabled kernel. To do so, we must modify" - eqawarn "the ${PN} binary itself and this *may* lead to breakage! If" - eqawarn "you suspect that ${PN} is being broken by this modification," - eqawarn "please open a bug." + pax-mark m "${D}"/usr/lib*/opengl/ati/lib/libGL.so.1.2 || die "pax-mark failed" fi } @@ -585,8 +588,8 @@ pkg_postinst() { "${ROOT}"/usr/bin/eselect opengl set --use-old ati "${ROOT}"/usr/bin/eselect opencl set --use-old amd - if has_version ">=x11-drivers/xf86-video-intel-2.20.3"; then - ewarn "It is reported that xf86-video-intel-2.20.3 and later cause the X server" + if has_version "x11-drivers/xf86-video-intel[sna]"; then + ewarn "It is reported that xf86-video-intel built with USE=\"sna\" causes the X server" ewarn "to crash on systems that use hybrid AMD/Intel graphics. If you experience" ewarn "this crash, downgrade to xf86-video-intel-2.20.2 or earlier or" ewarn "try disabling sna for xf86-video-intel." diff --git a/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff b/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff deleted file mode 100644 index 26015f4..0000000 --- a/x11-drivers/ati-drivers/files/ati-drivers-13.8-proc-permissions.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index 22561c5..6480d1a 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -821,7 +821,7 @@ static struct proc_dir_entry *firegl_proc_init( device_t *dev, - KCL_DEBUG1(FN_FIREGL_PROC, "minor %d, proc_list 0x%08lx\n", minor, (unsigned long)proc_list); - if (!minor) - { -- root = KCL_create_proc_dir(NULL, "ati", S_IFDIR); -+ root = KCL_create_proc_dir(NULL, "ati", S_IFDIR|S_IRUGO|S_IXUGO); - } - - if (!root) diff --git a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch b/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch deleted file mode 100644 index f5a35a3..0000000 --- a/x11-drivers/ati-drivers/files/ati-powermode-opt-path-2.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff -ur common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh ---- common.orig/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-07-28 04:22:36.000000000 +0100 -+++ common/usr/share/doc/fglrx/examples/etc/acpi/ati-powermode.sh 2006-08-04 12:19:42.000000000 +0100 -@@ -4,6 +4,8 @@ - # Control script for ACPI lid state and AC adapter state - # - -+aticonfig='/opt/bin/aticonfig' -+ - getXuser() { - user=`finger| grep -m1 ":$displaynum " | awk '{print $1}'` - if [ x"$user" = x"" ]; then -@@ -47,7 +49,7 @@ - done - - #If PPLIB is enabled --su $user -c '/usr/bin/aticonfig --pplib-cmd="get version"' | grep PPLIB -+su $user -c '$aticonfig --pplib-cmd="get version"' | grep PPLIB - if [ $? = 0 ]; then - echo "Has PPLIB" - has_pplib=1 -@@ -61,15 +63,15 @@ - if [ ${lid_closed} -eq 1 -o ${on_dc} -eq 1 ]; then - echo "Low power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc dc"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc dc"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=1 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=1" - fi - else - echo "high power" - if [ ${has_pplib} -eq 1 ]; then -- su $user -c '/usr/bin/aticonfig --pplib-cmd="notify psrc ac"' -+ su $user -c '$aticonfig --pplib-cmd="notify psrc ac"' - else -- su $user -c "/usr/bin/aticonfig --set-powerstate=3 --effective=now" -+ su $user -c "$aticonfig --set-powerstate=$($aticonfig --lsp | grep 'default state' | cut -c 3)" - fi - fi -
