fix

Author: mmdbalkhi

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 <[email protected]>"
 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*"