Received: by mail.netbsd.org (Postfix, from userid 605) id 750F784FD4; Wed, 11 May 2022 09:23:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id AA2D884FCE for ; Wed, 11 May 2022 09:23:32 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id utrjA35lcdgr for ; Wed, 11 May 2022 09:23:31 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9184584FC5 for ; Wed, 11 May 2022 09:23:31 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 185F4FA94; Wed, 11 May 2022 09:23:49 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_16522610291610" MIME-Version: 1.0 Date: Wed, 11 May 2022 09:23:49 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/multimedia/vlc To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20220511092349.185F4FA94@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_16522610291610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Wed May 11 09:23:48 UTC 2022 Modified Files: pkgsrc/multimedia/vlc: Makefile distinfo pkgsrc/multimedia/vlc/patches: patch-configure.ac patch-m4_dolt.m4 Added Files: pkgsrc/multimedia/vlc/patches: patch-modules_services__discovery_mtp.c Log Message: vlc: Update to 3.0.17.4 and fix build issues. Changes between 3.0.17.3 and 3.0.17.4: ---------------------------------- Service Discovery: * Fix UPnP regression on Windows Changes between 3.0.17.2 and 3.0.17.3: ---------------------------------- Demux: * Fix a regression causing a lack of audio in adaptive streaming Changes between 3.0.17 and 3.0.17.2: ---------------------------------- Interface: * Qt: Fix right click support on video Misc: * Update YouTube script Changes between 3.0.16 and 3.0.17: ---------------------------------- Core: * Fix a regression in parsing secondary source MRLs * Allow brackets in path part of URLs Access: * Fix support for screen capture on macOS with avcapture * Fix closing of HTTP 1.x connections * Improve HTTP2 memory usage * Improve AVCapture module * Improve AudioCD support (audio/data mixed mode, musicbrainz) * Improve SMB compatibility by changing the read size * Several improvements on the SRT modules (including streamID) Decoders/Packetizers: * Add support for DTS LBR * Fix some HEVC hardware decoding on Windows and crashes when aspect ratio changes * Fix hardware decoding for some AMD GPU drivers * Add support for new Fourcc for E-AC3, AV1, GeoVision * Fix crashes with VP9 streams * Fix styling issues with subs tx3g (mp4) tracks * Fix playback of live AV1 streams Audio Output: * iOS/tvOS: add support for spatial audio * macOS: fix some channels ordering for > 5.1 channels * Android: rework audio volume management Video Output: * Fix a D3D11 crash when the stream changes aspect ratio Demux: * Major overhaul of the adaptive streaming stack * Support for DAV video files * Add WebP image mapping * Fix missing audio start of Opus audio in MKV/WebM * Fix an infinite loop in MP4 * Fix attachments extractions in ogg files * Support Uncompressed audio in mp4 (ISO/IEC 23003-5) * Fix some lip sync issue in rare MPEG-TS streams Interface: * Qt/macOS: Fixup user provided URLs * Add safe area handling on macOS * Qt: improve preferences search * Qt: fix --no-mouse-events option Misc: * Update YouTube script * Fix Icecast directory parsing which could lead to missing entries * Improve UPnP compatibility with some servers 3rd party libraries (contrib): * Update FFmpeg to 4.4 * Update libflac to 1.3.4 to fix CVE-2020-0499 and CVE-2021-0561 * Update libsmb2 to fix invalid UTF-8 encoding of some filenames * Update taglib to fix corruptions when editing some OGG metadata * Update dav1d to 0.9.2 * Update fribidi to 1.0.11 * Update freetype to 2.11.1 * Update libass to 0.15.2 * Drop pthreadGC2 in favor of winpthreads * Enable Java support for blurays on Apple M1 * Update libsrt to 1.4.4 * Update twolame to 0.4.0 * Update mpg123 to 1.29.3 * Update libnfs to 5.0.1 * Update libarchive to 3.6.0 * Update AOM encoder to 3.1.1 To generate a diff of this commit: cvs rdiff -u -r1.265 -r1.266 pkgsrc/multimedia/vlc/Makefile cvs rdiff -u -r1.85 -r1.86 pkgsrc/multimedia/vlc/distinfo cvs rdiff -u -r1.6 -r1.7 pkgsrc/multimedia/vlc/patches/patch-configure.ac cvs rdiff -u -r1.1 -r1.2 pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4 cvs rdiff -u -r0 -r1.3 \ pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_16522610291610 Content-Disposition: inline Content-Length: 6319 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/multimedia/vlc/Makefile diff -u pkgsrc/multimedia/vlc/Makefile:1.265 pkgsrc/multimedia/vlc/Makefile:1.266 --- pkgsrc/multimedia/vlc/Makefile:1.265 Mon Apr 18 19:11:47 2022 +++ pkgsrc/multimedia/vlc/Makefile Wed May 11 09:23:48 2022 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.265 2022/04/18 19:11:47 adam Exp $ +# $NetBSD: Makefile,v 1.266 2022/05/11 09:23:48 jperkin Exp $ -DISTNAME= vlc-3.0.16 -PKGREVISION= 10 +DISTNAME= vlc-3.0.17.4 +#PKGREVISION= 10 CATEGORIES= multimedia MASTER_SITES= https://download.videolan.org/pub/videolan/vlc/${PKGVERSION_NOREV}/ EXTRACT_SUFX= .tar.xz @@ -28,7 +28,8 @@ PLIST_VARS+= altivec cdrom egl oss v4l2 .include "../../mk/bsd.prefs.mk" .include "options.mk" -CONFIGURE_ENV= LUAC=${PREFIX}/bin/luac5.2 +CONFIGURE_ENV+= BUILDCC=${CC:Q} +CONFIGURE_ENV+= LUAC=${PREFIX}/bin/luac5.2 # Avoid codec duplication with ffmpeg, etc @@ -173,7 +174,8 @@ SUBST_MESSAGE.fnt= Fixing hardcoded font CHECK_WRKREF_SKIP= lib/libvlccore.a \ lib/libvlccore.so* -MAKE_FLAGS+= BUILDCC=${CC:Q} +CPPFLAGS.SunOS+= -D__EXTENSIONS__ -D_XOPEN_SOURCE=600 +LDFLAGS.SunOS+= -lsocket -lnsl # The sed expression is a workaround for accepting NetBSD's libintl instead of gettext-lib pre-configure: Index: pkgsrc/multimedia/vlc/distinfo diff -u pkgsrc/multimedia/vlc/distinfo:1.85 pkgsrc/multimedia/vlc/distinfo:1.86 --- pkgsrc/multimedia/vlc/distinfo:1.85 Tue Oct 26 11:01:19 2021 +++ pkgsrc/multimedia/vlc/distinfo Wed May 11 09:23:48 2022 @@ -1,13 +1,14 @@ -$NetBSD: distinfo,v 1.85 2021/10/26 11:01:19 nia Exp $ +$NetBSD: distinfo,v 1.86 2022/05/11 09:23:48 jperkin Exp $ -BLAKE2s (vlc-3.0.16.tar.xz) = 08bddc88354f431c871b0b4f84e57dc5ad228cc71a7e4aaecf107367ca92409c -SHA512 (vlc-3.0.16.tar.xz) = 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298 -Size (vlc-3.0.16.tar.xz) = 26439328 bytes +BLAKE2s (vlc-3.0.17.4.tar.xz) = 33035b5a032653fa6eefc0972fb0e65e738911f47e369ecdafd8eb1909412719 +SHA512 (vlc-3.0.17.4.tar.xz) = dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb +Size (vlc-3.0.17.4.tar.xz) = 26567148 bytes SHA1 (patch-compat_Makefile.am) = 1c3e0a7c4610c55c3ec9ba80d66b9959661139b3 -SHA1 (patch-configure.ac) = 99e975954323b4e94daeb75ce2ae439b49c51b0f +SHA1 (patch-configure.ac) = c869f5e43c2d3bed5c376fdb7e751e071326e6b0 SHA1 (patch-lib_core.c) = 8ec5557424e6ddc05cc365aacd1ec847d9a94605 SHA1 (patch-lib_video.c) = 362aaf7977c264bb70a79e98cf18da923ae62e39 -SHA1 (patch-m4_dolt.m4) = a1aac0c1021001a489f9b515e218904e065ed659 +SHA1 (patch-m4_dolt.m4) = 6cf8ef04cc09510132a12df16b95a13e90019878 SHA1 (patch-modules_access_http_Makefile.am) = d91904c6cba1a75a6872d042e4fe87ed9ce65a22 SHA1 (patch-modules_gui_qt_dialogs_plugins.cpp) = b5cffc0bd54fd07e77f891f6bca58132d333afdd +SHA1 (patch-modules_services__discovery_mtp.c) = 5b5b9b341c71a3273178493ae55fccb583f5bd59 SHA1 (patch-share_Makefile.am) = 4f126948c73159d06aef323b47a702442b5981e8 Index: pkgsrc/multimedia/vlc/patches/patch-configure.ac diff -u pkgsrc/multimedia/vlc/patches/patch-configure.ac:1.6 pkgsrc/multimedia/vlc/patches/patch-configure.ac:1.7 --- pkgsrc/multimedia/vlc/patches/patch-configure.ac:1.6 Tue Jul 2 20:52:13 2019 +++ pkgsrc/multimedia/vlc/patches/patch-configure.ac Wed May 11 09:23:48 2022 @@ -1,10 +1,28 @@ -$NetBSD: patch-configure.ac,v 1.6 2019/07/02 20:52:13 nia Exp $ +$NetBSD: patch-configure.ac,v 1.7 2022/05/11 09:23:48 jperkin Exp $ Fix pkg-config'ing for lua. ---- configure.ac.orig 2019-06-11 14:28:26.000000000 +0000 +--- configure.ac.orig 2022-04-18 22:10:15.000000000 +0000 +++ configure.ac -@@ -1619,12 +1619,12 @@ AC_ARG_ENABLE(lua, +@@ -1401,7 +1401,7 @@ asm volatile("xorps %%xmm1,%%xmm2"::"r"( + ]) + ]) + +- AS_IF([test "${ac_cv_sse_inline}" != "no" -a "${SYS}" != "solaris"], [ ++ AS_IF([test "${ac_cv_sse_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_SSE, 1, [Define to 1 if SSE inline assembly is available.]) + ]) + +@@ -1416,7 +1416,7 @@ asm volatile("punpckhqdq %%xmm1,%%xmm2": + ac_cv_sse2_inline=no + ]) + ]) +- AS_IF([test "${ac_cv_sse2_inline}" != "no" -a "${SYS}" != "solaris"], [ ++ AS_IF([test "${ac_cv_sse2_inline}" != "no"], [ + AC_DEFINE(CAN_COMPILE_SSE2, 1, [Define to 1 if SSE2 inline assembly is available.]) + have_sse2="yes" + ]) +@@ -1676,12 +1676,12 @@ AC_ARG_ENABLE(lua, [disable LUA scripting support (default enabled)])]) if test "${enable_lua}" != "no" then Index: pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4 diff -u pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4:1.1 pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4:1.2 --- pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4:1.1 Tue Jul 2 20:52:13 2019 +++ pkgsrc/multimedia/vlc/patches/patch-m4_dolt.m4 Wed May 11 09:23:48 2022 @@ -1,4 +1,4 @@ -$NetBSD: patch-m4_dolt.m4,v 1.1 2019/07/02 20:52:13 nia Exp $ +$NetBSD: patch-m4_dolt.m4,v 1.2 2022/05/11 09:23:48 jperkin Exp $ Add NetBSD to dolt.m4. The fallback using libtool does not work correctly. @@ -9,7 +9,7 @@ correctly. AS_CASE([$host], [*-*-linux*|*-*-freebsd*], [pic_options='-fPIC'], -+ [*-*-netbsd*], [pic_options='-fPIC -DPIC'], ++ [*-*-netbsd*|*solaris*], [pic_options='-fPIC -DPIC'], [*-apple-darwin*], [pic_options='-fno-common'], [*mingw*|*nacl*], [pic_options=''] [*], [dolt_supported=no] Added files: Index: pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c diff -u /dev/null pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c:1.3 --- /dev/null Wed May 11 09:23:49 2022 +++ pkgsrc/multimedia/vlc/patches/patch-modules_services__discovery_mtp.c Wed May 11 09:23:48 2022 @@ -0,0 +1,14 @@ +$NetBSD: patch-modules_services__discovery_mtp.c,v 1.3 2022/05/11 09:23:48 jperkin Exp $ + +Include strings.h for rindex(). + +--- modules/services_discovery/mtp.c.orig 2017-11-24 15:29:18.000000000 +0000 ++++ modules/services_discovery/mtp.c +@@ -30,6 +30,7 @@ + #include + + #include ++#include + + /***************************************************************************** + * Module descriptor --_----------=_16522610291610--