Update to 2.4.56 from experimental.

Clean up patches after libdrm in trunk went to 1 version.


git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1522 058c260c-8361-11dd-a0ac-aa2bafec7d09

7 files changed, 17 insertions, 28 deletions

diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile
index a8b21d8..8d3bfb6 100644
--- a/graphics/libdrm/Makefile
+++ b/graphics/libdrm/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libdrm
-PORTVERSION=	2.4.55
+PORTVERSION=	2.4.56
 PORTEPOCH=	1
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo
index 8473356..01ee7f8 100644
--- a/graphics/libdrm/distinfo
+++ b/graphics/libdrm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (libdrm-2.4.55.tar.bz2) = 5caf273766147ec57c7acfb9d468ed59baf767828e51517abc161057ca70c643
-SIZE (libdrm-2.4.55.tar.bz2) = 589443
+SHA256 (libdrm-2.4.56.tar.bz2) = e20fbbe092177a8422913d8884a1255477456ab5b10b07389fa891a4dce54030
+SIZE (libdrm-2.4.56.tar.bz2) = 590856
diff --git a/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
deleted file mode 100644
index ff022a3..0000000
--- a/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- tests/radeon/radeon_ttm.c.orig	2013-11-07 11:34:28.207096353 +0100
-+++ tests/radeon/radeon_ttm.c	2013-11-07 11:37:41.571085931 +0100
-@@ -25,6 +25,10 @@
-  */
- #include <stdio.h>
- #include <stdlib.h>
-+#include <unistd.h>
-+
-+#include <xf86drm.h>
-+
- #include "rbo.h"
- 
- /* allocate as many single page bo to try to starve the kernel
diff --git a/graphics/libdrm/files/extra-configure b/graphics/libdrm/files/patch-configure
index 3d9d571..3d9d571 100644
--- a/graphics/libdrm/files/extra-configure
+++ b/graphics/libdrm/files/patch-configure
diff --git a/graphics/libdrm/files/extra-tests_modetest_Makefile.in b/graphics/libdrm/files/patch-tests_modetest_Makefile.in
index 535bd83..ce9493f 100644
--- a/graphics/libdrm/files/extra-tests_modetest_Makefile.in
+++ b/graphics/libdrm/files/patch-tests_modetest_Makefile.in
@@ -1,5 +1,5 @@
---- tests/modetest/Makefile.in.orig	2013-10-11 18:46:07.000000000 +0200
-+++ tests/modetest/Makefile.in	2013-11-07 11:30:15.274123603 +0100
+--- tests/modetest/Makefile.in.orig	2014-05-02 23:00:12.000000000 +0200
++++ tests/modetest/Makefile.in	2014-05-18 11:12:39.000000000 +0200
 @@ -80,8 +80,11 @@
  host_triplet = @host@
  @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT)
@@ -14,27 +14,29 @@
  subdir = tests/modetest
  DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
  	$(top_srcdir)/build-aux/depcomp
-@@ -98,7 +101,10 @@
+@@ -98,8 +101,10 @@
  CONFIG_CLEAN_VPATH_FILES =
  am__installdirs = "$(DESTDIR)$(bindir)"
  PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
--am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT)
-+am__modetest_SOURCES_DIST = buffers.c modetest.c buffers.h strchrnul.c
++am__modetest_SOURCES_DIST = buffers.c cursor.c modetest.c buffers.h strchrnul.c
 +@HAVE_STRCHRNUL_FALSE@am__objects_1 = strchrnul.$(OBJEXT)
-+am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) \
-+	$(am__objects_1)
+ am_modetest_OBJECTS = buffers.$(OBJEXT) cursor.$(OBJEXT) \
+-	modetest.$(OBJEXT)
++	modetest.$(OBJEXT) $(am__objects_1)
  modetest_OBJECTS = $(am_modetest_OBJECTS)
  am__DEPENDENCIES_1 =
  @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
-@@ -306,12 +312,12 @@
+@@ -307,14 +312,15 @@
  top_srcdir = @top_srcdir@
  AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \
  	-I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \
 -	-I$(top_srcdir) $(am__append_1)
 +	-I$(top_srcdir) $(am__append_2)
  modetest_SOURCES = \
--	buffers.c modetest.c buffers.h
-+	buffers.c modetest.c buffers.h $(am__append_1)
+ 	buffers.c buffers.h \
+ 	cursor.c cursor.h \
++	$(am__append_1) \
+ 	modetest.c
  
  modetest_LDADD = $(top_builddir)/libdrm.la \
 -	$(top_builddir)/libkms/libkms.la $(am__append_2)
@@ -42,9 +44,9 @@
  all: all-am
  
  .SUFFIXES:
-@@ -417,6 +423,7 @@
- 
+@@ -421,6 +427,7 @@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cursor.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@
 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/strchrnul.Po@am__quote@
  
diff --git a/graphics/libdrm/files/extra-tests_modetest_modetest.c b/graphics/libdrm/files/patch-tests_modetest_modetest.c
index 73e4e74..73e4e74 100644
--- a/graphics/libdrm/files/extra-tests_modetest_modetest.c
+++ b/graphics/libdrm/files/patch-tests_modetest_modetest.c
diff --git a/graphics/libdrm/files/extra-tests_modetest_strchrnul.c b/graphics/libdrm/files/patch-tests_modetest_strchrnul.c
index 26ba9ac..26ba9ac 100644
--- a/graphics/libdrm/files/extra-tests_modetest_strchrnul.c
+++ b/graphics/libdrm/files/patch-tests_modetest_strchrnul.c