svn commit: r489177 - in head: . multimedia multimedia/vlc multimedia/vlc/files multimedia/vlc3

Thomas Zander riggs at FreeBSD.org
Thu Jan 3 14:12:05 UTC 2019 

Author: riggs
Date: Thu Jan  3 14:12:03 2019
New Revision: 489177
URL: https://svnweb.freebsd.org/changeset/ports/489177

Log:
  Retire multimedia/vlc3; update multimedia/vlc to latest upstream 3.0.5

Added:
  head/multimedia/vlc/files/patch-modules_codec_aom.c   (contents, props changed)
Deleted:
  head/multimedia/vlc/files/patch-clang
  head/multimedia/vlc/files/patch-ffmpeg30
  head/multimedia/vlc/files/patch-ffmpeg40
  head/multimedia/vlc/files/patch-git_92ec47e
  head/multimedia/vlc/files/patch-git_a1e5e64
  head/multimedia/vlc/files/patch-git_a8953ba
  head/multimedia/vlc/files/patch-git_d2571e6
  head/multimedia/vlc/files/patch-include-vlc_common.h
  head/multimedia/vlc/files/patch-include-vlc_threads.h
  head/multimedia/vlc/files/patch-include_vlc__atomic.h
  head/multimedia/vlc/files/patch-include_vlc__playlist.h
  head/multimedia/vlc/files/patch-include_vlc__sout.h
  head/multimedia/vlc/files/patch-modules_gui_qt4_actions__manager.hpp
  head/multimedia/vlc/files/patch-modules_gui_qt4_components_simple__preferences.cpp
  head/multimedia/vlc/files/patch-v4l
  head/multimedia/vlc3/
Modified:
  head/MOVED
  head/multimedia/Makefile
  head/multimedia/vlc/Makefile
  head/multimedia/vlc/distinfo
  head/multimedia/vlc/files/patch-configure
  head/multimedia/vlc/files/patch-src-network-udp.c
  head/multimedia/vlc/pkg-plist

Modified: head/MOVED
==============================================================================
--- head/MOVED	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/MOVED	Thu Jan  3 14:12:03 2019	(r489177)
@@ -11551,3 +11551,4 @@ www/mod_php56|www/mod_php72|2019-01-01|Has expired: Se
 multimedia/vlc-qt4||2019-01-02|Has expired: Upstream supported ended in 2018, port deprecated on 31 Dec 2018
 multimedia/phonon-vlc at qt4||2019-01-02|vlc-qt4 has been removed, vlc now always uses qt5
 multimedia/phonon-vlc at qt5|multimedia/phonon-vlc|2019-01-02|vlc-qt4 has been removed, vlc now always uses qt5
+multimedia/vlc3|multimedia/vlc|2019-01-03|multimedia/vlc updated to supported upstream branch (previously vlc3)

Modified: head/multimedia/Makefile
==============================================================================
--- head/multimedia/Makefile	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/multimedia/Makefile	Thu Jan  3 14:12:03 2019	(r489177)
@@ -450,7 +450,6 @@
     SUBDIR += vdr-plugins
     SUBDIR += vid.stab
     SUBDIR += vlc
-    SUBDIR += vlc3
     SUBDIR += vtkmpeg2encode
     SUBDIR += w_scan
     SUBDIR += webcamd

Modified: head/multimedia/vlc/Makefile
==============================================================================
--- head/multimedia/vlc/Makefile	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/multimedia/vlc/Makefile	Thu Jan  3 14:12:03 2019	(r489177)
@@ -2,8 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	vlc
-DISTVERSION=	2.2.8
-PORTREVISION=	16
+DISTVERSION=	3.0.5
+PORTREVISION=	1
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
@@ -11,53 +11,50 @@ MASTER_SITES=	http://download.videolan.org/pub/videola
 		ftp://ftp.crans.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/
 
 MAINTAINER=	multimedia at FreeBSD.org
-COMMENT?=	Qt based multimedia player and streaming server
+COMMENT=	Qt based multimedia player and streaming server
 
 LICENSE=	GPLv2
 
