tags 983109 - wontfix tags 983109 + patch retitle 983109 Build vlc 3.0.17+ with srt support thanks
Hello all, providing some perspective, with my newly-acquired srt maintainer hat on, and directly adjusting this bug's metadata accordingly. On Fri, Feb 19, 2021 at 05:05:58PM +0100, Sebastian Ramacher wrote: > On 2021-02-19 16:34:48, Anton Lundin wrote: > > >From reading the rules file it looks like #962624 was the reason to not > > build vlc with srt support. It looks like that bug is fixed to me, and I > > think it would be nice to include srt support in vlc. > > > > > > I took a quick stab at building my own vlc with srt support but i got > > stpped by: > > [...] > > So, there is some incompatibility still left there. > > Given the recent commits > https://code.videolan.org/videolan/vlc-3.0/-/commit/3aad852a05d9a3b2469328cb9ea2e20b0acbce5c, > I don't expect vlc 3.0.x to gain support for srt 1.4.x. This needs to be > fixed upstream first. Once that's done, we can enable srt support again. Just for reference, development in the "vlc-3.0" repo as linked above has been discontinued in favor of the "vlc" repo. While the former only goes up to tag 3.0.14 the latter includes some even older commits that update SRT usage in VLC, cf. <https://code.videolan.org/videolan/vlc/-/commit/80b149ddf92226d12e71d4de6e6233f52b1ea2bb>. And these changes were released starting with tag 3.0.17 and are still present in the most recent 3.0.17.3 which was tagged yesterday, cf. | vlc master ± git diff 3.0.16..3.0.17 -- configure.ac | grep srt | -PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) | +PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) | vlc master ± git diff 3.0.16..3.0.17.3 -- configure.ac | grep srt | -PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) | +PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT]) I thus simply took upstream 3.0.17.3 and applied the Debian packaging from 3.0.16-1 to it, then also applied the attached patch and found the build completing fine, but now with SRT enabled again. The attached patch more or less reverts the commit 8663ed5 which disabled SRT usage back in 2020, cf. <https://salsa.debian.org/multimedia-team/vlc/-/commit/8663ed529c4c4ed0e35b013a83ccbb8578481b4b>. Here some relevant excerpts from the binary package debdiff: | New files in second set of .debs, found in package vlc-plugin-access-extra | -------------------------------------------------------------------------- | -rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/vlc/plugins/access/libaccess_srt_plugin.so | [...] | New files in second set of .debs, found in package vlc-plugin-base | ------------------------------------------------------------------ | -rw-r--r-- root/root /usr/lib/x86_64-linux-gnu/vlc/plugins/access_output/libaccess_output_srt_plugin.so | [...] | Control files of package vlc-plugin-access-extra: lines which differ (wdiff format) | ----------------------------------------------------------------------------------- | Depends: libc6 (>= 2.14), {+libsrt1.4-gnutls (>= 1.4.4),+} libvlccore9 (>= [-3.0.16),-] {+3.0.17.3),+} libvncclient1 (>= 0.9.10), libxcb-composite0, libxcb-shm0, libxcb1 (>= 1.6), vlc-plugin-abi-3-0-0f | [...] | Control files of package vlc-plugin-base: lines which differ (wdiff format) | --------------------------------------------------------------------------- | Depends: vlc-data (= [-3.0.16-1),-] {+3.0.17.3-0.1),+} liba52-0.7.4 (>= 0.7.4), libarchive13 (>= 3.1.2), libaribb24-0 (>= 1.0.3), libasound2 (>= 1.0.27), libass9 (>= 1:0.13.6), libavahi-client3 (>= 0.6.16), libavahi-common3 (>= 0.6.16), libavc1394-0 (>= 0.5.3), libavcodec58 (>= 7:4.4), libavformat58 (>= 7:4.4), libavutil56 (>= 7:4.4), libbluray2 (>= 1:1.0.0), libc6 (>= 2.33), libcairo2 (>= 1.13.1), libcddb2 (>= 1.3.2), libchromaprint1 (>= 1.3.2), libdav1d5 (>= 0.1.0), libdbus-1-3 (>= 1.9.14), libdc1394-25 (>= 2.2.6), libdca0 (>= 0.0.5), libdvbpsi10 (>= 1.3.0), libdvdnav4 (>= 6.1.0), libdvdread8 (>= 6.1.0), libebml5 (>= 1.4.2), libfaad2 (>= 2.7), libflac8 (>= 1.3.0), libfontconfig1 (>= 2.12.6), libfreetype6 (>= 2.2.1), libfribidi0 (>= 1.0.0), libgcc-s1 (>= 3.4), libgcrypt20 (>= 1.9.0), libglib2.0-0 (>= 2.28.0), libgnutls30 (>= 3.7.2), libgpg-error0 (>= 1.14), libharfbuzz0b (>= 0.9.4), libixml10 (>= 1:1.8.0), libjpeg62-turbo (>= 1.3.1), libkate1 (>= 0.3.0), liblirc-client0, liblua5.2-0 (>= 5.2.4), libmad0 (>= 0.15.1b-3), libmatroska7 (>= 1.6.3), libmpcdec6 (>= 1:0.1~r435), libmpeg2-4 (>= 0.5.1), libmpg123-0 (>= 1.28.0), libmtp9 (>= 1.1.0), libncursesw6 (>= 6), libnfs13 (>= 1.9.7), libogg0 (>= 1.1.0), libopenmpt-modplug1 (>= 0.2.7386~beta20.3), libopus0 (>= 1.1), libpng16-16 (>= 1.6.2-1), libpostproc55 (>= 7:4.4), libprotobuf-lite23 (>= 3.12.4), libpulse0 (>= 1.0), libraw1394-11 (>= 2.1.2), libresid-builder0c2a, librsvg2-2 (>= 2.14.4), libsamplerate0 (>= 0.1.7), libsdl-image1.2 (>= 1.2.10), libsdl1.2debian (>= 1.2.11), libsecret-1-0 (>= 0.7), libshine3 (>= 3.1.0), libshout3 (>= 2.2.2), libsidplay2, libsndio7.0 (>= [-1.1.0),-] {+1.8.1),+} libsoxr0 (>= 0.1.2), libspatialaudio0 (>= 0.3.0+git20180730+dfsg1), libspeex1 (>= 1.2~beta3-1), libspeexdsp1 (>= 1.2~beta3.2-1), {+libsrt1.4-gnutls (>= 1.4.4),+} libssh2-1 (>= 1.2.3), libstdc++6 (>= 11), libswscale5 (>= 7:4.4), libsystemd0, libtag1v5 (>= 1.9.1-2.2~), libtheora0 (>= 1.0), libtinfo6 (>= 6), libtwolame0 (>= 0.3.6), libudev1 (>= 183), libupnp13 (>= 1:1.8.3), libva-drm2 (>= 1.1.0), libva2 (>= 2.2.0), libvlccore9 (>= [-3.0.16),-] {+3.0.17.3),+} libvorbis0a (>= 1.1.2), libvorbisenc2 (>= 1.1.2), libx264-163 (>= 2:0.163.3060+git5db6aa6), libx265-199 (>= 3.5), libxcb-keysyms1 (>= 0.4.0), libxcb1, libxml2 (>= 2.7.4), libzvbi0 (>= 0.2.35), zlib1g (>= 1:1.1.4), vlc-plugin-abi-3-0-0f So, all in all please consider enabling SRT again in VLC, thanks. Some final notes: Yes, there were some warning around SRT parts during compilations, but apparently nothing fatal. Yes, I simply shied away from adjusting patch 0003 to apply cleanly, so I simply disabled it as it didn't matter to my build environment. And yes, I now saw that there were updates in the packaging repo on Salsa, but I had already started my work based on the released source package from the archives. Cheers, Flo
diff -Nru vlc-3.0.16/debian/changelog vlc-3.0.17.3/debian/changelog
--- vlc-3.0.16/debian/changelog 2021-06-21 21:07:16.000000000 +0200
+++ vlc-3.0.17.3/debian/changelog 2022-03-12 14:38:28.000000000 +0100
@@ -1,3 +1,11 @@
+vlc (3.0.17.3-0.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/:
+ - Reenable srt (Closes: #983109)
+
+ -- Florian Ernst <flor...@debian.org> Sat, 12 Mar 2022 14:38:28 +0100
+
vlc (3.0.16-1) unstable; urgency=medium
* Upload to unstable
diff -Nru vlc-3.0.16/debian/control vlc-3.0.17.3/debian/control
--- vlc-3.0.16/debian/control 2021-06-17 23:52:00.000000000 +0200
+++ vlc-3.0.17.3/debian/control 2022-03-12 14:38:28.000000000 +0100
@@ -91,6 +91,7 @@
libspatialaudio-dev,
libspeex-dev (>= 1.0.5),
libspeexdsp-dev (>= 1.0.5),
+ libsrt-gnutls-dev,
libssh2-1-dev,
libswscale-dev (>= 7:3.0),
libsystemd-dev [linux-any],
diff -Nru vlc-3.0.16/debian/patches/series vlc-3.0.17.3/debian/patches/series
--- vlc-3.0.16/debian/patches/series 2021-06-17 23:52:00.000000000 +0200
+++ vlc-3.0.17.3/debian/patches/series 2022-03-12 14:38:10.000000000 +0100
@@ -1,3 +1,3 @@
0001-configure-fix-linking-on-RISC-V-ISA.patch
0002-Revert-configure-Require-libmodplug-0.8.9.patch
-0003-Do-not-generate-cache-during-build.patch
+#0003-Do-not-generate-cache-during-build.patch
diff -Nru vlc-3.0.16/debian/rules vlc-3.0.17.3/debian/rules
--- vlc-3.0.16/debian/rules 2021-06-17 23:52:00.000000000 +0200
+++ vlc-3.0.17.3/debian/rules 2022-03-12 14:38:28.000000000 +0100
@@ -76,6 +76,7 @@
--enable-soxr \
--enable-spatialaudio \
--enable-speex \
+ --enable-srt \
--enable-svg \
--enable-svgdec \
--enable-taglib \
@@ -112,7 +113,6 @@
# projectm: broken
# schroedinger: removed from Debian (#845037)
# sparkle: MacOS X only
-# srt: broken package (#962624)
# telx: incompatible with zvbi
# vpx: not needed when having libavcodec
# vsxu: not in Debian
@@ -141,7 +141,6 @@
--disable-projectm \
--disable-schroedinger \
--disable-sparkle \
- --disable-srt \
--disable-telx \
--disable-vpx \
--disable-vsxu \
diff -Nru vlc-3.0.16/debian/vlc-plugin-access-extra.install
vlc-3.0.17.3/debian/vlc-plugin-access-extra.install
--- vlc-3.0.16/debian/vlc-plugin-access-extra.install 2021-06-11
20:56:47.000000000 +0200
+++ vlc-3.0.17.3/debian/vlc-plugin-access-extra.install 2022-03-12
14:38:28.000000000 +0100
@@ -1,2 +1,3 @@
usr/lib/*/vlc/plugins/access/libvnc_plugin.so
usr/lib/*/vlc/plugins/access/libxcb_screen_plugin.so
+usr/lib/*/vlc/plugins/access/libaccess_srt_plugin.so
signature.asc
Description: PGP signature
