diff options
author | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-11-07 21:46:57 +0800 |
---|---|---|
committer | zeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-11-07 21:46:57 +0800 |
commit | 6e28d13f7f0d9246e11e2dac86862c571806c02d (patch) | |
tree | ce0382ecaccb33d3cfa7cbdd0c3f4260716954f4 | |
parent | 7f94b5645493f224f3a2a19112ae5924f7f6fa1a (diff) | |
download | xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.tar xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.tar.gz xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.tar.bz2 xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.tar.lz xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.tar.xz xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.tar.zst xorg-devel-ports-6e28d13f7f0d9246e11e2dac86862c571806c02d.zip |
Update tp 2.4.47
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1211 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r-- | graphics/libdrm/Makefile | 5 | ||||
-rw-r--r-- | graphics/libdrm/distinfo | 4 | ||||
-rw-r--r-- | graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c | 13 | ||||
-rw-r--r-- | graphics/libdrm/files/extra-tests_modetest_Makefile.in | 28 | ||||
-rw-r--r-- | graphics/libdrm/files/extra-tests_modetest_modetest.c | 12 |
5 files changed, 38 insertions, 24 deletions
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index d9aa3c6..d795734 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -57,13 +57,14 @@ MAN7= drm-gem.7 \ CONFIGURE_ARGS+=--disable-manpages .endif -LIBDRM_VERSION= 2.4.46 +LIBDRM_VERSION= 2.4.47 LIBDRM_REVISION=0 PLIST_SUB+= OLD="@comment " NEW="" EXTRA_PATCHES+= ${FILESDIR}/extra-configure \ ${FILESDIR}/extra-tests_modetest_Makefile.in \ ${FILESDIR}/extra-tests_modetest_modetest.c \ - ${FILESDIR}/extra-tests_modetest_strchrnul.c + ${FILESDIR}/extra-tests_modetest_strchrnul.c \ + ${FILESDIR}/extra-tests__radeon__radeon_ttm.c CONFIGURE_ARGS+=--disable-vmwgfx .else CONFIGURE_ARGS= --enable-nouveau-experimental-api diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 7a11d90..5cad174 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,4 +1,4 @@ SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a SIZE (libdrm-2.4.17.tar.bz2) = 408882 -SHA256 (libdrm-2.4.46.tar.bz2) = 33cf320dad4e8060768714792e12643ddf6756a719d262ba7d60b39c2b2650f1 -SIZE (libdrm-2.4.46.tar.bz2) = 554190 +SHA256 (libdrm-2.4.47.tar.bz2) = a98809a55ede4dac17416cac41f1f017114a97a7b6c2574f96a225ab1bd06074 +SIZE (libdrm-2.4.47.tar.bz2) = 553085 diff --git a/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c new file mode 100644 index 0000000..ff022a3 --- /dev/null +++ b/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c @@ -0,0 +1,13 @@ +--- 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-tests_modetest_Makefile.in b/graphics/libdrm/files/extra-tests_modetest_Makefile.in index 74748e9..535bd83 100644 --- a/graphics/libdrm/files/extra-tests_modetest_Makefile.in +++ b/graphics/libdrm/files/extra-tests_modetest_Makefile.in @@ -1,6 +1,6 @@ ---- tests/modetest/Makefile.in.orig 2013-04-04 15:41:48.212028807 +0200 -+++ tests/modetest/Makefile.in 2013-04-04 15:45:21.384003991 +0200 -@@ -36,8 +52,11 @@ +--- 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 +@@ -80,8 +80,11 @@ host_triplet = @host@ @HAVE_INSTALL_TESTS_TRUE@bin_PROGRAMS = modetest$(EXEEXT) @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT) @@ -12,9 +12,9 @@ +@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS) +@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS) subdir = tests/modetest - DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in - ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -@@ -53,7 +72,10 @@ + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + $(top_srcdir)/build-aux/depcomp +@@ -98,7 +101,10 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) @@ -26,23 +26,23 @@ modetest_OBJECTS = $(am_modetest_OBJECTS) am__DEPENDENCIES_1 = @HAVE_CAIRO_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) -@@ -229,12 +265,10 @@ - top_builddir = @top_builddir@ +@@ -306,12 +312,12 @@ top_srcdir = @top_srcdir@ - AM_CFLAGS = -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ + AM_CFLAGS = $(filter-out -Wpointer-arith, $(WARN_CFLAGS)) \ + -I$(top_srcdir)/include/drm -I$(top_srcdir)/libkms/ \ - -I$(top_srcdir) $(am__append_1) --modetest_SOURCES = \ -- buffers.c modetest.c buffers.h -- + -I$(top_srcdir) $(am__append_2) -+modetest_SOURCES = buffers.c modetest.c buffers.h $(am__append_1) + modetest_SOURCES = \ +- buffers.c modetest.c buffers.h ++ buffers.c modetest.c buffers.h $(am__append_1) + modetest_LDADD = $(top_builddir)/libdrm.la \ - $(top_builddir)/libkms/libkms.la $(am__append_2) + $(top_builddir)/libkms/libkms.la $(am__append_3) all: all-am .SUFFIXES: -@@ -333,6 +370,7 @@ +@@ -417,6 +423,7 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/buffers.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/modetest.Po@am__quote@ diff --git a/graphics/libdrm/files/extra-tests_modetest_modetest.c b/graphics/libdrm/files/extra-tests_modetest_modetest.c index db62e98..73e4e74 100644 --- a/graphics/libdrm/files/extra-tests_modetest_modetest.c +++ b/graphics/libdrm/files/extra-tests_modetest_modetest.c @@ -1,6 +1,6 @@ ---- tests/modetest/modetest.c.orig 2013-02-22 00:44:28.203705216 +0100 -+++ tests/modetest/modetest.c 2013-02-22 00:44:56.803699770 +0100 -@@ -57,6 +57,10 @@ +--- tests/modetest/modetest.c.orig 2013-09-16 22:56:20.000000000 +0200 ++++ tests/modetest/modetest.c 2013-11-07 11:32:10.534114644 +0100 +@@ -59,6 +59,10 @@ #include "buffers.h" @@ -8,6 +8,6 @@ +char *strchrnul(const char *, int); +#endif + - drmModeRes *resources; - int fd, modes; - + struct crtc { + drmModeCrtc *crtc; + drmModeObjectProperties *props; |