Skip to content

Commit

Permalink
ffmpeg: disable ffplay(1) by default, relbump
Browse files Browse the repository at this point in the history
  • Loading branch information
sighook committed Dec 10, 2024
1 parent 701299b commit 1e1288f
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 31 deletions.
3 changes: 0 additions & 3 deletions ffmpeg/.footprint
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/ffmpeg
-rwxr-xr-x root/root usr/bin/ffmpeg-x264-10bit
-rwxr-xr-x root/root usr/bin/ffplay
-rwxr-xr-x root/root usr/bin/ffprobe
drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/libavcodec/
Expand Down Expand Up @@ -210,8 +209,6 @@ drwxr-xr-x root/root usr/share/man/man1/
-rw-r--r-- root/root usr/share/man/man1/ffmpeg-scaler.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffmpeg-utils.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffmpeg.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffplay-all.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffplay.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffprobe-all.1.gz
-rw-r--r-- root/root usr/share/man/man1/ffprobe.1.gz
drwxr-xr-x root/root usr/share/man/man3/
Expand Down
71 changes: 43 additions & 28 deletions ffmpeg/Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,75 +4,90 @@

name=ffmpeg
version=4.4.5
release=1
release=2
source="https://ffmpeg.org/releases/$name-$version.tar.bz2
ffmpeg-x264-10bit.sh CVE-2018-6621.patch"

build() {
#https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2018-6621
patch -p1 -d $name-$version -i $SRC/CVE-2018-6621.patch
patch -d $name-$version -Np1 -i $SRC/CVE-2018-6621.patch

pkgman isinst ffnvcodec-headers && \
if pkgman isinst ffnvcodec-headers; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-nvdec --enable-nvenc"
fi

pkgman isinst libvdpau && \
if pkgman isinst libvdpau; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-vdpau"
fi

pkgman isinst x264 && \
if pkgman isinst x264; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libx264"
fi

pkgman isinst libass && \
if pkgman isinst libass; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libass"
fi

pkgman isinst gsm && \
if pkgman isinst gsm; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libgsm"
fi

pkgman isinst lame && \
if pkgman isinst lame; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libmp3lame"
fi

pkgman isinst opus && \
if pkgman isinst opus; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libopus"
fi

pkgman isinst libvorbis && \
if pkgman isinst libvorbis; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libvorbis"
fi

pkgman isinst libtheora && \
if pkgman isinst libtheora; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libtheora"
fi

pkgman isinst fdk-aac && \
if pkgman isinst fdk-aac; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libfdk-aac --enable-nonfree"
fi

pkgman isinst dav1d && \
if pkgman isinst dav1d; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-libdav1d"
fi

pkgman isinst gnutls && \
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-gnutls" || \
if pkgman isinst gnutls; then
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-gnutls"
else
PKGMK_FFMPEG="$PKGMK_FFMPEG --enable-openssl --enable-nonfree"
fi

mkdir build; cd build

# --disable-ffplay: otherwise requires libsdl2
../$name-$version/configure \
--prefix=/usr \
--disable-debug \
--disable-doc \
--enable-gpl \
--enable-version3 \
--enable-shared \
--enable-pic \
--enable-ffplay \
--enable-avfilter \
--enable-postproc \
--enable-pthreads \
--enable-swresample \
--enable-avresample \
--disable-ffplay \
--disable-libfontconfig \
--disable-libfreetype \
--disable-libfribidi \
--disable-libfontconfig \
--disable-libxcb \
--disable-libxcb-shape \
--disable-libxcb-shm \
--disable-libxcb-xfixes \
--disable-libxcb-shape \
${PKGMK_FFMPEG} \
--enable-avfilter \
--enable-avresample \
--enable-ffprobe \
--enable-gpl \
--enable-pic \
--enable-postproc \
--enable-pthreads \
--enable-shared \
--enable-swresample \
--enable-version3 \
$PKGMK_FFMPEG \

make V=1
make DESTDIR=$PKG install install-man
Expand Down

0 comments on commit 1e1288f

Please sign in to comment.