diff options
| -rw-r--r-- | graphics/gnash/Makefile | 3 | ||||
| -rw-r--r-- | multimedia/Makefile | 1 | ||||
| -rw-r--r-- | multimedia/libva-glx/Makefile | 16 | ||||
| -rw-r--r-- | multimedia/libva/Makefile | 21 | ||||
| -rw-r--r-- | multimedia/libva/pkg-plist | 12 | ||||
| -rw-r--r-- | multimedia/libxine/Makefile | 5 | ||||
| -rw-r--r-- | multimedia/mythtv/Makefile | 3 |
7 files changed, 45 insertions, 16 deletions
diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 29bc5192d8c4..5db535c5d379 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -108,6 +108,9 @@ GNASH_RENDERERS+= agg IGNORE= support for OpenGL is currently broken, use option AGG GNASH_RENDERERS+= ogl LIB_DEPENDS+= libgdkglext-x11-1.0.so:x11-toolkits/gtkglext +. if ${PORT_OPTIONS:MVAAPI} +LIB_DEPENDS+= libva-glx.so:multimedia/libva-glx +. endif .endif .if ${PORT_OPTIONS:MCAIRO} diff --git a/multimedia/Makefile b/multimedia/Makefile index 14fc0046d445..b61aa940653e 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -224,6 +224,7 @@ SUBDIR += libuvc SUBDIR += libv4l SUBDIR += libva + SUBDIR += libva-glx SUBDIR += libva-intel-driver SUBDIR += libva-intel-hybrid-driver SUBDIR += libva-intel-media-driver diff --git a/multimedia/libva-glx/Makefile b/multimedia/libva-glx/Makefile new file mode 100644 index 000000000000..bd595133ca33 --- /dev/null +++ b/multimedia/libva-glx/Makefile @@ -0,0 +1,16 @@ +# $FreeBSD$ + +PKGNAMESUFFIX= -glx + +COMMENT= VAAPI wrapper for GLX + +OPTIONS_SLAVE= GLX X11 +OPTIONS_EXCLUDE=WAYLAND + +MASTERDIR= ${.CURDIR}/../libva + +post-install: slave-post-install +slave-post-install: + @${REINPLACE_CMD} '/glx/!s/^/@comment /' ${TMPPLIST} + +.include "${MASTERDIR}/Makefile" diff --git a/multimedia/libva/Makefile b/multimedia/libva/Makefile index 7986dcb3a1ac..800dfbe2d1e6 100644 --- a/multimedia/libva/Makefile +++ b/multimedia/libva/Makefile @@ -2,15 +2,16 @@ PORTNAME= libva PORTVERSION= 2.4.0 +PORTREVISION= 1 CATEGORIES= multimedia MAINTAINER= jbeich@FreeBSD.org -COMMENT= VAAPI wrapper and dummy driver +COMMENT?= VAAPI wrapper and dummy driver LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING -LIB_DEPENDS= libdrm.so:graphics/libdrm +LIB_DEPENDS+= libdrm.so:graphics/libdrm USES= meson pkgconfig USE_GITHUB= yes @@ -18,16 +19,22 @@ USE_LDCONFIG= yes GH_ACCOUNT= intel LDFLAGS+= -lpthread # for pthread_getthreadid_np -OPTIONS_DEFINE= WAYLAND X11 -OPTIONS_DEFAULT=WAYLAND X11 +OPTIONS_DEFINE= GLX WAYLAND X11 +OPTIONS_DEFAULT=GLX WAYLAND X11 +OPTIONS_EXCLUDE?=GLX # enslaved until subpackaging OPTIONS_SUB= yes +GLX_LIB_DEPENDS= libva-x11.so:multimedia/libva +GLX_USES= gl +GLX_USE= GL=gl +GLX_MESON_YES= with_glx +GLX_IMPLIES= X11 + WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland WAYLAND_MESON_YES= with_wayland -X11_USES= gl -X11_USE= GL=gl XORG=x11,xorgproto,xext,xfixes -X11_MESON_YES= with_x11 with_glx +X11_USE= XORG=x11,xorgproto,xext,xfixes +X11_MESON_YES= with_x11 post-patch: .SILENT # V4L2 is unused since http://github.com/intel/libva/commit/70074679333c diff --git a/multimedia/libva/pkg-plist b/multimedia/libva/pkg-plist index ea7400dd2c1b..45a6e58a59a8 100644 --- a/multimedia/libva/pkg-plist +++ b/multimedia/libva/pkg-plist @@ -1,6 +1,6 @@ include/va/va.h include/va/va_backend.h -%%X11%%include/va/va_backend_glx.h +%%GLX%%include/va/va_backend_glx.h include/va/va_backend_vpp.h %%WAYLAND%%include/va/va_backend_wayland.h include/va/va_compat.h @@ -22,7 +22,7 @@ include/va/va_enc_vp9.h include/va/va_fei_h264.h include/va/va_fei_hevc.h include/va/va_fei.h -%%X11%%include/va/va_glx.h +%%GLX%%include/va/va_glx.h include/va/va_str.h include/va/va_tpi.h include/va/va_version.h @@ -32,9 +32,9 @@ include/va/va_vpp.h lib/libva-drm.so lib/libva-drm.so.2 lib/libva-drm.so.2.400.0 -%%X11%%lib/libva-glx.so -%%X11%%lib/libva-glx.so.2 -%%X11%%lib/libva-glx.so.2.400.0 +%%GLX%%lib/libva-glx.so +%%GLX%%lib/libva-glx.so.2 +%%GLX%%lib/libva-glx.so.2.400.0 %%WAYLAND%%lib/libva-wayland.so %%WAYLAND%%lib/libva-wayland.so.2 %%WAYLAND%%lib/libva-wayland.so.2.400.0 @@ -45,7 +45,7 @@ lib/libva.so lib/libva.so.2 lib/libva.so.2.400.0 libdata/pkgconfig/libva-drm.pc -%%X11%%libdata/pkgconfig/libva-glx.pc +%%GLX%%libdata/pkgconfig/libva-glx.pc %%WAYLAND%%libdata/pkgconfig/libva-wayland.pc %%X11%%libdata/pkgconfig/libva-x11.pc libdata/pkgconfig/libva.pc diff --git a/multimedia/libxine/Makefile b/multimedia/libxine/Makefile index 58b39a1be0d0..871943da9fa7 100644 --- a/multimedia/libxine/Makefile +++ b/multimedia/libxine/Makefile @@ -3,7 +3,7 @@ PORTNAME= xine PORTVERSION= 1.2.9 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia ipv6 MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${PORTVERSION} PKGNAMEPREFIX= lib @@ -110,7 +110,8 @@ SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \ SMB_CONFIGURE_ENABLE= samba SNDIO_CONFIGURE_ENABLE= sndio SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio -VAAPI_LIB_DEPENDS= libva.so:multimedia/libva +VAAPI_LIB_DEPENDS= libva.so:multimedia/libva \ + libva-glx.so:multimedia/libva-glx VAAPI_CONFIGURE_ENABLE= vaapi W32DLL_CONFIGURE_ENABLE= w32dll W32DLL_PLIST_FILES= ${PLUGINSDIR}/xineplug_decode_qt.so \ diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile index 4d3643d3e98e..0f6b160a8b5e 100644 --- a/multimedia/mythtv/Makefile +++ b/multimedia/mythtv/Makefile @@ -4,7 +4,7 @@ PORTNAME= mythtv DISTVERSIONPREFIX= v DISTVERSION= 30.0 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES= multimedia @@ -22,6 +22,7 @@ LIB_DEPENDS= liblzo2.so:archivers/lzo2 \ libtag.so:audio/taglib \ libexiv2.so:graphics/exiv2 \ libva.so:multimedia/libva \ + libva-glx.so:multimedia/libva-glx \ libbluray.so:multimedia/libbluray \ libass.so:multimedia/libass \ libfftw3_threads.so:math/fftw3 \ |