Mon Jun 9 03:23:59 UTC 2014

3 files changed, 71 insertions, 18 deletions

diff --git a/extra/mesa/PKGBUILD b/extra/mesa/PKGBUILD
index 423ca1f4e..e6fbefd30 100644
--- a/extra/mesa/PKGBUILD
+++ b/extra/mesa/PKGBUILD
@@ -1,19 +1,20 @@
-# $Id: PKGBUILD 213367 2014-05-21 16:40:29Z lcarlier $
+# $Id: PKGBUILD 214387 2014-06-08 19:01:03Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase=mesa
-pkgname=('ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
-pkgver=10.1.4
+pkgname=('opencl-mesa' 'ati-dri' 'intel-dri' 'nouveau-dri' 'svga-dri' 'mesa' 'mesa-libgl')
+pkgver=10.2.1
 pkgrel=1
 arch=('i686' 'x86_64')
 makedepends=('python2' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto' 
-             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd')
+             'libxshmfence' 'libxxf86vm'  'libxdamage' 'libvdpau' 'wayland' 'elfutils' 'llvm' 'systemd'
+             'libomxil-bellagio' 'libclc' 'clang')
 url="http://mesa3d.sourceforge.net"
 license=('custom')
 source=(ftp://ftp.freedesktop.org/pub/mesa/${pkgver}/MesaLib-${pkgver}.tar.bz2
         LICENSE)
-md5sums=('6fddee101f49b7409cd29994c34ddee7'
+md5sums=('093f9b5d077e5f6061dcd7b01b7aa51a'
          '5c65a0fe315dd347e09b1f2826a1df5a')
 
 build() {
@@ -27,7 +28,7 @@ build() {
     --with-gallium-drivers=r300,r600,radeonsi,nouveau,svga,swrast \
     --with-dri-drivers=i915,i965,r200,radeon,nouveau,swrast \
     --with-egl-platforms=x11,drm,wayland \
-    --with-llvm-shared-libs \
+    --enable-llvm-shared-libs \
     --enable-egl \
     --disable-gallium-egl \
     --enable-gbm \
@@ -43,9 +44,13 @@ build() {
     --enable-texture-float \
     --enable-xa \
     --enable-vdpau \
-    --enable-dri3
+    --enable-dri3 \
+    --enable-omx \
+    --enable-opencl --enable-opencl-icd \
+    --with-clang-libdir=/usr/lib
+
     # --help
-    # --disable-gallium-egl : not well maintained/expose less bug, so prefer egl_dri2 (FS#40096)
+    # --disable-gallium-egl : not well maintained/expose more bugs, so prefer egl_dri2 (FS#40096)
 
   make
 
@@ -54,9 +59,24 @@ build() {
   make DESTDIR=${srcdir}/fakeinstall install
 }
 
+package_opencl-mesa() {
+  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+  depends=('mesa-libgl' "mesa=${pkgver}" 'libcl' 'libclc' 'clang')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/OpenCL ${pkgdir}/etc/
+  
+  install -m755 -d ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib*OpenCL* ${pkgdir}/usr/lib/
+
+  install -m755 -d "${pkgdir}/usr/share/licenses/opencl-mesa"
+  install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/opencl-mesa/"
+}
+
 package_ati-dri() {
   pkgdesc="Mesa drivers for AMD/ATI Radeon"
-  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
+  depends=('mesa-libgl' 'libtxc_dxtn' 'libomxil-bellagio' "mesa=${pkgver}")
   conflicts=('xf86-video-ati<6.9.0-6')
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
@@ -68,6 +88,9 @@ package_ati-dri() {
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_{r300,r600,radeonsi}* ${pkgdir}/usr/lib/gallium-pipe/
   
+  install -m755 -d ${pkgdir}/usr/lib/bellagio
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio/libomx_{r600,radeonsi}.so ${pkgdir}/usr/lib/bellagio/
+
   install -m755 -d "${pkgdir}/usr/share/licenses/ati-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/ati-dri/"
 }
@@ -85,7 +108,7 @@ package_intel-dri() {
 
 package_nouveau-dri() {
   pkgdesc="Mesa drivers for Nouveau"
-  depends=('mesa-libgl' 'libtxc_dxtn' "mesa=${pkgver}")
+  depends=('mesa-libgl' 'libtxc_dxtn' 'libomxil-bellagio' "mesa=${pkgver}")
 
   install -m755 -d ${pkgdir}/usr/lib/vdpau/
   mv -v ${srcdir}/fakeinstall/usr/lib/vdpau/libvdpau_nouveau.* ${pkgdir}/usr/lib/vdpau/
@@ -95,6 +118,9 @@ package_nouveau-dri() {
   
   install -m755 -d ${pkgdir}/usr/lib/gallium-pipe
   mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_nouveau* ${pkgdir}/usr/lib/gallium-pipe/
+
+  install -m755 -d ${pkgdir}/usr/lib/bellagio
+  mv -v ${srcdir}/fakeinstall/usr/lib/bellagio/libomx_nouveau.so ${pkgdir}/usr/lib/bellagio/
   
   install -m755 -d "${pkgdir}/usr/share/licenses/nouveau-dri"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/nouveau-dri/"
@@ -122,12 +148,25 @@ package_mesa() {
   conflicts=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
   replaces=('libglapi' 'osmesa' 'libgbm' 'libgles' 'libegl' 'khrplatform-devel')
 
-  mv -v ${srcdir}/fakeinstall/* ${pkgdir}
+  install -m755 -d ${pkgdir}/etc
+  mv -v ${srcdir}/fakeinstall/etc/drirc ${pkgdir}/etc
+  
+  install -m755 -d ${pkgdir}/usr/lib/{gallium-pipe,gbm}
+  mv -v ${srcdir}/fakeinstall/usr/lib/lib{OSMesa,gbm,glapi,wayland-egl,xatracker}.so* ${pkgdir}/usr/lib/
+  mv -v ${srcdir}/fakeinstall/usr/lib/gallium-pipe/pipe_swrast* ${pkgdir}/usr/lib/gallium-pipe/
+  mv -v ${srcdir}/fakeinstall/usr/lib/gbm/gbm_gallium_drm* ${pkgdir}/usr/lib/gbm/
+
+  mv -v ${srcdir}/fakeinstall/usr/include ${pkgdir}/usr
+  mv -v ${srcdir}/fakeinstall/usr/lib/pkgconfig ${pkgdir}/usr/lib/
+  
+  install -m755 -d ${pkgdir}/usr/lib/xorg/modules/dri
+  mv -v ${srcdir}/fakeinstall/usr/lib/xorg/modules/dri/swrast_dri* ${pkgdir}/usr/lib/xorg/modules/dri/
+  
   install -m755 -d ${pkgdir}/usr/lib/mesa
   # move libgl/EGL/glesv*.so to not conflict with blobs - may break .pc files ?
-  mv -v ${pkgdir}/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
-  mv -v ${pkgdir}/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
-  mv -v ${pkgdir}/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libEGL.so* 	${pkgdir}/usr/lib/mesa/
+  mv -v ${srcdir}/fakeinstall/usr/lib/libGLES*.so*	${pkgdir}/usr/lib/mesa/
 
   install -m755 -d "${pkgdir}/usr/share/licenses/mesa"
   install -m644 "${srcdir}/LICENSE" "${pkgdir}/usr/share/licenses/mesa/"
diff --git a/extra/spamassassin/PKGBUILD b/extra/spamassassin/PKGBUILD
index e15741009..2acbaf8dd 100644
--- a/extra/spamassassin/PKGBUILD
+++ b/extra/spamassassin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 214308 2014-06-05 18:50:41Z bluewind $
+# $Id: PKGBUILD 214376 2014-06-08 07:55:08Z fyan $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Manolis Tzanidakis
 pkgname=spamassassin
 pkgver=3.4.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A mail filter to identify spam."
 arch=('i686' 'x86_64')
 license=('APACHE')
@@ -26,7 +26,7 @@ source=("http://www.us.apache.org/dist/${pkgname}/source/Mail-SpamAssassin-${pkg
 md5sums=('5d0b50cee3bfa905cca35c33296c8c2a'
          'SKIP'
          'd0ce5f8a02fd74dbc83632f4aaec6185'
-         'bd27e3a54784a0a519d3abff3fa82392')
+         '0bcf0419608ec4ac200e794563620f31')
 
 prepare() {
   cd "${srcdir}/Mail-SpamAssassin-${pkgver}"
diff --git a/extra/spamassassin/net-dns.patch b/extra/spamassassin/net-dns.patch
index 84db0c598..76d28167d 100644
--- a/extra/spamassassin/net-dns.patch
+++ b/extra/spamassassin/net-dns.patch
@@ -1,4 +1,7 @@
-Fix FS#40707 by disabling the failing version check. We don't ship versions that old anyway.
+Fix FS#40707 by
+
+- disabling the failing version check. We don't ship versions that old anyway.
+- fix nameservers fetching from Net::DNS
 
 ---
 diff -Nur a/lib/Mail/SpamAssassin/Dns.pm b/lib/Mail/SpamAssassin/Dns.pm
@@ -25,3 +28,14 @@ diff -Nur a/lib/Mail/SpamAssassin/Plugin/AskDNS.pm Mail-SpamAssassin-3.4.0/lib/M
  
    return $self;
  }
+--- a/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-08 12:48:29.064230952 +0800
++++ b/lib/Mail/SpamAssassin/DnsResolver.pm	2014-06-08 12:49:06.961872678 +0800
+@@ -205,7 +205,7 @@
+     dbg("dns: servers set by config to: %s", join(', ',@ns_addr_port));
+   } elsif ($res) {  # default as provided by Net::DNS, e.g. /etc/resolv.conf
+     @ns_addr_port = map(untaint_var("[$_]:" . $res->{port}),
+-                        @{$res->{nameservers}});
++                        $res->nameservers);
+     dbg("dns: servers obtained from Net::DNS : %s", join(', ',@ns_addr_port));
+   }
+   return @ns_addr_port;