-DEPRECATED=	vlc 2.x and vlc-qt4 is EOL upstream
-EXPIRATION_DATE=	2018-12-31
-
 LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 		libdvbpsi.so:multimedia/libdvbpsi \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
-		libidn.so:dns/libidn
+		libidn.so:dns/libidn \
+		libmatroska.so:multimedia/libmatroska
 BUILD_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg \
 		yasm:devel/yasm
 RUN_DEPENDS=	ffmpeg>=3.4.1,1:multimedia/ffmpeg
 
+USES=		compiler:c++11-lib desktop-file-utils gettext-tools gmake gnome \
+		iconv libtool pathfix pkgconfig tar:xz
+
 # VLC git (post 2.2.4) requires C++11 support and passes the appropriate flag
 # to the compiler. Until the port is updated, we explicitly pass -std=c++11 to
-# the compiler because Qt 5.7+ requires C++11 support, and FreeBSD 10.3's clang
+# the compiler because Qt 5.7+ requires C++11 support, and FreeBSD 10's clang
 # does not default to C++11 mode.
 USE_CXXSTD=	c++11
 
-USES=		compiler:c++11-lib desktop-file-utils gmake iconv libtool pathfix \
-		pkgconfig tar:xz
 USE_GNOME=	libxml2
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 
-CONFLICTS?=	vlc-qt4-* \
-		vlc3-*
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-avcodec --enable-avformat --enable-dvbpsi \
 		--enable-fontconfig --enable-freetype --enable-libgcrypt \
 		--enable-libxml2 --enable-oss --enable-postproc \
 		--enable-swscale --enable-vlc \
-		--disable-alsa --disable-chromaprint --disable-crystalhd \
-		--disable-dc1394 --disable-decklink --disable-directfb \
+		--disable-alsa --disable-archive --disable-chromaprint --disable-crystalhd \
+		--disable-dc1394 --disable-decklink --disable-dsm \
 		--disable-dv1394 --disable-fdkaac \
-		--disable-gles1 --disable-gles2 --disable-kai --disable-kva \
+		--disable-gles2 --disable-kai --disable-kva \
 		--disable-vnc --disable-opencv --disable-projectm \
-		--disable-telx \
+		--disable-secret --disable-soxr --disable-telx \
 		--disable-tiger --disable-tremor --disable-udev \
-		--disable-update-check --disable-vcdx --disable-vsxu \
+		--disable-update-check --disable-vsxu \
 		--disable-wasapi --disable-x26410b \
-		--with-kde-solid=${PREFIX}/share/apps/solid/actions \
-		ac_cv_search_pthread_rwlock_init=-pthread
+		--with-kde-solid=${PREFIX}/share/solid/actions \
+		ac_cv_search_pthread_rwlock_init=-pthread \
+		BUILDCC="${CC}"
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=--enable-debug
 .endif
@@ -65,27 +62,31 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 CFLAGS_i386=	-fomit-frame-pointer
 LIBS+=		-L${LOCALBASE}/lib
 
-OPTIONS_DEFINE=	A52 AALIB ASS AVAHI CACA DBUS DCA DOCS DVDREAD \
-		DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNOMEVFS2 GNUTLS \
-		GOOM HTTPD JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \
-		LIVEMEDIA LUA MAD MATROSKA MODPLUG MPEG2 MTP MUSEPACK \
-		NCURSES NLS NOTIFY OGG OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
-		QT4 QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \
+OPTIONS_DEFINE=	A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDREAD \
+		DVDNAV FAAD FLAC FLUID FREERDP FRIBIDI GME GNUTLS \
+		GOOM HARFBUZZ JACK KATE LIBBLURAY LIBRSVG2 LIBSSH2 LIRC \
+		LIVEMEDIA LUA MAD MODPLUG MPEG2 MTP MUSEPACK \
+		NCURSES NFS NLS NOTIFY OGG OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \
+		QT5 REALRTSP RUNROOT SAMPLERATE SIDPLAY SCHROEDINGER \
 		SDL SHOUTCAST SKINS SMB SNDIO STREAM SPEEX TAGLIB THEORA \
