?mode=patch&uid=2010062917035929003
Open Patch: 2010062917035929003 (by stf)
+
stf
Votecheck 'core-relaxed':
Missing 1 qualified vote(s)
(clifford, daja77, fake, stefanp, teha)
package/x11/mesalib/preconfig.in
package/x11/mesalib/pkgmapper.in
package/x11/mesalib/no_broken_demos.diff
package/x11/mesalib/mesalib.conf
package/x11/mesalib/mesalib.desc
Stefan Fiedler: update mesalib
Stefan Fiedler:
update mesalib
--- package/x11/mesalib/preconfig.in (revision 124)
+++ package/x11/mesalib/preconfig.in (revision 125)
@@ -1 +0,0 @@
-pkgfork mesalib mesademos stages ------6--9
--- package/x11/mesalib/no_broken_demos.diff (revision 124)
+++ package/x11/mesalib/no_broken_demos.diff (revision 125)
@@ -1,39 +0,0 @@
---- ./progs/demos/Makefile.orig 2007-05-24 10:23:15.000000000 +0200
-+++ ./progs/demos/Makefile 2007-05-24 10:24:38.000000000 +0200
-@@ -14,8 +14,6 @@
- LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)
-
- PROGS = \
-- arbfplight \
-- arbfslight \
- arbocclude \
- bounce \
- clearspd \
-@@ -23,16 +21,13 @@
- drawpix \
- engine \
- fire \
-- fogcoord \
- fplight \
-- fslight \
- gamma \
- gearbox \
- gears \
- geartrain \
- glinfo \
- gloss \
-- glslnoise \
- gltestperf \
- glutfx \
- isosurf \
-@@ -61,9 +56,7 @@
- texobj \
- trispd \
- tunnel \
-- tunnel2 \
-- vao_demo \
-- winpos
-+ tunnel2
-
-
- ##### RULES #####
--- package/x11/mesalib/pkgmapper.in (revision 124)
+++ package/x11/mesalib/pkgmapper.in (revision 125)
@@ -1,8 +0,0 @@
-case "$pkg" in
- mesademos)
- pkg=mesalib ;;
- mesaglut)
- pkg=mesalib ;;
- mesalib)
- pkg=mesalib ;;
-esac
--- package/x11/mesalib/mesalib.conf (revision 124)
+++ package/x11/mesalib/mesalib.conf (revision 125)
@@ -5,20 +5,25 @@
# other drivers that need fixing
# --with-dri-drivers=fb,gamma,i915,i965,intel,r200,r300,r600,radeon
+# xorg-server is looking here for drivers
+libdir="$instroot/$prefix/X11R7/$multilib"
+
mesalib_prepatch() {
- if [ "$xpkg" == mesademos ] ; then
- tar xvjf $archdir/MesaDemos-$ver.tar.bz2 -C ..
- patch -p1 < $confdir/no_broken_demos.diff
- fi
+ # this fixes some demos
+ var_append makeopt " " "LDFLAGS=\"-L$root/usr/X11/$multilib\""
+
+ tar xvjf $archdir/MesaGLUT-$ver.tar.bz2 -C ..
+ tar xvjf $archdir/MesaDemos-$ver.tar.bz2 -C ..
+
find progs/ -type f -perm +111 | xargs -r chmod -x
- sed -i 's,/usr/local,/usr,g' configs/*
- if [ "$xpkg" == mesalib && "$crossnative" == cross ] ; then
+ if [ "$crossnative" == cross ] ; then
sed -i -e "s,ranlib ,$arch_target-ranlib ,g" bin/mklib
fi
}
mesalib_postmake() {
+ # install demos
find progs/ -type f -perm +111 | while read src; do
if [[ `basename $src` == gl* ]]; then
trg=`basename $src`
@@ -30,13 +35,5 @@
done
}
-if [ "$xpkg" = mesalib -o "$xpkg" = mesademos ] ; then
- prepatch="mesalib_prepatch"
- postmake="mesalib_postmake"
-
-fi
-
-if [ "$xpkg" = mesademos ] ; then
- makeinstopt=""
-fi
-
+prepatch="mesalib_prepatch"
+postmake="mesalib_postmake"
--- package/x11/mesalib/mesalib.desc (revision 124)
+++ package/x11/mesalib/mesalib.desc (revision 125)
@@ -40,20 +40,9 @@
[L] OpenSource
[S] Stable
-[V] 7.7
+[V] 7.7.1
[P] X --X--5---9 129.600
-#if xpkg == mesaglut
-[I] GL utility toolkit for the Mesa 3D graphics library
-[D] 111351166 MesaGLUT-7.7.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.7/
-#endif
-
-#if xpkg == mesalib
-[I] The Mesa 3D graphics library
-[D] 2489234568 MesaLib-7.7.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.7/
-#endif
-
-#if xpkg == mesademos
-[I] demos for the Mesa 3D graphics library
-[D] 2250514048 MesaDemos-7.7.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.7/
-#endif
+[D] 940357696 MesaLib-7.7.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.7.1/
+[D] 692890099 MesaGLUT-7.7.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.7.1/
+[D] 769140436 MesaDemos-7.7.1.tar.bz2 ftp://ftp.freedesktop.org/pub/mesa/7.7.1/
[Download this patch]