From owner-dev-commits-ports-main@freebsd.org Mon Sep 6 18:22:47 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id F2552678F52; Mon, 6 Sep 2021 18:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4H3GwQ5rhTz4pDK; Mon, 6 Sep 2021 18:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9248F235F1; Mon, 6 Sep 2021 18:22:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 186IMkw0066810; Mon, 6 Sep 2021 18:22:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 186IMkHq066809; Mon, 6 Sep 2021 18:22:46 GMT (envelope-from git) Date: Mon, 6 Sep 2021 18:22:46 GMT Message-Id: <202109061822.186IMkHq066809@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: fe3ca40c7e29 - main - multimedia/vlc: Enable support for subtitles and add missing deps MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fe3ca40c7e298d3c2246684f7817e6c52a0e20ca Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 18:22:47 -0000 The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=fe3ca40c7e298d3c2246684f7817e6c52a0e20ca commit fe3ca40c7e298d3c2246684f7817e6c52a0e20ca Author: Daniel Engberg AuthorDate: 2021-09-06 18:12:40 +0000 Commit: Daniel Engberg CommitDate: 2021-09-06 18:22:25 +0000 multimedia/vlc: Enable support for subtitles and add missing deps Additionally disable autodetection of (lib)mpg123 to avoid undefined dependencies and define wchar_t (iconv) usage Commit also includes suggestions by Philipp Ost PR: 256593 Approved by: arrowd (mentor) Differential Revision: https://reviews.freebsd.org/D31859 --- multimedia/vlc/Makefile | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile index e3f8f7555c6d..3779cec9efd2 100644 --- a/multimedia/vlc/Makefile +++ b/multimedia/vlc/Makefile @@ -2,7 +2,7 @@ PORTNAME= vlc DISTVERSION= 3.0.16 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 4 CATEGORIES= multimedia audio net www MASTER_SITES= http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \ @@ -19,14 +19,16 @@ LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libidn.so:dns/libidn \ - libmatroska.so:multimedia/libmatroska + libmatroska.so:multimedia/libmatroska \ + libgpg-error.so:security/libgpg-error \ + libebml.so:textproc/libebml BUILD_DEPENDS= gsed:textproc/gsed \ ffmpeg>=3.4.1,1:multimedia/ffmpeg \ yasm:devel/yasm RUN_DEPENDS= ffmpeg>=3.4.1,1:multimedia/ffmpeg USES= compiler:c++17-lang desktop-file-utils gettext-tools gmake gnome \ - iconv libtool localbase pathfix pkgconfig tar:xz + iconv:wchar_t libtool localbase 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 @@ -47,7 +49,7 @@ CONFIGURE_ARGS= --enable-avcodec --enable-avformat --enable-dvbpsi \ --disable-alsa --disable-archive --disable-chromaprint --disable-crystalhd \ --disable-dc1394 --disable-decklink --disable-dsm \ --disable-dv1394 --disable-fdkaac --disable-gst-decode \ - --disable-gles2 --disable-kai --disable-kva \ + --disable-gles2 --disable-kai --disable-kva --disable-mpg123 \ --disable-vnc --disable-opencv --disable-projectm \ --disable-secret --disable-soxr --disable-telx \ --disable-tiger --disable-tremor --disable-udev \ @@ -71,7 +73,7 @@ OPTIONS_DEFINE= A52 AALIB AOM ASS AVAHI CACA CHROMECAST DAV1D DBUS DCA DOCS DVDR TWOLAME UPNP V4L VAAPI VCD VDPAU VPX VORBIS WAYLAND X11 X264 X265 ZVBI OPTIONS_DEFINE_powerpc= ALTIVEC OPTIONS_DEFINE_powerpc64= ALTIVEC -OPTIONS_DEFAULT=AVAHI DAV1D DBUS DVDREAD DVDNAV GNUTLS JPEG \ +OPTIONS_DEFAULT=ASS AVAHI DAV1D DBUS DVDREAD DVDNAV GNUTLS HARFBUZZ JPEG \ LIVEMEDIA LUA OGG OPTIMIZED_CFLAGS \ OPUS PNG QT5 SAMPLERATE STREAM SPEEX TAGLIB THEORA TWOLAME \ V4L VAAPI VCD VDPAU VORBIS WAYLAND X11 @@ -317,7 +319,8 @@ SMB_CONFIGURE_ENABLE= smbclient STREAM_CONFIGURE_ENABLE=sout -SPEEX_LIB_DEPENDS= libspeex.so:audio/speex +SPEEX_LIB_DEPENDS= libspeex.so:audio/speex \ + libspeexdsp.so:audio/speexdsp SPEEX_CONFIGURE_ENABLE= speex TAGLIB_LIB_DEPENDS= libtag.so:audio/taglib