[arch-commits] Commit in mesa/trunk (PKGBUILD mesa-radeon-parallel-make.diff)
andyrtr at archlinux.org
andyrtr at archlinux.org
Fri Sep 7 19:59:26 UTC 2012
Date: Friday, September 7, 2012 @ 15:59:25
Author: andyrtr
Revision: 166439
prepare mesa 9.x release; make it build parallel; needs further work to use automake make install
Added:
mesa/trunk/mesa-radeon-parallel-make.diff
Modified:
mesa/trunk/PKGBUILD
--------------------------------+
PKGBUILD | 84 +++++++++----------------
mesa-radeon-parallel-make.diff | 129 +++++++++++++++++++++++++++++++++++++++
2 files changed, 162 insertions(+), 51 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-09-07 19:26:51 UTC (rev 166438)
+++ PKGBUILD 2012-09-07 19:59:25 UTC (rev 166439)
@@ -3,73 +3,48 @@
# Maintainer: Andreas Radke <andyrtr at archlinux.org>
pkgbase=mesa
-pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri') #'nouveau-dri')
+pkgname=('mesa' 'libgl' 'osmesa' 'libglapi' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel' 'ati-dri' 'intel-dri' 'svga-dri' 'nouveau-dri')
-#_git=true
-_gitdate=20111031
-_git=false
+_git=true
+_gitdate=20120907
+#_git=false
if [ "${_git}" = "true" ]; then
- pkgver=7.10.99.git20110709
- #pkgver=7.11
+ pkgver=8.99.git_$_gitdate
else
pkgver=8.0.4
fi
-pkgrel=3
+pkgrel=1
arch=('i686' 'x86_64')
-makedepends=('glproto>=1.4.15' 'libdrm>=2.4.30' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libx11>=1.4.99.1' 'libxt>=1.1.1'
- 'gcc-libs>=4.7.1-5' 'dri2proto>=2.6' 'python2' 'libxml2' 'imake' 'llvm' 'systemd-tools')
+makedepends=('glproto>=1.4.16' 'libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libx11>=1.5.0' 'libxt>=1.1.3'
+ 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'python2' 'libxml2' 'imake' 'llvm' 'systemd' 'libvdpau>=0.5')
url="http://mesa3d.sourceforge.net"
license=('custom')
source=(LICENSE
- mesa-8.0.3-llvm-3.1-fixes.patch)
+ mesa-radeon-parallel-make.diff)
if [ "${_git}" = "true" ]; then
- # mesa git shot from 7.11 branch - see for state: http://cgit.freedesktop.org/mesa/mesa/commit/?h=7.11&id=1ae00c5960af83bea9545a18a1754bad83d5cbd0
- #source=(${source[@]} 'ftp://ftp.archlinux.org/other/mesa/mesa-1ae00c5960af83bea9545a18a1754bad83d5cbd0.tar.bz2')
- source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-ef9f16f6322a89fb699fbe3da868b10f9acaef98.tar.bz2")
+ # 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-41d14eaf193c6b1eb87fe1998808a887f1c6c698.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"
- #source=(${source[@]} "MesaLib-git${_gitdate}.zip"::"http://cgit.freedesktop.org/mesa/mesa/snapshot/mesa-4464ee1a9aa3745109cee23531e3fb2323234d07.tar.bz2"
)
fi
md5sums=('5c65a0fe315dd347e09b1f2826a1df5a'
- 'c452ed3392468170726c004c2f4e02ca'
- 'd546f988adfdf986cff45b1efa2d8a46')
+ '5dca6edbe6b636c59c2e64f77271f12a'
+ '0cb1a5fe39b1766eb72fa5f77553241d')
build() {
cd ${srcdir}/?esa-*
- patch -Np1 -i "${srcdir}/mesa-8.0.3-llvm-3.1-fixes.patch"
+ # 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
-if [ "${_git}" = "true" ]; then
- autoreconf -vfi
- ./autogen.sh --prefix=/usr \
+ COMMONOPTS="--prefix=/usr \
--with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,nouveau,svga,swrast \
- --enable-gallium-llvm \
- --enable-egl \
- --enable-gallium-egl \
- --with-egl-platforms=x11,drm \
- --enable-shared-glapi \
- --enable-gbm \
- --enable-glx-tls \
- --enable-dri \
- --enable-glx \
- --enable-osmesa \
- --enable-gles1 \
- --enable-gles2 \
- --enable-texture-float \
- --enable-xa \
- --enable-shared-dricore
- #--enable-gbm \
- # --enable-gallium-svga \
-
- else
- autoreconf -vfi
- ./configure --prefix=/usr \
- --with-dri-driverdir=/usr/lib/xorg/modules/dri \
- --with-gallium-drivers=r300,r600,svga,swrast \
+ --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
--with-dri-drivers=i915,i965,r200,radeon,swrast \
--enable-gallium-llvm \
--enable-egl \
@@ -85,24 +60,31 @@
--enable-gles2 \
--enable-texture-float \
--enable-xa \
- --enable-shared-dricore
+ --enable-vdpau"
+
+if [ "${_git}" = "true" ]; then
+ ./autogen.sh \
+ $COMMONOPTS
+ else
+ autoreconf -vfi
+ ./configure \
+ $COMMONOPTS
fi
- make
+ make
}
package_libgl() {
- depends=('libdrm>=2.4.31' 'libxxf86vm>=1.1.1' 'libxdamage>=1.1.3' 'expat>=2.0.1' 'libglapi' 'gcc-libs')
+ depends=('libdrm>=2.4.39' 'libxxf86vm>=1.1.2' 'libxdamage>=1.1.3' 'expat>=2.1.0' 'libglapi' 'gcc-libs')
pkgdesc="Mesa 3-D graphics library and DRI software rasterizer"
- #replaces=('unichrome-dri' 'mach64-dri' 'mga-dri' 'r128-dri' 'savage-dri' 'sis-dri' 'tdfx-dri')
cd ${srcdir}/?esa-*
install -m755 -d "${pkgdir}/usr/lib"
install -m755 -d "${pkgdir}/usr/lib/xorg/modules/extensions"
bin/minstall lib/libGL.so* "${pkgdir}/usr/lib/"
- bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
- bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
+# bin/minstall lib/libdricore.so* "${pkgdir}/usr/lib/"
+# bin/minstall lib/libglsl.so* "${pkgdir}/usr/lib/"
cd src/mesa/drivers/dri
make -C ${srcdir}/?esa-*/src/gallium/targets/dri-swrast DESTDIR="${pkgdir}" install
@@ -209,7 +191,7 @@
}
package_mesa() {
- depends=('libgl' 'libx11>=1.4.3' 'libxt>=1.1.1' 'gcc-libs>=4.6' 'dri2proto>=2.6' 'glproto>=1.4.14') #dri2proto + glproto needed for gl.pc
+ depends=('libgl' 'libx11>=1.5.0' 'libxt>=1.1.3' 'gcc-libs>=4.7.1-6' 'dri2proto>=2.8' 'glproto>=1.4.16') #dri2proto + glproto needed for gl.pc
optdepends=('opengl-man-pages: for the OpenGL API man pages')
pkgdesc="Mesa 3-D graphics libraries and include files"
Added: mesa-radeon-parallel-make.diff
===================================================================
--- mesa-radeon-parallel-make.diff (rev 0)
+++ mesa-radeon-parallel-make.diff 2012-09-07 19:59:25 UTC (rev 166439)
@@ -0,0 +1,129 @@
+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
More information about the arch-commits
mailing list