Bug#1036678: unblock: ffmpeg/7:5.1.3-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please unblock package ffmpeg
[ Reason ]
ffmpeg releases stable updates with security fixes on a regular basis.
For Debian (old)stable, we publish these updates via DSAs. For bookworm,
we intend to follow 5.1.x release series. The upload to unstable updates
ffmpeg to the latest release of this series.
The upload also relaxes the dependencies between the shared library
packages (#1034315). They only need to be tight when internal avpriv
symbols are used.
[ Impact ]
Without the unblock, boomworm will be released with CVE-2022-3965 and
CVE-2022-3964 unfixed. Both are already fixed in bullseye.
[ Tests ]
ffmpeg has autopkgtests and a build time test suites. No regressions
where spotted. The new release was also in unstable for 40 days and no
regressions have been reported.
[ Risks ]
The changes to the dependencies come without risk due to the ffmpeg 4 ->
ffmpeg 5 transition. Upstream changes have a potential for regressions,
but they are usually fixed by upstream in the next stable release.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
[ Other info ]
The debdiff only includes the changes to debian/.
unblock ffmpeg/7:5.1.3-1
Cheers
--
Sebastian Ramacher
diff --git a/debian/changelog b/debian/changelog
index 2d2ec524..f4ed9fc6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+ffmpeg (7:5.1.3-1) unstable; urgency=medium
+
+ * New upstream version 5.1.3
+ * debian/patches: Drop patches from upstream
+ * debian/: Produce tight dependencies only for internal use of avpriv
+ symbols.
+
+ -- Sebastian Ramacher <sramacher@debian.org> Thu, 13 Apr 2023 01:09:42 +0200
+
ffmpeg (7:5.1.2-3) unstable; urgency=medium
* debian/rules: Disable more tests on ppc64 (Closes: #1022764)
diff --git a/debian/clean b/debian/clean
index b86b83b3..1fe0de74 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1 @@
-debian/shlibs.local
+debian/lib*.symbols
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 60cc8732..b896c047 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
[DEFAULT]
pristine-tar = True
-debian-branch = debian/master
-upstream-branch = upstream/latest
+debian-branch = debian/bookworm
+upstream-branch = upstream/bookworm
sign-tags = True
filter = */.git*
diff --git a/debian/libavcodec59.symbols b/debian/libavcodec59.symbols.in
similarity index 98%
rename from debian/libavcodec59.symbols
rename to debian/libavcodec59.symbols.in
index 676cc07d..a95d63bf 100644
--- a/debian/libavcodec59.symbols
+++ b/debian/libavcodec59.symbols.in
@@ -1,8 +1,9 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libavcodec.so.59 libavcodec59 #MINVER#
+| libavcodec59 (= @DEB_VERSION@)
* Build-Depends-Package: libavcodec-dev
- LIBAVCODEC_59@LIBAVCODEC_59 7:5.1
- (optional|regex)^avpriv_ 0
+ LIBAVCODEC_59@LIBAVCODEC_59 @DEB_VERSION_EPOCH_UPSTREAM@
+ (regex)^avpriv_ 0 1
av_ac3_parse_header@LIBAVCODEC_59 7:5.0
av_adts_header_parse@LIBAVCODEC_59 7:5.0
av_alloc_vdpaucontext@LIBAVCODEC_59 7:5.0
diff --git a/debian/libavdevice59.symbols b/debian/libavdevice59.symbols.in
similarity index 94%
rename from debian/libavdevice59.symbols
rename to debian/libavdevice59.symbols.in
index c962376e..16207f80 100644
--- a/debian/libavdevice59.symbols
+++ b/debian/libavdevice59.symbols.in
@@ -1,7 +1,7 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libavdevice.so.59 libavdevice59 #MINVER#
* Build-Depends-Package: libavdevice-dev
- LIBAVDEVICE_59@LIBAVDEVICE_59 7:5.1
+ LIBAVDEVICE_59@LIBAVDEVICE_59 @DEB_VERSION_EPOCH_UPSTREAM@
av_device_capabilities@LIBAVDEVICE_59 7:5.0
av_device_ffversion@LIBAVDEVICE_59 7:5.0
av_input_audio_device_next@LIBAVDEVICE_59 7:5.0
diff --git a/debian/libavfilter8.symbols b/debian/libavfilter8.symbols.in
similarity index 97%
rename from debian/libavfilter8.symbols
rename to debian/libavfilter8.symbols.in
index 260978d4..2df6307b 100644
--- a/debian/libavfilter8.symbols
+++ b/debian/libavfilter8.symbols.in
@@ -1,7 +1,7 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libavfilter.so.8 libavfilter8 #MINVER#
* Build-Depends-Package: libavfilter-dev
- LIBAVFILTER_8@LIBAVFILTER_8 7:5.1
+ LIBAVFILTER_8@LIBAVFILTER_8 @DEB_VERSION_EPOCH_UPSTREAM@
av_abuffersink_params_alloc@LIBAVFILTER_8 7:5.0
av_buffersink_get_ch_layout@LIBAVFILTER_8 7:5.1
av_buffersink_get_channel_layout@LIBAVFILTER_8 7:5.0
diff --git a/debian/libavformat59.symbols b/debian/libavformat59.symbols.in
similarity index 98%
rename from debian/libavformat59.symbols
rename to debian/libavformat59.symbols.in
index 8646e68b..6af1d3c1 100644
--- a/debian/libavformat59.symbols
+++ b/debian/libavformat59.symbols.in
@@ -1,8 +1,9 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libavformat.so.59 libavformat59 #MINVER#
+| libavformat59 (= @DEB_VERSION@)
* Build-Depends-Package: libavformat-dev
- (optional|regex)^avpriv_ 0
- LIBAVFORMAT_59@LIBAVFORMAT_59 7:5.1
+ (regex)^avpriv_ 0 1
+ LIBAVFORMAT_59@LIBAVFORMAT_59 @DEB_VERSION_EPOCH_UPSTREAM@
av_add_index_entry@LIBAVFORMAT_59 7:5.0
av_append_packet@LIBAVFORMAT_59 7:5.0
av_codec_get_id@LIBAVFORMAT_59 7:5.0
diff --git a/debian/libavutil57.symbols b/debian/libavutil57.symbols.in
similarity index 99%
rename from debian/libavutil57.symbols
rename to debian/libavutil57.symbols.in
index 67928e3b..9e4b0a99 100644
--- a/debian/libavutil57.symbols
+++ b/debian/libavutil57.symbols.in
@@ -1,8 +1,9 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libavutil.so.57 libavutil57 #MINVER#
+| libavutil57 (= @DEB_VERSION@)
* Build-Depends-Package: libavutil-dev
- LIBAVUTIL_57@LIBAVUTIL_57 7:5.1
- (optional|regex)^avpriv_ 0
+ LIBAVUTIL_57@LIBAVUTIL_57 @DEB_VERSION_EPOCH_UPSTREAM@
+ (regex)^avpriv_ 0 1
av_add_i@LIBAVUTIL_57 7:5.0
av_add_q@LIBAVUTIL_57 7:5.0
av_add_stable@LIBAVUTIL_57 7:5.0
diff --git a/debian/libpostproc56.symbols b/debian/libpostproc56.symbols.in
similarity index 89%
rename from debian/libpostproc56.symbols
rename to debian/libpostproc56.symbols.in
index dc68ff9f..a38f6095 100644
--- a/debian/libpostproc56.symbols
+++ b/debian/libpostproc56.symbols.in
@@ -1,7 +1,7 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libpostproc.so.56 libpostproc56 #MINVER#
* Build-Depends-Package: libpostproc-dev
- LIBPOSTPROC_56@LIBPOSTPROC_56 7:5.1
+ LIBPOSTPROC_56@LIBPOSTPROC_56 @DEB_VERSION_EPOCH_UPSTREAM@
postproc_configuration@LIBPOSTPROC_56 7:5.0
postproc_ffversion@LIBPOSTPROC_56 7:5.0
postproc_license@LIBPOSTPROC_56 7:5.0
diff --git a/debian/libswresample4.symbols b/debian/libswresample4.symbols.in
similarity index 94%
rename from debian/libswresample4.symbols
rename to debian/libswresample4.symbols.in
index 01ff8c5b..f61e963c 100644
--- a/debian/libswresample4.symbols
+++ b/debian/libswresample4.symbols.in
@@ -1,7 +1,7 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libswresample.so.4 libswresample4 #MINVER#
* Build-Depends-Package: libswresample-dev
- LIBSWRESAMPLE_4@LIBSWRESAMPLE_4 7:5.1
+ LIBSWRESAMPLE_4@LIBSWRESAMPLE_4 @DEB_VERSION_EPOCH_UPSTREAM@
swr_alloc@LIBSWRESAMPLE_4 7:5.0
swr_alloc_set_opts2@LIBSWRESAMPLE_4 7:5.1
swr_alloc_set_opts@LIBSWRESAMPLE_4 7:5.0
diff --git a/debian/libswscale6.symbols b/debian/libswscale6.symbols.in
similarity index 96%
rename from debian/libswscale6.symbols
rename to debian/libswscale6.symbols.in
index 1e5f8401..e95d5982 100644
--- a/debian/libswscale6.symbols
+++ b/debian/libswscale6.symbols.in
@@ -1,7 +1,7 @@
# SymbolsHelper-Confirmed: 7:5.0 amd64
libswscale.so.6 libswscale6 #MINVER#
* Build-Depends-Package: libswscale-dev
- LIBSWSCALE_6@LIBSWSCALE_6 7:5.1
+ LIBSWSCALE_6@LIBSWSCALE_6 @DEB_VERSION_EPOCH_UPSTREAM@
sws_allocVec@LIBSWSCALE_6 7:5.0
sws_alloc_context@LIBSWSCALE_6 7:5.0
sws_alloc_set_opts@LIBSWSCALE_6 7:5.0
diff --git a/debian/patches/0001-hwcontext_vulkan-remove-optional-encode-decode-exten.patch b/debian/patches/0001-hwcontext_vulkan-remove-optional-encode-decode-exten.patch
deleted file mode 100644
index fc27b168..00000000
--- a/debian/patches/0001-hwcontext_vulkan-remove-optional-encode-decode-exten.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Lynne <dev@lynne.ee>
-Date: Sun, 25 Dec 2022 01:03:30 +0100
-Subject: hwcontext_vulkan: remove optional encode/decode extensions from the
- list
-
-They're not currently used, so they don't need to be there.
-Vulkan stabilized the decode extensions less than a week ago, and their
-name prefixes were changed from EXT to KHR. It's a bit too soon to be
-depending on it, so rather than bumping, just remove these for now.
-
-(cherry picked from commit eb0455d64690eed0068e5cb202f72ecdf899837c)
----
- libavutil/hwcontext_vulkan.c | 8 --------
- 1 file changed, 8 deletions(-)
-
-diff --git a/libavutil/hwcontext_vulkan.c b/libavutil/hwcontext_vulkan.c
-index 237caa4..3bc0dc8 100644
---- a/libavutil/hwcontext_vulkan.c
-+++ b/libavutil/hwcontext_vulkan.c
-@@ -354,14 +354,6 @@ static const VulkanOptExtension optional_device_exts[] = {
- { VK_KHR_EXTERNAL_MEMORY_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_MEMORY },
- { VK_KHR_EXTERNAL_SEMAPHORE_WIN32_EXTENSION_NAME, FF_VK_EXT_EXTERNAL_WIN32_SEM },
- #endif
--
-- /* Video encoding/decoding */
-- { VK_KHR_VIDEO_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_KHR_VIDEO_DECODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_KHR_VIDEO_ENCODE_QUEUE_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_EXT_VIDEO_ENCODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_EXT_VIDEO_DECODE_H264_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
-- { VK_EXT_VIDEO_DECODE_H265_EXTENSION_NAME, FF_VK_EXT_NO_FLAG },
- };
-
- /* Converts return values to strings */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index cf1247f7..00000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-hwcontext_vulkan-remove-optional-encode-decode-exten.patch
diff --git a/debian/rules b/debian/rules
index 74fe31ef..4e26bcd8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -326,21 +326,14 @@ override_dh_install:
dh_install $(addprefix -p,$(EXTRA_PKGS)) --sourcedir=debian/tmp/extra
dh_install --remaining-packages
-override_dh_shlibdeps:
- $(RM) debian/shlibs.local
- set -e && for pkg in $(SHLIB_PKGS); do \
- lib=`echo $$pkg | sed 's/\([a-z]*\)\([0-9]*\)/\1/'`; \
- abi=`echo $$pkg | sed 's/\([a-z]*\)\([0-9]*\)/\2/'`; \
- ver=${DEB_VERSION}; \
- echo "$$lib $$abi $$pkg (= $$ver)" >> debian/shlibs.local; \
- done
+debian/%.symbols: debian/%.symbols.in
+ sed 's/@DEB_VERSION@/${DEB_VERSION}/;s/@DEB_VERSION_EPOCH_UPSTREAM@/${DEB_VERSION_EPOCH_UPSTREAM}/' $< > $@
+
+execute_before_dh_makeshlibs: $(patsubst %,debian/%.symbols,$(SHLIB_PKGS))
set -e && for pkg in $(EXTRA_PKGS); do \
mainpkg=`echo $$pkg | sed 's/-extra//'`; \
cp -f debian/$$mainpkg.symbols debian/$$pkg.symbols; \
- dh_shlibdeps -p$$pkg; \
- rm -f debian/$$pkg.symbols; \
done
- dh_shlibdeps --remaining-packages
# avoid error: Unknown DWARF DW_OP_0
override_dh_dwz:
Reply to: