Update to 2.4.35.

2.4.35:
Alex Deucher (3):
      radeon: add new pci ids
      radeon: fall back to 1D tiling only with broken kernels
      configure: bump version for release

Ben Widawsky (2):
      intel: sanitize i915_drm.h
      intel: wait render header updates

Inki Dae (1):
      libdrm: add exynos drm support

Michel Dänzer (1):
      radeon: Add Southern Islands PCI IDs.

2.4.34:
Anisse Astier (1):
      radeon: Add new R600 PCI ids for surface manager

Ben Skeggs (3):
      lists: add nicer+unsafe foreach, and list join macros
      nouveau: pull in major libdrm rewrite
      nouveau: init nvc0 channel alloc req structure fully

Christoph Bumiller (1):
      nouveau: expose notifier handle on nvc0 as well

Daniel Vetter (1):
      intel/decode: decode MI_WAIT_FOR_EVENT

Eugeni Dodonov (1):
      intel: add Ivy Bridge GT2 server variant

Marcin Slusarz (2):
      nouveau: remove unnecessary EAGAIN loops
      nouveau: fix channel closing

Paul Berry (2):
      intel: Add the ability to supply annotations for .aub files.
      configure: Bump version for 2.4.34.

Paulo Zanoni (4):
      modetest: fix some compiler warnings
      modetest: fix drmModeGetConnector memory leak
      modetest: call drmModeFreePlaneResources
      modetest: print more about our properties

Rob Clark (7):
      omap: fix license header
      modetest: add drm_plane support
      modetest: add YUV and multi-planar support
      modetest: add AR15/XR15 (RGB-1555) formats
      modetest: fix typo
      libdrm: update drm headers from kernel for prime/dmabuf
      omap: add dmabuf support

Víctor Manuel Jáquez Leal (1):
      omap: fix compiler warning

3 files changed, 8 insertions, 20 deletions

diff --git a/x11/libdrm/Makefile b/x11/libdrm/Makefile
index 9328d5d311d..4f0e26e5d59 100644
--- a/x11/libdrm/Makefile
+++ b/x11/libdrm/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2012/05/14 03:56:58 sbd Exp $
+# $NetBSD: Makefile,v 1.18 2012/06/10 16:32:13 wiz Exp $
 #
 
-DISTNAME=		libdrm-2.4.33
-PKGREVISION=		1
+DISTNAME=		libdrm-2.4.35
 CATEGORIES=		x11 graphics
 MASTER_SITES=		http://dri.freedesktop.org/libdrm/
 EXTRACT_SUFX=		.tar.bz2
@@ -40,7 +39,6 @@ CONFIGURE_ENV+=		drm_cv_atomic_primitives=libatomic-ops
 . endif
 .endif
 
-CONFIGURE_ARGS+=	--enable-nouveau-experimental-api
 CONFIGURE_ARGS+=	PTHREADSTUBS_CFLAGS=-I${PREFIX}/include \
 			PTHREADSTUBS_LIBS=-L${PREFIX}/lib
 
diff --git a/x11/libdrm/PLIST b/x11/libdrm/PLIST
index f93475ca099..e1def6344d1 100644
--- a/x11/libdrm/PLIST
+++ b/x11/libdrm/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/05/08 20:32:47 wiz Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/06/10 16:32:13 wiz Exp $
 include/libdrm/drm.h
 include/libdrm/drm_fourcc.h
 include/libdrm/drm_mode.h
@@ -9,8 +9,8 @@ include/libdrm/intel_bufmgr.h
 include/libdrm/intel_debug.h
 include/libdrm/mach64_drm.h
 include/libdrm/mga_drm.h
+include/libdrm/nouveau.h
 include/libdrm/nouveau_drm.h
-include/libdrm/nouveau_drmif.h
 include/libdrm/r128_drm.h
 include/libdrm/r600_pci_ids.h
 include/libdrm/radeon_bo.h
@@ -24,16 +24,6 @@ include/libdrm/radeon_surface.h
 include/libdrm/savage_drm.h
 include/libdrm/sis_drm.h
 include/libdrm/via_drm.h
-include/nouveau/nouveau_bo.h
-include/nouveau/nouveau_channel.h
-include/nouveau/nouveau_device.h
-include/nouveau/nouveau_grobj.h
-include/nouveau/nouveau_notifier.h
-include/nouveau/nouveau_pushbuf.h
-include/nouveau/nouveau_reloc.h
-include/nouveau/nouveau_resource.h
-include/nouveau/nv04_pushbuf.h
-include/nouveau/nvc0_pushbuf.h
 include/xf86drm.h
 include/xf86drmMode.h
 lib/libdrm.la
diff --git a/x11/libdrm/distinfo b/x11/libdrm/distinfo
index 5e94f558da1..b42560f6d13 100644
--- a/x11/libdrm/distinfo
+++ b/x11/libdrm/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.16 2012/05/08 20:32:47 wiz Exp $
+$NetBSD: distinfo,v 1.17 2012/06/10 16:32:13 wiz Exp $
 
-SHA1 (libdrm-2.4.33.tar.bz2) = 4da2c635491724e44326871e6a49ccfec0b6b5a6
-RMD160 (libdrm-2.4.33.tar.bz2) = 59ce56197f2f6f7069d2ddc23024e0ad680e20f4
-Size (libdrm-2.4.33.tar.bz2) = 446817 bytes
+SHA1 (libdrm-2.4.35.tar.bz2) = a1d8d4945f782371d7855dbd693db885bd7e3d83
+RMD160 (libdrm-2.4.35.tar.bz2) = e3275ab8d16b2d206b9ccab695900f2d07451c0a
+Size (libdrm-2.4.35.tar.bz2) = 531007 bytes
 SHA1 (patch-ab) = 66dadd3244bfa9c69be0982fd2108deb94483de2
 SHA1 (patch-ac) = 67c998df7dfc0dabc86320ea6d015cede3e464ea
 SHA1 (patch-ad) = ea3ef8de8db782ddab23f182f1e6bd9d8f612a78