-		TWOLAME UPNP V4L VAAPI VCD VDPAU VORBIS X11 X264 X265 ZVBI
+		TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI
 OPTIONS_DEFAULT=A52 AVAHI DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \
-		HTTPD LIVEMEDIA LUA MAD MATROSKA MPEG2 OGG OPTIMIZED_CFLAGS \
-		OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME V4L \
-		VAAPI VCD VDPAU VORBIS X11
+		LIVEMEDIA LUA MAD MPEG2 OGG OPTIMIZED_CFLAGS \
+		OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \
+		V4L VAAPI VCD VDPAU VORBIS WAYLAND X11
 OPTIONS_SUB=	yes
 
+AOM_DESC=	AV1 video encoding/decoding via libaom
 ASS_DESC=	ASS/SSA subtitle rendering
+CHROMECAST_DESC=Streaming to Chromecast devices
+DAV1D_DESC=	AV1 video decoding via libdav1d
 DVDREAD_DESC=	DVD Playback support
 DVDNAV_DESC=	DVD menu navigation
 FLUID_DESC=	Fluidsynth MIDI support
 FREERDP_DESC=	RDP support
 GME_DESC=	Game Music Emu (libgme) support
 GOOM_DESC=	Goom visualisation plugin
+HARFBUZZ_DESC=	OpenType text shaping engine
 KATE_DESC=	Kate codec support
 LIBSSH2_DESC=	SCP/SFTP support via libssh2
 REALRTSP_DESC=	Real RTSP access module
@@ -107,12 +108,21 @@ AALIB_CONFIGURE_ENABLE=	aa
 ASS_LIB_DEPENDS=	libass.so:multimedia/libass
 ASS_CONFIGURE_ENABLE=	libass
 
+AOM_LIB_DEPENDS=	libaom.so:multimedia/aom
+AOM_CONFIGURE_ENABLE=	aom
+
 AVAHI_LIB_DEPENDS=	libavahi-common.so:net/avahi-app
-AVAHI_CONFIGURE_ENABLE=	bonjour
+AVAHI_CONFIGURE_ENABLE=	avahi
 
 CACA_LIB_DEPENDS=	libcaca.so:graphics/libcaca
 CACA_CONFIGURE_ENABLE=	caca
 
+CHROMECAST_LIB_DEPENDS=	libprotobuf-lite.so:devel/protobuf
+CHROMECASE_CONFIGURE_ENABLE=	chromecast
+
+DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
+DAV1D_CONFIGURE_ENABLE=	dav1d
+
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_ENABLE=	dbus
 
@@ -149,16 +159,14 @@ GME_LIB_DEPENDS=	libgme.so:audio/libgme
 GME_CONFIGURE_ENABLE=	gme
 GME_CONFIGURE_ENV=	LIBS_gme="-L${LOCALBASE}/lib -lgme"
 
-GNOMEVFS2_USE=			GNOME=gnomevfs2
-GNOMEVFS2_CONFIGURE_ENABLE=	gnomevfs
-
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_ENABLE=gnutls
 
 GOOM_LIB_DEPENDS=	libgoom2.so:graphics/goom
 GOOM_CONFIGURE_ENABLE=	goom
 
-HTTPD_CONFIGURE_ENABLE=	httpd
+HARFBUZZ_LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
+HARFBUZZ_CONFIGURE_ENABLE=	harfbuzz
 
 JACK_LIB_DEPENDS=	libjack.so:audio/jack
 JACK_CONFIGURE_ENABLE=	jack
@@ -199,9 +207,6 @@ MAD_LIB_DEPENDS=	libmad.so:audio/libmad
 MAD_CONFIGURE_ENABLE=	mad
 MAD_CONFIGURE_ON=	--with-mad=${LOCALBASE}
 
