svn commit: r490498 - in head/multimedia: libva libva-intel-driver libva-intel-media-driver
Guido Falsi
madpilot at FreeBSD.org
Wed Jan 16 18:04:07 UTC 2019
Author: madpilot
Date: Wed Jan 16 18:04:05 2019
New Revision: 490498
URL: https://svnweb.freebsd.org/changeset/ports/490498
Log:
- Unbreak Wayland support in libva-intel-driver with Mesa 18.3 [1]
- Allow disabling X11 support in libva [2]
- Update minimum version requirement in libva-intel-media-driver
BUILD_DEPENDS (required by submitter/maintainer) [1]
- While here, silence some portling warnings
- Pass maintainership to jbeich (submitter) [1]
PR: 234891 [1], 234925 [2]
Submitted by: jbeich
Modified:
head/multimedia/libva-intel-driver/Makefile
head/multimedia/libva-intel-driver/distinfo
head/multimedia/libva-intel-media-driver/Makefile
head/multimedia/libva/Makefile
head/multimedia/libva/distinfo
head/multimedia/libva/pkg-plist
Modified: head/multimedia/libva-intel-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-driver/Makefile Wed Jan 16 17:52:50 2019 (r490497)
+++ head/multimedia/libva-intel-driver/Makefile Wed Jan 16 18:04:05 2019 (r490498)
@@ -3,9 +3,13 @@
PORTNAME= libva-intel-driver
PORTVERSION= 2.3.0
+PORTREVISION= 1
CATEGORIES= multimedia
-MAINTAINER= madpilot at FreeBSD.org
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCHFILES+= f139dafa5917.patch:-p1 # for mesa-libs 18.3+
+
+MAINTAINER= jbeich at FreeBSD.org
COMMENT= VAAPI driver for Intel GMA 4500 (Gen4) or newer
LICENSE= MIT
@@ -38,7 +42,9 @@ HYBRID_CONFIGURE_ENABLE= hybrid-codec
post-patch: .SILENT
${REINPLACE_CMD} -e 's/-ldl//' \
${WRKSRC}/src/Makefile.am
+# XXX Remove va_api_version hack after 2.4.0 update
${REINPLACE_CMD} -e 's|driverdir|& --define-variable prefix=${PREFIX}|' \
+ -e '/va_api_version/s/1\.4\.0/1.1.0/' \
${WRKSRC}/configure.ac
post-install:
Modified: head/multimedia/libva-intel-driver/distinfo
==============================================================================
--- head/multimedia/libva-intel-driver/distinfo Wed Jan 16 17:52:50 2019 (r490497)
+++ head/multimedia/libva-intel-driver/distinfo Wed Jan 16 18:04:05 2019 (r490498)
@@ -1,3 +1,5 @@
TIMESTAMP = 1545042612
SHA256 (intel-intel-vaapi-driver-2.3.0_GH0.tar.gz) = fcc3f09291e58fd316fd015d4e1329e7e03c38cffa4651bda725d500a66aa74e
SIZE (intel-intel-vaapi-driver-2.3.0_GH0.tar.gz) = 3967170
+SHA256 (f139dafa5917.patch) = aeb0b3f811740b7be74de2d9ff777e85b1a281e4f130bd85374d7f7dd7ce3cff
+SIZE (f139dafa5917.patch) = 3029
Modified: head/multimedia/libva-intel-media-driver/Makefile
==============================================================================
--- head/multimedia/libva-intel-media-driver/Makefile Wed Jan 16 17:52:50 2019 (r490497)
+++ head/multimedia/libva-intel-media-driver/Makefile Wed Jan 16 18:04:05 2019 (r490498)
@@ -4,6 +4,7 @@ PORTNAME= media-driver
DISTVERSIONPREFIX= intel-media-
DISTVERSION= 18.4.pre4-111
DISTVERSIONSUFFIX= -gc517a865
+PORTREVISION= 1
CATEGORIES= multimedia
PKGNAMEPREFIX= libva-intel-
@@ -18,7 +19,7 @@ ONLY_FOR_ARCHS= amd64 i386
ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported
BUILD_DEPENDS= gmmlib>=${PORTVERSION:C/([^.]*\.[^.]).*/\1/}:multimedia/gmmlib \
- libva>=2.3.0_2:multimedia/libva
+ libva>=2.3.0_3:multimedia/libva
LIB_DEPENDS= libpciaccess.so:devel/libpciaccess \
libigdgmm.so:multimedia/gmmlib \
libva.so:multimedia/libva
Modified: head/multimedia/libva/Makefile
==============================================================================
--- head/multimedia/libva/Makefile Wed Jan 16 17:52:50 2019 (r490497)
+++ head/multimedia/libva/Makefile Wed Jan 16 18:04:05 2019 (r490498)
@@ -2,13 +2,14 @@
PORTNAME= libva
PORTVERSION= 2.3.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
PATCHFILES+= cf11abe5e1b9.patch:-p1 # for media-driver 18.4+
+PATCHFILES+= 62bad1239d8e.patch:-p1 # for mesa-libs 18.3+
-MAINTAINER= madpilot at FreeBSD.org
+MAINTAINER= jbeich at FreeBSD.org
COMMENT= VAAPI wrapper and dummy driver
LICENSE= MIT
@@ -19,11 +20,10 @@ RUN_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:mu
LIB_DEPENDS= libdrm.so:graphics/libdrm
USES= autoreconf gmake libtool localbase pkgconfig tar:bzip2
-USE_XORG= xorgproto pciaccess x11 xext xfixes
-USE_GL= gl
+USE_LDCONFIG= yes
+
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=va
-USE_LDCONFIG= yes
INSTALL_TARGET= install-strip
USE_GITHUB= yes
@@ -33,9 +33,8 @@ LDFLAGS+= -lpthread
# prevent types conflict: videodev2.h vs. drm.h
CFLAGS+= -DHAVE_LINUX_INTEGER_TYPES
-OPTIONS_DEFINE= DEBUG WAYLAND
-OPTIONS_DEFAULT=WAYLAND
-WAYLAND_DESC= Support wayland protocol
+OPTIONS_DEFINE= DEBUG WAYLAND X11
+OPTIONS_DEFAULT=WAYLAND X11
OPTIONS_SUB= yes
DEBUG_CFLAGS= -D_DEBUG
@@ -44,8 +43,13 @@ DEBUG_CFLAGS_OFF= -DNDEBUG
WAYLAND_CONFIGURE_ENABLE= wayland
WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland
+X11_CONFIGURE_ENABLE= x11 glx
+X11_USES= gl
+X11_USE= GL=gl XORG=x11,xorgproto,xext,xfixes
+
post-patch: .SILENT
${REINPLACE_CMD} -e 's|$${libdir}/\(pkgconfig\)|${PREFIX}/libdata/\1|' \
+ -e 's/"$$USE_X11:$$enable_glx" != "yes:no"/"$$USE_X11" != "no"/' \
${WRKSRC}/configure.ac
${REINPLACE_CMD} '/^export VA_HEADER_/d' \
${WRKSRC}/doc/Makefile.am
Modified: head/multimedia/libva/distinfo
==============================================================================
--- head/multimedia/libva/distinfo Wed Jan 16 17:52:50 2019 (r490497)
+++ head/multimedia/libva/distinfo Wed Jan 16 18:04:05 2019 (r490498)
@@ -3,3 +3,5 @@ SHA256 (intel-libva-2.3.0_GH0.tar.gz) = 8d95e65c4d84d0
SIZE (intel-libva-2.3.0_GH0.tar.gz) = 222152
SHA256 (cf11abe5e1b9.patch) = 1df514db32ae2bb49d556c561005315566e232e3ad0dbc82176f76285ef23c2b
SIZE (cf11abe5e1b9.patch) = 3301
+SHA256 (62bad1239d8e.patch) = 603586a9b72394be0a729a160f78f0250ce8c7fa63766971bff50cb751fdb924
+SIZE (62bad1239d8e.patch) = 2291
Modified: head/multimedia/libva/pkg-plist
==============================================================================
--- head/multimedia/libva/pkg-plist Wed Jan 16 17:52:50 2019 (r490497)
+++ head/multimedia/libva/pkg-plist Wed Jan 16 18:04:05 2019 (r490498)
@@ -1,6 +1,6 @@
include/va/va.h
include/va/va_backend.h
-include/va/va_backend_glx.h
+%%X11%%include/va/va_backend_glx.h
include/va/va_backend_vpp.h
%%WAYLAND%%include/va/va_backend_wayland.h
include/va/va_compat.h
@@ -8,8 +8,8 @@ include/va/va_dec_hevc.h
include/va/va_dec_jpeg.h
include/va/va_dec_vp8.h
include/va/va_dec_vp9.h
-include/va/va_dri2.h
-include/va/va_dricommon.h
+%%X11%%include/va/va_dri2.h
+%%X11%%include/va/va_dricommon.h
include/va/va_drm.h
include/va/va_drmcommon.h
include/va/va_egl.h
@@ -22,30 +22,30 @@ include/va/va_enc_vp9.h
include/va/va_fei_h264.h
include/va/va_fei_hevc.h
include/va/va_fei.h
-include/va/va_glx.h
+%%X11%%include/va/va_glx.h
include/va/va_str.h
include/va/va_tpi.h
include/va/va_version.h
include/va/va_vpp.h
%%WAYLAND%%include/va/va_wayland.h
-include/va/va_x11.h
+%%X11%%include/va/va_x11.h
lib/libva-drm.so
lib/libva-drm.so.2
lib/libva-drm.so.2.300.0
-lib/libva-glx.so
-lib/libva-glx.so.2
-lib/libva-glx.so.2.300.0
+%%X11%%lib/libva-glx.so
+%%X11%%lib/libva-glx.so.2
+%%X11%%lib/libva-glx.so.2.300.0
%%WAYLAND%%lib/libva-wayland.so
%%WAYLAND%%lib/libva-wayland.so.2
%%WAYLAND%%lib/libva-wayland.so.2.300.0
-lib/libva-x11.so
-lib/libva-x11.so.2
-lib/libva-x11.so.2.300.0
+%%X11%%lib/libva-x11.so
+%%X11%%lib/libva-x11.so.2
+%%X11%%lib/libva-x11.so.2.300.0
lib/libva.so
lib/libva.so.2
lib/libva.so.2.300.0
libdata/pkgconfig/libva-drm.pc
-libdata/pkgconfig/libva-glx.pc
+%%X11%%libdata/pkgconfig/libva-glx.pc
%%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
-libdata/pkgconfig/libva-x11.pc
+%%X11%%libdata/pkgconfig/libva-x11.pc
libdata/pkgconfig/libva.pc
More information about the svn-ports-head
mailing list