From cfaae2dd9f21dc1821e41d95ce980c66e1ef07f7 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Wed, 30 May 2007 08:02:23 +0000 Subject: [PATCH] Clifford Wolf: Forked mesademos from mesalib package [2007052622503629836] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@8500 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/xorg/mesalib/mesalib.conf | 9 ++++++++- .../{no_broken_demos.patch => no_broken_demos.diff} | 0 package/xorg/mesalib/pkgmapper.in | 4 ++++ package/xorg/mesalib/preconfig.in | 3 +++ 4 files changed, 15 insertions(+), 1 deletion(-) rename package/xorg/mesalib/{no_broken_demos.patch => no_broken_demos.diff} (100%) create mode 100644 package/xorg/mesalib/pkgmapper.in create mode 100644 package/xorg/mesalib/preconfig.in diff --git a/package/xorg/mesalib/mesalib.conf b/package/xorg/mesalib/mesalib.conf index cb1338037..fa343be13 100644 --- a/package/xorg/mesalib/mesalib.conf +++ b/package/xorg/mesalib/mesalib.conf @@ -1,6 +1,9 @@ mesalib_prepatch() { - tar xvjf $archdir/MesaDemos-$ver.tar.bz2 -C .. + if [ $xpkg = mesademos ]; then + tar xvjf $archdir/MesaDemos-$ver.tar.bz2 -C .. + patch -p1 < $confdir/no_broken_demos.diff + fi find progs/ -type f -perm +111 | xargs -r chmod -x sed -i 's,/usr/local,/usr,g' configs/* } @@ -23,6 +26,10 @@ var_append CC_WRAPPER_FILTER "|" \ # FIXME: use a different makeopt if arch != x86 makeopt="linux-x86" +if [ $xpkg = mesademos ]; then + makeinstopt="" +fi + prepatch="mesalib_prepatch" postmake="mesalib_postmake" export CFLAGS="$CFLAGS -I/usr/X11/include" diff --git a/package/xorg/mesalib/no_broken_demos.patch b/package/xorg/mesalib/no_broken_demos.diff similarity index 100% rename from package/xorg/mesalib/no_broken_demos.patch rename to package/xorg/mesalib/no_broken_demos.diff diff --git a/package/xorg/mesalib/pkgmapper.in b/package/xorg/mesalib/pkgmapper.in new file mode 100644 index 000000000..e1433292f --- /dev/null +++ b/package/xorg/mesalib/pkgmapper.in @@ -0,0 +1,4 @@ +case "$pkg" in + mesademos) + pkg=mesalib ;; +esac diff --git a/package/xorg/mesalib/preconfig.in b/package/xorg/mesalib/preconfig.in new file mode 100644 index 000000000..ee324d2f1 --- /dev/null +++ b/package/xorg/mesalib/preconfig.in @@ -0,0 +1,3 @@ +if pkgcheck mesalib X; then + pkgfork mesalib mesademos stages ------6--9 +fi