-MATROSKA_LIB_DEPENDS=	libmatroska.so:multimedia/libmatroska
-MATROSKA_CONFIGURE_ENABLE=	mkv
-
 MODPLUG_LIB_DEPENDS=	libmodplug.so:audio/libmodplug
 MODPLUG_CONFIGURE_ENABLE=	mod
 
@@ -220,11 +225,14 @@ NCURSES_CONFIGURE_ENV=		NCURSES_CFLAGS="-I${NCURSESINC
 				NCURSES_LIBS="-L${NCURSESLIB} -lncursesw"
 NCURSES_CONFIGURE_ENABLE=	ncurses
 
+NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
+NFS_CONFIGURE_ENABLE=	nfs
+
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 NOTIFY_LIB_DEPENDS=	libnotify.so:devel/libnotify
-NOTIFY_USE=		GNOME=gtk20
+NOTIFY_USE=		GNOME=gtk30
 NOTIFY_CONFIGURE_ENABLE=notify
 
 OGG_LIB_DEPENDS=	libogg.so:audio/libogg
@@ -241,15 +249,10 @@ PNG_CONFIGURE_ENABLE=	png
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CONFIGURE_ENABLE=	pulse
 
-QT4_USES=	qt:4
-QT4_USE=		QT=gui,corelib,moc_build,rcc_build,uic_build
-# QT_CFLAGS:	pkg-config --cflags "QtCore QtGui >= 4.6.0"
-# QT_LIBS:	pkg-config --libs "QtCore QtGui >= 4.6.0"
-QT4_CONFIGURE_ENV=	QT_CFLAGS="-I${QT_INCDIR}/QtGui -DQT_SHARED -I${QT_INCDIR} -I${QT_INCDIR}/QtCore" \
-			QT_LIBS="-lQtGui -L${QT_LIBDIR} -lQtCore"
-
 QT5_USES=	qt:5
-QT5_USE=		QT=gui,core,widgets,x11extras,buildtools_build
+QT5_USE=	QT=gui,core,svg,widgets,x11extras,buildtools_build
+QT5_CONFIGURE_ENABLE=	qt
+QT5_IMPLIES=	X11
 
 REALRTSP_CONFIGURE_ENABLE=	realrtsp
 
@@ -262,13 +265,19 @@ SCHROEDINGER_LIB_DEPENDS=	libschroedinger-1.0.so:multi
 SCHROEDINGER_CONFIGURE_ENABLE=	schroedinger
 
 SDL_USE=		SDL=image
-SDL_CONFIGURE_ENABLE=	sdl sdl-image
+SDL_CONFIGURE_ENABLE=	sdl-image
 
 SIDPLAY_LIB_DEPENDS=	libsidplay2.so:audio/libsidplay2
 SIDPLAY_LDFLAGS=	-L${LOCALBASE}/lib/sidplay/builders
 SIDPLAY_CONFIGURE_ENABLE=	sid
 CONFIGURE_ARGS+=	--disable-sid
 
+SKINS_USE=		XORG=xext,xinerama,xpm
+SKINS_LIB_DEPENDS=	libminizip.so:archivers/minizip \
+			libtar.so:devel/libtar
+SKINS_CONFIGURE_ENABLE=	skins2 libtar
+SKINS_IMPLIES=		QT5
+
 SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_CONFIGURE_ENABLE=	shout
 
@@ -307,11 +316,20 @@ VCD_CONFIGURE_ENABLE=	vcd libcddb
 
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CONFIGURE_ENABLE=	vdpau
+VDPAU_IMPLIES=		X11
 
+VPX_LIB_DEPENDS=	libvpx.so:multimedia/libvpx
+VPX_CONFIGURE_ENABLE=	vpx
+
 VORBIS_LIB_DEPENDS=	libvorbis.so:audio/libvorbis
 VORBIS_CONFIGURE_ENABLE=vorbis
 
+WAYLAND_BUILD_DEPENDS=	wayland-protocols>=0:graphics/wayland-protocols
+WAYLAND_LIB_DEPENDS=	libwayland-client.so:graphics/wayland
+WAYLAND_CONFIGURE_ENABLE=	wayland
+
 X11_USE=		GL=gl XORG=xcb,xorgproto
