kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

multimedia/libva-glx: merge back into X11 option after 5343f55d87

Browse source 
libva-glx -> libGL -> libva dependency loop doesn't occur with
libGL from libglvnd instead of mesa-*.

This reverts commit 14a6544d4e.
This commit is contained in:
Jan Beich 2024-01-21 21:19:28 +01:00
parent 9fde18b995
commit 920a3d1486
8 changed files with 19 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
MOVED
View file

@ -2965,3 +2965,4 @@ x11-wm/flwm||2024-01-19|Has expired: Last upstream release and activity was in 2
x11-wm/jewel||2024-01-19|Has expired: Last upstream release was in 2004
x11-wm/antiwm||2024-01-20|Has expired: Last upstream release was in 2009
databases/qt5-sqldrivers-ibase||2024-01-21|Has expired: No fix with the oldest Firebird and BROKEN around 1 year
multimedia/libva-glx|multimedia/libva|2024-01-21|Merged into main port

5
graphics/gnash/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= gnash
PORTVERSION= 0.8.10
PORTREVISION= 62
PORTREVISION= 63
CATEGORIES= graphics multimedia
MASTER_SITES= http://git.savannah.gnu.org/cgit/gnash.git/snapshot/
DISTNAME= gnash-2b3bdede0305c4fc3ad21a0a4197330606c9b880
@ -119,9 +119,6 @@ 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}

1
multimedia/Makefile
View file

@ -189,7 +189,6 @@
SUBDIR += libuvc
SUBDIR += libv4l
SUBDIR += libva
SUBDIR += libva-glx
SUBDIR += libva-intel-driver
SUBDIR += libva-intel-hybrid-driver
SUBDIR += libva-intel-media-driver

15
multimedia/libva-glx/Makefile
View file

@ -1,15 +0,0 @@
PORTREVISION= 0
PKGNAMESUFFIX= -glx
COMMENT= VAAPI wrapper for GLX
MASTERDIR= ${.CURDIR}/../libva
OPTIONS_SLAVE= GLX ${GLX_IMPLIES}
OPTIONS_EXCLUDE=WAYLAND
post-install: slave-post-install
slave-post-install:
@${REINPLACE_CMD} '/glx/!s/^/@comment /' ${TMPPLIST}
.include "${MASTERDIR}/Makefile"

23
multimedia/libva/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= libva
DISTVERSION= 2.20.0
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= multimedia
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
@ -8,35 +8,28 @@ PATCHFILES+= 9ed99b6b0b3b.patch:-p1 # https://github.com/intel/libva/pull/667
PATCHFILES+= 6b0efda45140.patch:-p1 # https://github.com/intel/libva/pull/758
MAINTAINER= jbeich@FreeBSD.org
COMMENT?= VAAPI wrapper and dummy driver
COMMENT= VAAPI wrapper and dummy driver
WWW= https://github.com/intel/libva
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/COPYING
LIB_DEPENDS+= libdrm.so:graphics/libdrm
LIB_DEPENDS= libdrm.so:graphics/libdrm
USES= meson pkgconfig
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= intel
OPTIONS_DEFINE= GLX WAYLAND X11
OPTIONS_DEFAULT=GLX WAYLAND X11
OPTIONS_EXCLUDE?=GLX # enslaved until subpackaging
OPTIONS_DEFINE= WAYLAND X11
OPTIONS_DEFAULT=WAYLAND X11
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= xorg
X11_USE= XORG=x11,xcb,xext,xfixes,xorgproto
X11_MESON_YES= with_x11
X11_USES= gl xorg
X11_USE= GL=gl XORG=x11,xcb,xext,xfixes,xorgproto
X11_MESON_YES= with_glx with_x11
.include <bsd.port.mk>

12
multimedia/libva/pkg-plist
View file

@ -1,6 +1,6 @@
include/va/va.h
include/va/va_backend.h
%%GLX%%include/va/va_backend_glx.h
%%X11%%include/va/va_backend_glx.h
include/va/va_backend_prot.h
include/va/va_backend_vpp.h
%%WAYLAND%%include/va/va_backend_wayland.h
@ -25,7 +25,7 @@ include/va/va_enc_vp9.h
include/va/va_fei_h264.h
include/va/va_fei_hevc.h
include/va/va_fei.h
%%GLX%%include/va/va_glx.h
%%X11%%include/va/va_glx.h
include/va/va_prot.h
include/va/va_str.h
include/va/va_tpi.h
@ -36,9 +36,9 @@ include/va/va_vpp.h
lib/libva-drm.so
lib/libva-drm.so.2
lib/libva-drm.so.2.2000.0
%%GLX%%lib/libva-glx.so
%%GLX%%lib/libva-glx.so.2
%%GLX%%lib/libva-glx.so.2.2000.0
%%X11%%lib/libva-glx.so
%%X11%%lib/libva-glx.so.2
%%X11%%lib/libva-glx.so.2.2000.0
%%WAYLAND%%lib/libva-wayland.so
%%WAYLAND%%lib/libva-wayland.so.2
%%WAYLAND%%lib/libva-wayland.so.2.2000.0
@ -49,7 +49,7 @@ lib/libva.so
lib/libva.so.2
lib/libva.so.2.2000.0
libdata/pkgconfig/libva-drm.pc
%%GLX%%libdata/pkgconfig/libva-glx.pc
%%X11%%libdata/pkgconfig/libva-glx.pc
%%WAYLAND%%libdata/pkgconfig/libva-wayland.pc
%%X11%%libdata/pkgconfig/libva-x11.pc
libdata/pkgconfig/libva.pc

5
multimedia/libxine/Makefile
View file

@ -1,6 +1,6 @@
PORTNAME= xine
DISTVERSION= 1.2.13
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= multimedia
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-lib/${DISTVERSION}
PKGNAMEPREFIX= lib
@ -133,8 +133,7 @@ SMB_CONFIGURE_ENV= LIBSMBCLIENT_LIBS="-L${SAMBALIBS} -lsmbclient" \
SMB_CONFIGURE_ENABLE= samba
SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE= sndio
VAAPI_LIB_DEPENDS= libva.so:multimedia/libva \
libva-glx.so:multimedia/libva-glx
VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
VAAPI_CONFIGURE_ENABLE= vaapi
V4L_BUILD_DEPENDS= v4l_compat>=1.0.20100321:multimedia/v4l_compat
V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l

3
multimedia/mythtv/Makefile
View file

@ -1,7 +1,7 @@
PORTNAME= mythtv
DISTVERSIONPREFIX= v
DISTVERSION= 33.1
PORTREVISION= 5
PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= multimedia
@ -22,7 +22,6 @@ 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 \