From bb1352a9258e4d2149dce56da80f3b4d58da4796 Mon Sep 17 00:00:00 2001
From: James Meyer <james.meyer@operamail.com>
Date: Wed, 28 Nov 2012 09:22:39 -0600
Subject: libdrm: 2.4.40

---
 abs/core/libdrm/PKGBUILD               | 11 ++++++-----
 abs/core/libdrm/git_fixes.diff         | 13 ------------
 abs/core/libdrm/no-pthread-stubs.patch | 36 +++++++++++++++++++++++++++++++++-
 3 files changed, 41 insertions(+), 19 deletions(-)
 delete mode 100644 abs/core/libdrm/git_fixes.diff

diff --git a/abs/core/libdrm/PKGBUILD b/abs/core/libdrm/PKGBUILD
index 4833360..f4e43d2 100644
--- a/abs/core/libdrm/PKGBUILD
+++ b/abs/core/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 162833 2012-07-01 07:57:51Z andyrtr $
+# $Id: PKGBUILD 170783 2012-11-11 10:23:15Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.37
+pkgver=2.4.40
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -15,8 +15,8 @@ url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         no-pthread-stubs.patch
         COPYING)
-sha256sums=('e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f'
-            'f7a587357ea29cab9c06a4889f09e30d63eae76e9b9654666c53020d15ea52d7'
+sha256sums=('48c14e4600ea0fde522292893eb4055d2f6d86a69d093d379c827deaccffaa1f'
+            '3915aaff4d5b0ed523c3144911e7f79ee812dece0e3933c13a88dddcf5912ded'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
@@ -27,7 +27,8 @@ build() {
   autoreconf --force --install
   ./configure --prefix=/usr \
       --enable-udev \
-      --enable-vmwgfx-experimental-api
+      --enable-omap-experimental-api \
+      --enable-exynos-experimental-api
   make
 }
 
diff --git a/abs/core/libdrm/git_fixes.diff b/abs/core/libdrm/git_fixes.diff
deleted file mode 100644
index dc80155..0000000
--- a/abs/core/libdrm/git_fixes.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/intel/intel_bufmgr_gem.c b/intel/intel_bufmgr_gem.c
-index 19441f3..eb9dd32 100644
---- a/intel/intel_bufmgr_gem.c
-+++ b/intel/intel_bufmgr_gem.c
-@@ -958,7 +958,7 @@ static void drm_intel_gem_bo_purge_vma_cache(drm_intel_bufmgr_gem *bufmgr_gem)
- 				      bufmgr_gem->vma_cache.next,
- 				      vma_list);
- 		assert(bo_gem->map_count == 0);
--		DRMLISTDEL(&bo_gem->vma_list);
-+		DRMLISTDELINIT(&bo_gem->vma_list);
- 
- 		if (bo_gem->mem_virtual) {
- 			munmap(bo_gem->mem_virtual, bo_gem->bo.size);
diff --git a/abs/core/libdrm/no-pthread-stubs.patch b/abs/core/libdrm/no-pthread-stubs.patch
index 6745f4b..3b05ce1 100644
--- a/abs/core/libdrm/no-pthread-stubs.patch
+++ b/abs/core/libdrm/no-pthread-stubs.patch
@@ -62,9 +62,43 @@ diff -Nur libdrm-2.4.34.orig/radeon/Makefile.am libdrm-2.4.34/radeon/Makefile.am
  
  libdrm_radeon_la_LTLIBRARIES = libdrm_radeon.la
  libdrm_radeon_ladir = $(libdir)
- libdrm_radeon_la_LDFLAGS = -version-number 1:0:0 -no-undefined
+ 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
+ 
-- 
cgit v0.12

