Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=x11testing.git;a=commitdiff;h=e5a6be3067847f958bd664d75b4ebc1f64ffa626
commit e5a6be3067847f958bd664d75b4ebc1f64ffa626 Author: Michel Hermier <[email protected]> Date: Wed Oct 10 15:57:08 2012 +0200 mesa-9.0-1-i686 * Bump version. * Drop GLU support, it is now an external package. * Disable libosmesa for now. diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 6e766e2..3a61844 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -2,33 +2,29 @@ # Maintainer: bouleetbil <[email protected]> # Contributor: crazy <[email protected]> -#USE_DEVEL=y -#USE_WAYLAND_EGL=y - USE_DEBUG=${USE_DEBUG:-"n"} USE_DEVEL=${USE_DEVEL:-"n"} USE_DRI=${USE_DRI:-"y"} USE_DRI_OLD=${USE_DRI_OLD:-"y"} USE_EGL=${USE_EGL:-"y"} USE_GALLIUM=${USE_GALLIUM:-"y"} -USE_GLU=${USE_GLU:-"y"} USE_GLX=${USE_GLX:-"y"} -USE_OSMESA=${USE_OSMESA:-"y"} +USE_OSMESA=${USE_OSMESA:-"n"} USE_VDPAU=${USE_VDPAU:-"y"} USE_WAYLAND_EGL=${USE_WAYLAND_EGL:-"n"} pkgname=mesa origname=Mesa _F_archive_name="MesaLib" -pkgver=8.0.3 -pkgrel=2 +pkgver=9.0 +pkgrel=1 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; up2date="Flasttar ftp://ftp.freedesktop.org/pub/$pkgname/current/"; # libgl: provided by libgl, fglrx and nvidia packages depends=() -makedepends=('makedepend' 'libdrm-old>=2.4.33-3' 'libdrm-nouveau>=2.4.33-3') +makedepends=('makedepend') # should be mesa-*=$pkgver but apps should not depends on mesa anymore first, unless specific to mesa rodepends=('libgl') archs=('i686' 'x86_64' 'arm') @@ -36,47 +32,38 @@ groups=('x11' 'xorg-core' 'xorg-libs') if Fuse DEVEL; then unset source sha1sums - pkgver=9999.g83a0242 + pkgver=9999.g23cd6c4 pkgrel=0 _F_scm_type="git" _F_scm_url="git://anongit.freedesktop.org/mesa/mesa" Finclude scm else source=("ftp://ftp.freedesktop.org/pub/mesa/$pkgver/MesaLib-$pkgver.tar.bz2";) - sha1sums=('768bdb2fe133bbcccd3323b79484d0d17bc0d05d') + sha1sums=('dcddfd6b6b4a4ed4f7123ca75fd0108007bbad74') fi -source=("${source[@]}" \ - mesa-8.0.3-llvm-3.1-fixes.patch \ - libGL.la \ - libGLU.la) - -sha1sums=("${sha1sums[@]}" \ - '4ab1665ceda9efdc54c5270605bb2163c45e60be' \ - '650973d708466f5c4c21e70c1f1f6c118b27e614' \ - '12c57ac5e7e8a94d4d41b0f37b0fb3f470791c39') - subpkgs=('libgl' 'libgl-headers-mesa') subdescs=('Mesa DRI OpenGL files.' 'Mesa OpenGL headers files.') subprovides=('libgl-mesa' 'libgl-headers') subreplaces=('' '') subconflicts=('fglrx nvidia' 'nvidia') subdepends=('expat libxdamage libxxf86vm' 'dri2proto glproto') -subrodepends=("libgl-headers-mesa>=$pkgver-$pkgrel libglapi libglx mesa-dri-drivers>=$pkgver-$pkgrel libgbm>=$pkgver-$pkgrel libdrm libdrm-nouveau" '') +subrodepends=("libgl-headers-mesa>=$pkgver-$pkgrel libglapi libglx mesa-dri-drivers>=$pkgver-$pkgrel" '') # Remove mesa-dri-drivers when situation is more clearer about gles -# Remove libgbm rodepend after 1.6 it's only for help migration to mesa 7.11 subgroups=('x11' 'x11') subarchs=("${archs[*]}" "${archs[*]}") +subbackup=('' '') subpkgs=("${subpkgs[@]}" 'mesa-dri-drivers') subdescs=("${subdescs[@]}" 'Mesa OpenGL DRI drivers.') subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" "libdri llvm") +subdepends=("${subdepends[@]}" "libdrm llvm") subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" 'etc/drirc') subpkgs=("${subpkgs[@]}" 'libgbm') subdescs=("${subdescs[@]}" 'Mesa gbm library.') @@ -87,6 +74,7 @@ subdepends=("${subdepends[@]}" 'glibc') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') subpkgs=("${subpkgs[@]}" 'libglapi') subdescs=("${subdescs[@]}" 'Mesa OpenGL API library.') @@ -97,16 +85,18 @@ subdepends=("${subdepends[@]}" 'glibc') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') subpkgs=("${subpkgs[@]}" 'libgles') subdescs=("${subdescs[@]}" 'Mesa OpenGL ES1/ES2 libraries.') subprovides=("${subprovides[@]}" 'libgles-mesa') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') -subdepends=("${subdepends[@]}" '') -subrodepends=("${subrodepends[@]}" 'libdrm libdrm-nouveau libglapi khr-headers') +subdepends=("${subdepends[@]}" 'libdrm') +subrodepends=("${subrodepends[@]}" 'libglapi khr-headers') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') subpkgs=("${subpkgs[@]}" 'khr-headers') subdescs=("${subdescs[@]}" 'Khronos generic header.') @@ -117,6 +107,7 @@ subdepends=("${subdepends[@]}" '') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") +subbackup=("${subbackup[@]}" '') if Fuse EGL; then subpkgs=("${subpkgs[@]}" 'libegl') @@ -124,10 +115,11 @@ if Fuse EGL; then subprovides=("${subprovides[@]}" 'libegl-mesa') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') - subdepends=("${subdepends[@]}" 'dri2proto glproto') - subrodepends=("${subrodepends[@]}" 'khr-headers libgbm libdrm libdrm-nouveau') + subdepends=("${subdepends[@]}" 'dri2proto glproto libdrm') + subrodepends=("${subrodepends[@]}" 'khr-headers libgbm') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') subpkgs=("${subpkgs[@]}" 'libvg') subdescs=("${subdescs[@]}" 'Mesa OpenVG library.') @@ -138,6 +130,7 @@ if Fuse EGL; then subrodepends=("${subrodepends[@]}" 'libgl khr-headers') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') if Fuse WAYLAND_EGL; then subpkgs=("${subpkgs[@]}" 'libwayland-egl') @@ -149,31 +142,21 @@ if Fuse EGL; then subrodepends=("${subrodepends[@]}" 'libgl') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') fi fi -if Fuse GLU; then - subpkgs=("${subpkgs[@]}" 'libglu') - subdescs=("${subdescs[@]}" 'Mesa OpenGL Utility library.') - subprovides=("${subprovides[@]}" 'libglu-mesa') - subreplaces=("${subreplaces[@]}" '') - subconflicts=("${subconflicts[@]}" '') - subdepends=("${subdepends[@]}" '') - subrodepends=("${subrodepends[@]}" 'libgl') - subgroups=("${subgroups[@]}" 'x11') - subarchs=("${subarchs[@]}" "${archs[*]}") -fi - if Fuse VDPAU; then subpkgs=("${subpkgs[@]}" 'mesa-vdpau-drivers') subdescs=("${subdescs[@]}" 'Mesa VDPAU drivers.') - subprovides=("${subprovides[@]}" 'libglu-mesa') + subprovides=("${subprovides[@]}" '') subreplaces=("${subreplaces[@]}" '') subconflicts=("${subconflicts[@]}" '') subdepends=("${subdepends[@]}" 'libvdpau') subrodepends=("${subrodepends[@]}" '') subgroups=("${subgroups[@]}" 'x11') subarchs=("${subarchs[@]}" "${archs[*]}") + subbackup=("${subbackup[@]}" '') fi # NOTE: If you bump version (major or minor) you need to review the symlinking at the end of this @@ -186,11 +169,11 @@ build() { if Fuse DEVEL; then Funpack_scm - ./autogen.sh fi Fcd $origname-$pkgver Fpatchall + ./autogen.sh if Fuse DEBUG; then Fconfopts+=" --enable-debug" @@ -265,18 +248,11 @@ build() { Fconfopts+=" --disable-gallium" fi - if Fuse GLU; then - Fconfopts+=" --enable-glu" - else - Fconfopts+=" --disable-glu" - fi - Fconf --with-dri-driverdir=/usr/lib/dri \ --enable-gbm \ --enable-gles1 \ --enable-gles2 \ --enable-glx-tls \ - --enable-shared-dricore \ --enable-shared-glapi make || Fdie @@ -292,12 +268,6 @@ build() { cp -r docs/{README.*,*.html,COPYING} \ $Fdestdir/usr/share/doc/$pkgname-$pkgver/ || Fdie - # Install our .la files with r-xr-xr-x rights - Finstall 0555 libGL.la /usr/lib/ - - # Remove to avoid a conflict with libosmesa - Frm libosmesa usr/include/GL/osmesa.h - # Remove to avoid a conflict with Glew Frm /usr/include/GL/wglew.h Frm /usr/include/GL/glxew.h @@ -316,7 +286,9 @@ build() { Fsplit libgl-headers-mesa usr/include/GL/{gl.h,glext.h,glx.h,glxext.h} Fsplit libgl-headers-mesa usr/include/GL/internal + Fsplit mesa-dri-drivers etc/drirc Fsplit mesa-dri-drivers usr/lib/dri/ + Fsplit mesa-dri-drivers usr/lib/libdricore* Fsplit mesa-dri-drivers usr/lib/pkgconfig/dri.pc Fsplit libgles usr/include/GLES*/ @@ -344,13 +316,12 @@ build() { fi fi - if Fuse GLU; then - Finstall 0555 libGLU.la /usr/lib/ - Fln libGLU.so.1.3.08000 /usr/lib/libGLU.so.1.3 - - Fsplit libglu usr/include/GL/glu.h - Fsplit libglu usr/lib/libGLU.* - Fsplit libglu usr/lib/pkgconfig/glu.pc + if Fuse OSMESA; then + Fsplit libosmesa usr/include/GL/osmesa.h + Fsplit libosmesa usr/lib/libOSMesa.* + Fsplit libosmesa usr/lib/pkgconfig/osmesa.pc + else + Frm usr/include/GL/osmesa.h fi if Fuse VDPAU; then diff --git a/source/x11/mesa/libGL.la b/source/x11/mesa/libGL.la deleted file mode 100644 index 5739533..0000000 --- a/source/x11/mesa/libGL.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGL.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGL.so.1' - -# Names of this library. -library_names='libGL.so.1.2 libGL.so.1 libGL.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGL. -current=3 -age=2 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/source/x11/mesa/libGLU.la b/source/x11/mesa/libGLU.la deleted file mode 100644 index cc76b4b..0000000 --- a/source/x11/mesa/libGLU.la +++ /dev/null @@ -1,32 +0,0 @@ -# libGLU.la - a libtool library file -# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18) -# -# Please DO NOT delete this file! -# It is necessary for linking the library. - -# The name that we can dlopen(3). -dlname='libGLU.so.1' - -# Names of this library. -library_names='libGLU.so.1.3 libGLU.so.1 libGLU.so' - -# The name of the static archive. -old_library='' - -# Libraries that this one depends upon. -dependency_libs=' -L/usr/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread ' - -# Version information for libGLU. -current=4 -age=3 -revision=0 - -# Is this an already installed library? -installed=yes - -# Files to dlopen/dlpreopen -dlopen='' -dlpreopen='' - -# Directory that this library needs to be installed in: -libdir='/usr/lib' diff --git a/source/x11/mesa/mesa-8.0.3-llvm-3.1-fixes.patch b/source/x11/mesa/mesa-8.0.3-llvm-3.1-fixes.patch deleted file mode 100644 index 922577a..0000000 --- a/source/x11/mesa/mesa-8.0.3-llvm-3.1-fixes.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -index a50a51d..f1bb4d9 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp -@@ -235,7 +235,24 @@ lp_disassemble(const void* func) - int AsmPrinterVariant = AsmInfo->getAssemblerDialect(); - #endif - --#if HAVE_LLVM >= 0x0300 -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<const MCRegisterInfo> MRI(T->createMCRegInfo(Triple)); -+ if (!MRI) { -+ debug_printf("error: no register info for target %s\n", Triple.c_str()); -+ return; -+ } -+ -+ OwningPtr<const MCInstrInfo> MII(T->createMCInstrInfo()); -+ if (!MII) { -+ debug_printf("error: no instruction info for target %s\n", Triple.c_str()); -+ return; -+ } -+#endif -+ -+#if HAVE_LLVM >= 0x0301 -+ OwningPtr<MCInstPrinter> Printer( -+ T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *MII, *MRI, *STI)); -+#elif HAVE_LLVM == 0x0300 - OwningPtr<MCInstPrinter> Printer( - T->createMCInstPrinter(AsmPrinterVariant, *AsmInfo, *STI)); - #elif HAVE_LLVM >= 0x0208 -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index fe7616b..68f8808 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -62,7 +62,11 @@ - extern "C" void - lp_register_oprofile_jit_event_listener(LLVMExecutionEngineRef EE) - { -+#if HAVE_LLVM >= 0x0301 -+ llvm::unwrap(EE)->RegisterJITEventListener(llvm::JITEventListener::createOProfileJITEventListener()); -+#else - llvm::unwrap(EE)->RegisterJITEventListener(llvm::createOProfileJITEventListener()); -+#endif - } _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
