Skip to content

Commit

Permalink
multimedia/vlc: fix build with CHROMECAST ON and devel/protobuf 24 an…
Browse files Browse the repository at this point in the history
…d fix plist error if QT5 is ON and xext,xinerama,xpm installed

1. Non default option CHROMECAST require devel/protobuf.
After this commit
https://cgit.freebsd.org/ports/commit/?id=69e2e87fa56b54e267429b326f7f6188a7baaa71
consumers require USE_CXXSTD=c++17.
2. There is default ON configure option "skins2" in vlc. It require QT5 and
xext,xinerama,xpm - if they installed then it build bin/svlc and it is in
stage after build. Added option SKINS default OFF to handle bin/svlc.

Approved by:		arrowd (mentor)
Differential Revision:	https://reviews.freebsd.org/D43128
  • Loading branch information
Vladimir Druzenko authored and Vladimir Druzenko committed Dec 27, 2023
1 parent 1838091 commit 96a9498
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 1 deletion.
9 changes: 8 additions & 1 deletion multimedia/vlc/Makefile
Expand Up @@ -74,7 +74,7 @@ OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDR
LIVEMEDIA LUA MAD MFX MODPLUG MPEG2 MTP MUSEPACK \
NCURSES NFS NLS NOTIFY OGG OGGSPOTS OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY \
SDL SHOUTCAST SMB SNDIO STREAM SPEEX TAGLIB THEORA \
SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI
OPTIONS_DEFINE_powerpc= ALTIVEC
OPTIONS_DEFINE_powerpc64= ALTIVEC
Expand Down Expand Up @@ -106,6 +106,7 @@ OGGSPOTS_DESC= Experimental OggSpots codec
REALRTSP_DESC= Real RTSP access module
RUNROOT_DESC= Enable running as root
SIDPLAY_DESC= C64 sid demux support
SKINS_DESC= Build skins2 interface module (implies QT5)
STREAM_DESC= stream output
TAGLIB_DESC= ID3 tag and Ogg comment support
VCD_DESC= Audio/Video CD support
Expand Down Expand Up @@ -135,6 +136,7 @@ CACA_CONFIGURE_ENABLE= caca

CHROMECAST_LIB_DEPENDS= libprotobuf-lite.so:devel/protobuf
CHROMECAST_CONFIGURE_ENABLE= chromecast
CHROMECAST_USE= cxxstd=c++17

DAV1D_LIB_DEPENDS= libdav1d.so:multimedia/dav1d
DAV1D_CONFIGURE_ENABLE= dav1d
Expand Down Expand Up @@ -300,6 +302,11 @@ CONFIGURE_ARGS+= --disable-sid
SHOUTCAST_LIB_DEPENDS= libshout.so:audio/libshout
SHOUTCAST_CONFIGURE_ENABLE= shout

SKINS_USE= XORG=xext,xinerama,xpm
SKINS_USES= xorg
SKINS_CONFIGURE_ENABLE= skins2
SKINS_IMPLIES= QT5

SNDIO_LIB_DEPENDS= libsndio.so:audio/sndio
SNDIO_CONFIGURE_ENABLE= sndio

Expand Down
1 change: 1 addition & 0 deletions multimedia/vlc/pkg-plist
Expand Up @@ -2,6 +2,7 @@ bin/cvlc
%%NCURSES%%bin/nvlc
%%QT5%%bin/qvlc
bin/rvlc
%%SKINS%%bin/svlc
bin/vlc
bin/vlc-wrapper
include/vlc/deprecated.h
Expand Down

0 comments on commit 96a9498

Please sign in to comment.