svn commit: r362381 - head/graphics/libdrm

Baptiste Daroussin bapt at FreeBSD.org
Sun Jul 20 22:22:11 UTC 2014 

Author: bapt
Date: Sun Jul 20 22:22:10 2014
New Revision: 362381
URL: http://svnweb.freebsd.org/changeset/ports/362381
QAT: https://qat.redports.org/buildarchive/r362381/

Log:
  Update to 2.4.54 for both new and old xorg
  Also build libkms on architecture supporting it by default it will only be used
  by drivers needing libkms hence not by old xorg
  
  With hat:	x11

Modified:
  head/graphics/libdrm/Makefile
  head/graphics/libdrm/distinfo
  head/graphics/libdrm/pkg-plist

Modified: head/graphics/libdrm/Makefile
==============================================================================
--- head/graphics/libdrm/Makefile	Sun Jul 20 21:59:06 2014	(r362380)
+++ head/graphics/libdrm/Makefile	Sun Jul 20 22:22:10 2014	(r362381)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libdrm
-PORTVERSION=	${LIBDRM_VERSION}
-PORTREVISION=	${LIBDRM_REVISION}
+PORTVERSION=	2.4.54
 CATEGORIES=	graphics x11
 MASTER_SITES=	http://dri.freedesktop.org/libdrm/
 
@@ -13,9 +12,10 @@ COMMENT=	Userspace interface to kernel D
 LIB_DEPENDS=	libpciaccess.so:${PORTSDIR}/devel/libpciaccess \
 		libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs
 
-USES=		pkgconfig tar:bzip2
+USES=		libtool pkgconfig tar:bzip2
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
+INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	MANPAGES
 
@@ -23,16 +23,13 @@ OPTIONS_DEFINE=	MANPAGES
 OPTIONS_DEFAULT+=	MANPAGES
 .endif
 
-.include <bsd.port.options.mk>
-
-.if defined(WITH_NEW_XORG)
-
 USES+=		gmake
 
+.include <bsd.port.options.mk>
+
 # 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
@@ -48,21 +45,7 @@ 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 " NOUVEAU=""
-.endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 PLIST_SUB+=	INTEL_DRIVER=""
@@ -80,7 +63,4 @@ pre-patch:
 			   s,i?86|x86_64),i?86|amd64|x86_64),g' \
 		${WRKSRC}/configure
 
-post-install:
-	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so.*
-
 .include <bsd.port.mk>

Modified: head/graphics/libdrm/distinfo
==============================================================================
--- head/graphics/libdrm/distinfo	Sun Jul 20 21:59:06 2014	(r362380)
+++ head/graphics/libdrm/distinfo	Sun Jul 20 22:22:10 2014	(r362381)
@@ -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.54.tar.bz2) = d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9
+SIZE (libdrm-2.4.54.tar.bz2) = 644930

Modified: head/graphics/libdrm/pkg-plist
==============================================================================
--- head/graphics/libdrm/pkg-plist	Sun Jul 20 21:59:06 2014	(r362380)
+++ head/graphics/libdrm/pkg-plist	Sun Jul 20 22:22:10 2014	(r362381)
@@ -1,85 +1,60 @@
-%%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/via_drm.h
+include/libkms/libkms.h
 include/xf86drm.h
 include/xf86drmMode.h
-lib/libdrm.la
 lib/libdrm.so
 lib/libdrm.so.2
-%%INTEL_DRIVER%%lib/libdrm_intel.la
+lib/libdrm.so.2.4.0
 %%INTEL_DRIVER%%lib/libdrm_intel.so
 %%INTEL_DRIVER%%lib/libdrm_intel.so.1
-%%NOUVEAU%%lib/libdrm_nouveau.la
+%%INTEL_DRIVER%%lib/libdrm_intel.so.1.0.0
 %%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
-%%NEW%%%%KMS%%lib/libkms.la
-%%NEW%%%%KMS%%lib/libkms.so
-%%NEW%%%%KMS%%lib/libkms.so.1
+%%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
+lib/libkms.so
+lib/libkms.so.1
+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
+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
+ at dirrm include/libkms
+ at dirrm include/libdrm

More information about the svn-ports-head mailing list