[arch-commits] Commit in lib32-mesa/trunk (PKGBUILD llvm35.patch)
Laurent Carlier
lcarlier at archlinux.org
Sat Sep 20 08:09:26 UTC 2014
Date: Saturday, September 20, 2014 @ 10:09:26
Author: lcarlier
Revision: 119313
upgpkg: lib32-mesa 10.3.0-1
upstream update 10.3.0
Modified:
lib32-mesa/trunk/PKGBUILD
Deleted:
lib32-mesa/trunk/llvm35.patch
--------------+
PKGBUILD | 91 ++++++++++++++++++++++-----------------------------------
llvm35.patch | 26 ----------------
2 files changed, 36 insertions(+), 81 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-09-20 06:11:27 UTC (rev 119312)
+++ PKGBUILD 2014-09-20 08:09:26 UTC (rev 119313)
@@ -3,9 +3,9 @@
# Contributor: Andreas Radke <andyrtr at archlinux.org>
pkgbase=lib32-mesa
-pkgname=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri' 'lib32-mesa' 'lib32-mesa-libgl')
-pkgver=10.2.7
-pkgrel=2
+pkgname=('lib32-mesa-dri' 'lib32-mesa-vdpau' 'lib32-mesa' 'lib32-mesa-libgl')
+pkgver=10.3.0
+pkgrel=1
arch=('x86_64')
makedepends=('python2' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-elfutils' 'lib32-llvm' 'lib32-systemd'
@@ -12,18 +12,11 @@
'lib32-libvdpau' 'lib32-wayland')
url="http://mesa3d.sourceforge.net"
license=('custom')
-source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
- llvm35.patch)
-sha256sums=('27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f'
- SKIP
- 'd3d433564cd21da8aa56a9ceccee6122d5991cae2bd1924173359f13bd38bd6f')
+#source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2{,.sig}
+source=(ftp://ftp.freedesktop.org/pub/mesa/10.3/MesaLib-${pkgver}.tar.bz2{,.sig})
+sha256sums=('0283bfe710fa449ed82e465cfa09612a269e19abb7e0382082608062ce7960b5'
+ 'SKIP')
-prepare() {
- cd ${srcdir}/?esa-*
-
- patch -Np1 -i ../llvm35.patch
-}
-
build() {
export CC="gcc -m32"
export CXX="g++ -m32"
@@ -35,7 +28,8 @@
# our automake is far too new for their build system :)
autoreconf -vfi
- ./configure --enable-32-bit \
+ ./configure \
+ --build=i686-pc-linux-gnu --host=i686-pc-linux-gnu \
--libdir=/usr/lib32 \
--prefix=/usr \
--sysconfdir=/etc \
@@ -57,8 +51,7 @@
--enable-gles1 \
--enable-gles2 \
--enable-texture-float \
- --enable-vdpau \
- --enable-dri3
+ --enable-vdpau
make
@@ -66,60 +59,47 @@
make DESTDIR=${srcdir}/fakeinstall install
}
-package_lib32-ati-dri() {
- pkgdesc="Mesa drivers for AMD/ATI Radeon (32-bit)"
- depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'lib32-libtxc_dxtn' 'ati-dri')
-
- install -m755 -d ${pkgdir}/usr/lib32/vdpau/
- mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau/libvdpau_{r600,radeonsi}.* ${pkgdir}/usr/lib32/vdpau/
-
+package_lib32-mesa-dri() {
+ pkgdesc="Mesa DRI drivers (32-bit)"
+ depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'mesa-dri' 'lib32-libtxc_dxtn')
+ conflicts=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
+ provides=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
+ replaces=('lib32-ati-dri' 'lib32-intel-dri' 'lib32-nouveau-dri')
+
install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon,radeonsi}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/
+ # ati-dri
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{r200,r300,r600,radeon{,si}}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
+ # nouveau-dri
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau{,_vieux}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
+ # intel-dri
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
- #install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
- #mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib32/gallium-pipe/
-
install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s ati-dri "$pkgdir/usr/share/licenses/lib32-ati-dri"
+ ln -s mesa-dri "$pkgdir/usr/share/licenses/lib32-mesa-dri"
}
-package_lib32-intel-dri() {
- pkgdesc="Mesa DRI drivers for Intel (32-bit)"
- depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'lib32-libtxc_dxtn' 'intel-dri')
+package_lib32-mesa-vdpau() {
+ pkgdesc="Mesa VDPAU drivers (32-bit)"
+ depends=("lib32-mesa=${pkgver}")
- install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{i915,i965}_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri/
-
+ install -m755 -d ${pkgdir}/usr/lib32
+ mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau ${pkgdir}/usr/lib32
+
install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s intel-dri "$pkgdir/usr/share/licenses/lib32-intel-dri"
+ ln -s mesa "$pkgdir/usr/share/licenses/lib32-mesa-vdpau"
}
-package_lib32-nouveau-dri() {
- pkgdesc="Mesa drivers for Nouveau (32-bit)"
- depends=('lib32-mesa-libgl' "lib32-mesa=${pkgver}" 'lib32-libtxc_dxtn' 'nouveau-dri')
- install -m755 -d ${pkgdir}/usr/lib32/vdpau/
- mv -v ${srcdir}/fakeinstall/usr/lib32/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib32/vdpau/
-
- install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/nouveau_{dri,vieux_dri}.so ${pkgdir}/usr/lib32/xorg/modules/dri/
-
- #install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
- #mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib32/gallium-pipe/
-
- install -m755 -d "${pkgdir}/usr/share/licenses"
- ln -s nouveau-dri "$pkgdir/usr/share/licenses/lib32-nouveau-dri"
-}
-
package_lib32-mesa() {
pkgdesc="an open-source implementation of the OpenGL specification (32-bit)"
- depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd' 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'mesa')
+ depends=('lib32-libdrm' 'lib32-libxxf86vm' 'lib32-libxdamage' 'lib32-libxshmfence' 'lib32-systemd'
+ 'lib32-elfutils' 'lib32-llvm-libs' 'lib32-wayland' 'lib32-libgl' 'mesa')
optdepends=('opengl-man-pages: for the OpenGL API man pages')
provides=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
conflicts=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
replaces=('lib32-libglapi' 'lib32-osmesa' 'lib32-libgbm' 'lib32-libgles' 'lib32-libegl')
- install -m755 -d ${pkgdir}/usr/lib32/gallium-pipe
+ install -m755 -d ${pkgdir}/usr/lib32
mv -v ${srcdir}/fakeinstall/usr/lib32/lib{OSMesa,gbm,glapi,wayland-egl}.so* ${pkgdir}/usr/lib32/
#mv -v ${srcdir}/fakeinstall/usr/lib32/gallium-pipe/pipe_swrast* ${pkgdir}/usr/lib32/gallium-pipe/
# FS#41337
@@ -127,8 +107,9 @@
mv -v ${srcdir}/fakeinstall/usr/lib32/pkgconfig ${pkgdir}/usr/lib32/
+ # swrast
install -m755 -d ${pkgdir}/usr/lib32/xorg/modules/dri
- mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/swrast_dri* ${pkgdir}/usr/lib32/xorg/modules/dri/
+ mv -v ${srcdir}/fakeinstall/usr/lib32/xorg/modules/dri/{kms_,}swrast_dri.so ${pkgdir}/usr/lib32/xorg/modules/dri
install -m755 -d ${pkgdir}/usr/lib32/mesa
# move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
Deleted: llvm35.patch
===================================================================
--- llvm35.patch 2014-09-20 06:11:27 UTC (rev 119312)
+++ llvm35.patch 2014-09-20 08:09:26 UTC (rev 119313)
@@ -1,26 +0,0 @@
-From 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6 Mon Sep 17 00:00:00 2001
-From: Aaron Watry <awatry at gmail.com>
-Date: Fri, 20 Jun 2014 19:13:30 -0500
-Subject: gallivm: Fix build after LLVM commit 211259
-
-Signed-off-by: Aaron Watry <awatry at gmail.com>
-Reviewed-by: Tom Stellard <thomas.stellard at amd.com>
-
-diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-index df26883..413a0c2 100644
---- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
-@@ -51,7 +51,9 @@
- #include <llvm/MC/MCInstPrinter.h>
- #include <llvm/MC/MCRegisterInfo.h>
-
--#if HAVE_LLVM >= 0x0303
-+#if HAVE_LLVM >= 0x0305
-+#define OwningPtr std::unique_ptr
-+#elif HAVE_LLVM >= 0x0303
- #include <llvm/ADT/OwningPtr.h>
- #endif
-
---
-cgit v0.10.2
-
More information about the arch-commits
mailing list