[Midnightbsd-cvs] mports [16918] trunk/graphics/libdrm/pkg-plist: update drm
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 7 10:19:13 EDT 2014
Revision: 16918
http://svnweb.midnightbsd.org/mports/?rev=16918
Author: laffer1
Date: 2014-09-07 10:19:12 -0400 (Sun, 07 Sep 2014)
Log Message:
-----------
update drm
Modified Paths:
--------------
trunk/graphics/libdrm/Makefile
trunk/graphics/libdrm/distinfo
trunk/graphics/libdrm/files/extra-xf86drmMode.c
trunk/graphics/libdrm/pkg-plist
Added Paths:
-----------
trunk/graphics/libdrm/files/extra-configure
trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in
trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c
trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c
Property Changed:
----------------
trunk/graphics/libdrm/files/extra-xf86drmMode.c
Modified: trunk/graphics/libdrm/Makefile
===================================================================
--- trunk/graphics/libdrm/Makefile 2014-09-07 14:15:18 UTC (rev 16917)
+++ trunk/graphics/libdrm/Makefile 2014-09-07 14:19:12 UTC (rev 16918)
@@ -11,47 +11,66 @@
LICENSE= mit
-BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
-LIB_DEPENDS= pciaccess:${PORTSDIR}/devel/libpciaccess \
- pthread-stubs:${PORTSDIR}/devel/libpthread-stubs
-RUN_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:${PORTSDIR}/devel/libpthread-stubs
+LIB_DEPENDS= libpciaccess.so:${PORTSDIR}/devel/libpciaccess \
+ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
-USES= tar:bzip2
+USES= pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-CONFIGURE_ARGS= --enable-nouveau-experimental-api
+OPTIONS_DEFINE= MANPAGES
-MAKE_JOBS_SAFE= yes
+.if defined(PACKAGE_BUILDING)
+OPTIONS_DEFAULT+= MANPAGES
+.endif
+.include <bsd.mport.options.mk>
+
.if defined(WITH_NEW_XORG)
-OPTIONS= KMS "Enable experimental KMS support" Off
+USES+= gmake
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MKMS}
+# KMS support in the kernel is only build on these archs, disable others
+.if ${ARCH} == "amd64" || ${ARCH} == "i386"
CONFIGURE_ARGS+=--enable-libkms
EXTRA_PATCHES+= ${FILESDIR}/extra-xf86drmMode.c
-PLIST_SUB+= KMS=""
+PLIST_SUB+= KMS="" NOUVEAU=""
.else
-PLIST_SUB+= KMS="@comment "
+CONFIGURE_ARGS+=--disable-libkms
+PLIST_SUB+= KMS="@comment " NOUVEAU="@comment "
.endif
-LIBDRM_VERSION= 2.4.31
-LIBDRM_REVISION=1
+.if ${PORT_OPTIONS:MMANPAGES}
+BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
+USE_GNOME+= libxslt:build
+PLIST_SUB+= MAN=""
+.else
+CONFIGURE_ARGS+=--disable-manpages
+PLIST_SUB+= MAN="@comment "
+.endif
+
+LIBDRM_VERSION= 2.4.52
+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__radeon__radeon_ttm.c
+CONFIGURE_ARGS+=--disable-vmwgfx
.else
+CONFIGURE_ARGS= --enable-nouveau-experimental-api
LIBDRM_VERSION= 2.4.17
LIBDRM_REVISION=1
-PLIST_SUB+= OLD="" NEW="@comment "
+PLIST_SUB+= OLD="" NEW="@comment " NOUVEAU=""
.endif
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64" || ${ARCH} == "powerpc"
+.if ${ARCH} == amd64 || ${ARCH} == i386
PLIST_SUB+= INTEL_DRIVER=""
PLIST_SUB+= RADEON_DRIVERS=""
+.elif ${ARCH} == ia64 || ${ARCH} == powerpc || ${ARCH} == powerpc64
+PLIST_SUB+= INTEL_DRIVER="@comment "
+PLIST_SUB+= RADEON_DRIVERS=""
.else
PLIST_SUB+= INTEL_DRIVER="@comment "
PLIST_SUB+= RADEON_DRIVERS="@comment "
@@ -59,7 +78,10 @@
pre-patch:
@${REINPLACE_CMD} 's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g; \
- 12661s/x86_/amd/g' \
+ s,i?86|x86_64),i?86|amd64|x86_64),g' \
${WRKSRC}/configure
-.include <bsd.port.post.mk>
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
+
+.include <bsd.port.mk>
Modified: trunk/graphics/libdrm/distinfo
===================================================================
--- trunk/graphics/libdrm/distinfo 2014-09-07 14:15:18 UTC (rev 16917)
+++ trunk/graphics/libdrm/distinfo 2014-09-07 14:19:12 UTC (rev 16918)
@@ -1,4 +1,4 @@
SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.31.tar.bz2) = 8fc7e0e5b2f9bf493447a4ef7adc49174a700824457774cb53c1b8f2da866af4
-SIZE (libdrm-2.4.31.tar.bz2) = 475677
+SHA256 (libdrm-2.4.52.tar.bz2) = fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1
+SIZE (libdrm-2.4.52.tar.bz2) = 551473
Added: trunk/graphics/libdrm/files/extra-configure
===================================================================
--- trunk/graphics/libdrm/files/extra-configure (rev 0)
+++ trunk/graphics/libdrm/files/extra-configure 2014-09-07 14:19:12 UTC (rev 16918)
@@ -0,0 +1,39 @@
+--- 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 \
Added: trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
===================================================================
--- trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c (rev 0)
+++ trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c 2014-09-07 14:19:12 UTC (rev 16918)
@@ -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
Added: trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in
===================================================================
--- trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in (rev 0)
+++ trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in 2014-09-07 14:19:12 UTC (rev 16918)
@@ -0,0 +1,52 @@
+--- 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 at bin_PROGRAMS = modetest$(EXEEXT)
+ @HAVE_INSTALL_TESTS_FALSE at noinst_PROGRAMS = modetest$(EXEEXT)
+- at HAVE_CAIRO_TRUE@am__append_1 = $(CAIRO_CFLAGS)
+- at HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_LIBS)
++ at HAVE_STRCHRNUL_FALSE@am__append_1 = \
++ at HAVE_STRCHRNUL_FALSE@ strchrnul.c
++
++ at HAVE_CAIRO_TRUE@am__append_2 = $(CAIRO_CFLAGS)
++ at 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,7 +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
++ at HAVE_STRCHRNUL_FALSE@am__objects_1 = strchrnul.$(OBJEXT)
++am_modetest_OBJECTS = buffers.$(OBJEXT) modetest.$(OBJEXT) \
++ $(am__objects_1)
+ modetest_OBJECTS = $(am_modetest_OBJECTS)
+ am__DEPENDENCIES_1 =
+ @HAVE_CAIRO_TRUE at am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1)
+@@ -306,12 +312,12 @@
+ 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)
+
+ 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:
+@@ -417,6 +423,7 @@
+
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/buffers.Po at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/modetest.Po at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/strchrnul.Po at am__quote@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
Added: trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c
===================================================================
--- trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c (rev 0)
+++ trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c 2014-09-07 14:19:12 UTC (rev 16918)
@@ -0,0 +1,13 @@
+--- 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;
Added: trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c
===================================================================
--- trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c (rev 0)
+++ trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c 2014-09-07 14:19:12 UTC (rev 16918)
@@ -0,0 +1,48 @@
+--- 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 */
++}
++
Modified: trunk/graphics/libdrm/files/extra-xf86drmMode.c
===================================================================
--- trunk/graphics/libdrm/files/extra-xf86drmMode.c 2014-09-07 14:15:18 UTC (rev 16917)
+++ trunk/graphics/libdrm/files/extra-xf86drmMode.c 2014-09-07 14:19:12 UTC (rev 16918)
@@ -22,7 +22,7 @@
closedir(sysdir);
if (found)
return 0;
-+#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__MidnightBSD__)
+ return 0;
#endif
return -ENOSYS;
Property changes on: trunk/graphics/libdrm/files/extra-xf86drmMode.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/graphics/libdrm/pkg-plist
===================================================================
--- trunk/graphics/libdrm/pkg-plist 2014-09-07 14:15:18 UTC (rev 16917)
+++ trunk/graphics/libdrm/pkg-plist 2014-09-07 14:19:12 UTC (rev 16918)
@@ -17,12 +17,14 @@
%%NEW%%include/libdrm/drm_mode.h
%%NEW%%include/libdrm/drm_sarea.h
%%NEW%%include/libdrm/i915_drm.h
+%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_aub.h
%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h
%%NEW%%%%INTEL_DRIVER%%include/libdrm/intel_debug.h
%%NEW%%include/libdrm/mach64_drm.h
%%NEW%%include/libdrm/mga_drm.h
+%%NEW%%%%NOUVEAU%%include/libdrm/nouveau.h
%%NEW%%include/libdrm/nouveau_drm.h
-%%NEW%%include/libdrm/nouveau_drmif.h
+%%NEW%%include/libdrm/qxl_drm.h
%%NEW%%include/libdrm/r128_drm.h
%%NEW%%%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h
%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h
@@ -37,17 +39,14 @@
%%NEW%%include/libdrm/sis_drm.h
%%NEW%%include/libdrm/via_drm.h
%%NEW%%%%KMS%%include/libkms/libkms.h
-include/nouveau/nouveau_bo.h
-include/nouveau/nouveau_channel.h
+%%OLD%%include/nouveau/nouveau_bo.h
+%%OLD%%include/nouveau/nouveau_channel.h
%%OLD%%include/nouveau/nouveau_class.h
-include/nouveau/nouveau_device.h
-include/nouveau/nouveau_grobj.h
-include/nouveau/nouveau_notifier.h
-include/nouveau/nouveau_pushbuf.h
-%%NEW%%include/nouveau/nouveau_reloc.h
-include/nouveau/nouveau_resource.h
-%%NEW%%include/nouveau/nv04_pushbuf.h
-%%NEW%%include/nouveau/nvc0_pushbuf.h
+%%OLD%%include/nouveau/nouveau_device.h
+%%OLD%%include/nouveau/nouveau_grobj.h
+%%OLD%%include/nouveau/nouveau_notifier.h
+%%OLD%%include/nouveau/nouveau_pushbuf.h
+%%OLD%%include/nouveau/nouveau_resource.h
include/xf86drm.h
include/xf86drmMode.h
lib/libdrm.la
@@ -56,9 +55,10 @@
%%INTEL_DRIVER%%lib/libdrm_intel.la
%%INTEL_DRIVER%%lib/libdrm_intel.so
%%INTEL_DRIVER%%lib/libdrm_intel.so.1
-lib/libdrm_nouveau.la
-lib/libdrm_nouveau.so
-lib/libdrm_nouveau.so.1
+%%NOUVEAU%%lib/libdrm_nouveau.la
+%%NOUVEAU%%lib/libdrm_nouveau.so
+%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1
+%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2
%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.la
%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
@@ -67,10 +67,19 @@
%%NEW%%%%KMS%%lib/libkms.so.1
libdata/pkgconfig/libdrm.pc
%%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
-libdata/pkgconfig/libdrm_nouveau.pc
+%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
%%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
- at dirrm include/nouveau
+%%NEW%%%%MAN%%man/man3/drmAvailable.3.gz
+%%NEW%%%%MAN%%man/man3/drmHandleEvent.3.gz
+%%NEW%%%%MAN%%man/man3/drmModeGetResources.3.gz
+%%NEW%%%%MAN%%man/man7/drm-gem.7.gz
+%%NEW%%%%MAN%%man/man7/drm-kms.7.gz
+%%NEW%%%%MAN%%man/man7/drm-memory.7.gz
+%%NEW%%%%MAN%%man/man7/drm-mm.7.gz
+%%NEW%%%%MAN%%man/man7/drm-ttm.7.gz
+%%NEW%%%%MAN%%man/man7/drm.7.gz
+%%OLD%%@dirrm include/nouveau
%%NEW%%%%KMS%%@dirrm include/libkms
%%NEW%%@dirrm include/libdrm
%%OLD%%@dirrm include/drm
More information about the Midnightbsd-cvs
mailing list