Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/codeblocks/PKGBUILD
	community/gnash/PKGBUILD
	community/i3lock/PKGBUILD
	community/instead/PKGBUILD
	extra/asio/PKGBUILD
	extra/cups/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/ocrad/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/scribus/PKGBUILD
	extra/xdg-user-dirs/PKGBUILD

2 files changed, 11 insertions, 128 deletions

diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 93312bb7e..e60ba8abf 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,31 +1,35 @@
-# $Id: PKGBUILD 189301 2013-07-02 19:57:06Z lcarlier $
+# $Id: PKGBUILD 190056 2013-07-13 17:35:10Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
 pkgver=2.4.46
-pkgrel=1
+pkgrel=2
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64 'mips64el')
 license=('custom')
 depends=('glibc' 'libpciaccess')
-makedepends=('cairo')
+makedepends=('cairo' 'clang')
 [ "$CARCH" != "mips64el" ] && makedepends+=('valgrind')
 replaces=('libdrm-new' 'libdrm-nouveau')
 options=('!libtool')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
-        no-pthread-stubs.patch
         COPYING)
 sha256sums=('33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1'
-            'c2d2e8575dac9d08f1271b2cfa68ac3b42e69f99efe6e3a7e20064f22f7e28ab'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
   cd $pkgname-$pkgver
-  patch -Np1 -i ../no-pthread-stubs.patch
 
-  #libtoolize --force
+  # pthread is useless in Linux
+  sed -i "/pthread-stubs/d" configure.ac
   autoreconf --force --install
+  
+  # gcc 4.8 introduces graphic corruption and X crashes with nouveau cards (nv44)
+  # http://gcc.gnu.org/ml/gcc-help/2013-07/msg00103.html
+  # we use clang compiler meanwhile
+  export CC=clang
+
   ./configure --prefix=/usr --enable-udev
   make
 }
diff --git a/extra/libdrm/no-pthread-stubs.patch b/extra/libdrm/no-pthread-stubs.patch
deleted file mode 100644
index d49e397b7..000000000
--- a/extra/libdrm/no-pthread-stubs.patch
+++ /dev/null
@@ -1,121 +0,0 @@
-diff -Nur libdrm-2.4.34.orig/configure.ac libdrm-2.4.34/configure.ac
---- libdrm-2.4.34.orig/configure.ac	2012-05-12 14:54:06.375335490 +0000
-+++ libdrm-2.4.34/configure.ac	2012-05-12 14:54:32.075142065 +0000
-@@ -47,10 +47,6 @@
- LT_INIT([disable-static])
- 
- 
--PKG_CHECK_MODULES(PTHREADSTUBS, pthread-stubs)
--AC_SUBST(PTHREADSTUBS_CFLAGS)
--AC_SUBST(PTHREADSTUBS_LIBS)
--
- pkgconfigdir=${libdir}/pkgconfig
- AC_SUBST(pkgconfigdir)
- AC_ARG_ENABLE([udev],
-diff -Nur libdrm-2.4.34.orig/intel/Makefile.am libdrm-2.4.34/intel/Makefile.am
---- libdrm-2.4.34.orig/intel/Makefile.am	2012-05-12 14:54:06.372001955 +0000
-+++ libdrm-2.4.34/intel/Makefile.am	2012-05-12 14:55:24.164745055 +0000
-@@ -26,7 +26,6 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/intel \
--	$(PTHREADSTUBS_CFLAGS) \
- 	$(PCIACCESS_CFLAGS) \
- 	$(VALGRIND_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
-@@ -35,7 +34,6 @@
- libdrm_intel_ladir = $(libdir)
- libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
- libdrm_intel_la_LIBADD = ../libdrm.la \
--	@PTHREADSTUBS_LIBS@ \
- 	@PCIACCESS_LIBS@ \
- 	@CLOCK_LIB@
- 
-diff -Nur libdrm-2.4.34.orig/nouveau/Makefile.am libdrm-2.4.34/nouveau/Makefile.am
---- libdrm-2.4.34.orig/nouveau/Makefile.am	2012-05-12 14:54:06.331998148 +0000
-+++ libdrm-2.4.34/nouveau/Makefile.am	2012-05-12 14:56:00.941132085 +0000
-@@ -2,14 +2,13 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/nouveau \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm \
- 	-DDEBUG
- 
- libdrm_nouveau_la_LTLIBRARIES = libdrm_nouveau.la
- libdrm_nouveau_ladir = $(libdir)
- libdrm_nouveau_la_LDFLAGS = -version-number 2:0:0 -no-undefined
--libdrm_nouveau_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_nouveau_la_LIBADD = ../libdrm.la
- 
- libdrm_nouveau_la_SOURCES = nouveau.c \
- 			    pushbuf.c \
-diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
---- libdrm-2.4.34.orig/radeon/Makefile.am	2012-05-12 14:54:06.365334765 +0000
-+++ libdrm-2.4.34/radeon/Makefile.am	2012-05-12 14:55:48.084557437 +0000
-@@ -26,13 +26,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/radeon \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
- libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:1 -no-undefined
--libdrm_radeon_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_radeon_la_LIBADD = ../libdrm.la
- 
- libdrm_radeon_la_SOURCES = \
- 	radeon_bo_gem.c \
---- libdrm-2.4.40/omap/Makefile.am	2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/omap/Makefile.am	2012-11-06 19:24:44.183224706 +0100
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/omap \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_omap_la_LTLIBRARIES = libdrm_omap.la
- libdrm_omap_ladir = $(libdir)
- libdrm_omap_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_omap_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_omap_la_LIBADD = ../libdrm.la
- 
- libdrm_omap_la_SOURCES = omap_drm.c
- 
---- libdrm-2.4.40/exynos/Makefile.am	2012-06-14 23:32:50.000000000 +0200
-+++ libdrm-2.4.40/exynos/Makefile.am	2012-11-06 19:26:01.975323106 +0100
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/exynos \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_exynos_la_LTLIBRARIES = libdrm_exynos.la
- libdrm_exynos_ladir = $(libdir)
- libdrm_exynos_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_exynos_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_exynos_la_LIBADD = ../libdrm.la
- 
- libdrm_exynos_la_SOURCES = exynos_drm.c
- 
---- libdrm-2.4.44/freedreno/Makefile.am	2013-04-19 00:59:07.000000000 +0200
-+++ libdrm-2.4.44/freedreno/Makefile.am.new	2013-04-19 17:19:03.153950143 +0200
-@@ -2,13 +2,12 @@
- 	$(WARN_CFLAGS) \
- 	-I$(top_srcdir) \
- 	-I$(top_srcdir)/freedreno \
--	$(PTHREADSTUBS_CFLAGS) \
- 	-I$(top_srcdir)/include/drm
- 
- libdrm_freedreno_la_LTLIBRARIES = libdrm_freedreno.la
- libdrm_freedreno_ladir = $(libdir)
- libdrm_freedreno_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_freedreno_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_freedreno_la_LIBADD = ../libdrm.la
- 
- libdrm_freedreno_la_SOURCES = \
- 	freedreno_device.c \