ffmpeg: remove bin packages

now provided by ffmpeg6
This commit is contained in:
zlice 2024-07-06 15:38:10 -04:00 committed by classabbyamp
parent 677a2164e4
commit c065b25f64
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5

View file

@ -2,8 +2,9 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname! # audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg pkgname=ffmpeg
version=4.4.4 version=4.4.4
revision=7 revision=8
short_desc="Decoding, encoding and streaming software" build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later" license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org" homepage="https://www.ffmpeg.org"
@ -29,11 +30,13 @@ makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-deve
$(vopt_if srt srt-devel) $(vopt_if rist librist-devel) $(vopt_if srt srt-devel) $(vopt_if rist librist-devel)
$(vopt_if vulkan 'vulkan-loader-devel') $(vopt_if vulkan 'vulkan-loader-devel')
$(vopt_if nvenc nv-codec-headers) $(vopt_if nvdec nv-codec-headers)" $(vopt_if nvenc nv-codec-headers) $(vopt_if nvdec nv-codec-headers)"
depends="ffplay>=${version}_${revision}" # ffmpeg6 provides ffmpeg, ffprobe, ffplay, etc
depends="ffmpeg6"
build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio build_options="x265 v4l2 vaapi vdpau vpx fdk_aac aom nvenc sndio pulseaudio
dav1d zimg webp sofa vulkan drm svtav1 srt rist nvdec" dav1d zimg webp sofa vulkan drm svtav1 srt rist nvdec"
build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm srt rist" build_options_default="x265 v4l2 vpx aom sndio pulseaudio dav1d webp vulkan drm srt rist"
desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)" desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)"
desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)" desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)"
desc_option_sofa="Enable support for AES SOFA" desc_option_sofa="Enable support for AES SOFA"
@ -132,11 +135,16 @@ do_configure() {
do_build() { do_build() {
make ${makejobs} make ${makejobs}
make doc/ff{mpeg,play}.1
} }
# transitional dummy package for ffmpeg6
# binaries conflict with 6
do_install() { do_install() {
make DESTDIR=${DESTDIR} install install-man make DESTDIR=${DESTDIR} install
rm -rf ${DESTDIR}/usr/bin
rm -rf ${DESTDIR}/usr/share/man/man1
rm -rf ${DESTDIR}/usr/share/ffmpeg/ffprobe.xsd
rm -rf ${DESTDIR}/usr/share/ffmpeg/libvpx*ffpreset
} }
libavcodec_package() { libavcodec_package() {
@ -213,8 +221,9 @@ ffmpeg-devel_package() {
libswscale>=${version}_${revision} libswscale>=${version}_${revision}
libswresample>=${version}_${revision} libswresample>=${version}_${revision}
libavresample>=${version}_${revision}" libavresample>=${version}_${revision}"
short_desc+=" - development files" short_desc="Decoding, encoding and streaming software - development files"
conflicts="ffmpeg6-devel"
replaces="ffmpeg6-devel>=0"
if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then if [ "$XBPS_TARGET_MACHINE" = "i686" ]; then
# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections # /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" nostrip_files="/usr/lib/libavfilter.a"
@ -231,9 +240,7 @@ ffmpeg-devel_package() {
} }
ffplay_package() { ffplay_package() {
short_desc="Simple video player using FFmpeg and SDL2" short_desc="Simple video player using FFmpeg and SDL2 (transitional dummy package)"
pkg_install() { build_style="meta"
vmove usr/bin/ffplay depends="ffplay6"
vmove "usr/share/man/man1/ffplay*"
}
} }