diff options
Diffstat (limited to 'graphics')
-rw-r--r-- | graphics/libdrm/Makefile | 2 | ||||
-rw-r--r-- | graphics/libdrm/distinfo | 4 | ||||
-rw-r--r-- | graphics/libdrm/files/patch-configure | 39 | ||||
-rw-r--r-- | graphics/libdrm/files/patch-tests_modetest_Makefile.in | 54 | ||||
-rw-r--r-- | graphics/libdrm/files/patch-tests_modetest_modetest.c | 13 | ||||
-rw-r--r-- | graphics/libdrm/files/patch-tests_modetest_strchrnul.c | 48 |
6 files changed, 3 insertions, 157 deletions
diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 8d3bfb6..1e6cfbd 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= libdrm -PORTVERSION= 2.4.56 +PORTVERSION= 2.4.58 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 01ee7f8..1964ede 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,2 +1,2 @@ -SHA256 (libdrm-2.4.56.tar.bz2) = e20fbbe092177a8422913d8884a1255477456ab5b10b07389fa891a4dce54030 -SIZE (libdrm-2.4.56.tar.bz2) = 590856 +SHA256 (libdrm-2.4.58.tar.bz2) = b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd +SIZE (libdrm-2.4.58.tar.bz2) = 573202 diff --git a/graphics/libdrm/files/patch-configure b/graphics/libdrm/files/patch-configure deleted file mode 100644 index 3d9d571..0000000 --- a/graphics/libdrm/files/patch-configure +++ /dev/null @@ -1,39 +0,0 @@ ---- configure.orig 2013-02-22 00:30:16.861698520 +0100 -+++ configure 2013-02-22 00:30:26.189704713 +0100 -@@ -671,6 +671,8 @@ - HAVE_VMWGFX_TRUE - HAVE_LIBKMS_FALSE - HAVE_LIBKMS_TRUE -+HAVE_STRCHRNUL_FALSE -+HAVE_STRCHRNUL_TRUE - CLOCK_LIB - pkgconfigdir - PTHREADSTUBS_LIBS -@@ -12341,6 +12345,27 @@ - done - - -+for ac_func in strchrnul -+do : -+ ac_fn_c_check_func "$LINENO" "strchrnul" "ac_cv_func_strchrnul" -+if test "x$ac_cv_func_strchrnul" = xyes; then : -+ cat >>confdefs.h <<_ACEOF -+#define HAVE_STRCHRNUL 1 -+_ACEOF -+ HAVE_STRCHRNUL=yes -+fi -+done -+ -+ -+ if test "x$ac_cv_func_strchrnul" = xyes; then -+ HAVE_STRCHRNUL_TRUE= -+ HAVE_STRCHRNUL_FALSE='#' -+else -+ HAVE_STRCHRNUL_TRUE='#' -+ HAVE_STRCHRNUL_FALSE= -+fi -+ -+ - - - MAYBE_WARN="-Wall -Wextra \ diff --git a/graphics/libdrm/files/patch-tests_modetest_Makefile.in b/graphics/libdrm/files/patch-tests_modetest_Makefile.in deleted file mode 100644 index ce9493f..0000000 --- a/graphics/libdrm/files/patch-tests_modetest_Makefile.in +++ /dev/null @@ -1,54 +0,0 @@ ---- 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) - @HAVE_INSTALL_TESTS_FALSE@noinst_PROGRAMS = modetest$(EXEEXT) --@HAVE_CAIRO_TRUE@am__append_1 = $(CAIRO_CFLAGS) --@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_LIBS) -+@HAVE_STRCHRNUL_FALSE@am__append_1 = \ -+@HAVE_STRCHRNUL_FALSE@ strchrnul.c -+ -+@HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS) -+@HAVE_CAIRO_TRUE@am__append_3 = $(CAIRO_LIBS) - subdir = tests/modetest - DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/build-aux/depcomp -@@ -98,8 +101,10 @@ - CONFIG_CLEAN_VPATH_FILES = - am__installdirs = "$(DESTDIR)$(bindir)" - PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) -+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) 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) -@@ -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 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) -+ $(top_builddir)/libkms/libkms.la $(am__append_3) - all: all-am - - .SUFFIXES: -@@ -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@ - - .c.o: - @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< diff --git a/graphics/libdrm/files/patch-tests_modetest_modetest.c b/graphics/libdrm/files/patch-tests_modetest_modetest.c deleted file mode 100644 index 73e4e74..0000000 --- a/graphics/libdrm/files/patch-tests_modetest_modetest.c +++ /dev/null @@ -1,13 +0,0 @@ ---- 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" - -+#ifndef HAVE_STRCHRNUL -+char *strchrnul(const char *, int); -+#endif -+ - struct crtc { - drmModeCrtc *crtc; - drmModeObjectProperties *props; diff --git a/graphics/libdrm/files/patch-tests_modetest_strchrnul.c b/graphics/libdrm/files/patch-tests_modetest_strchrnul.c deleted file mode 100644 index 26ba9ac..0000000 --- a/graphics/libdrm/files/patch-tests_modetest_strchrnul.c +++ /dev/null @@ -1,48 +0,0 @@ ---- tests/modetest/strchrnul.c.orig 2013-02-22 00:35:04.198698781 +0100 -+++ tests/modetest/strchrnul.c 2013-02-22 00:34:36.280333357 +0100 -@@ -0,0 +1,45 @@ -+/*- -+ * Copyright (c) 2013 Niclas Zeising -+ * All rights reserved. -+ * -+ * Redistribution and use in source and binary forms, with or without -+ * modification, are permitted provided that the following conditions -+ * are met: -+ * 1. Redistributions of source code must retain the above copyright -+ * notice, this list of conditions and the following disclaimer. -+ * 2. Redistributions in binary form must reproduce the above copyright -+ * notice, this list of conditions and the following disclaimer in the -+ * documentation and/or other materials provided with the distribution. -+ * -+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND -+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -+ * SUCH DAMAGE. -+ * -+ */ -+ -+/* -+ * Copied from: -+ * svn://svn.freebsd.org/base/head/lib/libc/string/strchrnul.c 246766 2013-02-13 15:46:33Z zeising -+ */ -+ -+char * -+strchrnul(const char *p, int ch) -+{ -+ char c; -+ -+ c = ch; -+ for (;; ++p) { -+ if (*p == c || *p == '\0') -+ return ((char *)p); -+ } -+ /* NOTREACHED */ -+} -+ |