Date: Fri, 17 Oct 2014 09:45:18 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r371034 - in head/graphics/libdrm: . files Message-ID: <201410170945.s9H9jIDk037747@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Fri Oct 17 09:45:18 2014 New Revision: 371034 URL: https://svnweb.freebsd.org/changeset/ports/371034 QAT: https://qat.redports.org/buildarchive/r371034/ Log: Update to 2.4.58. Remove support for the old libdrm and WITH_NEW_XORG. Obtained from: xorg-dev Deleted: head/graphics/libdrm/files/ Modified: head/graphics/libdrm/Makefile head/graphics/libdrm/distinfo head/graphics/libdrm/pkg-plist Modified: head/graphics/libdrm/Makefile ============================================================================== --- head/graphics/libdrm/Makefile Fri Oct 17 09:14:00 2014 (r371033) +++ head/graphics/libdrm/Makefile Fri Oct 17 09:45:18 2014 (r371034) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= libdrm -PORTVERSION= ${LIBDRM_VERSION} -PORTREVISION= ${LIBDRM_REVISION} +PORTVERSION= 2.4.58 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= http://dri.freedesktop.org/libdrm/ @@ -14,10 +13,10 @@ COMMENT= Userspace interface to kernel D LIB_DEPENDS= libpciaccess.so:${PORTSDIR}/devel/libpciaccess \ libpthread-stubs.so:${PORTSDIR}/devel/libpthread-stubs -GNU_CONFIGURE= yes -INSTALL_TARGET= install-strip USES= libtool pkgconfig tar:bzip2 +GNU_CONFIGURE= yes USE_LDCONFIG= yes +INSTALL_TARGET= install-strip OPTIONS_DEFINE= MANPAGES @@ -25,16 +24,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 @@ -50,21 +46,7 @@ CONFIGURE_ARGS+=--disable-manpages 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: head/graphics/libdrm/distinfo ============================================================================== --- head/graphics/libdrm/distinfo Fri Oct 17 09:14:00 2014 (r371033) +++ head/graphics/libdrm/distinfo Fri Oct 17 09:45:18 2014 (r371034) @@ -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.58.tar.bz2) = b155fae6b9c9a3b02ef8b77f58c7c219194c996a4018dc55ba66c03996a365dd +SIZE (libdrm-2.4.58.tar.bz2) = 573202 Modified: head/graphics/libdrm/pkg-plist ============================================================================== --- head/graphics/libdrm/pkg-plist Fri Oct 17 09:14:00 2014 (r371033) +++ head/graphics/libdrm/pkg-plist Fri Oct 17 09:45:18 2014 (r371034) @@ -1,52 +1,30 @@ -%%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 +%%KMS%%include/libkms/libkms.h include/xf86drm.h include/xf86drmMode.h lib/libdrm.so @@ -56,31 +34,25 @@ lib/libdrm.so.2.4.0 %%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.1 -%%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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201410170945.s9H9jIDk037747>