+X11_USES=		gl
 X11_LIB_DEPENDS=	libxcb-keysyms.so:x11/xcb-util-keysyms
 X11_CONFIGURE_ENABLE=	xcb xvideo
 X11_CONFIGURE_WITH=	x
@@ -337,29 +355,6 @@ WITH_DVD_DEVICE?=/dev/cd0
 INSTALLS_ICONS=	yes
 .endif
 
-.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4}
-CONFIGURE_ARGS+=	--enable-qt
-.else
-CONFIGURE_ARGS+=	--disable-qt
-.endif
-
-.if ${PORT_OPTIONS:MQT5} && ${PORT_OPTIONS:MQT4}
-IGNORE=	please choose one of QT4 or QT5
-.endif
-
-.if ${PORT_OPTIONS:MSKINS}
-.if ${PORT_OPTIONS:MQT5} || ${PORT_OPTIONS:MQT4}
-LIB_DEPENDS+=	libminizip.so:archivers/minizip \
-		libtar.so:devel/libtar
-USE_XORG+=	xext xinerama xpm
-CONFIGURE_ARGS+=--enable-skins2 --enable-libtar
-.else
-IGNORE=	SKINS option requires QT4 or QT5 option
-.endif
-.else
-CONFIGURE_ARGS+=--disable-skins2 --disable-libtar
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} \
 		-e '\|LIBS|s|-lrt||' \
@@ -371,15 +366,12 @@ post-patch:
 	@${RM} -r ${WRKSRC}/modules/access/v4l2/linux
 # XXX FreeBSD doesn't have strerror_l() - use the android version of error.c
 	@${CP} ${WRKSRC}/src/android/error.c ${WRKSRC}/src/posix
