Skip to content

Commit d33af03

Browse files
committed
fix
1 parent ecc5f4a commit d33af03

1 file changed

Lines changed: 18 additions & 21 deletions

File tree

srcpkgs/ffmpeg7/template

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,18 @@
22
pkgname=ffmpeg7
33
version=7.1
44
revision=1
5-
_arch="x86_64"
65
hostmakedepends="git automake autoconf pkg-config"
76
makedepends="zlib-devel bzip2-devel freetype-devel alsa-lib-devel libXfixes-devel
8-
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
9-
libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
10-
libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
11-
speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
12-
libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
13-
x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
14-
libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
15-
zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
16-
$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
17-
$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
7+
libXext-devel libXvMC-devel libxcb-devel lame-devel libtheora-devel
8+
libvorbis-devel x264-devel xvidcore-devel jack-devel SDL2-devel
9+
libcdio-paranoia-devel librtmp-devel libmodplug-devel gnutls-devel
10+
speex-devel celt-devel harfbuzz-devel libass-devel opus-devel ocl-icd-devel
11+
libbs2b-devel libvidstab-devel vmaf-devel libbluray-devel pulseaudio-devel
12+
x265-devel v4l-utils-devel libvpx-devel libaom-devel libdav1d-devel
13+
libwebp-devel libdrm-devel srt-devel librist-devel vulkan-loader-devel
14+
zimg-devel libmysofa-devel libsvt-av1-devel $(vopt_if vaapi libva-devel)
15+
$(vopt_if vdpau libvdpau-devel) $(vopt_if fdk_aac fdk-aac-devel)
16+
$(vopt_if onevpl oneVPL-devel) $(vopt_if nvcodec nv-codec-headers)"
1817

1918
maintainer="Komeil Parseh <ahmdparsh129@gmail.com>"
2019
short_desc="Decoding, encoding and streaming software"
@@ -32,14 +31,11 @@ case "$XBPS_TARGET_MACHINE" in
3231
hostmakedepends+=" nasm"
3332
;;
3433
x86_64*)
35-
hostmakedepends+=" nasm"
36-
build_options_default+=" vaapi vdpau nvcodec onevpl"
37-
;;
38-
ppc64*)
39-
build_options_default+=" vaapi vdpau"
34+
hostmakedepends+=" nasm"
35+
build_options_default+=" vaapi vdpau nvcodec onevpl"
4036
;;
41-
mips*)
42-
CFLAGS="-mnan=legacy";;
37+
ppc64*) build_options_default+=" vaapi vdpau";;
38+
mips*) CFLAGS="-mnan=legacy";;
4339
esac
4440

4541
do_configure() {
@@ -176,11 +172,10 @@ ffmpeg7-devel_package() {
176172
libswscale7>=${version}_${revision}
177173
libswresample7>=${version}_${revision}"
178174
short_desc+=" - development files"
179-
conflicts="ffmpeg-devel"
180-
replaces="ffmpeg-devel>=0"
175+
conflicts="ffmpeg*-devel"
176+
replaces="ffmpeg*-devel>=0"
181177
case "$XBPS_TARGET_MACHINE" in
182178
i686*)
183-
# /usr/bin/strip: error: the input file '/destdir//ffmpeg-devel-4.4.4/usr/lib/libavfilter.a(vf_atadenoise.o)' has no sections
184179
nostrip_files="/usr/lib/libavfilter.a";;
185180
esac
186181
pkg_install() {
@@ -195,6 +190,8 @@ ffmpeg7-devel_package() {
195190

196191
ffplay7_package() {
197192
short_desc="Simple video player using FFmpeg and SDL2"
193+
conflicts="ffplay*"
194+
replaces="ffplay*>0"
198195
pkg_install() {
199196
vmove usr/bin/ffplay
200197
vmove "usr/share/man/man1/ffplay*"

0 commit comments

Comments
 (0)