From 653f3522b0ee18d3e6c719589e3075c2e43a50c2 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Wed, 4 Aug 2010 21:49:02 +0200 Subject: [PATCH] xf86-video-nvidia-legacy: add metafile support Signed-off-by: Stephan Raue --- packages/x11/driver/xf86-video-nvidia-legacy/arch | 2 -- .../x11/driver/xf86-video-nvidia-legacy/build | 5 +---- .../x11/driver/xf86-video-nvidia-legacy/install | 14 ++++++-------- packages/x11/driver/xf86-video-nvidia-legacy/meta | 15 +++++++++++++++ .../x11/driver/xf86-video-nvidia-legacy/unpack | 8 ++++---- packages/x11/driver/xf86-video-nvidia-legacy/url | 2 -- 6 files changed, 26 insertions(+), 20 deletions(-) delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/arch create mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/meta delete mode 100644 packages/x11/driver/xf86-video-nvidia-legacy/url diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/arch b/packages/x11/driver/xf86-video-nvidia-legacy/arch deleted file mode 100644 index 7414689203..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/arch +++ /dev/null @@ -1,2 +0,0 @@ -i386 -x86_64 diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/build b/packages/x11/driver/xf86-video-nvidia-legacy/build index 24f1e4e4bd..ab5cb5a4d1 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/build +++ b/packages/x11/driver/xf86-video-nvidia-legacy/build @@ -2,8 +2,5 @@ . config/options $1 -$SCRIPTS/build toolchain -$SCRIPTS/build linux - -cd $BUILD/$1/usr/src/nv +cd $PKG_BUILD/usr/src/nv make module CC=$CC SYSSRC=$(kernel_path) SYSOUT=$(kernel_path) diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/install b/packages/x11/driver/xf86-video-nvidia-legacy/install index 6102aa3efe..c31d3634c4 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/install +++ b/packages/x11/driver/xf86-video-nvidia-legacy/install @@ -3,27 +3,25 @@ . config/options $1 $SCRIPTS/build busybox-hosttools -$SCRIPTS/install linux -$SCRIPTS/install libXinerama VER=`ls $BUILD/linux*/modules/lib/modules` mkdir -p $INSTALL/$XORG_PATH_MODULES/drivers - cp -P $BUILD/$1/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers + cp -P $PKG_BUILD/usr/X11R6/lib/modules/drivers/*_drv.so $INSTALL/$XORG_PATH_MODULES/drivers mkdir -p $INSTALL/$XORG_PATH_MODULES/extensions - cp -P $BUILD/$1/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so + cp -P $PKG_BUILD/usr/X11R6/lib/modules/extensions/libglx.so* $INSTALL/$XORG_PATH_MODULES/extensions/libglx_nvidia.so mkdir -p $INSTALL/etc/X11 cp -P $PKG_DIR/config/*.conf $INSTALL/etc/X11 mkdir -p $INSTALL/usr/lib - cp -P $BUILD/$1/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1 - cp -P $BUILD/$1/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 - cp -P $BUILD/$1/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1 + cp -P $PKG_BUILD/usr/lib/libGLcore.so* $INSTALL/usr/lib/libGLcore.so.1 + cp -P $PKG_BUILD/usr/lib/libGL.so* $INSTALL/usr/lib/libGL_nvidia.so.1 + cp -P $PKG_BUILD/usr/lib/tls/*tls*.so* $INSTALL/usr/lib/libnvidia-tls.so.1 mkdir -p $INSTALL/lib/modules/$VER/nvidia - cp -P $BUILD/$1/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia + cp -P $PKG_BUILD/usr/src/nv/nvidia.ko $INSTALL/lib/modules/$VER/nvidia for MOD in `find $INSTALL/lib/modules/$VER/nvidia -name *.ko`; do $STRIP --strip-debug $MOD diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/meta b/packages/x11/driver/xf86-video-nvidia-legacy/meta new file mode 100644 index 0000000000..deb5281138 --- /dev/null +++ b/packages/x11/driver/xf86-video-nvidia-legacy/meta @@ -0,0 +1,15 @@ +PKG_NAME="xf86-video-nvidia-legacy" +PKG_VERSION="96.43.17" +PKG_REV="1" +PKG_ARCH="i386 x86_64" +PKG_LICENSE="nonfree" +PKG_SITE="http://www.nvidia.com/" +[ $TARGET_ARCH = i386 ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86/$PKG_VERSION/NVIDIA-Linux-x86-${PKG_VERSION}-pkg0.run" +[ $TARGET_ARCH = x86_64 ] && PKG_URL="ftp://download.nvidia.com/XFree86/Linux-x86_64/$PKG_VERSION/NVIDIA-Linux-x86_64-${PKG_VERSION}-pkg0.run" +PKG_DEPENDS="linux libXinerama" +PKG_BUILD_DEPENDS="toolchain linux xorg-server" +PKG_PRIORITY="optional" +PKG_SECTION="x11/driver" +PKG_SHORTDESC="xf86-video-nvidia-legacy: The Xorg driver for NVIDIA legacy video chips" +PKG_LONGDESC="These binary drivers provide optimized hardware acceleration of OpenGL applications via a direct-rendering X Server. AGP, PCIe, SLI, TV-out and flat panel displays are also supported. This version supports legacy Geforce GPUs plus complimentary Quadros and nforce." +PKG_IS_ADDON="no" diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/unpack b/packages/x11/driver/xf86-video-nvidia-legacy/unpack index 2c7d1a6633..7204f76d39 100755 --- a/packages/x11/driver/xf86-video-nvidia-legacy/unpack +++ b/packages/x11/driver/xf86-video-nvidia-legacy/unpack @@ -7,14 +7,14 @@ require_eglibc $1 NV_ARCH=x86 [ "$TARGET_ARCH" = x86_64 ] && NV_ARCH=x86_64 -NV_PKG="`grep $NV_ARCH- $PKG_DIR/url | sed 's%.*/\(.*\)$%\1%'`" -[ -d $BUILD/$1 ] && rm -rf $BUILD/$1 +NV_PKG="`echo $PKG_URL | sed 's%.*/\(.*\)$%\1%'`" +[ -d $PKG_BUILD ] && rm -rf $PKG_$BUILD -sh $SOURCES/$1/$NV_PKG --extract-only --target $BUILD/$1 +sh $SOURCES/$1/$NV_PKG --extract-only --target $PKG_$BUILD echo "### Applying upstream patches ###" for patch in `ls $PKG_DIR/patches.upstream`; do cat $PKG_DIR/patches.upstream/$patch | patch -d \ - `echo $BUILD/$1 | cut -f1 -d\ ` -p1 + `echo $PKG_BUILD | cut -f1 -d\ ` -p1 done diff --git a/packages/x11/driver/xf86-video-nvidia-legacy/url b/packages/x11/driver/xf86-video-nvidia-legacy/url deleted file mode 100644 index 6e2c0755ea..0000000000 --- a/packages/x11/driver/xf86-video-nvidia-legacy/url +++ /dev/null @@ -1,2 +0,0 @@ -ftp://download.nvidia.com/XFree86/Linux-x86/96.43.17/NVIDIA-Linux-x86-96.43.17-pkg0.run -ftp://download.nvidia.com/XFree86/Linux-x86_64/96.43.17/NVIDIA-Linux-x86_64-96.43.17-pkg0.run \ No newline at end of file