-.if ${PORT_OPTIONS:MQT4}
-# XXX no sane way to tell configure not to pick up Qt5X11Extras with qt4
-	@${REINPLACE_CMD} s/Qt5X11Extras/Qt5X11Extras-not/ \
-		${WRKSRC}/configure
-.endif
 
 post-install:
 	@(cd ${STAGEDIR}${PREFIX} && ${FIND} -s lib/vlc -not -name '*.la' \
 		-type f -o -type l >> ${TMPPLIST})
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/vlc/plugins/*/*.so
+	# plugin cache becomes stale after strip. Regenerate it:
+	${WRKSRC}/bin/vlc-cache-gen ${STAGEDIR}${PREFIX}/lib/vlc/plugins
 
 .include <bsd.port.mk>

Modified: head/multimedia/vlc/distinfo
==============================================================================
--- head/multimedia/vlc/distinfo	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/multimedia/vlc/distinfo	Thu Jan  3 14:12:03 2019	(r489177)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1514481430
-SHA256 (vlc-2.2.8.tar.xz) = 9bf046848fb56d93518881b39099b8288ee005d5ba0ddf705b6f6643b8d562ec
-SIZE (vlc-2.2.8.tar.xz) = 22137276
+TIMESTAMP = 1546088783
+SHA256 (vlc-3.0.5.tar.xz) = f5c087dfebd4827052bf3b97996b3a05c79ae336dcb60a9e8d1a010f270072db
+SIZE (vlc-3.0.5.tar.xz) = 25700560

Modified: head/multimedia/vlc/files/patch-configure
==============================================================================
--- head/multimedia/vlc/files/patch-configure	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/multimedia/vlc/files/patch-configure	Thu Jan  3 14:12:03 2019	(r489177)
@@ -1,57 +1,30 @@
---- configure.orig	2016-04-05 00:45:51 UTC
+--- configure.orig	2018-02-26 14:47:53 UTC
 +++ configure
-@@ -8471,9 +8471,6 @@ case "${host_os}" in
+@@ -9027,9 +9027,6 @@ case "${host_os}" in
      ;;
    freebsd*)
      SYS=freebsd
 -    CFLAGS="${CFLAGS} -pthread"
 -    CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
 -    LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+     ac_cv_ld_z_defs=no
      ;;
    openbsd*)
-     SYS=openbsd
-@@ -25539,7 +25536,7 @@ main ()
-   return 0;
- }
+@@ -25572,7 +25569,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
+ _Thread_local int foo = 0;
+                    int main() {}
  _ACEOF
 -if ac_fn_c_try_compile "$LINENO"; then :
 +if ac_fn_c_try_link "$LINENO"; then :
  
-         ac_cv_c_o4=yes
- 
-@@ -25583,7 +25580,7 @@ main ()
+     { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+ $as_echo "ok" >&6; }
+@@ -27072,7 +27069,7 @@ main ()
    return 0;
  }
  _ACEOF
 -if ac_fn_c_try_compile "$LINENO"; then :
 +if ac_fn_c_try_link "$LINENO"; then :
  
-           ac_cv_c_o3=yes
- 
-@@ -26777,7 +26774,7 @@ _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
-   ac_cv_altivec_inline="yes"
- else
--  CFLAGS="${CFLAGS} -Wa,-m7400"
-+  CFLAGS="${CFLAGS} -Wa,-maltivec"
-           cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-@@ -26790,7 +26787,7 @@ asm volatile("vperm 0,1,2,3");
- }
- _ACEOF
- if ac_fn_c_try_compile "$LINENO"; then :
--  ac_cv_altivec_inline="-Wa,-m7400"
-+  ac_cv_altivec_inline="-Wa,-maltivec"
- else
-   ac_cv_altivec_inline=no
- fi
-@@ -49199,7 +49196,7 @@ fi
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
- 
--        as_fn_error $? "\"You cannot build VLC with Qt-5.5.0. You need to backport I78ef29975181ee22429c9bd4b11d96d9e68b7a9c\"" "$LINENO" 5
-+        $as_echo "Qt-5.5.x found. Ensure Qt I78ef29975181ee22429c9bd4b11d96d9e68b7a9c is backported." >&5
- 
- fi
+       ac_cv_c_visibility_hidden=yes
  

Added: head/multimedia/vlc/files/patch-modules_codec_aom.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/vlc/files/patch-modules_codec_aom.c	Thu Jan  3 14:12:03 2019	(r489177)
@@ -0,0 +1,10 @@
+--- modules/codec/aom.c.orig	2018-12-19 00:05:20 UTC
++++ modules/codec/aom.c
+@@ -98,7 +98,6 @@ uint8_t          i_needs_hack;
+ { VLC_CODEC_I444, AOM_IMG_FMT_I444, 8, 0 },
+ 
+ { VLC_CODEC_YV12, AOM_IMG_FMT_YV12, 8, 0 },
+-{ VLC_CODEC_YUVA, AOM_IMG_FMT_444A, 8, 0 },
+ 
+ { VLC_CODEC_GBR_PLANAR, AOM_IMG_FMT_I444, 8, 1 },
+ { VLC_CODEC_GBR_PLANAR_10L, AOM_IMG_FMT_I44416, 10, 1 },

Modified: head/multimedia/vlc/files/patch-src-network-udp.c
==============================================================================
--- head/multimedia/vlc/files/patch-src-network-udp.c	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/multimedia/vlc/files/patch-src-network-udp.c	Thu Jan  3 14:12:03 2019	(r489177)
@@ -1,11 +1,11 @@
---- src/network/udp.c.orig
+--- src/network/udp.c.orig	2018-01-17 13:29:46 UTC
 +++ src/network/udp.c
-@@ -383,7 +383,7 @@ int net_Subscribe (vlc_object_t *obj, in
+@@ -315,7 +315,7 @@ net_SourceSubscribe (vlc_object_t *obj, 
  {
- /* MCAST_JOIN_GROUP was introduced to OS X in v10.7, but it doesn't work,
-  * so ignore it to use the same code as on 10.5 or 10.6 */
--#if defined (MCAST_JOIN_GROUP) && !defined (__APPLE__)
-+#if defined (MCAST_JOIN_GROUP) && !defined (__APPLE__) && !defined (__FreeBSD__)
-     /* Agnostic SSM multicast join */
+ /* MCAST_JOIN_SOURCE_GROUP was introduced to OS X in v10.7, but it doesn't work,
+  * so ignore it to use the same code path as on 10.5 or 10.6 */
+-#if defined (MCAST_JOIN_SOURCE_GROUP) && !defined (__APPLE__)
++#if defined (MCAST_JOIN_SOURCE_GROUP) && !defined (__APPLE__) && !defined (__FreeBSD__)
+     /* Family-agnostic Source-Specific Multicast join */
      int level;
