Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] New package: ffmpeg7-7.1_1
@ 2025-01-04 18:59 mmdbalkhi
  2025-01-04 19:14 ` [PR REVIEW] " classabbyamp
                   ` (31 more replies)
  0 siblings, 32 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 18:59 UTC (permalink / raw)
  To: ml

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

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

https://github.com/mmdbalkhi/void-packages ffmpeg7
https://github.com/void-linux/void-packages/pull/53844

New package: ffmpeg7-7.1_1
#### 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**

<!-- 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, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ~~arch64-musl~~
  - ~~armv7l~~
  - ~~armv6l-musl~~

cc: @classabbyamp 


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

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

From ecc5f4a2558d7bf192d045ad67a18ae61421d8b9 Mon Sep 17 00:00:00 2001
From: Komeil Parseh <ahmdparsh129@gmail.com>
Date: Sat, 4 Jan 2025 22:08:26 +0330
Subject: [PATCH] New package: ffmpeg7-7.1_1

---
 srcpkgs/ffmpeg7-devel    |   1 +
 srcpkgs/ffmpeg7/template | 202 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/ffplay7          |   1 +
 srcpkgs/libavcodec7      |   1 +
 srcpkgs/libavdevice7     |   1 +
 srcpkgs/libavfilter7     |   1 +
 srcpkgs/libavformat7     |   1 +
 srcpkgs/libavresample7   |   1 +
 srcpkgs/libavutil7       |   1 +
 srcpkgs/libpostproc7     |   1 +
 srcpkgs/libswresample7   |   1 +
 srcpkgs/libswscale7      |   1 +
 12 files changed, 213 insertions(+)
 create mode 120000 srcpkgs/ffmpeg7-devel
 create mode 100644 srcpkgs/ffmpeg7/template
 create mode 120000 srcpkgs/ffplay7
 create mode 120000 srcpkgs/libavcodec7
 create mode 120000 srcpkgs/libavdevice7
 create mode 120000 srcpkgs/libavfilter7
 create mode 120000 srcpkgs/libavformat7
 create mode 120000 srcpkgs/libavresample7
 create mode 120000 srcpkgs/libavutil7
 create mode 120000 srcpkgs/libpostproc7
 create mode 120000 srcpkgs/libswresample7
 create mode 120000 srcpkgs/libswscale7

