diff options
Diffstat (limited to 'source/l/ffmpeg/ffmpeg.SlackBuild')
| -rwxr-xr-x | source/l/ffmpeg/ffmpeg.SlackBuild | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source/l/ffmpeg/ffmpeg.SlackBuild b/source/l/ffmpeg/ffmpeg.SlackBuild index 1553821b0..b66afc46d 100755 --- a/source/l/ffmpeg/ffmpeg.SlackBuild +++ b/source/l/ffmpeg/ffmpeg.SlackBuild @@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=ffmpeg VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -59,6 +59,9 @@ else LIBDIRSUFFIX="" fi +# GCC 14 "fix": +SLKCFLAGS="$SLKCFLAGS -Wno-error=int-conversion" + # If PulseAudio is not found, use the _alsa $TAG and disable it in the build: if [ ! -r /usr/lib${LIBDIRSUFFIX}/pkgconfig/libpulse.pc ]; then TAG="_alsa" @@ -123,9 +126,7 @@ libbs2b="" ; [ "${BS2B:-no}" != "no" ] && libbs2b="--enable-libbs2b" rubberband="" ; [ "${RUBBERBAND:-no}" != "no" ] && rubberband="--enable-librubberband" tesseract="" ; [ "${TESSERACT:-no}" != "no" ] && tesseract="--enable-libtesseract" libjack="" ; [ "${JACK:-no}" != "no" ] && libjack="--enable-libjack" -libaom="" ; [ "${AOM:-no}" != "no" ] && libaom="--enable-libaom" lv2="" ; [ "${LV2:-no}" != "no" ] && lv2="--enable-lv2" -libdav1d="" ; [ "${DAV1D:-no}" != "no" ] && libdav1d="--enable-libdav1d" rabbitmq="" ; [ "${RABBITMQ:-no}" != "no" ] && rabbitmq="--enable-librabbitmq" libcodec2="" ; [ "${CODEC2:-no}" != "no" ] && libcodec2="--enable-libcodec2" libsoxr="" ; [ "${SOXR:-no}" != "no" ] && libsoxr="--enable-libsoxr" @@ -159,9 +160,11 @@ liblensfun="" ; [ "${LENSFUN:-no}" != "no" ] && liblensfun="--enable-liblens fontconfig="" ; [ "${FONTCONFIG:-yes}" != "no" ] && fontconfig="--enable-libfontconfig" freetype="" ; [ "${FREETYPE:-yes}" != "no" ] && freetype="--enable-libfreetype" fribidi="" ; [ "${FRIBIDI:-yes}" != "no" ] && fribidi="--enable-libfribidi" +libaom="" ; [ "${AOM:-yes}" != "no" ] && libaom="--enable-libaom" libbluray="" ; [ "${BLURAY:-yes}" != "no" ] && libbluray="--enable-libbluray" libcaca="" ; [ "${CACA:-yes}" != "no" ] && libcaca="--enable-libcaca" libcdio="" ; [ "${LIBCDIO:-yes}" != "no" ] && libcdio="--enable-libcdio" +libdav1d="" ; [ "${DAV1D:-yes}" != "no" ] && libdav1d="--enable-libdav1d" libssh="" ; [ "${LIBSSH:-yes}" != "no" ] && libssh="--enable-libssh" libtheora="" ; [ "${THEORA:-yes}" != "no" ] && libtheora="--enable-libtheora" libv4l2="" ; [ "${V4L2:-yes}" != "no" ] && libv4l2="--enable-libv4l2" @@ -213,6 +216,9 @@ zcat $CWD/ffmpeg.vulkan.diff.gz | patch -p1 --verbose || exit 1 # Fix ctx memory leak: zcat $CWD/250471ea1745fc703eb346a2a662304536a311b1.patch | patch -p1 --verbose || exit 1 +# Patch for recent nv-codec-headers: +zcat $CWD/0004-support-nv-codec-headers-12.2.patch.gz | patch -p1 --verbose || exit 1 + CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ |