[Midnightbsd-cvs] mports [19117] trunk/graphics/libdrm: libdrm 2.4.60
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun May 24 17:24:19 EDT 2015
Revision: 19117
http://svnweb.midnightbsd.org/mports/?rev=19117
Author: laffer1
Date: 2015-05-24 17:24:18 -0400 (Sun, 24 May 2015)
Log Message:
-----------
libdrm 2.4.60
Modified Paths:
--------------
trunk/graphics/libdrm/Makefile
trunk/graphics/libdrm/distinfo
trunk/graphics/libdrm/pkg-plist
Added Paths:
-----------
trunk/graphics/libdrm/files/patch-xf86drmMode.c
Removed 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
trunk/graphics/libdrm/files/extra-xf86drmMode.c
Modified: trunk/graphics/libdrm/Makefile
===================================================================
--- trunk/graphics/libdrm/Makefile 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/Makefile 2015-05-24 21:24:18 UTC (rev 19117)
@@ -1,8 +1,8 @@
# $MidnightBSD$
PORTNAME= libdrm
-PORTVERSION= ${LIBDRM_VERSION}
-PORTREVISION= ${LIBDRM_REVISION}
+PORTVERSION= 2.4.60
+PORTEPOCH= 1
CATEGORIES= graphics x11
MASTER_SITES= http://dri.freedesktop.org/libdrm/
@@ -14,10 +14,10 @@
LIB_DEPENDS= libpciaccess.so:${PORTSDIR}/devel/libpciaccess \
libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
-INSTALL_TARGET= install-strip
USES= libtool pkgconfig tar:bzip2
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
+INSTALL_TARGET= install-strip
OPTIONS_DEFINE= MANPAGES
@@ -25,16 +25,13 @@
OPTIONS_DEFAULT+= MANPAGES
.endif
+USES+= gmake
+
.include <bsd.mport.options.mk>
-.if defined(WITH_NEW_XORG)
-
-USES+= gmake
-
# 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="" NOUVEAU=""
.else
CONFIGURE_ARGS+=--disable-libkms
@@ -50,21 +47,7 @@
PLIST_SUB+= MAN="@comment "
.endif
-LIBDRM_VERSION= 2.4.52
-LIBDRM_REVISION=1
-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=2
-PLIST_SUB+= OLD="" NEW="@comment " NOUVEAU=""
-.endif
.if ${ARCH} == amd64 || ${ARCH} == i386
PLIST_SUB+= INTEL_DRIVER=""
Modified: trunk/graphics/libdrm/distinfo
===================================================================
--- trunk/graphics/libdrm/distinfo 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/distinfo 2015-05-24 21:24:18 UTC (rev 19117)
@@ -1,4 +1,2 @@
-SHA256 (libdrm-2.4.17.tar.bz2) = b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
-SIZE (libdrm-2.4.17.tar.bz2) = 408882
-SHA256 (libdrm-2.4.52.tar.bz2) = fa693c2f1f61befcefbdcc396673e38481110bac9db610afa4b8afb2be0218c1
-SIZE (libdrm-2.4.52.tar.bz2) = 551473
+SHA256 (libdrm-2.4.60.tar.bz2) = 99575fc6c8e31f59193f5320fd4db7a5478e2641b5266147caab9aa875b59889
+SIZE (libdrm-2.4.60.tar.bz2) = 581786
Deleted: trunk/graphics/libdrm/files/extra-configure
===================================================================
--- trunk/graphics/libdrm/files/extra-configure 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/files/extra-configure 2015-05-24 21:24:18 UTC (rev 19117)
@@ -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 \
Deleted: trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c
===================================================================
--- trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/files/extra-tests__radeon__radeon_ttm.c 2015-05-24 21:24:18 UTC (rev 19117)
@@ -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
Deleted: trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in
===================================================================
--- trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/files/extra-tests_modetest_Makefile.in 2015-05-24 21:24:18 UTC (rev 19117)
@@ -1,52 +0,0 @@
---- 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 $@ $<
Deleted: trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c
===================================================================
--- trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/files/extra-tests_modetest_modetest.c 2015-05-24 21:24:18 UTC (rev 19117)
@@ -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;
Deleted: trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c
===================================================================
--- trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/files/extra-tests_modetest_strchrnul.c 2015-05-24 21:24:18 UTC (rev 19117)
@@ -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 */
-+}
-+
Deleted: trunk/graphics/libdrm/files/extra-xf86drmMode.c
===================================================================
--- trunk/graphics/libdrm/files/extra-xf86drmMode.c 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/files/extra-xf86drmMode.c 2015-05-24 21:24:18 UTC (rev 19117)
@@ -1,29 +0,0 @@
---- xf86drmMode.c.orig 2010-09-08 14:23:39.000000000 +0200
-+++ xf86drmMode.c 2011-07-18 18:59:11.000000000 +0200
-@@ -54,7 +54,7 @@
-
- static inline DRM_IOCTL(int fd, int cmd, void *arg)
- {
-- int ret = drmIoctl(fd, cmd, arg);
-+ int ret = drmIoctl(fd, (unsigned)cmd, arg);
- return ret < 0 ? -errno : ret;
- }
-
-@@ -659,7 +659,7 @@
- */
- int drmCheckModesettingSupported(const char *busid)
- {
--#ifdef __linux__
-+#if defined (__linux__)
- char pci_dev_dir[1024];
- int domain, bus, dev, func;
- DIR *sysdir;
-@@ -709,6 +709,8 @@
- closedir(sysdir);
- if (found)
- return 0;
-+#elif defined(__FreeBSD__) || defined(__DragonFly__) || defined(__MidnightBSD__)
-+ return 0;
- #endif
- return -ENOSYS;
-
Added: trunk/graphics/libdrm/files/patch-xf86drmMode.c
===================================================================
--- trunk/graphics/libdrm/files/patch-xf86drmMode.c (rev 0)
+++ trunk/graphics/libdrm/files/patch-xf86drmMode.c 2015-05-24 21:24:18 UTC (rev 19117)
@@ -0,0 +1,46 @@
+Disable checking for hw.dri.%d.modesetting.
+This sysctl is only available if a KMS module is loaded. But the libdrm
+check happens before X got a chance of loading the KMS module.
+
+--- xf86drmMode.c.orig 2014-08-27 20:04:46.000000000 +0200
++++ xf86drmMode.c 2014-10-18 15:12:02.586937600 +0200
+@@ -774,38 +774,7 @@
+ if (found)
+ return 0;
+ #elif defined (__FreeBSD__) || defined (__FreeBSD_kernel__)
+- char kbusid[1024], sbusid[1024];
+- char oid[128];
+- int domain, bus, dev, func;
+- int i, modesetting, ret;
+- size_t len;
+-
+- ret = sscanf(busid, "pci:%04x:%02x:%02x.%d", &domain, &bus, &dev,
+- &func);
+- if (ret != 4)
+- return -EINVAL;
+- snprintf(kbusid, sizeof(kbusid), "pci:%04x:%02x:%02x.%d", domain, bus,
+- dev, func);
+-
+- /* How many GPUs do we expect in the machine ? */
+- for (i = 0; i < 16; i++) {
+- snprintf(oid, sizeof(oid), "hw.dri.%d.busid", i);
+- len = sizeof(sbusid);
+- ret = sysctlbyname(oid, sbusid, &len, NULL, 0);
+- if (ret == -1) {
+- if (errno == ENOENT)
+- continue;
+- return -EINVAL;
+- }
+- if (strcmp(sbusid, kbusid) != 0)
+- continue;
+- snprintf(oid, sizeof(oid), "hw.dri.%d.modesetting", i);
+- len = sizeof(modesetting);
+- ret = sysctlbyname(oid, &modesetting, &len, NULL, 0);
+- if (ret == -1 || len != sizeof(modesetting))
+- return -EINVAL;
+- return (modesetting ? 0 : -ENOSYS);
+- }
++ return 0;
+ #elif defined(__DragonFly__)
+ return 0;
+ #endif
Property changes on: trunk/graphics/libdrm/files/patch-xf86drmMode.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/graphics/libdrm/pkg-plist
===================================================================
--- trunk/graphics/libdrm/pkg-plist 2015-05-24 20:20:30 UTC (rev 19116)
+++ trunk/graphics/libdrm/pkg-plist 2015-05-24 21:24:18 UTC (rev 19117)
@@ -1,52 +1,31 @@
-%%OLD%%include/drm/drm.h
-%%OLD%%include/drm/drm_mode.h
-%%OLD%%include/drm/drm_sarea.h
-%%OLD%%include/drm/i915_drm.h
-%%OLD%%include/drm/mach64_drm.h
-%%OLD%%include/drm/mga_drm.h
-%%OLD%%include/drm/nouveau_drm.h
-%%OLD%%include/drm/nouveau_drmif.h
-%%OLD%%include/drm/r128_drm.h
-%%OLD%%include/drm/radeon_drm.h
-%%OLD%%include/drm/savage_drm.h
-%%OLD%%include/drm/sis_drm.h
-%%OLD%%include/drm/via_drm.h
-%%OLD%%%%INTEL_DRIVER%%include/intel_bufmgr.h
-%%NEW%%include/libdrm/drm.h
-%%NEW%%include/libdrm/drm_fourcc.h
-%%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/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
-%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h
-%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h
-%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs.h
-%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h
-%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h
-%%NEW%%include/libdrm/radeon_drm.h
-%%NEW%%%%RADEON_DRIVERS%%include/libdrm/radeon_surface.h
-%%NEW%%include/libdrm/savage_drm.h
-%%NEW%%include/libdrm/sis_drm.h
-%%NEW%%include/libdrm/via_drm.h
-%%NEW%%%%KMS%%include/libkms/libkms.h
-%%OLD%%include/nouveau/nouveau_bo.h
-%%OLD%%include/nouveau/nouveau_channel.h
-%%OLD%%include/nouveau/nouveau_class.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/libdrm/drm.h
+include/libdrm/drm_fourcc.h
+include/libdrm/drm_mode.h
+include/libdrm/drm_sarea.h
+include/libdrm/i915_drm.h
+%%INTEL_DRIVER%%include/libdrm/intel_aub.h
+%%INTEL_DRIVER%%include/libdrm/intel_bufmgr.h
+%%INTEL_DRIVER%%include/libdrm/intel_debug.h
+include/libdrm/mach64_drm.h
+include/libdrm/mga_drm.h
+%%NOUVEAU%%include/libdrm/nouveau.h
+include/libdrm/nouveau_drm.h
+include/libdrm/qxl_drm.h
+include/libdrm/r128_drm.h
+%%RADEON_DRIVERS%%include/libdrm/r600_pci_ids.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_bo.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_bo_gem.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_bo_int.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_cs.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_cs_gem.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_cs_int.h
+include/libdrm/radeon_drm.h
+%%RADEON_DRIVERS%%include/libdrm/radeon_surface.h
+include/libdrm/savage_drm.h
+include/libdrm/sis_drm.h
+include/libdrm/tegra_drm.h
+include/libdrm/via_drm.h
+%%KMS%%include/libkms/libkms.h
include/xf86drm.h
include/xf86drmMode.h
lib/libdrm.so
@@ -56,31 +35,25 @@
%%INTEL_DRIVER%%lib/libdrm_intel.so.1
%%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0
%%NOUVEAU%%lib/libdrm_nouveau.so
-%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1
-%%OLD%%%%NOUVEAU%%lib/libdrm_nouveau.so.1.0.0
-%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2
-%%NEW%%%%NOUVEAU%%lib/libdrm_nouveau.so.2.0.0
-%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so
-%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
-%%NEW%%%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.0
-%%NEW%%%%KMS%%lib/libkms.so
-%%NEW%%%%KMS%%lib/libkms.so.1
-%%NEW%%%%KMS%%lib/libkms.so.1.0.0
+%%NOUVEAU%%lib/libdrm_nouveau.so.2
+%%NOUVEAU%%lib/libdrm_nouveau.so.2.0.0
+%%RADEON_DRIVERS%%lib/libdrm_radeon.so
+%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1
+%%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1
+%%KMS%%lib/libkms.so
+%%KMS%%lib/libkms.so.1
+%%KMS%%lib/libkms.so.1.0.0
libdata/pkgconfig/libdrm.pc
%%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc
%%NOUVEAU%%libdata/pkgconfig/libdrm_nouveau.pc
-%%NEW%%%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
-%%NEW%%%%KMS%%libdata/pkgconfig/libkms.pc
-%%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
+%%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc
+%%KMS%%libdata/pkgconfig/libkms.pc
+%%MAN%%man/man3/drmAvailable.3.gz
+%%MAN%%man/man3/drmHandleEvent.3.gz
+%%MAN%%man/man3/drmModeGetResources.3.gz
+%%MAN%%man/man7/drm-gem.7.gz
+%%MAN%%man/man7/drm-kms.7.gz
+%%MAN%%man/man7/drm-memory.7.gz
+%%MAN%%man/man7/drm-mm.7.gz
+%%MAN%%man/man7/drm-ttm.7.gz
+%%MAN%%man/man7/drm.7.gz
More information about the Midnightbsd-cvs
mailing list