xf86-video-fglrx: rework package, fix dependencies, fix install

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2011-05-20 19:25:59 +02:00
parent 6ca3ab6958
commit 8fcefaae06
2 changed files with 12 additions and 10 deletions

View File

@ -53,7 +53,8 @@ mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers
cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers
mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions/fglrx mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions/fglrx
cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/extensions/fglrx/*.so $INSTALL/$XORG_PATH_MODULES/extensions/fglrx # rename to not conflicting with Mesa libGL.so
cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/extensions/fglrx/fglrx-libglx.so $INSTALL/$XORG_PATH_MODULES/extensions/libglx_fglrx.so
mkdir -p $INSTALL/$XORG_PATH_MODULES/linux mkdir -p $INSTALL/$XORG_PATH_MODULES/linux
cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL/$XORG_PATH_MODULES/linux cp -P $PKG_BUILD/$BASEDIR/usr/X11R6/$LIBDIR/modules/linux/*.so $INSTALL/$XORG_PATH_MODULES/linux
@ -61,21 +62,22 @@ mkdir -p $INSTALL/$XORG_PATH_MODULES/linux
mkdir -p $INSTALL/etc/X11 mkdir -p $INSTALL/etc/X11
cp $PKG_DIR/config/*.conf $INSTALL/etc/X11 cp $PKG_DIR/config/*.conf $INSTALL/etc/X11
mkdir -p $INSTALL/etc/ati
cp $PKG_BUILD/common/etc/ati/amdpcsdb.default $INSTALL/etc/ati
# DRI driver # DRI driver
mkdir -p $INSTALL/usr/lib/dri mkdir -p $INSTALL/usr/lib/dri
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/modules/dri/fglrx_dri.so* $INSTALL/usr/lib/dri
# Ati's libGL has an hardcoded location for DRI modules
mkdir -p $INSTALL/usr/X11R6/$LIBDIR/modules/
ln -sf /usr/lib/dri $INSTALL/usr/X11R6/$LIBDIR/modules/dri
# OpenGL libs # OpenGL libs
mkdir -p $INSTALL/usr/lib/fglrx mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/fglrx # rename to not conflicting with Mesa libGL.so
cp -P $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/fglrx/fglrx-libGL.so* $INSTALL/usr/lib/libGL_fglrx.so.1
# System Libs # System Libs
mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/usr/lib
cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so* $INSTALL/usr/lib cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libati*.so $INSTALL/usr/lib
cp $PKG_BUILD/arch/$ARCH/usr/$LIBDIR/libatiuki.so* $INSTALL/usr/lib/libatiuki.so.1
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libati*.so* $INSTALL/usr/lib
cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib cp $PKG_BUILD/arch/$ARCH/usr/X11R6/$LIBDIR/libfglrx*.so* $INSTALL/usr/lib

View File

@ -25,8 +25,8 @@ PKG_ARCH="i386 x86_64"
PKG_LICENSE="nonfree" PKG_LICENSE="nonfree"
PKG_SITE="http://www.ati.com/" PKG_SITE="http://www.ati.com/"
PKG_URL="http://www2.ati.com/drivers/linux/ati-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run" PKG_URL="http://www2.ati.com/drivers/linux/ati-driver-installer-`echo $PKG_VERSION | sed 's/\./-/'`-x86.x86_64.run"
PKG_DEPENDS="linux" PKG_DEPENDS="linux libX11 libXinerama libXcomposite"
PKG_BUILD_DEPENDS="toolchain util-macros libX11" PKG_BUILD_DEPENDS="toolchain util-macros libX11 libXinerama libXcomposite"
PKG_PRIORITY="optional" PKG_PRIORITY="optional"
PKG_SECTION="x11/driver" PKG_SECTION="x11/driver"
PKG_SHORTDESC="xf86-video-fglrx: ATI binary Xorg driver" PKG_SHORTDESC="xf86-video-fglrx: ATI binary Xorg driver"