[arch-commits] Commit in catalyst-utils/trunk (4 files)
Jan de Groot
jgc at archlinux.org
Fri Oct 17 21:20:37 UTC 2008
Date: Friday, October 17, 2008 @ 17:20:37
Author: jgc
Revision: 15723
upgpkg: catalyst-utils 8.11-0.1
Modified:
catalyst-utils/trunk/ChangeLog
catalyst-utils/trunk/PKGBUILD
catalyst-utils/trunk/amdcccle.desktop
catalyst-utils/trunk/catalyst-utils.install
------------------------+
ChangeLog | 5 +
PKGBUILD | 176 ++++++++++++++++++++---------------------------
amdcccle.desktop | 13 ---
catalyst-utils.install | 32 ++------
4 files changed, 95 insertions(+), 131 deletions(-)
Modified: ChangeLog
===================================================================
--- ChangeLog 2008-10-17 21:17:52 UTC (rev 15722)
+++ ChangeLog 2008-10-17 21:20:37 UTC (rev 15723)
@@ -1,3 +1,8 @@
+2008-10-17 Jan de Groot <jgc at archlinux.org>
+ * 8.11-0.1
+ Update to Ubuntu's prerelease of 8.11.
+ Support xorg-server 1.5.
+
2008-08-22 Andreas Radke <andyrtr at archlinux.org>
* 8.8-1
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2008-10-17 21:17:52 UTC (rev 15722)
+++ PKGBUILD 2008-10-17 21:20:37 UTC (rev 15723)
@@ -5,121 +5,101 @@
# Thanks to testing monkey S1G1 for contributions
pkgname=catalyst-utils
-pkgver=8.8
-pkgrel=1
+pkgver=8.11
+pkgrel=0.1
pkgdesc="Proprietary AMD/ATI userspace tools and libraries for Radeon brand cards."
arch=('i686' 'x86_64')
url="http://www.ati.amd.com"
license=('custom')
#finger required for acpi scripts
-depends=('xorg-server>=1.1.1' 'libdrm' 'libstdc++5' 'netkit-bsd-finger' \
+depends=('xorg-server>=1.5.2-2' 'libdrm>=2.3.1' 'libstdc++5' 'netkit-bsd-finger' \
'libxrandr' 'libsm' 'fontconfig' 'libxcursor' 'libxi' 'gcc-libs')
replaces=('ati-drivers' 'ati-fglrx-utils' 'fglrx-utils')
conflicts=('libgl' 'ati-drivers-module' 'ati-drivers' 'nvidia')
provides=('libgl')
-install=${pkgname}.install
-source=(http://www2.ati.com/drivers/linux/ati-driver-installer-${pkgver/./-}-x86.x86_64.run \
- amdcccle.desktop catalyst.sh atieventsd.sh ati-powermode.sh.patch)
-md5sums=('276976fb5aaf108efcdbf37256bf6d51'
- '1f4b870e977b155af549442932e8ce6f'
- 'bdafe749e046bfddee2d1c5e90eabd83'
- 'f729bf913613f49b0b9759c246058a87'
- 'b157eecaf2e26b386c427f3a64672dbc')
options=('!strip')
+install=catalyst-utils.install
+source=(http://archive.ubuntu.com/ubuntu/pool/multiverse/f/fglrx-installer/fglrx-installer_8.543.orig.tar.gz
+ amdcccle.desktop catalyst.sh atieventsd.sh)
+md5sums=('6abc8e86f1a00168ba8f43d58f71cb69'
+ '4efa8414a8fe9eeb50da38b5522ef81d'
+ 'bdafe749e046bfddee2d1c5e90eabd83'
+ 'f729bf913613f49b0b9759c246058a87')
build() {
- cd $startdir/src
+ # Create directories
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/dri"
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/drivers"
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
+ install -m755 -d "${pkgdir}/usr/lib/xorg/modules/linux"
+ install -m755 -d "${pkgdir}/usr/bin"
+ install -m755 -d "${pkgdir}/usr/sbin"
+ install -m755 -d "${pkgdir}/etc/acpi/events"
+ install -m755 -d "${pkgdir}/etc/ati"
+ install -m755 -d "${pkgdir}/etc/rc.d"
+ install -m755 -d "${pkgdir}/etc/profile.d"
+ install -m755 -d "${pkgdir}/usr/include/X11/extensions"
+ install -m755 -d "${pkgdir}/usr/include/GL"
+ install -m755 -d "${pkgdir}/usr/share/ati/amdcccle"
+ install -m755 -d "${pkgdir}/usr/share/pixmaps"
+ install -m755 -d "${pkgdir}/usr/share/man/man8"
+ install -m755 -d "${pkgdir}/usr/share/applications"
+ install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
- [ "$CARCH" = "i686" ] && _arch="x86";
- [ "$CARCH" = "x86_64" ] && _arch="x86_64";
+ # X driver installation
+ if [ "${CARCH}" = "i686" ]; then
+ cd "${srcdir}/x740/usr/X11R6/lib/modules" || return 1
+ elif [ "${CARCH}" = "x86_64" ]; then
+ cd "${srcdir}/x740_64a/usr/X11R6/lib/modules" || return 1
+ fi
+ install -m644 *.a "${pkgdir}/usr/lib/xorg/modules/" || return 1
+ install -m755 *.so "${pkgdir}/usr/lib/xorg/modules/" || return 1
+ install -m755 drivers/*.so "${pkgdir}/usr/lib/xorg/modules/drivers/" || return 1
+ install -m755 linux/*.so "${pkgdir}/usr/lib/xorg/modules/linux/" || return 1
+ install -m755 extensions/libglx.so "${pkgdir}/usr/lib/xorg/modules/extensions/" || return 1
+ install -m755 extensions/libdri.so "${pkgdir}/usr/lib/xorg/modules/extensions/libdri.ati" || return 1
- /bin/sh ./ati-driver-installer-${pkgver/./-}-x86.x86_64.run --extract archive_files
+ # Controlcenter / library installation
+ if [ "${CARCH}" = "i686" ]; then
+ cd "${srcdir}/arch/x86/usr" || return 1
+ elif [ "${CARCH}" = "x86_64" ]; then
+ cd "${srcdir}/arch/x86_64/usr" || return 1
+ fi
+ install -m755 X11R6/bin/* "${pkgdir}/usr/bin/" || return 1
+ install -m755 sbin/* "${pkgdir}/usr/sbin/" || return 1
+ install -m755 X11R6/lib/*.so* "${pkgdir}/usr/lib/" || return 1
+ install -m644 X11R6/lib/*.a "${pkgdir}/usr/lib/" || return 1
+ install -m644 X11R6/lib/*.cap "${pkgdir}/usr/lib/" || return 1
+ install -m755 X11R6/lib/modules/dri/*.so "${pkgdir}/usr/lib/xorg/modules/dri/" || return 1
+ ln -sf libfglrx_dm.so.1.0 "${pkgdir}/usr/lib/libfglrx_dm.so.1"
+ ln -sf libfglrx_pp.so.1.0 "${pkgdir}/usr/lib/libfglrx_pp.so.1"
+ ln -sf libfglrx_tvout.so.1.0 "${pkgdir}/usr/lib/libfglrx_tvout.so.1"
+ ln -sf libfglrx_gamma.so.1.0 "${pkgdir}/usr/lib/libfglrx_gamma.so.1"
+ ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so.1"
+ ln -sf libGL.so.1.2 "${pkgdir}/usr/lib/libGL.so"
- # Grab the example ACPI scripts for lid close and AC plugged/unplugged
- mkdir -p $startdir/src/etc/
- cp $startdir/src/archive_files/common/usr/share/doc/fglrx/examples/etc/acpi $startdir/src/etc -r
- cd $startdir/src/etc/acpi
- sed -i "s#/usr/X11R6/bin/aticonfig#/usr/bin/aticonfig#g" $startdir/src/etc/acpi/ati-powermode.sh || return 1
- sed -i "s#--effective=now##g" $startdir/src/etc/acpi/ati-powermode.sh || return 1
- patch -Np0 -i $startdir/src/ati-powermode.sh.patch
- cd ../..
-
- # Get our architecture files and common files all in one place
- cp $startdir/src/archive_files/arch/${_arch}/* $startdir/src/ -r
- cp $startdir/src/archive_files/common/* $startdir/src/ -r
- if [ "$CARCH" = "x86_64" ]; then
- cp $startdir/src/archive_files/x710_64a/* $startdir/src/ -r
- else
- cp $startdir/src/archive_files/x710/* $startdir/src/ -r
- fi
+ cd "${srcdir}"
+ install -m644 etc/ati/* "${pkgdir}/etc/ati/" || return 1
+ chmod 755 "${pkgdir}/etc/ati/authatieventsd.sh" || return 1
- # Remove src and documents - install remaining files
- mkdir -p $startdir/src/usr/share/pixmaps
- mv $startdir/src/usr/share/icons/* $startdir/src/usr/share/pixmaps/
- rm -rf $startdir/src/usr/{src,share/{icons,doc,applnk,gnome}}
+ install -m644 usr/X11R6/include/X11/extensions/*.h "${pkgdir}/usr/include/X11/extensions/" || return 1
+ install -m644 usr/include/GL/*.h "${pkgdir}/usr/include/GL/" || return 1
+ install -m755 usr/sbin/*.sh "${pkgdir}/usr/sbin/" || return 1
+ install -m644 usr/share/ati/amdcccle/* "${pkgdir}/usr/share/ati/amdcccle/" || return 1
+ install -m644 usr/share/icons/*.xpm "${pkgdir}/usr/share/pixmaps/" || return 1
+ install -m644 usr/share/man/man8/*.8 "${pkgdir}/usr/share/man/man8/" || return 1
+ install -m644 "${srcdir}/amdcccle.desktop" "${pkgdir}/usr/share/applications/" || return 1
- # Install into correct paths for Xorg7
- install -d -m 755 $startdir/pkg/usr/include $startdir/pkg/usr/bin \
- $startdir/pkg/usr/lib/xorg/modules $startdir/pkg/etc \
- $startdir/pkg/usr/share $startdir/pkg/usr/sbin \
- $startdir/pkg/etc/rc.d $startdir/pkg/etc/acpi
+ # ACPI example files
+ install -m755 usr/share/doc/fglrx/examples/etc/acpi/*.sh "${pkgdir}/etc/acpi/" || return 1
+ sed -i -e 's/usr\/X11R6/usr/g' "${pkgdir}/etc/acpi/ati-powermode.sh" || return 1
+ install -m644 usr/share/doc/fglrx/examples/etc/acpi/events/* "${pkgdir}/etc/acpi/events/" || return 1
- mv $startdir/src/etc/* $startdir/pkg/etc/
- mv $startdir/src/usr/sbin/* $startdir/pkg/usr/sbin/
- mv $startdir/src/usr/include/* $startdir/pkg/usr/include/
- mv $startdir/src/usr/share/* $startdir/pkg/usr/share/
- mv $startdir/src/usr/X11R6/include/* $startdir/pkg/usr/include/
- mv $startdir/src/usr/X11R6/bin/* $startdir/pkg/usr/bin/
- if [ "$CARCH" == "x86_64" ]; then
- mv $startdir/src/usr/X11R6/lib64/modules/* $startdir/pkg/usr/lib/xorg/modules/
- rm -rf $startdir/src/usr/X11R6/lib64/modules
- mv $startdir/src/usr/X11R6/lib64/* $startdir/pkg/usr/lib
- else
- mv $startdir/src/usr/X11R6/lib/modules/* $startdir/pkg/usr/lib/xorg/modules/
- rm -rf $startdir/src/usr/X11R6/lib/modules
- mv $startdir/src/usr/X11R6/lib/* $startdir/pkg/usr/lib/
- fi
+ # Add ATI Events Daemon launcher
+ install -m755 "${srcdir}/atieventsd.sh" "${pkgdir}/etc/rc.d/atieventsd" || return 1
+
+ # thanks to cerebral, we dont need that damned symlink
+ install -m755 "${srcdir}/catalyst.sh" "${pkgdir}/etc/profile.d/" || return 1
- # correct dir permissions
- find $startdir/pkg/usr -type d -exec chmod 755 {} \;
-
- # correct FILE permissions - >=8.39.4 has nearly every file marked 0744. This
- # is dumb, and previous versions of the drivers had no files marked this
- # way. Fixing permissions of files to what they were in 8.38.6
- find $startdir/pkg/etc -not -type d -exec chmod 0444 {} \;
- find $startdir/pkg/etc -name '*.sh' -not -type d -exec chmod a+x {} \;
- chmod u+w $startdir/pkg/etc/{ati/control,acpi/ati-powermode.sh}
- find $startdir/pkg/usr/{bin,lib,sbin} -not -type d -exec chmod 0755 {} \;
- chmod 0555 $startdir/pkg/usr/sbin/atigetsysteminfo.sh
- find $startdir/pkg/usr/lib -name '*.a' -not -type d -exec chmod 0644 {} \;
- find $startdir/pkg/usr/{share,include} -not -type d -exec chmod 0444 {} \;
- find $startdir/pkg/usr/share/ati/amdcccle/ -name '*.qm' -not -type d -exec chmod 0644 {} \;
- find $startdir/pkg/usr/share/man -not -type d -exec chmod 0644 {} \;
-
- # create proper symlinks to libGL.so, libfglrx_pp.so, and libfglrx_gamma.so
- cd $startdir/pkg/usr/lib
- ln -s libGL.so.1.2 libGL.so
- ln -s libGL.so.1.2 libGL.so.1
- ln -sf /usr/lib/libfglrx_pp.so.1.0 libfglrx_pp.so.1
- ln -sf /usr/lib/libfglrx_gamma.so.1.0 libfglrx_gamma.so.1
-
- mkdir -p ${startdir}/pkg/usr/lib/xorg/modules/extensions
- cd ${startdir}/pkg/usr/lib/xorg/modules/extensions
- ln -sf libGLcore.xorg libGLcore.so
- ln -sf libglx.xorg libglx.so
-
- # install licenses
- install -m 0644 -D $startdir/src/archive_files/ATI_LICENSE.TXT \
- $startdir/pkg/usr/share/licenses/${pkgname}/AMD_ATI_LICENSE.TXT
- # create DE file
- install -m 0755 -D $startdir/src/amdcccle.desktop \
- $startdir/pkg/usr/share/applications/amdcccle.desktop
- # thanks to cerebral, we dont need that damned symlink
- install -m 0755 -D $startdir/src/catalyst.sh \
- $startdir/pkg/etc/profile.d/catalyst.sh
- # Add ATI Events Daemon launcher
- install -m 0755 -D $startdir/src/atieventsd.sh \
- $startdir/pkg/etc/rc.d/atieventsd
-
+ install -m644 "${srcdir}/usr/share/doc/fglrx/ATI_LICENSE.TXT" "${pkgdir}/usr/share/licenses/${pkgname}/" || return 1
}
-
Modified: amdcccle.desktop
===================================================================
--- amdcccle.desktop 2008-10-17 21:17:52 UTC (rev 15722)
+++ amdcccle.desktop 2008-10-17 21:20:37 UTC (rev 15723)
@@ -3,16 +3,9 @@
Comment=ATI graphics adapter settings
Name[de]=ATI Catalyst Control Center
Comment[de]=ATI grafics adapter settings
-SwallowExec=
-BinaryPattern=
-Icon=ccc_large.xpm
-MiniIcon=ccc_small.xpm
-Protocols=
-MimeType=
+Icon=ccc_large
+MiniIcon=ccc_small
Exec=amdcccle
-TerminalOptions=
-Path=
-DocPath=
Type=Application
-Terminal=0
+Terminal=false
Categories=Settings;DesktopSettings;
Modified: catalyst-utils.install
===================================================================
--- catalyst-utils.install 2008-10-17 21:17:52 UTC (rev 15722)
+++ catalyst-utils.install 2008-10-17 21:20:37 UTC (rev 15723)
@@ -1,12 +1,3 @@
-# This is a default template for a post-install scriptlet. You can
-# remove any functions you don't need (and this header).
-
-# arg 1: the new package version
-pre_install() {
- /bin/true
-}
-
-# arg 1: the new package version
post_install() {
echo "PLEASE NOTE:"
echo "For these drivers to work, you must install kernel modules."
@@ -16,24 +7,19 @@
echo "You can use the tool 'aticonfig' to generate an xorg.conf file."
echo "Remember to add fglrx to the MODULES list in /etc/rc.conf."
echo "--------------------------------------------------------------"
+
+ rm -f usr/lib/xorg/modules/extensions/libdri.so
+ ln -sf libglx.ati usr/lib/xorg/modules/extensions/libdri.so
}
-# arg 1: the new package version
-# arg 2: the old package version
post_upgrade() {
- /bin/true
+ rm -f usr/lib/xorg/modules/extensions/libdri.so
+ ln -sf libglx.ati usr/lib/xorg/modules/extensions/libdri.so
}
-# arg 1: the old package version
-pre_remove() {
- /bin/true
-}
-
-# arg 1: the old package version
post_remove() {
- /bin/true
+ # If the symlink is dead, remove it
+ if [ ! -e usr/lib/xorg/modules/extensions/libdri.so ]; then
+ rm -f usr/lib/xorg/modules/extensions/libdri.so
+ fi
}
-
-op=$1
-shift
-$op $*
More information about the arch-commits
mailing list