[PR PATCH] ffmpeg: remove ffplay subpackage

[PR PATCH] ffmpeg: remove ffplay subpackage

[paper42]

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

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

https://github.com/paper42/void-packages split-ffplay
https://github.com/void-linux/void-packages/pull/32519

ffmpeg: remove ffplay subpackage
moved to a separate package due to a cyclic dependency
SDL2 - pipewire - ffmpeg (ffplay) - SDL2

I am not sure if this is the best approach.

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

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

From e6cfd072955143de4d65bd1a339e755f451cc1c1 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 16 Aug 2021 22:09:39 +0200
Subject: [PATCH 1/2] ffmpeg: remove ffplay subpackage

moved to a separate package due to a cyclic dependency
SDL2 - pipewire - ffmpeg (ffplay) - SDL2
---
 srcpkgs/ffmpeg/template | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/ffmpeg/template b/srcpkgs/ffmpeg/template
index 33d3e0bfc2d6..867b462edd2f 100644
--- a/srcpkgs/ffmpeg/template
+++ b/srcpkgs/ffmpeg/template
@@ -1,8 +1,9 @@
 # Template file for 'ffmpeg'
+# should be kept in sync with 'ffplay' (shared distfiles)
 # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
 pkgname=ffmpeg
 version=4.3.2
-revision=3
+revision=4
 short_desc="Decoding, encoding and streaming software"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="GPL-3.0-or-later"
@@ -14,7 +15,7 @@ checksum=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
 hostmakedepends="pkg-config perl yasm"
 makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
  libXext-devel libXvMC-devel libxcb-devel faad2-devel lame-devel libtheora-devel
- libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
+ libvorbis-devel x264-devel xvidcore-devel jack-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 $(vopt_if pulseaudio pulseaudio-devel)
@@ -24,7 +25,6 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
  $(vopt_if nvenc nv-codec-headers) $(vopt_if sndio sndio-devel)
  $(vopt_if dav1d libdav1d-devel) $(vopt_if zimg zimg-devel)
  $(vopt_if webp libwebp-devel) $(vopt_if sofa libmysofa-devel)"
-depends="ffplay>=${version}_${revision}"
 
 build_options="x265 v4l2 vaapi vdpau vpx faac fdk_aac aom nvenc sndio pulseaudio
  dav1d zimg webp sofa"
@@ -184,10 +184,3 @@ ffmpeg-devel_package() {
 		vmove usr/share/man/man3
 	}
 }
-ffplay_package() {
-	short_desc="Simple video player using FFmpeg and SDL2"
-	pkg_install() {
-		vmove usr/bin/ffplay
-		vmove "usr/share/man/man1/ffplay*"
-	}
-}

From ccadb49d9cbc77f943c6138477ba578f4337a935 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Mon, 16 Aug 2021 22:04:40 +0200
Subject: [PATCH 2/2] New package: ffplay-4.3.2

---
 srcpkgs/ffplay          |  1 -
 srcpkgs/ffplay/template | 47 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 delete mode 120000 srcpkgs/ffplay
 create mode 100644 srcpkgs/ffplay/template

diff --git a/srcpkgs/ffplay b/srcpkgs/ffplay
deleted file mode 120000
index a9f1eea092d5..000000000000
--- a/srcpkgs/ffplay
+++ /dev/null
@@ -1 +0,0 @@
-ffmpeg
\ No newline at end of file
diff --git a/srcpkgs/ffplay/template b/srcpkgs/ffplay/template
new file mode 100644
index 000000000000..a8819b61f086
--- /dev/null
+++ b/srcpkgs/ffplay/template
@@ -0,0 +1,47 @@
+# Template file for 'ffplay'
+# should be kept in sync with 'ffmpeg' (shared distfiles)
+pkgname=ffplay
+version=4.3.2
+wrksrc=ffmpeg-${version}
+revision=3
+hostmakedepends="pkg-config yasm"
+makedepends="ffmpeg-devel SDL2-devel"
+short_desc="Simple video player using FFmpeg and SDL2"
+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=46e4e64f1dd0233cbc0934b9f1c0da676008cad34725113fb7f802cfa84ccddb
+
+do_configure() {
+	# just to generate config.h
+	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
+	./configure --prefix=/usr --disable-stripping --disable-everything ${_args}
+}
+
+do_build() {
+	set +x
+	$CC -o ffplay fftools/ffplay.c fftools/cmdutils.c \
+		-lm -I. \
+		$(pkg-config --cflags --libs sdl2 libavcodec libavdevice libavfilter libavformat libavresample libavutil libpostproc libswresample libswscale)
+	set -x
+}
+
+do_install() {
+	vbin ffplay
+}

Re: [PR REVIEW] ffmpeg: remove ffplay subpackage

[ericonr]

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

New review comment by ericonr on void-packages repository

https://github.com/void-linux/void-packages/pull/32519#discussion_r689857486

Comment:
This feels somewhat fragile, since we could miss any defines added by configure scripts and what not. I'd almost say building the entire thing and just taking the binary afterwards is safer.

Re: ffmpeg: remove ffplay subpackage

[paper42]

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

New comment by paper42 on void-packages repository

https://github.com/void-linux/void-packages/pull/32519#issuecomment-899866105

Comment:
closing in favor of a better solution in #32521

Re: [PR PATCH] [Closed]: ffmpeg: remove ffplay subpackage

[paper42]

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

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

ffmpeg: remove ffplay subpackage
https://github.com/void-linux/void-packages/pull/32519

Description:
moved to a separate package due to a cyclic dependency
SDL2 - pipewire - ffmpeg (ffplay) - SDL2

I am not sure if this is the best approach.