-     struct group_req gr;
+     struct group_source_req gsr;

Modified: head/multimedia/vlc/pkg-plist
==============================================================================
--- head/multimedia/vlc/pkg-plist	Thu Jan  3 13:54:54 2019	(r489176)
+++ head/multimedia/vlc/pkg-plist	Thu Jan  3 14:12:03 2019	(r489177)
@@ -1,13 +1,13 @@
 bin/cvlc
 %%NCURSES%%bin/nvlc
 %%QT5%%bin/qvlc
-%%QT4%%bin/qvlc
 bin/rvlc
 %%SKINS%%bin/svlc
 bin/vlc
 bin/vlc-wrapper
 include/vlc/deprecated.h
 include/vlc/libvlc.h
+include/vlc/libvlc_dialog.h
 include/vlc/libvlc_events.h
 include/vlc/libvlc_media.h
 include/vlc/libvlc_media_discoverer.h
@@ -15,11 +15,12 @@ include/vlc/libvlc_media_library.h
 include/vlc/libvlc_media_list.h
 include/vlc/libvlc_media_list_player.h
 include/vlc/libvlc_media_player.h
-include/vlc/libvlc_structures.h
+include/vlc/libvlc_renderer_discoverer.h
 include/vlc/libvlc_version.h
 include/vlc/libvlc_vlm.h
 include/vlc/plugins/vlc_about.h
 include/vlc/plugins/vlc_access.h
+include/vlc/plugins/vlc_actions.h
 include/vlc/plugins/vlc_addons.h
 include/vlc/plugins/vlc_aout.h
 include/vlc/plugins/vlc_aout_volume.h
@@ -29,6 +30,7 @@ include/vlc/plugins/vlc_avcodec.h
 include/vlc/plugins/vlc_bits.h
 include/vlc/plugins/vlc_block.h
 include/vlc/plugins/vlc_block_helper.h
+include/vlc/plugins/vlc_boxes.h
 include/vlc/plugins/vlc_charset.h
 include/vlc/plugins/vlc_codec.h
 include/vlc/plugins/vlc_common.h
@@ -53,13 +55,16 @@ include/vlc/plugins/vlc_image.h
 include/vlc/plugins/vlc_inhibit.h
 include/vlc/plugins/vlc_input.h
 include/vlc/plugins/vlc_input_item.h
-include/vlc/plugins/vlc_keys.h
+include/vlc/plugins/vlc_interface.h
+include/vlc/plugins/vlc_interrupt.h
+include/vlc/plugins/vlc_keystore.h
 include/vlc/plugins/vlc_main.h
 include/vlc/plugins/vlc_md5.h
-include/vlc/plugins/vlc_meta_fetcher.h
 include/vlc/plugins/vlc_media_library.h
+include/vlc/plugins/vlc_memstream.h
 include/vlc/plugins/vlc_messages.h
 include/vlc/plugins/vlc_meta.h
+include/vlc/plugins/vlc_meta_fetcher.h
 include/vlc/plugins/vlc_mime.h
 include/vlc/plugins/vlc_modules.h
 include/vlc/plugins/vlc_mouse.h
@@ -74,18 +79,22 @@ include/vlc/plugins/vlc_playlist.h
 include/vlc/plugins/vlc_plugin.h
 include/vlc/plugins/vlc_probe.h
 include/vlc/plugins/vlc_rand.h