diff --git a/srcpkgs/ffmpeg7-devel b/srcpkgs/ffmpeg7-devel
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/ffmpeg7-devel
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/ffmpeg7/template b/srcpkgs/ffmpeg7/template
new file mode 100644
index 00000000000000..d2122cbf56a504
--- /dev/null
+++ b/srcpkgs/ffmpeg7/template
@@ -0,0 +1,202 @@
+# Template file for 'ffmpeg7'
+pkgname=ffmpeg7
+version=7.1
+revision=1
+_arch="x86_64"
+hostmakedepends="git automake autoconf pkg-config"
+makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
+	libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
+	libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+	libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
+	speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+	libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
+	x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
+	libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
+	zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
+	$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
+	$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
+
+maintainer="Komeil Parseh <ahmdparsh129@gmail.com>"
+short_desc="Decoding, encoding and streaming software"
+license="GPL-3.0-or-later"
+homepage="https://www.ffmpeg.org"
+changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
+distfiles="https://ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
+checksum="40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6"
+
+build_options="vaapi vdpau fdk_aac nvcodec onevpl"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+		build_options_default+=" vaapi vdpau nvcodec"
+		hostmakedepends+=" nasm"
+		;;
+	x86_64*)
+			hostmakedepends+=" nasm"
+			build_options_default+=" vaapi vdpau nvcodec onevpl"
+			;;
+	ppc64*)
+		build_options_default+=" vaapi vdpau"
+		;;
+	mips*)
+		CFLAGS="-mnan=legacy";;
+esac
+
+do_configure() {
+		# Fix gcc on x86_64-musl only
+		if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+				vsed -i configure -e "s;_cflags_speed='-O3';_cflags_speed='-O2';"
+		fi
+
+		if [ "$CROSS_BUILD" ]; then
+				case "$XBPS_TARGET_MACHINE" in
+						arm*) _arch="arm";;
+						aarch64*) _arch="aarch64";;
+						mips*) _arch="mips";;
+						ppc64*) _arch="ppc64";;
+						ppc*) _arch="ppc";;
+						*) _arch="${XBPS_TARGET_MACHINE%%-musl}";;
+				esac
+
+				_args+=" --enable-cross-compile
+						--sysroot=$XBPS_CROSS_BASE
+						--cross-prefix=${XBPS_CROSS_TRIPLET}-
+						--target-os=linux --arch=${_arch}"
+		fi
+
+		case "$XBPS_TARGET_MACHINE" in
+				ppc|ppc-musl) _args+=" --disable-altivec";;
+		esac
+
+		./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \
+				--disable-stripping \
+				--enable-libcdio --enable-version3 --enable-runtime-cpudetect \
+				--enable-libmp3lame --enable-libvorbis --enable-libxvid \
+				--enable-libx264 --enable-libvpx --enable-libtheora \
+				--enable-shared --enable-static --enable-libxcb \
+				--enable-libpulse --enable-libfreetype --enable-libmodplug \
+				--enable-libspeex --enable-libcelt --enable-libass \
+				--enable-libopus --enable-librtmp --enable-libjack \
+				--disable-libopencore_amrnb --disable-libopencore_amrwb \
+				--disable-libopenjpeg --enable-libbluray \
+				--enable-postproc --enable-opencl --enable-libvmaf ${_args} \
+				--enable-libx265 --enable-libv4l2 --enable-libaom \
+				--enable-libbs2b --enable-libvidstab --enable-libdav1d \
+				--enable-libsrt --enable-librist --enable-libwebp \
+				--enable-vulkan --enable-libdrm --enable-libsvtav1 \
+				--enable-libfreetype --enable-libharfbuzz --enable-libfontconfig \
+				$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
+				$(vopt_enable vaapi) $(vopt_enable vdpau) \
+				$(vopt_enable zimg libzimg) \
+				$(vopt_enable sofa libmysofa) \
+				$(vopt_enable onevpl libvpl) \
+				$(vopt_enable nvcodec nvenc) \
+				$(vopt_enable nvcodec nvdec)
+
+}
+
+do_build() {
+		make ${makejobs}
+		make doc/ff{mpeg,play}.1
+}
+
+do_install() {
+		make DESTDIR=${DESTDIR} install install-man
+}
+
+libavcodec7_package() {
+		short_desc="FFmpeg codec library"
+		pkg_install() {
+				vmove "usr/lib/libavcodec.so.*"
+		}
+}
+
+libavdevice7_package() {
+		short_desc="FFmpeg device handling library"
+		pkg_install() {
+				vmove "usr/lib/libavdevice.so.*"
+		}
+}
+
+libavresample7_package() {
+		short_desc="Package deprecated, removal needed"
+		build_style=meta
+}
+
+libavformat7_package() {
+		short_desc="FFmpeg file format library"
+		pkg_install() {
+				vmove "usr/lib/libavformat.so.*"
+		}
+}
+
+libavutil7_package() {
+		short_desc="FFmpeg utility library"
+		pkg_install() {
+				vmove "usr/lib/libavutil.so.*"
+		}
+}
+
+libavfilter7_package() {
+		short_desc="FFmpeg audio/video filter library"
+		pkg_install() {
+				vmove "usr/lib/libavfilter.so.*"
+		}
+}
+
+libpostproc7_package() {
+		short_desc="FFmpeg video postprocessing library"
+		pkg_install() {
+				vmove "usr/lib/libpostproc.so.*"
+		}
+}
+
+libswscale7_package() {
+		short_desc="FFmpeg video scaling library"
+		pkg_install() {
+				vmove "usr/lib/libswscale.so.*"
+		}
+}
+
+libswresample7_package() {
+		short_desc="FFmpeg video resampling library"
+		pkg_install() {
+				vmove "usr/lib/libswresample.so.*"
+		}
+}
+
+ffmpeg7-devel_package() {
+		depends="
+				libavcodec7>=${version}_${revision}
+				libavdevice7>=${version}_${revision}
+				libavformat7>=${version}_${revision}
+				libavutil7>=${version}_${revision}
+				libavfilter7>=${version}_${revision}
+				libpostproc7>=${version}_${revision}
+				libswscale7>=${version}_${revision}
+				libswresample7>=${version}_${revision}"
+		short_desc+=" - development files"
+		conflicts="ffmpeg-devel"
+		replaces="ffmpeg-devel>=0"
+		case "$XBPS_TARGET_MACHINE" in
+				i686*)
+				# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
+				nostrip_files="/usr/lib/libavfilter.a";;
+		esac
+		pkg_install() {
+				vmove usr/include
+				vmove usr/lib/pkgconfig
+				vmove "usr/lib/*.a"
+				vmove "usr/lib/*.so"
+				vmove usr/share/ffmpeg/examples
+				vmove usr/share/man/man3
+		}
+}
+
+ffplay7_package() {
+		short_desc="Simple video player using FFmpeg and SDL2"
+		pkg_install() {
+				vmove usr/bin/ffplay
+				vmove "usr/share/man/man1/ffplay*"
+		}
+}
diff --git a/srcpkgs/ffplay7 b/srcpkgs/ffplay7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/ffplay7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavcodec7 b/srcpkgs/libavcodec7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavcodec7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavdevice7 b/srcpkgs/libavdevice7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavdevice7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavfilter7 b/srcpkgs/libavfilter7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavfilter7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavformat7 b/srcpkgs/libavformat7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavformat7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavresample7 b/srcpkgs/libavresample7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavresample7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavutil7 b/srcpkgs/libavutil7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavutil7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libpostproc7 b/srcpkgs/libpostproc7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libpostproc7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libswresample7 b/srcpkgs/libswresample7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libswresample7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libswscale7 b/srcpkgs/libswscale7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libswscale7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (2 preceding siblings ...)
  2025-01-04 19:14 ` classabbyamp
@ 2025-01-04 19:14 ` classabbyamp
  2025-01-04 19:28 ` zlice
                   ` (27 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2025-01-04 19:14 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903141269

Comment:
what's this?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
@ 2025-01-04 19:14 ` classabbyamp
  2025-01-04 19:14 ` classabbyamp
                   ` (30 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2025-01-04 19:14 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903141231

Comment:
indent string continuations with a single space

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
  2025-01-04 19:14 ` [PR REVIEW] " classabbyamp
  2025-01-04 19:14 ` classabbyamp
@ 2025-01-04 19:14 ` classabbyamp
  2025-01-04 19:14 ` classabbyamp
                   ` (28 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2025-01-04 19:14 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903141212

Comment:
there are double indents from this line onwards

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
  2025-01-04 19:14 ` [PR REVIEW] " classabbyamp
@ 2025-01-04 19:14 ` classabbyamp
  2025-01-04 19:14 ` classabbyamp
                   ` (29 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2025-01-04 19:14 UTC (permalink / raw)
  To: ml

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

New review comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903141289

Comment:
needs to conflict/replace with other ffmpeg*-devel too

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (3 preceding siblings ...)
  2025-01-04 19:14 ` classabbyamp
@ 2025-01-04 19:28 ` zlice
  2025-01-04 19:29 ` [PR REVIEW] " mmdbalkhi
                   ` (26 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-04 19:28 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571390308

Comment:
will try to build to cluster-f of dep packages tonight unless you have mmdbalkhi

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (4 preceding siblings ...)
  2025-01-04 19:28 ` zlice
@ 2025-01-04 19:29 ` mmdbalkhi
  2025-01-04 19:31 ` zlice
                   ` (25 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 19:29 UTC (permalink / raw)
  To: ml

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

New review comment by mmdbalkhi on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903142960

Comment:
Is this necessary for the other subpkgs as well? The build of the ffplay7 package failed due to the conflict field.

```diff
...
ffplay7_package() {
		short_desc="Simple video player using FFmpeg and SDL2"
+		conflicts="ffplay*"
+		replaces="ffplay*>0"
		pkg_install() {
				vmove usr/bin/ffplay
				vmove "usr/share/man/man1/ffplay*"
		}
}
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (5 preceding siblings ...)
  2025-01-04 19:29 ` [PR REVIEW] " mmdbalkhi
@ 2025-01-04 19:31 ` zlice
  2025-01-04 19:31 ` [PR PATCH] [Updated] " mmdbalkhi
                   ` (24 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-04 19:31 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571391040

Comment:
@classabbyamp is there anything bad with https://github.com/void-linux/void-packages/pull/51496 ? just makes this a pita the keep flipping between onevpl and libvpl

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (6 preceding siblings ...)
  2025-01-04 19:31 ` zlice
@ 2025-01-04 19:31 ` mmdbalkhi
  2025-01-04 19:34 ` [PR REVIEW] " zlice
                   ` (23 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 19:31 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by mmdbalkhi against master on the void-packages repository

https://github.com/mmdbalkhi/void-packages ffmpeg7
https://github.com/void-linux/void-packages/pull/53844

New package: ffmpeg7-7.1_1
#### 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**

<!-- 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, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ~~arch64-musl~~
  - ~~armv7l~~
  - ~~armv6l-musl~~

cc: @classabbyamp 


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

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

From ecc5f4a2558d7bf192d045ad67a18ae61421d8b9 Mon Sep 17 00:00:00 2001
From: Komeil Parseh <ahmdparsh129@gmail.com>
Date: Sat, 4 Jan 2025 22:08:26 +0330
Subject: [PATCH 1/2] New package: ffmpeg7-7.1_1

---
 srcpkgs/ffmpeg7-devel    |   1 +
 srcpkgs/ffmpeg7/template | 202 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/ffplay7          |   1 +
 srcpkgs/libavcodec7      |   1 +
 srcpkgs/libavdevice7     |   1 +
 srcpkgs/libavfilter7     |   1 +
 srcpkgs/libavformat7     |   1 +
 srcpkgs/libavresample7   |   1 +
 srcpkgs/libavutil7       |   1 +
 srcpkgs/libpostproc7     |   1 +
 srcpkgs/libswresample7   |   1 +
 srcpkgs/libswscale7      |   1 +
 12 files changed, 213 insertions(+)
 create mode 120000 srcpkgs/ffmpeg7-devel
 create mode 100644 srcpkgs/ffmpeg7/template
 create mode 120000 srcpkgs/ffplay7
 create mode 120000 srcpkgs/libavcodec7
 create mode 120000 srcpkgs/libavdevice7
 create mode 120000 srcpkgs/libavfilter7
 create mode 120000 srcpkgs/libavformat7
 create mode 120000 srcpkgs/libavresample7
 create mode 120000 srcpkgs/libavutil7
 create mode 120000 srcpkgs/libpostproc7
 create mode 120000 srcpkgs/libswresample7
 create mode 120000 srcpkgs/libswscale7

diff --git a/srcpkgs/ffmpeg7-devel b/srcpkgs/ffmpeg7-devel
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/ffmpeg7-devel
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/ffmpeg7/template b/srcpkgs/ffmpeg7/template
new file mode 100644
index 00000000000000..d2122cbf56a504
--- /dev/null
+++ b/srcpkgs/ffmpeg7/template
@@ -0,0 +1,202 @@
+# Template file for 'ffmpeg7'
+pkgname=ffmpeg7
+version=7.1
+revision=1
+_arch="x86_64"
+hostmakedepends="git automake autoconf pkg-config"
+makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
+	libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
+	libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+	libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
+	speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+	libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
+	x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
+	libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
+	zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
+	$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
+	$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
+
+maintainer="Komeil Parseh <ahmdparsh129@gmail.com>"
+short_desc="Decoding, encoding and streaming software"
+license="GPL-3.0-or-later"
+homepage="https://www.ffmpeg.org"
+changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
+distfiles="https://ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
+checksum="40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6"
+
+build_options="vaapi vdpau fdk_aac nvcodec onevpl"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+		build_options_default+=" vaapi vdpau nvcodec"
+		hostmakedepends+=" nasm"
+		;;
+	x86_64*)
+			hostmakedepends+=" nasm"
+			build_options_default+=" vaapi vdpau nvcodec onevpl"
+			;;
+	ppc64*)
+		build_options_default+=" vaapi vdpau"
+		;;
+	mips*)
+		CFLAGS="-mnan=legacy";;
+esac
+
+do_configure() {
+		# Fix gcc on x86_64-musl only
+		if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+				vsed -i configure -e "s;_cflags_speed='-O3';_cflags_speed='-O2';"
+		fi
+
+		if [ "$CROSS_BUILD" ]; then
+				case "$XBPS_TARGET_MACHINE" in
+						arm*) _arch="arm";;
+						aarch64*) _arch="aarch64";;
+						mips*) _arch="mips";;
+						ppc64*) _arch="ppc64";;
+						ppc*) _arch="ppc";;
+						*) _arch="${XBPS_TARGET_MACHINE%%-musl}";;
+				esac
+
+				_args+=" --enable-cross-compile
+						--sysroot=$XBPS_CROSS_BASE
+						--cross-prefix=${XBPS_CROSS_TRIPLET}-
+						--target-os=linux --arch=${_arch}"
+		fi
+
+		case "$XBPS_TARGET_MACHINE" in
+				ppc|ppc-musl) _args+=" --disable-altivec";;
+		esac
+
+		./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \
+				--disable-stripping \
+				--enable-libcdio --enable-version3 --enable-runtime-cpudetect \
+				--enable-libmp3lame --enable-libvorbis --enable-libxvid \
+				--enable-libx264 --enable-libvpx --enable-libtheora \
+				--enable-shared --enable-static --enable-libxcb \
+				--enable-libpulse --enable-libfreetype --enable-libmodplug \
+				--enable-libspeex --enable-libcelt --enable-libass \
+				--enable-libopus --enable-librtmp --enable-libjack \
+				--disable-libopencore_amrnb --disable-libopencore_amrwb \
+				--disable-libopenjpeg --enable-libbluray \
+				--enable-postproc --enable-opencl --enable-libvmaf ${_args} \
+				--enable-libx265 --enable-libv4l2 --enable-libaom \
+				--enable-libbs2b --enable-libvidstab --enable-libdav1d \
+				--enable-libsrt --enable-librist --enable-libwebp \
+				--enable-vulkan --enable-libdrm --enable-libsvtav1 \
+				--enable-libfreetype --enable-libharfbuzz --enable-libfontconfig \
+				$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
+				$(vopt_enable vaapi) $(vopt_enable vdpau) \
+				$(vopt_enable zimg libzimg) \
+				$(vopt_enable sofa libmysofa) \
+				$(vopt_enable onevpl libvpl) \
+				$(vopt_enable nvcodec nvenc) \
+				$(vopt_enable nvcodec nvdec)
+
+}
+
+do_build() {
+		make ${makejobs}
+		make doc/ff{mpeg,play}.1
+}
+
+do_install() {
+		make DESTDIR=${DESTDIR} install install-man
+}
+
+libavcodec7_package() {
+		short_desc="FFmpeg codec library"
+		pkg_install() {
+				vmove "usr/lib/libavcodec.so.*"
+		}
+}
+
+libavdevice7_package() {
+		short_desc="FFmpeg device handling library"
+		pkg_install() {
+				vmove "usr/lib/libavdevice.so.*"
+		}
+}
+
+libavresample7_package() {
+		short_desc="Package deprecated, removal needed"
+		build_style=meta
+}
+
+libavformat7_package() {
+		short_desc="FFmpeg file format library"
+		pkg_install() {
+				vmove "usr/lib/libavformat.so.*"
+		}
+}
+
+libavutil7_package() {
+		short_desc="FFmpeg utility library"
+		pkg_install() {
+				vmove "usr/lib/libavutil.so.*"
+		}
+}
+
+libavfilter7_package() {
+		short_desc="FFmpeg audio/video filter library"
+		pkg_install() {
+				vmove "usr/lib/libavfilter.so.*"
+		}
+}
+
+libpostproc7_package() {
+		short_desc="FFmpeg video postprocessing library"
+		pkg_install() {
+				vmove "usr/lib/libpostproc.so.*"
+		}
+}
+
+libswscale7_package() {
+		short_desc="FFmpeg video scaling library"
+		pkg_install() {
+				vmove "usr/lib/libswscale.so.*"
+		}
+}
+
+libswresample7_package() {
+		short_desc="FFmpeg video resampling library"
+		pkg_install() {
+				vmove "usr/lib/libswresample.so.*"
+		}
+}
+
+ffmpeg7-devel_package() {
+		depends="
+				libavcodec7>=${version}_${revision}
+				libavdevice7>=${version}_${revision}
+				libavformat7>=${version}_${revision}
+				libavutil7>=${version}_${revision}
+				libavfilter7>=${version}_${revision}
+				libpostproc7>=${version}_${revision}
+				libswscale7>=${version}_${revision}
+				libswresample7>=${version}_${revision}"
+		short_desc+=" - development files"
+		conflicts="ffmpeg-devel"
+		replaces="ffmpeg-devel>=0"
+		case "$XBPS_TARGET_MACHINE" in
+				i686*)
+				# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
+				nostrip_files="/usr/lib/libavfilter.a";;
+		esac
+		pkg_install() {
+				vmove usr/include
+				vmove usr/lib/pkgconfig
+				vmove "usr/lib/*.a"
+				vmove "usr/lib/*.so"
+				vmove usr/share/ffmpeg/examples
+				vmove usr/share/man/man3
+		}
+}
+
+ffplay7_package() {
+		short_desc="Simple video player using FFmpeg and SDL2"
+		pkg_install() {
+				vmove usr/bin/ffplay
+				vmove "usr/share/man/man1/ffplay*"
+		}
+}
diff --git a/srcpkgs/ffplay7 b/srcpkgs/ffplay7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/ffplay7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavcodec7 b/srcpkgs/libavcodec7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavcodec7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavdevice7 b/srcpkgs/libavdevice7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavdevice7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavfilter7 b/srcpkgs/libavfilter7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavfilter7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavformat7 b/srcpkgs/libavformat7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavformat7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavresample7 b/srcpkgs/libavresample7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavresample7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavutil7 b/srcpkgs/libavutil7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavutil7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libpostproc7 b/srcpkgs/libpostproc7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libpostproc7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libswresample7 b/srcpkgs/libswresample7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libswresample7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libswscale7 b/srcpkgs/libswscale7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libswscale7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file

From 9281e974f46c8853f48a40a4aac57fbcd0efe8e1 Mon Sep 17 00:00:00 2001
From: Komeil Parseh <ahmdparsh129@gmail.com>
Date: Sat, 4 Jan 2025 23:01:06 +0330
Subject: [PATCH 2/2] fix

---
 srcpkgs/ffmpeg7/template | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/srcpkgs/ffmpeg7/template b/srcpkgs/ffmpeg7/template
index d2122cbf56a504..aed35abc4e28e7 100644
--- a/srcpkgs/ffmpeg7/template
+++ b/srcpkgs/ffmpeg7/template
@@ -2,19 +2,18 @@
 pkgname=ffmpeg7
 version=7.1
 revision=1
-_arch="x86_64"
 hostmakedepends="git automake autoconf pkg-config"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
-	libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
-	libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
-	libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
-	speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
-	libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
-	x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
-	libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
-	zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
-	$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
-	$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
+ libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
+ libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+ libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
+ speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+ libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
+ x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
+ libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
+ zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
+ $(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
+ $(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
 
 maintainer="Komeil Parseh <ahmdparsh129@gmail.com>"
 short_desc="Decoding, encoding and streaming software"
@@ -42,6 +41,7 @@ case "$XBPS_TARGET_MACHINE" in
 		CFLAGS="-mnan=legacy";;
 esac
 
+
 do_configure() {
 		# Fix gcc on x86_64-musl only
 		if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
@@ -176,11 +176,10 @@ ffmpeg7-devel_package() {
 				libswscale7>=${version}_${revision}
 				libswresample7>=${version}_${revision}"
 		short_desc+=" - development files"
-		conflicts="ffmpeg-devel"
-		replaces="ffmpeg-devel>=0"
+		conflicts="ffmpeg*-devel"
+		replaces="ffmpeg*-devel>=0"
 		case "$XBPS_TARGET_MACHINE" in
 				i686*)
-				# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
 				nostrip_files="/usr/lib/libavfilter.a";;
 		esac
 		pkg_install() {
@@ -195,6 +194,8 @@ ffmpeg7-devel_package() {
 
 ffplay7_package() {
 		short_desc="Simple video player using FFmpeg and SDL2"
+		conflicts="ffplay*"
+		replaces="ffplay*>0"
 		pkg_install() {
 				vmove usr/bin/ffplay
 				vmove "usr/share/man/man1/ffplay*"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (7 preceding siblings ...)
  2025-01-04 19:31 ` [PR PATCH] [Updated] " mmdbalkhi
@ 2025-01-04 19:34 ` zlice
  2025-01-04 19:34 ` [PR PATCH] [Updated] " mmdbalkhi
                   ` (22 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-04 19:34 UTC (permalink / raw)
  To: ml

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903143482

Comment:
 think ffplay is fine but ffmpeg6-devel exist

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR PATCH] [Updated] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (8 preceding siblings ...)
  2025-01-04 19:34 ` [PR REVIEW] " zlice
@ 2025-01-04 19:34 ` mmdbalkhi
  2025-01-04 19:34 ` [PR REVIEW] " zlice
                   ` (21 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 19:34 UTC (permalink / raw)
  To: ml

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

There is an updated pull request by mmdbalkhi against master on the void-packages repository

https://github.com/mmdbalkhi/void-packages ffmpeg7
https://github.com/void-linux/void-packages/pull/53844

New package: ffmpeg7-7.1_1
#### 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**

<!-- 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, x86_64-glibc
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - ~~arch64-musl~~
  - ~~armv7l~~
  - ~~armv6l-musl~~

cc: @classabbyamp 


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

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

From ecc5f4a2558d7bf192d045ad67a18ae61421d8b9 Mon Sep 17 00:00:00 2001
From: Komeil Parseh <ahmdparsh129@gmail.com>
Date: Sat, 4 Jan 2025 22:08:26 +0330
Subject: [PATCH 1/2] New package: ffmpeg7-7.1_1

---
 srcpkgs/ffmpeg7-devel    |   1 +
 srcpkgs/ffmpeg7/template | 202 +++++++++++++++++++++++++++++++++++++++
 srcpkgs/ffplay7          |   1 +
 srcpkgs/libavcodec7      |   1 +
 srcpkgs/libavdevice7     |   1 +
 srcpkgs/libavfilter7     |   1 +
 srcpkgs/libavformat7     |   1 +
 srcpkgs/libavresample7   |   1 +
 srcpkgs/libavutil7       |   1 +
 srcpkgs/libpostproc7     |   1 +
 srcpkgs/libswresample7   |   1 +
 srcpkgs/libswscale7      |   1 +
 12 files changed, 213 insertions(+)
 create mode 120000 srcpkgs/ffmpeg7-devel
 create mode 100644 srcpkgs/ffmpeg7/template
 create mode 120000 srcpkgs/ffplay7
 create mode 120000 srcpkgs/libavcodec7
 create mode 120000 srcpkgs/libavdevice7
 create mode 120000 srcpkgs/libavfilter7
 create mode 120000 srcpkgs/libavformat7
 create mode 120000 srcpkgs/libavresample7
 create mode 120000 srcpkgs/libavutil7
 create mode 120000 srcpkgs/libpostproc7
 create mode 120000 srcpkgs/libswresample7
 create mode 120000 srcpkgs/libswscale7

diff --git a/srcpkgs/ffmpeg7-devel b/srcpkgs/ffmpeg7-devel
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/ffmpeg7-devel
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/ffmpeg7/template b/srcpkgs/ffmpeg7/template
new file mode 100644
index 00000000000000..d2122cbf56a504
--- /dev/null
+++ b/srcpkgs/ffmpeg7/template
@@ -0,0 +1,202 @@
+# Template file for 'ffmpeg7'
+pkgname=ffmpeg7
+version=7.1
+revision=1
+_arch="x86_64"
+hostmakedepends="git automake autoconf pkg-config"
+makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
+	libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
+	libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+	libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
+	speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+	libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
+	x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
+	libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
+	zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
+	$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
+	$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
+
+maintainer="Komeil Parseh <ahmdparsh129@gmail.com>"
+short_desc="Decoding, encoding and streaming software"
+license="GPL-3.0-or-later"
+homepage="https://www.ffmpeg.org"
+changelog="https://raw.githubusercontent.com/FFmpeg/FFmpeg/master/Changelog"
+distfiles="https://ffmpeg.org/releases/ffmpeg-${version}.tar.xz"
+checksum="40973d44970dbc83ef302b0609f2e74982be2d85916dd2ee7472d30678a7abe6"
+
+build_options="vaapi vdpau fdk_aac nvcodec onevpl"
+
+case "$XBPS_TARGET_MACHINE" in
+	i686*)
+		build_options_default+=" vaapi vdpau nvcodec"
+		hostmakedepends+=" nasm"
+		;;
+	x86_64*)
+			hostmakedepends+=" nasm"
+			build_options_default+=" vaapi vdpau nvcodec onevpl"
+			;;
+	ppc64*)
+		build_options_default+=" vaapi vdpau"
+		;;
+	mips*)
+		CFLAGS="-mnan=legacy";;
+esac
+
+do_configure() {
+		# Fix gcc on x86_64-musl only
+		if [ "$XBPS_TARGET_MACHINE" = "x86_64-musl" ]; then
+				vsed -i configure -e "s;_cflags_speed='-O3';_cflags_speed='-O2';"
+		fi
+
+		if [ "$CROSS_BUILD" ]; then
+				case "$XBPS_TARGET_MACHINE" in
+						arm*) _arch="arm";;
+						aarch64*) _arch="aarch64";;
+						mips*) _arch="mips";;
+						ppc64*) _arch="ppc64";;
+						ppc*) _arch="ppc";;
+						*) _arch="${XBPS_TARGET_MACHINE%%-musl}";;
+				esac
+
+				_args+=" --enable-cross-compile
+						--sysroot=$XBPS_CROSS_BASE
+						--cross-prefix=${XBPS_CROSS_TRIPLET}-
+						--target-os=linux --arch=${_arch}"
+		fi
+
+		case "$XBPS_TARGET_MACHINE" in
+				ppc|ppc-musl) _args+=" --disable-altivec";;
+		esac
+
+		./configure --prefix=/usr --disable-debug --enable-gpl --enable-gnutls \
+				--disable-stripping \
+				--enable-libcdio --enable-version3 --enable-runtime-cpudetect \
+				--enable-libmp3lame --enable-libvorbis --enable-libxvid \
+				--enable-libx264 --enable-libvpx --enable-libtheora \
+				--enable-shared --enable-static --enable-libxcb \
+				--enable-libpulse --enable-libfreetype --enable-libmodplug \
+				--enable-libspeex --enable-libcelt --enable-libass \
+				--enable-libopus --enable-librtmp --enable-libjack \
+				--disable-libopencore_amrnb --disable-libopencore_amrwb \
+				--disable-libopenjpeg --enable-libbluray \
+				--enable-postproc --enable-opencl --enable-libvmaf ${_args} \
+				--enable-libx265 --enable-libv4l2 --enable-libaom \
+				--enable-libbs2b --enable-libvidstab --enable-libdav1d \
+				--enable-libsrt --enable-librist --enable-libwebp \
+				--enable-vulkan --enable-libdrm --enable-libsvtav1 \
+				--enable-libfreetype --enable-libharfbuzz --enable-libfontconfig \
+				$(vopt_if fdk_aac '--enable-nonfree --enable-libfdk-aac') \
+				$(vopt_enable vaapi) $(vopt_enable vdpau) \
+				$(vopt_enable zimg libzimg) \
+				$(vopt_enable sofa libmysofa) \
+				$(vopt_enable onevpl libvpl) \
+				$(vopt_enable nvcodec nvenc) \
+				$(vopt_enable nvcodec nvdec)
+
+}
+
+do_build() {
+		make ${makejobs}
+		make doc/ff{mpeg,play}.1
+}
+
+do_install() {
+		make DESTDIR=${DESTDIR} install install-man
+}
+
+libavcodec7_package() {
+		short_desc="FFmpeg codec library"
+		pkg_install() {
+				vmove "usr/lib/libavcodec.so.*"
+		}
+}
+
+libavdevice7_package() {
+		short_desc="FFmpeg device handling library"
+		pkg_install() {
+				vmove "usr/lib/libavdevice.so.*"
+		}
+}
+
+libavresample7_package() {
+		short_desc="Package deprecated, removal needed"
+		build_style=meta
+}
+
+libavformat7_package() {
+		short_desc="FFmpeg file format library"
+		pkg_install() {
+				vmove "usr/lib/libavformat.so.*"
+		}
+}
+
+libavutil7_package() {
+		short_desc="FFmpeg utility library"
+		pkg_install() {
+				vmove "usr/lib/libavutil.so.*"
+		}
+}
+
+libavfilter7_package() {
+		short_desc="FFmpeg audio/video filter library"
+		pkg_install() {
+				vmove "usr/lib/libavfilter.so.*"
+		}
+}
+
+libpostproc7_package() {
+		short_desc="FFmpeg video postprocessing library"
+		pkg_install() {
+				vmove "usr/lib/libpostproc.so.*"
+		}
+}
+
+libswscale7_package() {
+		short_desc="FFmpeg video scaling library"
+		pkg_install() {
+				vmove "usr/lib/libswscale.so.*"
+		}
+}
+
+libswresample7_package() {
+		short_desc="FFmpeg video resampling library"
+		pkg_install() {
+				vmove "usr/lib/libswresample.so.*"
+		}
+}
+
+ffmpeg7-devel_package() {
+		depends="
+				libavcodec7>=${version}_${revision}
+				libavdevice7>=${version}_${revision}
+				libavformat7>=${version}_${revision}
+				libavutil7>=${version}_${revision}
+				libavfilter7>=${version}_${revision}
+				libpostproc7>=${version}_${revision}
+				libswscale7>=${version}_${revision}
+				libswresample7>=${version}_${revision}"
+		short_desc+=" - development files"
+		conflicts="ffmpeg-devel"
+		replaces="ffmpeg-devel>=0"
+		case "$XBPS_TARGET_MACHINE" in
+				i686*)
+				# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
+				nostrip_files="/usr/lib/libavfilter.a";;
+		esac
+		pkg_install() {
+				vmove usr/include
+				vmove usr/lib/pkgconfig
+				vmove "usr/lib/*.a"
+				vmove "usr/lib/*.so"
+				vmove usr/share/ffmpeg/examples
+				vmove usr/share/man/man3
+		}
+}
+
+ffplay7_package() {
+		short_desc="Simple video player using FFmpeg and SDL2"
+		pkg_install() {
+				vmove usr/bin/ffplay
+				vmove "usr/share/man/man1/ffplay*"
+		}
+}
diff --git a/srcpkgs/ffplay7 b/srcpkgs/ffplay7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/ffplay7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavcodec7 b/srcpkgs/libavcodec7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavcodec7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavdevice7 b/srcpkgs/libavdevice7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavdevice7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavfilter7 b/srcpkgs/libavfilter7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavfilter7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavformat7 b/srcpkgs/libavformat7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavformat7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavresample7 b/srcpkgs/libavresample7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavresample7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libavutil7 b/srcpkgs/libavutil7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libavutil7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libpostproc7 b/srcpkgs/libpostproc7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libpostproc7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libswresample7 b/srcpkgs/libswresample7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libswresample7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file
diff --git a/srcpkgs/libswscale7 b/srcpkgs/libswscale7
new file mode 120000
index 00000000000000..706d9901278548
--- /dev/null
+++ b/srcpkgs/libswscale7
@@ -0,0 +1 @@
+ffmpeg7/
\ No newline at end of file

From d33af03541910f22cddf01416aef5aafec4afc96 Mon Sep 17 00:00:00 2001
From: Komeil Parseh <ahmdparsh129@gmail.com>
Date: Sat, 4 Jan 2025 23:01:06 +0330
Subject: [PATCH 2/2] fix

---
 srcpkgs/ffmpeg7/template | 39 ++++++++++++++++++---------------------
 1 file changed, 18 insertions(+), 21 deletions(-)

diff --git a/srcpkgs/ffmpeg7/template b/srcpkgs/ffmpeg7/template
index d2122cbf56a504..4b0251ba2d60fb 100644
--- a/srcpkgs/ffmpeg7/template
+++ b/srcpkgs/ffmpeg7/template
@@ -2,19 +2,18 @@
 pkgname=ffmpeg7
 version=7.1
 revision=1
-_arch="x86_64"
 hostmakedepends="git automake autoconf pkg-config"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
-	libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
-	libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
-	libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
-	speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
-	libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
-	x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
-	libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
-	zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
-	$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
-	$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
+ libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
+ libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+ libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
+ speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
+ libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
+ x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
+ libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
+ zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
+ $(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
+ $(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
 
 maintainer="Komeil Parseh <ahmdparsh129@gmail.com>"
 short_desc="Decoding, encoding and streaming software"
@@ -32,14 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
 		hostmakedepends+=" nasm"
 		;;
 	x86_64*)
-			hostmakedepends+=" nasm"
-			build_options_default+=" vaapi vdpau nvcodec onevpl"
-			;;
-	ppc64*)
-		build_options_default+=" vaapi vdpau"
+		hostmakedepends+=" nasm"
+		build_options_default+=" vaapi vdpau nvcodec onevpl"
 		;;
-	mips*)
-		CFLAGS="-mnan=legacy";;
+	ppc64*) build_options_default+=" vaapi vdpau";;
+	mips*) CFLAGS="-mnan=legacy";;
 esac
 
 do_configure() {
@@ -176,11 +172,10 @@ ffmpeg7-devel_package() {
 				libswscale7>=${version}_${revision}
 				libswresample7>=${version}_${revision}"
 		short_desc+=" - development files"
-		conflicts="ffmpeg-devel"
-		replaces="ffmpeg-devel>=0"
+		conflicts="ffmpeg*-devel"
+		replaces="ffmpeg*-devel>=0"
 		case "$XBPS_TARGET_MACHINE" in
 				i686*)
-				# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
 				nostrip_files="/usr/lib/libavfilter.a";;
 		esac
 		pkg_install() {
@@ -195,6 +190,8 @@ ffmpeg7-devel_package() {
 
 ffplay7_package() {
 		short_desc="Simple video player using FFmpeg and SDL2"
+		conflicts="ffplay*"
+		replaces="ffplay*>0"
 		pkg_install() {
 				vmove usr/bin/ffplay
 				vmove "usr/share/man/man1/ffplay*"

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (9 preceding siblings ...)
  2025-01-04 19:34 ` [PR PATCH] [Updated] " mmdbalkhi
@ 2025-01-04 19:34 ` zlice
  2025-01-04 19:43 ` classabbyamp
                   ` (20 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-04 19:34 UTC (permalink / raw)
  To: ml

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903143502

Comment:
may need to disable ffplay in 6...or replace 6 entirely idk, depends how many deps build with 7 fine?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (10 preceding siblings ...)
  2025-01-04 19:34 ` [PR REVIEW] " zlice
@ 2025-01-04 19:43 ` classabbyamp
  2025-01-04 20:03 ` [PR REVIEW] " mmdbalkhi
                   ` (19 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2025-01-04 19:43 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571394000

Comment:
ask the maintainer of onevpl, not me

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (11 preceding siblings ...)
  2025-01-04 19:43 ` classabbyamp
@ 2025-01-04 20:03 ` mmdbalkhi
  2025-01-04 20:05 ` mmdbalkhi
                   ` (18 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 20:03 UTC (permalink / raw)
  To: ml

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

New review comment by mmdbalkhi on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903146911

Comment:
> may need to disable ffplay in 6...or replace 6 entirely
Why are you considering disabling `ffplay` in 6? Is there a specific reason behind it?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (12 preceding siblings ...)
  2025-01-04 20:03 ` [PR REVIEW] " mmdbalkhi
@ 2025-01-04 20:05 ` mmdbalkhi
  2025-01-04 20:13 ` zlice
                   ` (17 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 20:05 UTC (permalink / raw)
  To: ml

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

New review comment by mmdbalkhi on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903146911

Comment:
> may need to disable ffplay in 6...or replace 6 entirely

Why are you considering disabling `ffplay` in 6? Is there a specific reason behind it?

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: [PR REVIEW] New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (13 preceding siblings ...)
  2025-01-04 20:05 ` mmdbalkhi
@ 2025-01-04 20:13 ` zlice
  2025-01-04 20:37 ` zlice
                   ` (16 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-04 20:13 UTC (permalink / raw)
  To: ml

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

New review comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#discussion_r1903147830

Comment:
7 is newer so the binary ffmpeg/ffplay may as well be 7 on the system. only a few thing use the binaries directly instead of the libraries. ill post my branch iaf.

basically:
- add depends to ffplay7 here
- `ffmpeg` and `ffmpeg6` need the conflict for devel packages and a revbumped
- `ffplay6` becomes meta pkg like `ffmpeg`'s `ffplay` is

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (14 preceding siblings ...)
  2025-01-04 20:13 ` zlice
@ 2025-01-04 20:37 ` zlice
  2025-01-04 20:48 ` mmdbalkhi
                   ` (15 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-04 20:37 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571405820

Comment:
https://github.com/zlice/void-packages/tree/ffmpeg7 this is dirty because of libvpl as mentioned, some revbumps and stuff are off

should be 84 packages to test ffmpeg7-devel

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (15 preceding siblings ...)
  2025-01-04 20:37 ` zlice
@ 2025-01-04 20:48 ` mmdbalkhi
  2025-01-05  2:29 ` zlice
                   ` (14 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: mmdbalkhi @ 2025-01-04 20:48 UTC (permalink / raw)
  To: ml

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

New comment by mmdbalkhi on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571407964

Comment:
@zlice
I'd be happy to help if there's anything I can do. Just let me know what needs to be done.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (16 preceding siblings ...)
  2025-01-04 20:48 ` mmdbalkhi
@ 2025-01-05  2:29 ` zlice
  2025-01-05  7:15 ` zlice
                   ` (13 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-05  2:29 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571475831

Comment:
These didn't build. Some probably have patches like xine-lib did

- xine-lib (patches - https://gitlab.archlinux.org/archlinux/packaging/packages/xine-lib/-/blob/main/PKGBUILD?ref_type=heads#L42)
- libopenshot
- qt5-webengine
- qt6-pdf
- qtox
- arcan
- attract
- aubio
- blender (other PRs in the works right now)
- deadbeef
- ffms2
- gerbera
- goldendict
- idjc
- loudgain
- minidlna
- mixxx
- notcurses
- openmw
- osg
- pcsx2
- pianobar
- qmmp
- siril
- spek-x
- ssr
- telegram-desktop
- vba-m
- wf-recorder
- kodi (next version being worked on)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (17 preceding siblings ...)
  2025-01-05  2:29 ` zlice
@ 2025-01-05  7:15 ` zlice
  2025-01-06 15:03 ` ahesford
                   ` (12 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-05  7:15 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571475831

Comment:
~~These didn't build. Some probably have patches like xine-lib did~~

### builds fine

- arcan - 0.7.0
- ffms2 - 5.0 shlib (deps: Aegisub, siril, vapoursynth-ffms2-source)
- deadbeef - https://github.com/DeaDBeeF-Player/deadbeef/blob/d4cca5605447122cd080691f43e46047a6039359/plugins/ffmpeg/ffmpeg.c
- aubio - https://github.com/aubio/aubio/issues/397
- attract - https://github.com/mickelson/attract/commit/20f5cf243a8d14e072145576262d7539fd5bb8c4
- idjc - 0.9.9
- loudgain - https://github.com/kyndair/loudgain/releases/tag/v0.7.0
- gerbera - 2.2.0 (needs exiv2-devel)
- siril - 1.2.5 (needs host dep : cmake)
- goldendict - https://github.com/goldendict/goldendict/commit/718462c5c1e2b6f3064f921c0800e45b8d5b84b8
- minidlna - 1 line diff
- notcurses - 3.0.11
- spek-x - 1 line diff really https://github.com/MikeWang000000/spek-X/commit/8b73c5235af495b666093e46492ab4c52c85e687#diff-c96dc15869ca3f495070d3daebf8184f7eada3a383a1b3e635215b84e0026b16L149 - https://github.com/MikeWang000000/spek-X/issues/27
- qmmp - 2.2.3 (qt6, shlibs)
- pianobar - 2024.12.21
- ssr - https://aur.archlinux.org/cgit/aur.git/tree/ffmpeg7.patch?h=simplescreenrecorder
- vba-m - dirty patch, a lot of stuff is deprecated that wasn't touched and will probably be removed soon. not sure it works
- wf-recorder - 1 line diff, https://github.com/ammen99/wf-recorder/issues/285
- xine-lib https://gitlab.archlinux.org/archlinux/packaging/packages/xine-lib/-/blob/main/PKGBUILD?ref_type=heads#L42
- osg - made patch https://github.com/openscenegraph/OpenSceneGraph/pull/1281

### needs work

- pcsx2 - 2.20 is out but ive seen void builds as WIP before
- mixxx - 2.5.0 ? needs https://github.com/microsoft/GSL (qt6)


- telegram-desktop - bringing in 6 somehow? so it conflicts with 7
- libopenshot - needs updated to 0.4.0 (openshot is 3.3 too), open issues about 7 tests and build

- blender (other PRs in the works right now)


### big

- openmw
- qt5-webengine
- qt6-pdf
- kodi (next version being worked on)

### dead?

- qtox - no active maintainers, archived and read-only


^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (18 preceding siblings ...)
  2025-01-05  7:15 ` zlice
@ 2025-01-06 15:03 ` ahesford
  2025-01-06 15:19 ` zlice
                   ` (11 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: ahesford @ 2025-01-06 15:03 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573296758

Comment:
Now that the vast majority of our packages build against `ffmpeg6`, I think it's time to bite the bullet:
- Move `ffmpeg -> ffmpeg4`; rebuild all packages that still cannot be moved to newer ffmpeg.
- Move `ffmpeg6 -> ffmpeg` with a simultaneous bump to v7.

We want to avoid an endless string of versioned ffmpeg packages; the current split only exists because we still have stragglers that couldn't be moved to v6.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (19 preceding siblings ...)
  2025-01-06 15:03 ` ahesford
@ 2025-01-06 15:19 ` zlice
  2025-01-06 15:21 ` zlice
                   ` (10 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 15:19 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573329382

Comment:
i'll make a pr for the ffmpeg4 bit. don't think many people would have it installed. it's not even on my system.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (20 preceding siblings ...)
  2025-01-06 15:19 ` zlice
@ 2025-01-06 15:21 ` zlice
  2025-01-06 15:24 ` zlice
                   ` (9 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 15:21 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573329382

Comment:
i'll make a pr for the ffmpeg4 bit. don't think many people would have it installed. it's not even on my system.

edit: actually what's the best way to go about that...sounds like a few steps of metapkg/replace ?

- make `ffmpeg > ffmpeg4`
- make `ffmpeg > meta for ffmpeg6` ?

next pr (this pr?)

- make `ffmpeg7`
- make `ffmpeg > meta for ffmpeg7`

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (21 preceding siblings ...)
  2025-01-06 15:21 ` zlice
@ 2025-01-06 15:24 ` zlice
  2025-01-06 15:32 ` classabbyamp
                   ` (8 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 15:24 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573329382

Comment:
i'll make a pr for the ffmpeg4 bit. don't think many people would have it installed. it's not even on my system.

edit: actually what's the best way to go about that...sounds like a few steps of metapkg/replace ?

- make `ffmpeg > ffmpeg4`
- make `ffmpeg > meta for ffmpeg6` ?

next pr (this pr?)

- make `ffmpeg7`
- make `ffmpeg > meta for ffmpeg7`

edit-edit:

actually, do we even want to do this? ffmpeg8 will eventually come out, then it's the same song and dance again

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (22 preceding siblings ...)
  2025-01-06 15:24 ` zlice
@ 2025-01-06 15:32 ` classabbyamp
  2025-01-06 15:42 ` ahesford
                   ` (7 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: classabbyamp @ 2025-01-06 15:32 UTC (permalink / raw)
  To: ml

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

New comment by classabbyamp on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573354748

Comment:
let's go with `ffmpeg` as a metapackage

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (23 preceding siblings ...)
  2025-01-06 15:32 ` classabbyamp
@ 2025-01-06 15:42 ` ahesford
  2025-01-06 15:49 ` zlice
                   ` (6 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: ahesford @ 2025-01-06 15:42 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573374077

Comment:
I was thinking `ffmpeg` and its subs would just be the actual package of whatever the current version is. That way, we avoid piling up old versions that will need manual cleaning.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (24 preceding siblings ...)
  2025-01-06 15:42 ` ahesford
@ 2025-01-06 15:49 ` zlice
  2025-01-06 15:50 ` zlice
                   ` (5 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 15:49 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571475831

Comment:
~~These didn't build. Some probably have patches like xine-lib did~~

### builds fine

- arcan - 0.7.0
- ffms2 - 5.0 shlib (deps: Aegisub, siril, vapoursynth-ffms2-source)
- deadbeef - https://github.com/DeaDBeeF-Player/deadbeef/blob/d4cca5605447122cd080691f43e46047a6039359/plugins/ffmpeg/ffmpeg.c
- aubio - https://github.com/aubio/aubio/issues/397
- attract - https://github.com/mickelson/attract/commit/20f5cf243a8d14e072145576262d7539fd5bb8c4
- idjc - 0.9.9
- loudgain - https://github.com/kyndair/loudgain/releases/tag/v0.7.0
- gerbera - 2.2.0 (needs exiv2-devel)
- siril - 1.2.5 (needs host dep : cmake)
- goldendict - https://github.com/goldendict/goldendict/commit/718462c5c1e2b6f3064f921c0800e45b8d5b84b8
- minidlna - 1 line diff
- notcurses - 3.0.11
- spek-x - 1 line diff really https://github.com/MikeWang000000/spek-X/commit/8b73c5235af495b666093e46492ab4c52c85e687#diff-c96dc15869ca3f495070d3daebf8184f7eada3a383a1b3e635215b84e0026b16L149 - https://github.com/MikeWang000000/spek-X/issues/27
- qmmp - 2.2.3 (qt6, shlibs)
- pianobar - 2024.12.21
- ssr - https://aur.archlinux.org/cgit/aur.git/tree/ffmpeg7.patch?h=simplescreenrecorder
- vba-m - dirty patch, a lot of stuff is deprecated that wasn't touched and will probably be removed soon. not sure it works
- wf-recorder - 1 line diff, https://github.com/ammen99/wf-recorder/issues/285
- xine-lib https://gitlab.archlinux.org/archlinux/packaging/packages/xine-lib/-/blob/main/PKGBUILD?ref_type=heads#L42
- osg - made patch https://github.com/openscenegraph/OpenSceneGraph/pull/1281
- telegram-desktop - ~~bringing in 6 somehow? so it conflicts with 7~~ (didn't bother revbumps because i've been down that road, works fine with tg_owt and libopenal up to date)

### needs work

- pcsx2 - 2.20 is out but ive seen void builds as WIP before
- mixxx - 2.5.0 ? needs https://github.com/microsoft/GSL (qt6)

- libopenshot - needs updated to 0.4.0 (openshot is 3.3 too), open issues about 7 tests and build

- blender (other PRs in the works right now)


### big

- openmw - too much to patch, easier to just wait for release (mwsound and osg-ffmpeg-videoplayer dirs)
- qt5-webengine
- qt6-pdf
- kodi (next version being worked on)

### dead?

- qtox - no active maintainers, archived and read-only


^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (25 preceding siblings ...)
  2025-01-06 15:49 ` zlice
@ 2025-01-06 15:50 ` zlice
  2025-01-06 15:52 ` zlice
                   ` (4 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 15:50 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573391247

Comment:
then you can't update in waves like 6 did. everything will have to go at once

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (26 preceding siblings ...)
  2025-01-06 15:50 ` zlice
@ 2025-01-06 15:52 ` zlice
  2025-01-06 16:33 ` ahesford
                   ` (3 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 15:52 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573391247

Comment:
then you can't update in waves like 6 did. everything will have to go at once

(luckily a lot of packages aren't using the system ffmpeg now, so it's not as painful. but still about 80-90 packages that need updated at a single time. 30 seemed to be the sweet-spot for ci to build and be happy w/o timeouts)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (27 preceding siblings ...)
  2025-01-06 15:52 ` zlice
@ 2025-01-06 16:33 ` ahesford
  2025-01-06 20:57 ` zlice
                   ` (2 subsequent siblings)
  31 siblings, 0 replies; 33+ messages in thread
From: ahesford @ 2025-01-06 16:33 UTC (permalink / raw)
  To: ml

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

New comment by ahesford on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2573472054

Comment:
I think we should strive for a single ffmpeg version at any given time, then deal with spawning a new version only under extenuating circumstances. In this case, I think we should get everything currently building with ffmpeg6 building with v7 before accepting this package.

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (28 preceding siblings ...)
  2025-01-06 16:33 ` ahesford
@ 2025-01-06 20:57 ` zlice
  2025-01-07 13:19 ` zlice
  2025-02-05 21:03 ` zlice
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-06 20:57 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2571475831

Comment:
~~These didn't build. Some probably have patches like xine-lib did~~

### builds fine

- arcan - 0.7.0
- ffms2 - 5.0 shlib (deps: Aegisub, siril, vapoursynth-ffms2-source)
- deadbeef - https://github.com/DeaDBeeF-Player/deadbeef/blob/d4cca5605447122cd080691f43e46047a6039359/plugins/ffmpeg/ffmpeg.c
- aubio - https://github.com/aubio/aubio/issues/397
- attract - https://github.com/mickelson/attract/commit/20f5cf243a8d14e072145576262d7539fd5bb8c4
- idjc - 0.9.9
- loudgain - https://github.com/kyndair/loudgain/releases/tag/v0.7.0
- gerbera - 2.2.0 (needs exiv2-devel)
- siril - 1.2.5 (needs host dep : cmake)
- goldendict - https://github.com/goldendict/goldendict/commit/718462c5c1e2b6f3064f921c0800e45b8d5b84b8
- minidlna - 1 line diff
- notcurses - 3.0.11
- spek-x - 1 line diff really https://github.com/MikeWang000000/spek-X/commit/8b73c5235af495b666093e46492ab4c52c85e687#diff-c96dc15869ca3f495070d3daebf8184f7eada3a383a1b3e635215b84e0026b16L149 - https://github.com/MikeWang000000/spek-X/issues/27
- qmmp - 2.2.3 (qt6, shlibs)
- pianobar - 2024.12.21
- ssr - https://aur.archlinux.org/cgit/aur.git/tree/ffmpeg7.patch?h=simplescreenrecorder
- vba-m - dirty patch, a lot of stuff is deprecated that wasn't touched and will probably be removed soon. not sure it works
- wf-recorder - 1 line diff, https://github.com/ammen99/wf-recorder/issues/285
- xine-lib https://gitlab.archlinux.org/archlinux/packaging/packages/xine-lib/-/blob/main/PKGBUILD?ref_type=heads#L42
- osg - made patch https://github.com/openscenegraph/OpenSceneGraph/pull/1281
- telegram-desktop - ~~bringing in 6 somehow? so it conflicts with 7~~ (didn't bother revbumps because i've been down that road, works fine with tg_owt and libopenal up to date)

- libopenshot - made patch 0.4.0 (openshot 3.3 too), open issues about 7 tests and build
- qtox - no active maintainers, archived and read-only - https://github.com/TokTok/qTox/pull/42/files

### needs work

- pcsx2 - 2.20 is out but ive seen void builds as WIP before
- mixxx - 2.5.0 ? https://github.com/void-linux/void-packages/pull/53868 (qt6)



- blender (other PRs in the works right now)


### big

- openmw - too much to patch, easier to just wait for release (mwsound and osg-ffmpeg-videoplayer dirs)
- qt5-webengine
- qt6-pdf
- kodi (next version being worked on)

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (29 preceding siblings ...)
  2025-01-06 20:57 ` zlice
@ 2025-01-07 13:19 ` zlice
  2025-02-05 21:03 ` zlice
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-01-07 13:19 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2575279740

Comment:
so qt5 and qt6 both say 'ffmpeg >= 5' is not supported (but i think really mean ffmpeg7, as 6 appears to be building webengine)

i'm sure they can be patched but other programs like chromium started using built-in ffmpeg. cuts out some codecs and new features from the system ffmpeg in kde browsers but would be less work for void members.

```
qt6-pdf(webengine)
configure.cmake:    MESSAGE "Unmodified ffmpeg >= 5.0 is not supported."

qt5-webengine
src/buildtools/configure.json:            "message": "Unmodified ffmpeg >= 5.0 is not supported. Please configure with -qt-webengine-ffmpeg."
```

^ permalink raw reply	[flat|nested] 33+ messages in thread

* Re: New package: ffmpeg7-7.1_1
  2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
                   ` (30 preceding siblings ...)
  2025-01-07 13:19 ` zlice
@ 2025-02-05 21:03 ` zlice
  31 siblings, 0 replies; 33+ messages in thread
From: zlice @ 2025-02-05 21:03 UTC (permalink / raw)
  To: ml

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

New comment by zlice on void-packages repository

https://github.com/void-linux/void-packages/pull/53844#issuecomment-2638017988

Comment:
fyi, spek-x ffmpeg7 https://github.com/MikeWang000000/spek-X/releases/tag/v0.9.4

^ permalink raw reply	[flat|nested] 33+ messages in thread

end of thread, other threads:[~2025-02-05 21:03 UTC | newest]

Thread overview: 33+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-01-04 18:59 [PR PATCH] New package: ffmpeg7-7.1_1 mmdbalkhi
2025-01-04 19:14 ` [PR REVIEW] " classabbyamp
2025-01-04 19:14 ` classabbyamp
2025-01-04 19:14 ` classabbyamp
2025-01-04 19:14 ` classabbyamp
2025-01-04 19:28 ` zlice
2025-01-04 19:29 ` [PR REVIEW] " mmdbalkhi
2025-01-04 19:31 ` zlice
2025-01-04 19:31 ` [PR PATCH] [Updated] " mmdbalkhi
2025-01-04 19:34 ` [PR REVIEW] " zlice
2025-01-04 19:34 ` [PR PATCH] [Updated] " mmdbalkhi
2025-01-04 19:34 ` [PR REVIEW] " zlice
2025-01-04 19:43 ` classabbyamp
2025-01-04 20:03 ` [PR REVIEW] " mmdbalkhi
2025-01-04 20:05 ` mmdbalkhi
2025-01-04 20:13 ` zlice
2025-01-04 20:37 ` zlice
2025-01-04 20:48 ` mmdbalkhi
2025-01-05  2:29 ` zlice
2025-01-05  7:15 ` zlice
2025-01-06 15:03 ` ahesford
2025-01-06 15:19 ` zlice
2025-01-06 15:21 ` zlice
2025-01-06 15:24 ` zlice
2025-01-06 15:32 ` classabbyamp
2025-01-06 15:42 ` ahesford
2025-01-06 15:49 ` zlice
2025-01-06 15:50 ` zlice
2025-01-06 15:52 ` zlice
2025-01-06 16:33 ` ahesford
2025-01-06 20:57 ` zlice
2025-01-07 13:19 ` zlice
2025-02-05 21:03 ` zlice

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).