Skip to content

Commit

Permalink
ffmpeg: remove bin packages
Browse files Browse the repository at this point in the history
now provided by ffmpeg6
  • Loading branch information
zlice authored and classabbyamp committed Jul 21, 2024
1 parent 677a216 commit c065b25
Showing 1 changed file with 19 additions and 12 deletions.
31 changes: 19 additions & 12 deletions srcpkgs/ffmpeg/template
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@
# audacity also needs to be bumped when a new ffmpeg version bumps libavformat's soname!
pkgname=ffmpeg
version=4.4.4
revision=7
short_desc="Decoding, encoding and streaming software"
revision=8
build_style=meta
short_desc="Decoding, encoding and streaming software (transitional dummy package)"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://www.ffmpeg.org"
Expand All @@ -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 vulkan 'vulkan-loader-devel')
$(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
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"

desc_option_srt="Enable support for SRT (Secure, Reliable, Transport)"
desc_option_rist="Enable support for RIST (Reliable Internet Stream Transport)"
desc_option_sofa="Enable support for AES SOFA"
Expand Down Expand Up @@ -132,11 +135,16 @@ do_configure() {

do_build() {
make ${makejobs}
make doc/ff{mpeg,play}.1
}

# transitional dummy package for ffmpeg6
# binaries conflict with 6
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() {
Expand Down Expand Up @@ -213,8 +221,9 @@ ffmpeg-devel_package() {
libswscale>=${version}_${revision}
libswresample>=${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
# /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"
Expand All @@ -231,9 +240,7 @@ ffmpeg-devel_package() {
}

ffplay_package() {
short_desc="Simple video player using FFmpeg and SDL2"
pkg_install() {
vmove usr/bin/ffplay
vmove "usr/share/man/man1/ffplay*"
}
short_desc="Simple video player using FFmpeg and SDL2 (transitional dummy package)"
build_style="meta"
depends="ffplay6"
}

0 comments on commit c065b25

Please sign in to comment.