+include/vlc/plugins/vlc_renderer_discovery.h
 include/vlc/plugins/vlc_services_discovery.h
 include/vlc/plugins/vlc_sout.h
 include/vlc/plugins/vlc_spu.h
 include/vlc/plugins/vlc_stream.h
+include/vlc/plugins/vlc_stream_extractor.h
 include/vlc/plugins/vlc_strings.h
 include/vlc/plugins/vlc_subpicture.h
 include/vlc/plugins/vlc_text_style.h
 include/vlc/plugins/vlc_threads.h
+include/vlc/plugins/vlc_timestamp_helper.h
 include/vlc/plugins/vlc_tls.h
 include/vlc/plugins/vlc_url.h
 include/vlc/plugins/vlc_variables.h
 include/vlc/plugins/vlc_video_splitter.h
+include/vlc/plugins/vlc_viewpoint.h
 include/vlc/plugins/vlc_vlm.h
 include/vlc/plugins/vlc_vout.h
 include/vlc/plugins/vlc_vout_display.h
@@ -96,15 +105,16 @@ include/vlc/plugins/vlc_xml.h
 include/vlc/vlc.h
 lib/libvlc.so
 lib/libvlc.so.5
-lib/libvlc.so.5.5.1
+lib/libvlc.so.5.6.0
 lib/libvlccore.so
-lib/libvlccore.so.8
-lib/libvlccore.so.8.0.1
+lib/libvlccore.so.9
+lib/libvlccore.so.9.0.0
 libdata/pkgconfig/libvlc.pc
 libdata/pkgconfig/vlc-plugin.pc
 man/man1/vlc-wrapper.1.gz
 man/man1/vlc.1.gz
 share/applications/vlc.desktop
+share/icons/hicolor/128x128/apps/vlc-kb.png
 share/icons/hicolor/128x128/apps/vlc-xmas.png
 share/icons/hicolor/128x128/apps/vlc.png
 share/icons/hicolor/16x16/apps/vlc.png
@@ -115,15 +125,12 @@ share/icons/hicolor/32x32/apps/vlc.png
 share/icons/hicolor/32x32/apps/vlc.xpm
 share/icons/hicolor/48x48/apps/vlc-xmas.png
 share/icons/hicolor/48x48/apps/vlc.png
-share/apps/solid/actions/vlc-openbd.desktop
-share/apps/solid/actions/vlc-opencda.desktop
-share/apps/solid/actions/vlc-opendvd.desktop
-share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/ach/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/af/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/am/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/an/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ar/LC_MESSAGES/vlc.mo
+%%NLS%%share/locale/as_IN/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ast/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/az/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/vlc.mo
@@ -131,6 +138,7 @@ share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/bn/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/bn_IN/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/br/LC_MESSAGES/vlc.mo
+%%NLS%%share/locale/brx/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/bs/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ca/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/cgg/LC_MESSAGES/vlc.mo
@@ -143,7 +151,6 @@ share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/el/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/es/LC_MESSAGES/vlc.mo
-%%NLS%%share/locale/es_MX/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/et/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/fa/LC_MESSAGES/vlc.mo
@@ -151,6 +158,7 @@ share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/fi/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/fur/LC_MESSAGES/vlc.mo
+%%NLS%%share/locale/fy/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/ga/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/gd/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/gl/LC_MESSAGES/vlc.mo
@@ -207,6 +215,7 @@ share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/th/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/tl/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/tr/LC_MESSAGES/vlc.mo
+%%NLS%%share/locale/ug/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/uz/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/vi/LC_MESSAGES/vlc.mo
@@ -214,3 +223,8 @@ share/apps/solid/actions/vlc-openvcd.desktop
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/vlc.mo
 %%NLS%%share/locale/zu/LC_MESSAGES/vlc.mo
+share/metainfo/vlc.appdata.xml
+share/solid/actions/vlc-openbd.desktop
+share/solid/actions/vlc-opencda.desktop
+share/solid/actions/vlc-opendvd.desktop
+share/solid/actions/vlc-openvcd.desktop

More information about the svn-ports-all mailing list