From ccc5d2337c0507961b4684fcbf350164d6761569 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Thu, 20 Jun 2019 16:29:09 +0000 Subject: MFH: r504636 Update to upstream release 3.0.7.1; Makefile fixes Details: - Update to newest upstream release 3.0.7.1 - Fix drive-by dependencies, reported in [1] - Introduce new options for JPEG and OGGSPOTS [1] PR: 238261 [1] Reported by: phascolarctos@protonmail.ch [1] Approved by: ports-secteam (riggs) --- multimedia/vlc/Makefile | 25 +++++++---- multimedia/vlc/distinfo | 6 +-- multimedia/vlc/files/patch-modules_codec_vpx.c | 57 -------------------------- multimedia/vlc/pkg-plist | 14 +++---- 4 files changed, 25 insertions(+), 77 deletions(-) delete mode 100644 multimedia/vlc/files/patch-modules_codec_vpx.c diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index 97c753e723a2..d2d607e9a401 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= vlc -DISTVERSION= 3.0.6 -PORTREVISION= 9 +DISTVERSION= 3.0.7.1 PORTEPOCH= 4 CATEGORIES= multimedia audio ipv6 net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -45,7 +44,7 @@ CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --enable-swscale --enable-vlc \ --disable-alsa --disable-archive --disable-chromaprint --disable-crystalhd \ --disable-dc1394 --disable-decklink --disable-dsm \ - --disable-dv1394 --disable-fdkaac \ + --disable-dv1394 --disable-fdkaac --disable-gst-decode \ --disable-gles2 --disable-kai --disable-kva \ --disable-vnc --disable-opencv --disable-projectm \ --disable-secret --disable-soxr --disable-telx \ @@ -64,13 +63,13 @@ LIBS+= -L${LOCALBASE}/lib 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 LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \ + GOOM HARFBUZZ JACK JPEG KATE LIBBLURAY LIBPLACEBO LIBRSVG2 LIBSSH2 LIRC \ LIVEMEDIA LUA MAD MODPLUG MPEG2 MTP MUSEPACK \ - NCURSES NFS NLS NOTIFY OGG OPTIMIZED_CFLAGS OPUS PNG PULSEAUDIO \ + NCURSES NFS NLS NOTIFY OGG OGGSPOTS 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 VPX VORBIS WAYLAND X11 X264 X265 ZVBI -OPTIONS_DEFAULT=A52 AVAHI DAV1D DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS \ +OPTIONS_DEFAULT=A52 AVAHI DAV1D DBUS DCA DVDREAD DVDNAV FAAD FLAC GNUTLS JPEG \ LIVEMEDIA LUA MAD MPEG2 OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \ V4L VAAPI VCD VDPAU VORBIS WAYLAND X11 @@ -90,6 +89,7 @@ HARFBUZZ_DESC= OpenType text shaping engine KATE_DESC= Kate codec support LIBPLACEBO_DESC=HDR tonemapping support through libplacebo LIBSSH2_DESC= SCP/SFTP support via libssh2 +OGGSPOTS_DESC= Experimental OggSpots codec REALRTSP_DESC= Real RTSP access module RUNROOT_DESC= Enable running as root SIDPLAY_DESC= C64 sid demux support @@ -172,6 +172,9 @@ HARFBUZZ_CONFIGURE_ENABLE= harfbuzz JACK_LIB_DEPENDS= libjack.so:audio/jack JACK_CONFIGURE_ENABLE= jack +JPEG_USES= jpeg +JPEG_CONFIGURE_ENABLE= jpeg + KATE_LIB_DEPENDS= libkate.so:multimedia/libkate KATE_CONFIGURE_ENABLE= kate @@ -181,7 +184,7 @@ LIBBLURAY_CONFIGURE_ENABLE= bluray LIBPLACEBO_LIB_DEPENDS= libplacebo.so:graphics/libplacebo LIBPLACEBO_CONFIGURE_ENABLE= libplacebo -LIBRSVG2_USE= GNOME=librsvg2 +LIBRSVG2_USE= GNOME=librsvg2,cairo LIBRSVG2_CONFIGURE_ENABLE= svg LIBSSH2_LIB_DEPENDS= libssh2.so:security/libssh2 @@ -236,12 +239,15 @@ NLS_USES= gettext NLS_CONFIGURE_ENABLE= nls NOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify -NOTIFY_USE= GNOME=gtk30 +NOTIFY_USE= GNOME=gtk30,cairo NOTIFY_CONFIGURE_ENABLE=notify OGG_LIB_DEPENDS= libogg.so:audio/libogg OGG_CONFIGURE_ENABLE= ogg +OGGSPOTS_CONFIGURE_ENABLE= oggspots +OGGSPOTS_IMPLIES= OGG + OPTIMIZED_CFLAGS_CONFIGURE_ENABLE= optimizations OPUS_LIB_DEPENDS= libopus.so:audio/opus @@ -268,6 +274,7 @@ SAMPLERATE_CONFIGURE_ENABLE= samplerate SCHROEDINGER_LIB_DEPENDS= libschroedinger-1.0.so:multimedia/schroedinger SCHROEDINGER_CONFIGURE_ENABLE= schroedinger +SDL_USES= sdl SDL_USE= SDL=image SDL_CONFIGURE_ENABLE= sdl-image @@ -332,7 +339,7 @@ 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_USE= GL=gl XORG=xcb,xorgproto,sm,ice,x11 X11_USES= gl X11_LIB_DEPENDS= libxcb-keysyms.so:x11/xcb-util-keysyms X11_CONFIGURE_ENABLE= xcb xvideo diff --git a/multimedia/vlc/distinfo b/multimedia/vlc/distinfo index 99dd79742217..57622e6b0e83 100644 --- a/multimedia/vlc/distinfo +++ b/multimedia/vlc/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1547225134 -SHA256 (vlc-3.0.6.tar.xz) = 18c16d4be0f34861d0aa51fbd274fb87f0cab3b7119757ead93f3db3a1f27ed3 -SIZE (vlc-3.0.6.tar.xz) = 25699704 +TIMESTAMP = 1560608081 +SHA256 (vlc-3.0.7.1.tar.xz) = 0655804371096772f06104b75c21cde8a76e3b6c8a2fdadc97914f082c6264f5 +SIZE (vlc-3.0.7.1.tar.xz) = 26052372 diff --git a/multimedia/vlc/files/patch-modules_codec_vpx.c b/multimedia/vlc/files/patch-modules_codec_vpx.c deleted file mode 100644 index 4f338fb76e64..000000000000 --- a/multimedia/vlc/files/patch-modules_codec_vpx.c +++ /dev/null @@ -1,57 +0,0 @@ -Regressed by https://chromium.googlesource.com/webm/libvpx/+/c9a459216dc3%5E!/ - -codec/vpx.c:119:23: error: use of undeclared identifier 'VPX_IMG_FMT_444A' - { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, - ^ -codec/vpx.c:120:23: error: use of undeclared identifier 'VPX_IMG_FMT_YUY2'; did you mean 'VPX_IMG_FMT_YV12'? - { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, - ^~~~~~~~~~~~~~~~ -codec/vpx.c:121:23: error: use of undeclared identifier 'VPX_IMG_FMT_UYVY'; did you mean 'VPX_IMG_FMT_YV12'? - { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, - ^~~~~~~~~~~~~~~~ -codec/vpx.c:122:23: error: use of undeclared identifier 'VPX_IMG_FMT_YVYU'; did you mean 'VPX_IMG_FMT_YV12'? - { VLC_CODEC_YVYU, VPX_IMG_FMT_YVYU, 8, 0 }, - ^~~~~~~~~~~~~~~~ -codec/vpx.c:124:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB555' - { VLC_CODEC_RGB15, VPX_IMG_FMT_RGB555, 8, 0 }, - ^ -codec/vpx.c:125:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB565' - { VLC_CODEC_RGB16, VPX_IMG_FMT_RGB565, 8, 0 }, - ^ -codec/vpx.c:126:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB24' - { VLC_CODEC_RGB24, VPX_IMG_FMT_RGB24, 8, 0 }, - ^ -codec/vpx.c:127:24: error: use of undeclared identifier 'VPX_IMG_FMT_RGB32' - { VLC_CODEC_RGB32, VPX_IMG_FMT_RGB32, 8, 0 }, - ^ -codec/vpx.c:129:23: error: use of undeclared identifier 'VPX_IMG_FMT_ARGB' - { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, - ^ -codec/vpx.c:130:23: error: use of undeclared identifier 'VPX_IMG_FMT_ARGB_LE'; did you mean 'VPX_IMG_FMT_NONE'? - { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, - ^~~~~~~~~~~~~~~~~~~ -codec/vpx.c:150:34: error: invalid application of 'sizeof' to an incomplete type 'const struct (anonymous struct at codec/vpx.c:104:14) []' - for( unsigned int i = 0; i < ARRAY_SIZE(chroma_table); i++ ) - ^~~~~~~~~~~~~~~~~~~~~~~~ - ---- modules/codec/vpx.c.orig 2018-03-29 12:04:52 UTC -+++ modules/codec/vpx.c -@@ -116,18 +116,6 @@ static const struct - { VLC_CODEC_I440, VPX_IMG_FMT_I440, 8, 0 }, - - { VLC_CODEC_YV12, VPX_IMG_FMT_YV12, 8, 0 }, -- { VLC_CODEC_YUVA, VPX_IMG_FMT_444A, 8, 0 }, -- { VLC_CODEC_YUYV, VPX_IMG_FMT_YUY2, 8, 0 }, -- { VLC_CODEC_UYVY, VPX_IMG_FMT_UYVY, 8, 0 }, -- { VLC_CODEC_YVYU, VPX_IMG_FMT_YVYU, 8, 0 }, -- -- { VLC_CODEC_RGB15, VPX_IMG_FMT_RGB555, 8, 0 }, -- { VLC_CODEC_RGB16, VPX_IMG_FMT_RGB565, 8, 0 }, -- { VLC_CODEC_RGB24, VPX_IMG_FMT_RGB24, 8, 0 }, -- { VLC_CODEC_RGB32, VPX_IMG_FMT_RGB32, 8, 0 }, -- -- { VLC_CODEC_ARGB, VPX_IMG_FMT_ARGB, 8, 0 }, -- { VLC_CODEC_BGRA, VPX_IMG_FMT_ARGB_LE, 8, 0 }, - - { VLC_CODEC_GBR_PLANAR, VPX_IMG_FMT_I444, 8, 1 }, - { VLC_CODEC_GBR_PLANAR_10L, VPX_IMG_FMT_I44416, 10, 1 }, diff --git a/multimedia/vlc/pkg-plist b/multimedia/vlc/pkg-plist index 716da98d9242..bddb44be1c3f 100644 --- a/multimedia/vlc/pkg-plist +++ b/multimedia/vlc/pkg-plist @@ -128,11 +128,11 @@ share/icons/hicolor/48x48/apps/vlc.png %%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/am_ET/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 %%NLS%%share/locale/bg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/bn/LC_MESSAGES/vlc.mo @@ -141,8 +141,8 @@ share/icons/hicolor/48x48/apps/vlc.png %%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/ca@valencia/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cgg/LC_MESSAGES/vlc.mo -%%NLS%%share/locale/ckb/LC_MESSAGES/vlc.mo %%NLS%%share/locale/co/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cs/LC_MESSAGES/vlc.mo %%NLS%%share/locale/cy/LC_MESSAGES/vlc.mo @@ -151,6 +151,7 @@ share/icons/hicolor/48x48/apps/vlc.png %%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 @@ -168,34 +169,32 @@ share/icons/hicolor/48x48/apps/vlc.png %%NLS%%share/locale/hr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hu/LC_MESSAGES/vlc.mo %%NLS%%share/locale/hy/LC_MESSAGES/vlc.mo -%%NLS%%share/locale/ia/LC_MESSAGES/vlc.mo %%NLS%%share/locale/id/LC_MESSAGES/vlc.mo %%NLS%%share/locale/is/LC_MESSAGES/vlc.mo %%NLS%%share/locale/it/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ja/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ka/LC_MESSAGES/vlc.mo +%%NLS%%share/locale/kab/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/km/LC_MESSAGES/vlc.mo %%NLS%%share/locale/kn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ko/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ks_IN/LC_MESSAGES/vlc.mo +%%NLS%%share/locale/ku_IQ/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ky/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lg/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lt/LC_MESSAGES/vlc.mo %%NLS%%share/locale/lv/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mai/LC_MESSAGES/vlc.mo -%%NLS%%share/locale/mk/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ml/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/mr/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ms/LC_MESSAGES/vlc.mo -%%NLS%%share/locale/my/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nb/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ne/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/nn/LC_MESSAGES/vlc.mo %%NLS%%share/locale/oc/LC_MESSAGES/vlc.mo -%%NLS%%share/locale/or/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pa/LC_MESSAGES/vlc.mo %%NLS%%share/locale/pl/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ps/LC_MESSAGES/vlc.mo @@ -211,10 +210,9 @@ share/icons/hicolor/48x48/apps/vlc.png %%NLS%%share/locale/sv/LC_MESSAGES/vlc.mo %%NLS%%share/locale/ta/LC_MESSAGES/vlc.mo %%NLS%%share/locale/te/LC_MESSAGES/vlc.mo -%%NLS%%share/locale/tet/LC_MESSAGES/vlc.mo %%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/tt/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 -- cgit v1.2.3