[arch-commits] Commit in libdrm/trunk (4 files)

Jan de Groot jgc at archlinux.org
Fri Sep 4 11:47:59 UTC 2009


    Date: Friday, September 4, 2009 @ 07:47:59
  Author: jgc
Revision: 50966

upgpkg: libdrm 2.4.13-1
    Update to 2.4.13
Remove git-fixes.patch, there are no real fixes in git at this moment
Add intel-pciids.patch to add support for some new Intel chips

Added:
  libdrm/trunk/intel-pciids.patch
Modified:
  libdrm/trunk/PKGBUILD
  libdrm/trunk/no-pthread-stubs.patch
Deleted:
  libdrm/trunk/git-fixes.patch

------------------------+
 PKGBUILD               |   14 +++++++-------
 git-fixes.patch        |   44 --------------------------------------------
 intel-pciids.patch     |   28 ++++++++++++++++++++++++++++
 no-pthread-stubs.patch |    4 ++--
 4 files changed, 37 insertions(+), 53 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-09-04 11:43:46 UTC (rev 50965)
+++ PKGBUILD	2009-09-04 11:47:59 UTC (rev 50966)
@@ -2,7 +2,7 @@
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.12
+pkgver=2.4.13
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -12,17 +12,17 @@
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         no-pthread-stubs.patch
-        git-fixes.patch
+        intel-pciids.patch
         COPYING)
-md5sums=('15d26219c046377d5fcb1cb37e7b03a2'
-         '97584cada4db57c1eb799f0b94e738ae'
-         '268de9ab6a6380e46189e577023cce42'
-         'ba65e71c481b94ef0fb6c23c7f21ffa1')
+sha1sums=('0d3065d8521fca97239ce4aecbc81dc08d07de7d'
+          'aa187b94c3ccc0f3b1139a719688b2e450343485'
+          'acaaf6dba0cf4ac2b0c59142b11b34585414f680'
+          'ba3dcd636997ee0d30df14b03dae05c24ae5d094')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   patch -Np1 -i "${srcdir}/no-pthread-stubs.patch" || return 1
-  patch -Np1 -i "${srcdir}/git-fixes.patch" || return 1
+  patch -Np1 -i "${srcdir}/intel-pciids.patch" || return 1
   libtoolize --force || return 1
   aclocal || return 1
   autoconf || return 1

Deleted: git-fixes.patch
===================================================================
--- git-fixes.patch	2009-09-04 11:43:46 UTC (rev 50965)
+++ git-fixes.patch	2009-09-04 11:47:59 UTC (rev 50966)
@@ -1,44 +0,0 @@
-From 0411c37409102c71e8ba980f9afb2d4a8c64189d Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexdeucher at gmail.com>
-Date: Wed, 15 Jul 2009 18:40:41 +0000
-Subject: Add R600_SCRATCH_REG_OFFSET to radeon_drm.h
-
-This lets us libdrm from master for r6xx/r7xx 3d
----
-diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
-index e9f2afa..3fc417a 100644
---- a/shared-core/radeon_drm.h
-+++ b/shared-core/radeon_drm.h
-@@ -303,6 +303,7 @@ typedef union {
- #define RADEON_INDEX_PRIM_OFFSET	20
- 
- #define RADEON_SCRATCH_REG_OFFSET	32
-+#define R600_SCRATCH_REG_OFFSET         256
- 
- #define RADEON_NR_SAREA_CLIPRECTS	12
- 
---
-cgit v0.8.2
-From 9aed44beeac4f250a58c792d64a4dee1dde3d086 Mon Sep 17 00:00:00 2001
-From: Alex Deucher <alexdeucher at gmail.com>
-Date: Wed, 15 Jul 2009 18:51:38 +0000
-Subject: Add RADEON_INIT_R600_CP too
-
-this rounds out the r6xx/r7xx stuff in radeon_drm.h
----
-diff --git a/shared-core/radeon_drm.h b/shared-core/radeon_drm.h
-index 3fc417a..85aa025 100644
---- a/shared-core/radeon_drm.h
-+++ b/shared-core/radeon_drm.h
-@@ -548,7 +548,8 @@ typedef struct drm_radeon_init {
- 		RADEON_INIT_CP = 0x01,
- 		RADEON_CLEANUP_CP = 0x02,
- 		RADEON_INIT_R200_CP = 0x03,
--		RADEON_INIT_R300_CP = 0x04
-+		RADEON_INIT_R300_CP = 0x04,
-+		RADEON_INIT_R600_CP = 0x05
- 	} func;
- 	unsigned long sarea_priv_offset;
- 	int is_pci; /* for overriding only */
---
-cgit v0.8.2

Added: intel-pciids.patch
===================================================================
--- intel-pciids.patch	                        (rev 0)
+++ intel-pciids.patch	2009-09-04 11:47:59 UTC (rev 50966)
@@ -0,0 +1,28 @@
+From 121b9648f846d900e67818869974ee82046e9b25 Mon Sep 17 00:00:00 2001
+From: Zhenyu Wang <zhenyuw at linux.intel.com>
+Date: Fri, 04 Sep 2009 01:24:23 +0000
+Subject: libdrm_intel: add new pci ids
+
+New ids for G41, Clarkdale and Arrandale.
+Make sure we don't need to count fence also on new chips.
+
+Signed-off-by: Zhenyu Wang <zhenyuw at linux.intel.com>
+---
+diff --git a/libdrm/intel/intel_chipset.h b/libdrm/intel/intel_chipset.h
+index 0b3af02..26bc585 100644
+--- a/libdrm/intel/intel_chipset.h
++++ b/libdrm/intel/intel_chipset.h
+@@ -48,7 +48,10 @@
+                        (dev)->pci_device == 0x2A42 || \
+                        (dev)->pci_device == 0x2E02 || \
+                        (dev)->pci_device == 0x2E12 || \
+-                       (dev)->pci_device == 0x2E22)
++                       (dev)->pci_device == 0x2E22 || \
++                       (dev)->pci_device == 0x2E32 || \
++                       (dev)->pci_device == 0x0042 || \
++                       (dev)->pci_device == 0x0046)
+ 
+ #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
+ 
+--
+cgit v0.8.2

Modified: no-pthread-stubs.patch
===================================================================
--- no-pthread-stubs.patch	2009-09-04 11:43:46 UTC (rev 50965)
+++ no-pthread-stubs.patch	2009-09-04 11:47:59 UTC (rev 50966)
@@ -25,8 +25,8 @@
  libdrm_intel_la_LTLIBRARIES = libdrm_intel.la
  libdrm_intel_ladir = $(libdir)
  libdrm_intel_la_LDFLAGS = -version-number 1:0:0 -no-undefined
--libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@
-+libdrm_intel_la_LIBADD = ../libdrm.la
+-libdrm_intel_la_LIBADD = ../libdrm.la @PTHREADSTUBS_LIBS@ @CLOCK_LIB@
++libdrm_intel_la_LIBADD = ../libdrm.la @CLOCK_LIB@
  
  libdrm_intel_la_SOURCES = \
  	intel_bufmgr.c \




More information about the arch-commits mailing list