MesaLib: update to 9.2.0.

This commit is contained in:
Juan RP 2013-08-28 09:14:52 +02:00
parent 18b75f0dde
commit bda58819ff
3 changed files with 13 additions and 85 deletions

View File

@ -997,7 +997,7 @@ libkeyutils.so.1 libkeyutils-1.5.5_1
libiptcdata.so.0 libiptcdata-1.0.4_1
libutempter.so.0 libutempter-1.1.5_1
libxatracker.so.1 MesaLib-7.11_1
libdricore9.1.6.so.1 MesaLib-9.1.6_1
libdricore9.2.0.so.1 MesaLib-9.2.0_1
libllvmradeon9.1.6.so MesaLib-9.1.6_1
libtumbler-1.so.0 tumbler-4.9.2_1
libwebrtc_audio_processing.so.0 webrtc-audio-processing-0.1_1

View File

@ -1,72 +0,0 @@
Submitted By: Armin K. <krejzi at email dot com>
Date: 2013-05-22
Initial Package Version: 9.1.3
Upstream Status: Fixed upstream
Origin: Upstream
Description: Fixes building with LLVM 3.3.
--- src/gallium/drivers/r600/llvm_wrapper.cpp 2013-03-05 23:54:28.000000000 +0100
+++ src/gallium/drivers/r600/llvm_wrapper.cpp 2013-05-15 12:53:51.605926357 +0200
@@ -1,8 +1,16 @@
#include <llvm/ADT/OwningPtr.h>
#include <llvm/ADT/StringRef.h>
+#if HAVE_LLVM < 0x0303
#include <llvm/LLVMContext.h>
-#include <llvm/PassManager.h>
#include <llvm/Support/IRReader.h>
+#else
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
+#include <llvm/IR/Function.h>
+#include <llvm/IR/DataLayout.h>
+#include <llvm/IRReader/IRReader.h>
+#endif
+#include <llvm/PassManager.h>
#include <llvm/Support/MemoryBuffer.h>
#include <llvm/Support/SourceMgr.h>
#include <llvm/Transforms/IPO.h>
--- src/gallium/drivers/r600/Makefile.am 2013-03-05 23:54:28.000000000 +0100
+++ src/gallium/drivers/r600/Makefile.am 2013-05-15 12:53:51.605926357 +0200
@@ -26,7 +26,8 @@
-I$(top_srcdir)/src/gallium/drivers/radeon/
AM_CXXFLAGS= \
- $(LLVM_CXXFLAGS)
+ $(LLVM_CXXFLAGS) \
+ $(DEFINES)
endif
if USE_R600_LLVM_COMPILER
--- src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-03-05 23:54:28.000000000 +0100
+++ src/gallium/drivers/radeon/radeon_llvm_emit.cpp 2013-05-15 12:54:13.196319331 +0200
@@ -25,13 +25,21 @@
*/
#include "radeon_llvm_emit.h"
+#if HAVE_LLVM < 0x0303
#include <llvm/LLVMContext.h>
#include <llvm/Module.h>
+#include <llvm/DataLayout.h>
+#else
+#include <llvm/IR/LLVMContext.h>
+#include <llvm/IR/Module.h>
+#include <llvm/IR/DataLayout.h>
+#include <llvm/Support/CBindingWrapping.h>
+#endif
+
#include <llvm/PassManager.h>
#include <llvm/ADT/Triple.h>
#include <llvm/Support/FormattedStream.h>
#include <llvm/Support/Host.h>
-#include <llvm/Support/IRReader.h>
#include <llvm/Support/SourceMgr.h>
#include <llvm/Support/TargetRegistry.h>
#include <llvm/Support/TargetSelect.h>
@@ -39,7 +47,6 @@
#include <llvm/Target/TargetMachine.h>
#include <llvm/Transforms/Scalar.h>
#include <llvm-c/Target.h>
-#include <llvm/DataLayout.h>
#include <iostream>
#include <stdlib.h>

View File

@ -1,30 +1,29 @@
# Template build file for 'MesaLib'.
pkgname=MesaLib
version=9.1.6
version=9.2.0
revision=1
wrksrc="Mesa-${version}"
build_style=gnu-configure
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gallium-g3dvl
--enable-gles1 --enable-gles2 --enable-openvg --enable-egl
--with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-vdpau --enable-xa
configure_args="--enable-glx-tls --enable-shared-glapi --enable-gbm
--enable-gles1 --enable-gles2 --enable-openvg --enable-egl --enable-xa
--with-dri-driverdir=/usr/lib/xorg/modules/dri --enable-vdpau
--enable-gallium-egl --enable-xvmc --enable-osmesa --enable-texture-float
--with-gallium-drivers=r300,r600,svga,swrast,nouveau --enable-gbm
--with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast
--with-gallium-drivers=i915,r300,r600,radeonsi,svga,swrast,nouveau
--with-egl-platforms=drm,wayland"
short_desc="Graphics library similar to SGI's OpenGL"
maintainer="Juan RP <xtraeme@gmail.com>"
homepage="http://www.mesa3d.org/"
license="MIT, LGPL-2.1"
distfiles="ftp://ftp.freedesktop.org/pub/mesa/$version/$pkgname-$version.tar.bz2"
checksum=e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d
distfiles="ftp://ftp.freedesktop.org/pub/mesa/${version%.*}/$pkgname-$version.tar.bz2"
checksum=75e6a9bf59fb402f5fbed846be4effafa8a5809229579cd41023b906223a9187
hostmakedepends="automake libtool flex pkg-config llvm>=3.3"
makedepends="glproto dri2proto>=2.1 libXext-devel libXxf86vm-devel libXdamage-devel
libudev-devel>=183 libdrm-devel expat-devel talloc-devel libxml2-python
libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel"
libvdpau-devel libXvMC-devel>=1.0.6 wayland-devel elfutils-devel"
pre_configure() {
./autogen.sh
NOCONFIGURE=1 ./autogen.sh
}
post_install() {
@ -119,11 +118,11 @@ mesa-ati-dri_package() {
pkg_install() {
vmove "usr/lib/libXvMCr[36]00.so*"
vmove "usr/lib/vdpau/libvdpau_r[36]00.so*"
#vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
vmove "usr/lib/vdpau/libvdpau_radeon*.so*"
vmove "usr/lib/xorg/modules/dri/radeon*"
vmove "usr/lib/xorg/modules/dri/r[236]00*"
vmove "usr/lib/gallium-pipe/pipe_r[36]00.so"
#vmove usr/lib/gallium-pipe/pipe_radeonsi.so
vmove usr/lib/gallium-pipe/pipe_radeonsi.so
}
}
@ -131,6 +130,7 @@ mesa-intel-dri_package() {
short_desc="Mesa DRI drivers for Intel GPUs"
pkg_install() {
vmove "usr/lib/xorg/modules/dri/i9[16]5_dri.*"
vmove /usr/lib/gallium-pipe/pipe_i915.so
}
}