[PR PATCH] update: ffmpeg to 5.1.2 [Draft]

[PR PATCH] update: ffmpeg to 5.1.2 [Draft]

[absrd]

[-- Attachment #1: Type: text/plain, Size: 1234 bytes --]

There is a new pull request by absrd against master on the void-packages repository

https://github.com/absrd/void-packages ffmpeg
https://github.com/void-linux/void-packages/pull/41470

update: ffmpeg to 5.1.2 [Draft]
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->


A patch file from https://github.com/void-linux/void-packages/pull/41470.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-ffmpeg-41470.patch --]
[-- Type: text/x-diff, Size: 4893 bytes --]

From 1b289af13b24d108c3e30cf5f3ac70cda202aaa8 Mon Sep 17 00:00:00 2001
From: Felix Kleinschmidt <fk@bsrd.io>
Date: Thu, 5 Jan 2023 09:25:23 -0300
Subject: [PATCH] update: ffmpeg to 5.1.2

---
 common/shlibs           | 17 ++++++++---------
 srcpkgs/ffmpeg/template | 17 +++++------------
 srcpkgs/libavresample   |  1 -
 srcpkgs/moc/template    |  2 +-
 srcpkgs/mpd/template    |  2 +-
 srcpkgs/mpv/template    |  2 +-
 6 files changed, 16 insertions(+), 25 deletions(-)
 delete mode 120000 srcpkgs/libavresample

diff --git a/common/shlibs b/common/shlibs
index 52a6d3e6d5fb..016ddc5bfd5b 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -391,15 +391,14 @@ libid3tag.so.0 libid3tag-0.15.1b_1
 libgif.so.7 giflib-5.1.0_1
 libImlib2.so.1 imlib2-1.4.2_1
 libmp3lame.so.0 lame-3.98.2_1
-libavdevice.so.58 libavdevice-4.0_1
-libavformat.so.58 libavformat-4.0_1
-libswscale.so.5 libswscale-4.0_1
-libswresample.so.3 libswresample-4.0_1
-libavresample.so.4 libavresample-4.0_1
-libpostproc.so.55 libpostproc-4.0_1
-libavcodec.so.58 libavcodec-4.0_1
-libavutil.so.56 libavutil-4.0_1
-libavfilter.so.7 libavfilter-4.0_1
+libavdevice.so.59 libavdevice-5.1.2_1
+libavformat.so.59 libavformat-5.1.2_1
+libswscale.so.6 libswscale-5.1.2_1
+libswresample.so.4 libswresample-5.1.2_1
+libpostproc.so.56 libpostproc-5.1.2_1
+libavcodec.so.59 libavcodec-5.1.2_1
+libavutil.so.57 libavutil-5.1.2_1
+libavfilter.so.8 libavfilter-5.1.2_1
 libSDL-1.2.so.0 SDL-1.2.14_1
 libSDL_image-1.2.so.0 SDL_image-1.2.10_1
 libx264.so.157 x264-20190507.2245_1
diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 23a3d5c9967b..8a2653d7953a 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,15 +1,15 @@
 # Template file for 'ffmpeg'
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
-version=4.4.3
-revision=2
+version=5.1.2
+revision=1
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
 homepage="https://www.ffmpeg.org"
 changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
 distfiles="https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
-checksum=6c5b6c195e61534766a0b5fe16acc919170c883362612816d0a1c7f4f947006e
+checksum=619e706d662c8420859832ddc259cd4d4096a48a2ce1eefd052db9e440eef3dc
 
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
@@ -114,7 +114,7 @@ do_configure() {
 		$(vopt_enable x265 libx265) \
 		$(vopt_enable v4l2 libv4l2) \
 		$(vopt_enable aom libaom) $(vopt_enable vaapi) $(vopt_enable vdpau) \
-		--enable-libbs2b --enable-avresample --enable-libvidstab \
+		--enable-libbs2b --enable-libvidstab \
 		$(vopt_enable dav1d libdav1d) \
 		$(vopt_enable zimg libzimg) \
 		$(vopt_enable webp libwebp) \
@@ -147,12 +147,6 @@ libavdevice_package() {
 		vmove "usr/lib/libavdevice.so.*"
 	}
 }
-libavresample_package() {
-	short_desc="FFmpeg audio resampling library"
-	pkg_install() {
-		vmove "usr/lib/libavresample.so.*"
-	}
-}
 libavformat_package() {
 	short_desc="FFmpeg file format library"
 	pkg_install() {
@@ -198,8 +192,7 @@ ffmpeg-devel_package() {
 		libavfilter>=${version}_${revision}
 		libpostproc>=${version}_${revision}
 		libswscale>=${version}_${revision}
-		libswresample>=${version}_${revision}
-		libavresample>=${version}_${revision}"
+		libswresample>=${version}_${revision}"
 	short_desc+=" - development files"
 	pkg_install() {
 		vmove usr/include
diff --git a/srcpkgs/libavresample b/srcpkgs/libavresample
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/libavresample
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/moc/template b/srcpkgs/moc/template
index c42be650a1d2..4b95426599bf 100644
--- a/srcpkgs/moc/template
+++ b/srcpkgs/moc/template
@@ -1,7 +1,7 @@
 # Template file for 'moc'
 pkgname=moc
 version=2.5.2
-revision=6
+revision=7
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="db-devel ncurses-devel libcurl-devel popt-devel ffmpeg-devel
diff --git a/srcpkgs/mpd/template b/srcpkgs/mpd/template
index a20516becd04..63543c230c3d 100644
--- a/srcpkgs/mpd/template
+++ b/srcpkgs/mpd/template
@@ -1,7 +1,7 @@
 # Template file for 'mpd'
 pkgname=mpd
 version=0.23.11
-revision=1
+revision=2
 build_style=meson
 configure_args="-Dopus=enabled -Dmikmod=enabled -Dneighbor=true
  -Dsoundcloud=enabled -Dpipe=true -Dtwolame=enabled -Dbzip2=enabled
diff --git a/srcpkgs/mpv/template b/srcpkgs/mpv/template
index 5dcef38aa241..74e94bc4451e 100644
--- a/srcpkgs/mpv/template
+++ b/srcpkgs/mpv/template
@@ -1,7 +1,7 @@
 # Template file for 'mpv'
 pkgname=mpv
 version=0.35.0
-revision=2
+revision=3
 build_style=meson
 configure_args="-Dcdda=enabled -Ddvbin=enabled -Ddvdnav=enabled
  -Dlibmpv=true -Dcplugins=enabled

Re: update: ffmpeg to 5.1.2 [Draft]

[Danoloan10]

[-- Attachment #1: Type: text/plain, Size: 410 bytes --]

New comment by Danoloan10 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1372913630

Comment:
This package has so many dependencies (`grep "depends=.*ffmpeg" srcpkgs/**/template | wc -l` gives 12000+). And this update is quite breaking apparently. How should we go on about verifying the update? Should a new ffmpeg4 package be introduced while transitioning?

Re: update: ffmpeg to 5.1.2 [Draft]

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1373364032

Comment:
Excluding symlinks, we don't even have 12k total templates!

https://github.com/void-linux/void-packages/pull/36315 has significant work regarding this.

Re: update: ffmpeg to 5.1.2 [Draft]

[Danoloan10]

[-- Attachment #1: Type: text/plain, Size: 265 bytes --]

New comment by Danoloan10 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1373880698

Comment:
That's right, didn't think about the symlinks... That PR has some impressive work. There many broken dependencies yet :(

Re: update: ffmpeg to 5.1.2 [Draft]

[Johnnynator]

[-- Attachment #1: Type: text/plain, Size: 270 bytes --]

New comment by Johnnynator on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1374032508

Comment:
The `xrevshlib` tool in xtools can be used to find all the packages that do link against ffmpeg (or one of its subpackages).

Re: update: ffmpeg to 5.1.2 [Draft]

[motorto]

[-- Attachment #1: Type: text/plain, Size: 389 bytes --]

New comment by motorto on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1410762605

Comment:
Would it be acceptable to create an ffmpeg4.4 package and a ffmpeg (that tracks the upstream version) ? 

This would make it possible to update the ffmpeg, and the packages that don't build with 5.0 uses the 4.4 package.

@Johnnynator @paper42

Re: update: ffmpeg to 5.1.2 [Draft]

[milgra]

[-- Attachment #1: Type: text/plain, Size: 345 bytes --]

New comment by milgra on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1455206831

Comment:
Hi, my programs also need ffmpeg5 so it would be nice if we could make this work. What about creating an ffmpeg5 package so nothing breaks? I don't know what to put into common/shlibs in that case though.

Re: update: ffmpeg to 5.1.2 [Draft]

[paper42]

[-- Attachment #1: Type: text/plain, Size: 803 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1455213426

Comment:
This PR is failing all checks, is missing a lot of revbumps and didn't get any attention from the author since it was opened. If anyone is interested in continuing this work, please open a new PR and base it on @tibequadorian's work linked above which was way more complete and wasn't just a simple revbump (which this update definitely isn't).

It would be acceptable to have a ffmpeg4 package and switch all packages that don't work with ffmpeg5 to it if:
* there are important packages that don't work and can not be made to work with ffmpeg5 reliably
* at the same time, ffmpeg is updated to v5 and all packages that work with it get rebuilt with ffmpeg (5)

Re: update: ffmpeg to 5.1.2 [Draft]

[paper42]

[-- Attachment #1: Type: text/plain, Size: 818 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1455213426

Comment:
This PR is failing all checks, is missing a lot of revbumps and didn't get any attention from the author since it was opened. If anyone is interested in continuing this work, please open a new PR and base it on @tibequadorian's work linked above which was way more complete and wasn't just a simple revbump (which this update definitely isn't).

It would be acceptable to have a ffmpeg4 package and switch all packages that don't work with ffmpeg 5 to it if:
* there are important packages that don't work with ffmpeg 5 and can not be made to work with ffmpeg 5 reliably
* at the same time, ffmpeg is updated to v5 and all packages that work with it get rebuilt for ffmpeg (5)

Re: update: ffmpeg to 5.1.2 [Draft]

[zlice]

[-- Attachment #1: Type: text/plain, Size: 431 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475297910

Comment:
> It would be acceptable to have a ffmpeg4 package and switch all packages that don't work with ffmpeg 5 to it if ...

Have an example package of how this works? I see `mlt`(6) and `mlt7` but I'm not seeing where the binary becomes `melt` vs `melt-7` unless it's in makefiles or something.

Re: update: ffmpeg to 5.1.2 [Draft]

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 149 bytes --]

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475308800

Comment:
wlroots

Re: update: ffmpeg to 5.1.2 [Draft]

[zlice]

[-- Attachment #1: Type: text/plain, Size: 180 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475310789

Comment:
What about something with a binary(ies)?

Re: update: ffmpeg to 5.1.2 [Draft]

[zlice]

[-- Attachment #1: Type: text/plain, Size: 248 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475310789

Comment:
What about something with a binary(ies)?

edit: i guess i should specify, something in /bin, not a library

Re: update: ffmpeg to 5.1.2 [Draft]

[icp1994]

[-- Attachment #1: Type: text/plain, Size: 145 bytes --]

New comment by icp1994 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475312819

Comment:
lua

Re: update: ffmpeg to 5.1.2 [Draft]

[paper42]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475397890

Comment:
> lua

lua uses versioned packages and the lua package is just an transitional empty package pointing to one version for backwards compatibility

Re: update: ffmpeg to 5.1.2 [Draft]

[paper42]

[-- Attachment #1: Type: text/plain, Size: 309 bytes --]

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475397890

Comment:
> lua

lua uses versioned packages (lua51, lua52, etc.) and the lua package is just an transitional empty package pointing to one version for backwards compatibility

Re: update: ffmpeg to 5.1.2 [Draft]

[zlice]

[-- Attachment #1: Type: text/plain, Size: 261 bytes --]

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1475429339

Comment:
> lua uses versioned packages ...

will splitting ffmpeg to 4 and 5 with 'alternatives' like lua and php not work then?

Re: update: ffmpeg to 5.1.2 [Draft]

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 305 bytes --]

New comment by github-actions[bot] on void-packages repository

https://github.com/void-linux/void-packages/pull/41470#issuecomment-1595925260

Comment:
Pull Requests become stale 90 days after last activity and are closed 14 days after that.  If this pull request is still relevant bump it or assign it.

Re: [PR PATCH] [Closed]: update: ffmpeg to 5.1.2 [Draft]

[github-actions]

[-- Attachment #1: Type: text/plain, Size: 1088 bytes --]

There's a closed pull request on the void-packages repository

update: ffmpeg to 5.1.2 [Draft]
https://github.com/void-linux/void-packages/pull/41470

Description:
<!-- Uncomment relevant sections and delete options which are not applicable -->

#### Testing the changes
- I tested the changes in this PR: YES

<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->

<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - aarch64-musl
  - armv7l
  - armv6l-musl
-->