diff options
author | Guido Falsi <madpilot@FreeBSD.org> | 2019-01-16 18:04:05 +0000 |
---|---|---|
committer | Guido Falsi <madpilot@FreeBSD.org> | 2019-01-16 18:04:05 +0000 |
commit | b062a5caad8a19cf72bec1c11f3f1e1b08772da6 (patch) | |
tree | a975e6c63419d0eacaa98fd28878a68c1cd2f2ca /multimedia/libva | |
parent | - Update to 2.150.2 (diff) |
- 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
Notes
Notes:
svn path=/head/; revision=490498
Diffstat (limited to 'multimedia/libva')
-rw-r--r-- | multimedia/libva/Makefile | 20 | ||||
-rw-r--r-- | multimedia/libva/distinfo | 2 | ||||
-rw-r--r-- | multimedia/libva/pkg-plist | 26 |
3 files changed, 27 insertions, 21 deletions
diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index d65570470895..8d7f0ec38b6b 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -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@FreeBSD.org +MAINTAINER= jbeich@FreeBSD.org COMMENT= VAAPI wrapper and dummy driver LICENSE= MIT @@ -19,11 +20,10 @@ RUN_DEPENDS= ${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat 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 diff --git a/multimedia/libva/distinfo b/multimedia/libva/distinfo index 74abda26f5e7..cc5a80a64643 100644 --- a/multimedia/libva/distinfo +++ b/multimedia/libva/distinfo @@ -3,3 +3,5 @@ SHA256 (intel-libva-2.3.0_GH0.tar.gz) = 8d95e65c4d84d0f82097581e163d3770694c600c 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 diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index 794d53abeaff..905aa58539d2 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -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 |