Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=xorg73.git;a=commitdiff;h=c721464299dc5e2e84a0f67edd7a90d97a3e9639
commit c721464299dc5e2e84a0f67edd7a90d97a3e9639 Author: crazy <[EMAIL PROTECTED]> Date: Wed Jan 16 22:42:03 2008 +0100 mesa-7.0.2-1-i686 * Version bump * added missing pc file as patch * now really build with XCB support * fixed these weird warnings about missing headers * fixed the way we install * removed old not used stuff from FB diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index b29afdd..b2db301 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -4,8 +4,8 @@ pkgname=mesa origname=Mesa -pkgver=7.0.1 -pkgrel=2 +pkgver=7.0.2 +pkgrel=1 pkgdesc="Mesa is a 3D graphics library" _F_sourceforge_dirname="mesa3d" _F_sourceforge_name="MesaLib" @@ -13,14 +13,14 @@ Finclude sourceforge url="http://mesa3d.sourceforge.net/"; # libgl: provided by libgl, fglrx and nvidia packages depends=('expat' 'libx11>=1.1.3' 'libxext>=1.0.3' 'libxxf86vm>=1.0.1-2' 'libxi>=1.1.3' 'libxmu>=1.0.3-2' \ - 'libice>=1.0.4' 'libdrm>=2.3.0-2' 'libgl' 'libxdamage>=1.1.1' 'libxfixes>=4.0.3-2') -makedepends=('makedepend' 'glproto' 'xf86vidmodeproto') + 'libice>=1.0.4' 'libdrm>=2.3.0-2' 'libgl' 'libxdamage>=1.1.1' 'libxfixes>=4.0.3-2' 'libxcb>=1.1' 'expat' 'libgcc') +makedepends=('makedepend' 'glproto>=1.4.9' 'xf86vidmodeproto') archs=('i686' 'x86_64') groups=('x11' 'xorg-core' 'xorg-libs') source=($source \ - libGL.la libGLU.la \ + missing-glw.pc.in.patch \ change-default-dri-driver-dir-X7.1.patch \ - mesa-build-config.patch) + mesa-build-config.patch libGL.la libGLU.la) subpkgs=('libgl') subdescs=('Mesa OpenGL files.') @@ -47,28 +47,33 @@ build() { echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF} echo "USING_EGL = 0" >> ${HOSTCONF} echo "PROGRAM_DIRS =" >> ${HOSTCONF} - + echo "DEFINES += -DUSE_XCB" >> "${HOSTCONF}" + ## solution for xcb stolen from gentoo =) + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF} + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF} + echo "INSTALL_DIR = /usr" >> "${HOSTCONF}" + echo 'DRI_DRIVER_INSTALL_DIR = /usr/lib/dri' >> ${HOSTCONF} + # hakish fix these warning about missing header files .. + echo "MKDEP_OPTIONS = -fdepend -I$(gcc -print-search-dirs|head -n1|sed 's/.*: //')include" >> ${HOSTCONF} export DRI_DRIVER_DIR="/usr/lib/dri" make ${CONFIG} || Fdie Fmkdir /usr - - make INSTALL_DIR=$Fdestdir/usr DESTDIR=$Fdestdir/usr install \ - DRI_DRIVER_INSTALL_DIR=$Fdestdir/usr/lib/dri || Fdie + + # br0ken on SMP + unset MAKEFLAGS + make DESTDIR=$Fdestdir install || Fdie Fmkdir /usr/share/doc/$pkgname-$pkgver cp -r docs/{README.*,*.html,COPYING} \ $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie - -# -Hm- now make install do this :S -# Fmkdir /usr/lib/dri -# cp -ar $Fsrcdir/$origname-$pkgver/lib$dripath/*_dri.so $Fdestdir/usr/lib/dri || Fdie + # Copy our .la files and chmod them with a+rx cp -ar $Fsrcdir/lib{GL,GLU}.la $Fdestdir/usr/lib || Fdie chmod a+rx $Fdestdir/usr/lib/lib{GL,GLU}.la || Fdie - Fln libGLU.so.1.3.070001 /usr/lib/libGLU.so.1.3 + Fln libGLU.so.1.3.070002 /usr/lib/libGLU.so.1.3 Fln libGLw.so.1.0.0 /usr/lib/libGLw.so.1.0 # Remove glut.h because it conflicts with freeglut :P @@ -78,9 +83,10 @@ build() { Fsplit libgl usr/lib/libGL.la } -sha1sums=('51961ceeb1d2fb12e6de7c6a47e7b81f3cd5993f' \ - '650973d708466f5c4c21e70c1f1f6c118b27e614' \ - '12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39' \ +sha1sums=('5a95a2a0ce055997747eaf66725aec77de318dc5' \ + 'faeea09e2113541f226ac7c1c29a477ee23ef4e7' \ '426b0b08617ec19cba41ab20f3891cab82f205a2' \ - 'f7f706ec568a80543c6d6096b3d8a833b80399ed') + 'f7f706ec568a80543c6d6096b3d8a833b80399ed' \ + '650973d708466f5c4c21e70c1f1f6c118b27e614' \ + '12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39') # optimization OK diff --git a/source/x11/mesa/missing-glw.pc.in.patch b/source/x11/mesa/missing-glw.pc.in.patch new file mode 100644 index 0000000..01bb9a4 --- /dev/null +++ b/source/x11/mesa/missing-glw.pc.in.patch @@ -0,0 +1,15 @@ +diff -Naur Mesa-7.0.2/src/glw/glw.pc.in Mesa-7.0.2-p/src/glw/glw.pc.in +--- Mesa-7.0.2/src/glw/glw.pc.in 1970-01-01 01:00:00.000000000 +0100 ++++ Mesa-7.0.2-p/src/glw/glw.pc.in 2007-11-11 00:17:08.000000000 +0100 +@@ -0,0 +1,11 @@ [EMAIL PROTECTED]@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/@LIB_DIR@ ++includedir=${prefix}/include ++ ++Name: glw ++Description: Mesa OpenGL widget library ++Requires: gl ++Version: @VERSION@ ++Libs: -L${libdir} -lGLU ++Cflags: -I${includedir} _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
