commit 980babcc9b68001574fabf79524e0383dc85045f
Author: Juergen Daubert <jue(a)jue.li>
Date: Wed Oct 10 11:39:27 2012 +0200
[notify] mesa3d: update to 9.0
Note:
libGLU (OpenGL Utility library) has been removed from mesa and
is now in a separate port xorg/glu.
diff --git a/mesa3d/.footprint b/mesa3d/.footprint
index 099c063..b0de10d 100644
--- a/mesa3d/.footprint
+++ b/mesa3d/.footprint
@@ -1,4 +1,6 @@
drwxr-xr-x root/root usr/
+drwxr-xr-x root/root usr/etc/
+-rw-r--r-- root/root usr/etc/drirc
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/EGL/
-rw-r--r-- root/root usr/include/EGL/egl.h
@@ -9,8 +11,6 @@ drwxr-xr-x root/root usr/include/GL/
-rw-r--r-- root/root usr/include/GL/gl.h
-rw-r--r-- root/root usr/include/GL/gl_mangle.h
-rw-r--r-- root/root usr/include/GL/glext.h
--rw-r--r-- root/root usr/include/GL/glu.h
--rw-r--r-- root/root usr/include/GL/glu_mangle.h
-rw-r--r-- root/root usr/include/GL/glx.h
-rw-r--r-- root/root usr/include/GL/glx_mangle.h
-rw-r--r-- root/root usr/include/GL/glxext.h
@@ -24,24 +24,38 @@ drwxr-xr-x root/root usr/include/KHR/
-rw-r--r-- root/root usr/include/KHR/khrplatform.h
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/dri/
+-rwxr-xr-x root/root usr/lib/dri/i915_dri.la
-rwxr-xr-x root/root usr/lib/dri/i915_dri.so
+-rwxr-xr-x root/root usr/lib/dri/i965_dri.la
-rwxr-xr-x root/root usr/lib/dri/i965_dri.so
+-rwxr-xr-x root/root usr/lib/dri/nouveau_dri.so
+-rwxr-xr-x root/root usr/lib/dri/nouveau_vieux_dri.la
+-rwxr-xr-x root/root usr/lib/dri/nouveau_vieux_dri.so
+-rwxr-xr-x root/root usr/lib/dri/r200_dri.la
-rwxr-xr-x root/root usr/lib/dri/r200_dri.so
-rwxr-xr-x root/root usr/lib/dri/r600_dri.so
+-rwxr-xr-x root/root usr/lib/dri/radeon_dri.la
-rwxr-xr-x root/root usr/lib/dri/radeon_dri.so
+-rwxr-xr-x root/root usr/lib/dri/swrast_dri.la
-rwxr-xr-x root/root usr/lib/dri/swrast_dri.so
-rwxr-xr-x root/root usr/lib/dri/vmwgfx_dri.so
-lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1
-lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0
--rwxr-xr-x root/root usr/lib/libEGL.so.1.0
-lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1
-lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.2
--rwxr-xr-x root/root usr/lib/libGL.so.1.2
-lrwxrwxrwx root/root usr/lib/libGLU.so -> libGLU.so.1
-lrwxrwxrwx root/root usr/lib/libGLU.so.1 -> libGLU.so.1.3.08004
--rwxr-xr-x root/root usr/lib/libGLU.so.1.3.08004
+-rwxr-xr-x root/root usr/lib/libEGL.la
+lrwxrwxrwx root/root usr/lib/libEGL.so -> libEGL.so.1.0.0
+lrwxrwxrwx root/root usr/lib/libEGL.so.1 -> libEGL.so.1.0.0
+-rwxr-xr-x root/root usr/lib/libEGL.so.1.0.0
+-rwxr-xr-x root/root usr/lib/libGL.la
+lrwxrwxrwx root/root usr/lib/libGL.so -> libGL.so.1.2.0
+lrwxrwxrwx root/root usr/lib/libGL.so.1 -> libGL.so.1.2.0
+-rwxr-xr-x root/root usr/lib/libGL.so.1.2.0
+-rwxr-xr-x root/root usr/lib/libdricore9.0.0.la
+lrwxrwxrwx root/root usr/lib/libdricore9.0.0.so -> libdricore9.0.0.so.1.0.0
+lrwxrwxrwx root/root usr/lib/libdricore9.0.0.so.1 -> libdricore9.0.0.so.1.0.0
+-rwxr-xr-x root/root usr/lib/libdricore9.0.0.so.1.0.0
+-rwxr-xr-x root/root usr/lib/libglapi.la
+lrwxrwxrwx root/root usr/lib/libglapi.so -> libglapi.so.0.0.0
+lrwxrwxrwx root/root usr/lib/libglapi.so.0 -> libglapi.so.0.0.0
+-rwxr-xr-x root/root usr/lib/libglapi.so.0.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/dri.pc
-rw-r--r-- root/root usr/lib/pkgconfig/egl.pc
-rw-r--r-- root/root usr/lib/pkgconfig/gl.pc
--rw-r--r-- root/root usr/lib/pkgconfig/glu.pc
diff --git a/mesa3d/.md5sum b/mesa3d/.md5sum
index fbdcd85..1469d73 100644
--- a/mesa3d/.md5sum
+++ b/mesa3d/.md5sum
@@ -1,2 +1 @@
-d546f988adfdf986cff45b1efa2d8a46 MesaLib-8.0.4.tar.bz2
-0082f4d17674155aa13bc611a5687788 mesa-8.0.3-llvm-3.1-fixes.patch
+60e557ce407be3732711da484ab3db6c MesaLib-9.0.tar.bz2
diff --git a/mesa3d/Pkgfile b/mesa3d/Pkgfile
index d4da895..14360e3 100644
--- a/mesa3d/Pkgfile
+++ b/mesa3d/Pkgfile
@@ -4,19 +4,17 @@
# Depends on: libdrm, xorg-makedepend, xorg-glproto, xorg-xextproto, xorg-dri2proto, xorg-libx11, xorg-xf86vidmodeproto, xorg-libxext, xorg-libxxf86vm, xorg-libxt, xorg-libxdamage, xorg-libpciaccess, expat, talloc, libxml2-python
name=mesa3d
-version=8.0.4
-release=2
-source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2
- mesa-8.0.3-llvm-3.1-fixes.patch)
+version=9.0
+release=1
+source=(ftp://ftp.freedesktop.org/pub/mesa/$version/MesaLib-$version.tar.bz2)
build() {
cd Mesa-$version
- patch -p 1 -i $SRC/mesa-8.0.3-llvm-3.1-fixes.patch
-
- ./configure --prefix=/usr \
- --with-dri-drivers=i915,i965,r200,radeon,swrast \
- --with-gallium-drivers=i915,r600,svga \
+ autoreconf --install --symlink
+ ./configure --prefix=/usr \
+ --with-dri-drivers=i915,i965,r200,radeon,swrast,nouveau \
+ --with-gallium-drivers=i915,r600,svga,nouveau
make
make DESTDIR=$PKG install
diff --git a/mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch b/mesa3d/mesa-8.0.3-llvm-3.1-fixes.patch
deleted file mode 100644
index 922577a..0000000
--- a/mesa3d/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
- }
