[arch-commits] Commit in mesa/trunk (4 files)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Oct 5 15:17:45 UTC 2012
Date: Friday, October 5, 2012 @ 11:17:44
Author: andyrtr
Revision: 168062
upgpkg: mesa 8.99.git_20121005-1
update to todays snapshot + add a new build fix; fix deps to match the *.pc files
Added:
mesa/trunk/pthread_fix.diff
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/mesa-8.0.3-llvm-3.1-fixes.patch
mesa/trunk/mesa-radeon-parallel-make.diff
---------------------------------+
PKGBUILD | 31 +++++----
mesa-8.0.3-llvm-3.1-fixes.patch | 46 -------------
mesa-radeon-parallel-make.diff | 129 --------------------------------------
pthread_fix.diff | 23 ++++++
4 files changed, 42 insertions(+), 187 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-10-05 15:07:13 UTC (rev 168061)
+++ PKGBUILD 2012-10-05 15:17:44 UTC (rev 168062)
@@ -6,7 +6,7 @@
pkgname=('libglapi' 'libgl' 'mesa' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
_git=true
-_gitdate=20121002
+_gitdate=20121005
#_git=false
if [ "${_git}" = "true" ]; then
@@ -22,26 +22,25 @@
license=('custom')
options=('!libtool')
source=(LICENSE
- mesa-radeon-parallel-make.diff)
+ pthread_fix.diff)
if [ "${_git}" = "true" ]; then
# mesa git shot from 9.0 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/log/?h=9.0
#source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-41d14eaf193c6b1eb87fe1998808a887f1c6c698.tar.gz')
- source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-604cd6b966d060334fdaa11ae8444797d54d3142.tar.gz")
+ source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-542f6feda9bf18267dbd337943a5e871400d425a.tar.gz")
else
source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2"
#source=(${source[@]} "ftp://ftp.freedesktop.org/pub/mesa/8.0/MesaLib-8.0-rc2.tar.bz2"
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- '5dca6edbe6b636c59c2e64f77271f12a'
- '71af5320af6873920384d245f103b892')
+ '03956ac54a44467678120f485b626633'
+ '52760839a596df5058fcbb63a2bb10da')
build() {
cd ${srcdir}/?esa-*
- # fix parallel build - http://cgit.freedesktop.org/mesa/mesa/commit/src/gallium/drivers/radeon/Makefile?id=cebbdd4ac23725963207bf6f8fc7101150e6065f
- # and the next commit - http://cgit.freedesktop.org/mesa/mesa/commit/?id=2baaa5c7eb21517f0197bfd91154e9b4886fbb1b
- patch -Np1 -i ${srcdir}/mesa-radeon-parallel-make.diff
+ # build fix from master http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd4fde8f674f5e3efa19e929f97de4ecfd82391b
+ patch -Np1 -i ${srcdir}/pthread_fix.diff
COMMONOPTS="--prefix=/usr \
--sysconfdir=/etc \
@@ -119,7 +118,8 @@
}
package_mesa() {
- depends=('libgl' 'libx11>=1.5.0' 'libxt>=1.1.3' 'gcc-libs>=4.7.1-6') # check pkg/mesa/usr/lib/pkgconfig/gl.pc
+ # check also gl.pc
+ depends=('libgl' 'libx11>=1.5.0' 'libxext>=1.3.1' 'libxdamage' 'libxfixes' 'libxcb' 'libxxf86vm')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
pkgdesc="Mesa 3-D graphics libraries and include files"
@@ -136,12 +136,18 @@
}
package_osmesa() {
- depends=('gcc-libs')
+ depends=('libglapi' 'gcc-libs')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
pkgdesc="Mesa 3D off-screen rendering library"
-
+
+ # fix linking because of splitted package
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" install
+
make -C ${srcdir}/?esa-*/src/mesa/drivers/osmesa DESTDIR="${pkgdir}" install
+ # fix linking because of splitted package - cleanup
+ make -C ${srcdir}/?esa-*/src/mapi/shared-glapi DESTDIR="${pkgdir}" uninstall
+
install -m755 -d "${pkgdir}/usr/share/licenses/osmesa"
install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/osmesa/"
}
@@ -180,7 +186,8 @@
}
package_libegl() {
- depends=('libxext' 'libxfixes' 'libgbm' 'khrplatform-devel')
+ # check also egl.pc
+ depends=('libx11' 'libxext' 'libxdamage' 'libxfixes' 'libxxf86vm' 'libxcb' 'libgbm' 'khrplatform-devel')
pkgdesc="Mesa EGL libraries and headers"
make -C ${srcdir}/?esa-*/src/gallium/targets/egl-static DESTDIR="${pkgdir}" install
Deleted: mesa-8.0.3-llvm-3.1-fixes.patch
===================================================================
--- mesa-8.0.3-llvm-3.1-fixes.patch 2012-10-05 15:07:13 UTC (rev 168061)
+++ mesa-8.0.3-llvm-3.1-fixes.patch 2012-10-05 15:17:44 UTC (rev 168062)
@@ -1,46 +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
- }
-
-
Deleted: mesa-radeon-parallel-make.diff
===================================================================
--- mesa-radeon-parallel-make.diff 2012-10-05 15:07:13 UTC (rev 168061)
+++ mesa-radeon-parallel-make.diff 2012-10-05 15:17:44 UTC (rev 168062)
@@ -1,129 +0,0 @@
-From cebbdd4ac23725963207bf6f8fc7101150e6065f Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard at amd.com>
-Date: Wed, 29 Aug 2012 13:01:15 +0000
-Subject: radeon/llvm: Cleanup makefile
-
-Hopefully, this will fix all the parallel make problems people have
-been having.
----
-diff --git a/src/gallium/drivers/radeon/Makefile b/src/gallium/drivers/radeon/Makefile
-index 43f668a..7f1c613 100644
---- a/src/gallium/drivers/radeon/Makefile
-+++ b/src/gallium/drivers/radeon/Makefile
-@@ -20,8 +20,6 @@ tablegen = $(TBLGEN) -I $(LLVM_INCLUDEDIR) $1 $2 -o $3
-
- HAVE_LLVM_INTRINSICS = $(shell grep IntrinsicsR600.td $(LLVM_INCLUDEDIR)/llvm/Intrinsics.td)
-
--gen: $(GENERATED_SOURCES)
--
- SIRegisterInfo.td: SIGenRegisterInfo.pl
- $(PERL) $^ > $@
-
-@@ -38,37 +36,37 @@ endif
- R600RegisterInfo.td: R600GenRegisterInfo.pl
- $(PERL) $^ > $@
-
--AMDGPUGenRegisterInfo.inc: *.td
-+AMDGPUGenRegisterInfo.inc: $(TD_FILES)
- $(call tablegen, -gen-register-info, AMDGPU.td, $@)
-
--AMDGPUGenInstrInfo.inc: *.td
-+AMDGPUGenInstrInfo.inc: $(TD_FILES)
- $(call tablegen, -gen-instr-info, AMDGPU.td, $@)
-
--AMDGPUGenAsmWriter.inc: *.td
-+AMDGPUGenAsmWriter.inc: $(TD_FILES)
- $(call tablegen, -gen-asm-writer, AMDGPU.td, $@)
-
--AMDGPUGenDAGISel.inc: *.td
-+AMDGPUGenDAGISel.inc: $(TD_FILES)
- $(call tablegen, -gen-dag-isel, AMDGPU.td, $@)
-
--AMDGPUGenCallingConv.inc: *.td
-+AMDGPUGenCallingConv.inc: $(TD_FILES)
- $(call tablegen, -gen-callingconv, AMDGPU.td, $@)
-
--AMDGPUGenSubtargetInfo.inc: *.td
-+AMDGPUGenSubtargetInfo.inc: $(TD_FILES)
- $(call tablegen, -gen-subtarget, AMDGPU.td, $@)
-
--AMDGPUGenEDInfo.inc: *.td
-+AMDGPUGenEDInfo.inc: $(TD_FILES)
- $(call tablegen, -gen-enhanced-disassembly-info, AMDGPU.td, $@)
-
--AMDGPUGenIntrinsics.inc: *.td
-+AMDGPUGenIntrinsics.inc: $(TD_FILES)
- $(call tablegen, -gen-tgt-intrinsic, AMDGPU.td, $@)
-
--AMDGPUGenCodeEmitter.inc: *.td
-+AMDGPUGenCodeEmitter.inc: $(TD_FILES)
- $(call tablegen, -gen-emitter, AMDGPU.td, $@)
-
--AMDGPUGenMCCodeEmitter.inc: *.td
-+AMDGPUGenMCCodeEmitter.inc: $(TD_FILES)
- $(call tablegen, -mc-emitter -gen-emitter, AMDGPU.td, $@)
-
--AMDGPUGenDFAPacketizer.inc: *.td
-+AMDGPUGenDFAPacketizer.inc: $(TD_FILES)
- $(call tablegen, -gen-dfa-packetizer, AMDGPU.td, $@)
-
- LOADER_LIBS=$(shell llvm-config --libs bitreader asmparser)
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 2eb1120..333dd03 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -1,4 +1,30 @@
-
-+TD_FILES := \
-+ AMDGPU.td \
-+ AMDGPUInstrInfo.td \
-+ AMDGPUInstructions.td \
-+ AMDGPUIntrinsics.td \
-+ AMDGPURegisterInfo.td \
-+ AMDILBase.td \
-+ AMDILInstrInfo.td \
-+ AMDILIntrinsics.td \
-+ AMDILRegisterInfo.td \
-+ Processors.td \
-+ R600InstrInfo.td \
-+ R600Instructions.td \
-+ R600Intrinsics.td \
-+ R600IntrinsicsNoOpenCL.td \
-+ R600IntrinsicsOpenCL.td \
-+ R600RegisterInfo.td \
-+ R600Schedule.td \
-+ SIInstrFormats.td \
-+ SIInstrInfo.td \
-+ SIInstructions.td \
-+ SIIntrinsics.td \
-+ SIRegisterInfo.td \
-+ SISchedule.td
-+
-+
- GENERATED_SOURCES := \
- R600Intrinsics.td \
- R600RegisterInfo.td \
---
-cgit v0.9.0.2-2-gbebe
-From 2baaa5c7eb21517f0197bfd91154e9b4886fbb1b Mon Sep 17 00:00:00 2001
-From: Tom Stellard <thomas.stellard at amd.com>
-Date: Thu, 06 Sep 2012 14:05:22 +0000
-Subject: radeon/llvm: Remove R600InstrInfo.td from TD_FILES
-
-Fixes build bug introduced by
-cebbdd4ac23725963207bf6f8fc7101150e6065f
----
-diff --git a/src/gallium/drivers/radeon/Makefile.sources b/src/gallium/drivers/radeon/Makefile.sources
-index 333dd03..f387636 100644
---- a/src/gallium/drivers/radeon/Makefile.sources
-+++ b/src/gallium/drivers/radeon/Makefile.sources
-@@ -10,7 +10,6 @@ TD_FILES := \
- AMDILIntrinsics.td \
- AMDILRegisterInfo.td \
- Processors.td \
-- R600InstrInfo.td \
- R600Instructions.td \
- R600Intrinsics.td \
- R600IntrinsicsNoOpenCL.td \
---
-cgit v0.9.0.2-2-gbebe
Added: pthread_fix.diff
===================================================================
--- pthread_fix.diff (rev 0)
+++ pthread_fix.diff 2012-10-05 15:17:44 UTC (rev 168062)
@@ -0,0 +1,23 @@
+From dd4fde8f674f5e3efa19e929f97de4ecfd82391b Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88 at gmail.com>
+Date: Thu, 27 Sep 2012 22:49:52 +0000
+Subject: build: Set PTHREAD_LIBS for pkgconfig files if empty
+
+---
+diff --git a/configure.ac b/configure.ac
+index 770df2f..dc2720d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -509,6 +509,10 @@ AC_CHECK_DECLS([signbit],[],
+
+ dnl Check for pthreads
+ AX_PTHREAD
++dnl AX_PTHREADS leaves PTHREAD_LIBS empty for gcc and sets PTHREAD_CFLAGS
++dnl to -pthread, which causes problems if we need -lpthread to appear in
++dnl pkgconfig files.
++test -z "$PTHREAD_LIBS" && PTHREAD_LIBS="-lpthread"
+
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+--
+cgit v0.9.0.2-2-gbebe
More information about the arch-commits
mailing list