FFmpeg 8.0

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index 19b5b8757b6e94c8812f422cd7275b472bc045f0325fe550e7db9e88781d400f..f3f6a55ffcc196a17bf4badcc1d8202cfea1c8e85727cc6dfc4020d88bbebf74 100644 (file)
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -38,8 +38,7 @@
 /dq-20240101.tar.zst
 /dq.git/
 /expat-2.6.2.tar.xz
-/ffmpeg-n7.2-dev-1370-g5021764413.tar.zst
-/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst
+/ffmpeg-n8.0.tar.zst
 /ffmpeg.git/
 /flac-1.4.3.tar.xz
 /fltk-1.3.9-docs-html.tar.gz
@@ -175,7 +174,7 @@
 /mpc-1.3.1.tar.gz
 /mpfr-2.4.2.tar.xz
 /mpfr-4.2.1.tar.xz
-/mpv-v0.37.0-546-g474e213f52.tar.zst
+/mpv-v0.40.0-445-g7815181b19.tar.zst
 /mpv.git/
 /mu-1.10.8.tar.xz
 /mupdf-1.24.0-170-g05063f228.tar.zst

diff --git a/build/distfiles/ffmpeg-n7.2-dev-1370-g5021764413.tar.zst.do b/build/distfiles/ffmpeg-n7.2-dev-1370-g5021764413.tar.zst.do
deleted file mode 100644 (file)
index 1a232ad..0000000
--- a/build/distfiles/ffmpeg-n7.2-dev-1370-g5021764413.tar.zst.do
+++ /dev/null
@@ -1,7 +0,0 @@
-[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../..
-sname=$1.do . "$BASS_ROOT"/lib/rc
-[ -d ffmpeg.git ] || git clone --depth 1 --bare https://github.com/FFmpeg/FFmpeg.git ffmpeg.git >&2
-cd ffmpeg.git
-commit=5021764413a138f340ba46a9b145215b7535ea83
-git fetch origin $commit >&2
-git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR

diff --git a/build/distfiles/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst.do b/build/distfiles/ffmpeg-n8.0.tar.zst.do
similarity index 100%
rename from build/distfiles/ffmpeg-n7.2-dev-3093-g35a6de137a.tar.zst.do
rename to build/distfiles/ffmpeg-n8.0.tar.zst.do

diff --git a/build/distfiles/mpv-v0.37.0-546-g474e213f52.tar.zst.do b/build/distfiles/mpv-v0.40.0-445-g7815181b19.tar.zst.do
similarity index 85%
rename from build/distfiles/mpv-v0.37.0-546-g474e213f52.tar.zst.do
rename to build/distfiles/mpv-v0.40.0-445-g7815181b19.tar.zst.do
index e336c225d1164652917be56badfc46619f7648e4966fd1fbdb862d63b5d8a47c..e83d1b97f0e21276ddeb9270ce002c1d2eaa44870a7504fb982d3eb82c5319b8 100644 (file)
--- a/build/distfiles/mpv-v0.37.0-546-g474e213f52.tar.zst.do
+++ b/build/distfiles/mpv-v0.40.0-445-g7815181b19.tar.zst.do
@@ -2,6 +2,6 @@
 sname=$1.do . "$BASS_ROOT"/lib/rc
 [ -d mpv.git ] || git clone --depth 1 --bare https://github.com/mpv-player/mpv.git >&2
 cd mpv.git
-commit=474e213f528c5c9c72faabb83f75e441a212d591
+commit=7815181b19e29a887a7105330768b9078e99a42e
 git fetch origin $commit >&2
 git archive --prefix=${1%.tar.zst}/ $commit | $COMPRESSOR

diff --git a/build/skel/lang/lua-5.2.4.do b/build/skel/lang/lua-5.2.4.do
index eab84824732cb756d7bc3f3d1b1261eb83a5c25e065e8b374aef53171cab1c8d..f01c4aaf3e2456bf276ed3fce5078e2186a9c6c44892496bb5084c117ba80b94 100644 (file)
--- a/build/skel/lang/lua-5.2.4.do
+++ b/build/skel/lang/lua-5.2.4.do
@@ -14,7 +14,7 @@ $TAR xf "$DISTFILES"/$NAME.tar.gz
 
 cd $NAME
 uname -s | grep -q -i freebsd && sys=freebsd || sys=linux
-make -j$MAKE_JOBS CC=cc CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS -lncurses" $sys >&2
+make -j$MAKE_JOBS CC=cc CFLAGS="$CFLAGS -fPIC" LDFLAGS="$LDFLAGS -lncurses" $sys >&2
 make install INSTALL_TOP="$SKELBINS"/$ARCH/$NAME-$hsh >&2
 cd "$SKELBINS"/$ARCH/$NAME-$hsh
 mkdir -p libdata/pkgconfig

diff --git a/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do b/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do
deleted file mode 100644 (file)
index 26082b6..0000000
--- a/build/skel/multimedia/ffmpeg-n7.2-dev-1370-g5021764413.do
+++ /dev/null
@@ -1,52 +0,0 @@
-[ -n "$BASS_ROOT" ] || BASS_ROOT="$(dirname "$(realpath -- "$0")")"/../../../..
-sname=$1.do . "$BASS_ROOT"/lib/rc
-. "$BASS_ROOT"/build/skel/common.rc
-
-bdeps="
-rc-paths
-stow
-archivers/zstd
-devel/gmake-4.4.1
-devel/pkgconf-2.1.1
-textproc/texinfo-7.1.1
-devel/nasm-2.16.01
-"
-rdeps="
-audio/flac-1.4.3
-audio/opus-1.5.2
-audio/wavpack-5.7.0
-multimedia/dav1d-1.5.2
-multimedia/libvpx-v1.14.1-303-gd6ae3ea465
-multimedia/svt-av1-v3.1.2
-multimedia/x264-2024-05-12
-security/gnutls-3.8.6
-"
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.zst $rdeps
-hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
-. "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
-"$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
-. ./rc
-$TAR xf "$DISTFILES"/$NAME.tar.zst
-"$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
-
-cd $NAME
-./configure --prefix="$SKELBINS"/$ARCH/$NAME-$hsh \
-    --cc=cc --cxx=c++ --objcc=cc --dep-cc=cc \
-    --enable-gpl \
-    --enable-shared --enable-pic \
-    --enable-postproc \
-    --enable-avfilter \
-    --enable-pthreads \
-    --disable-alsa \
-    --enable-gnutls \
-    --enable-libsvtav1 --enable-libdav1d \
-    --enable-libopus --enable-libvorbis \
-    --enable-libvpx \
-    --enable-libx264 \
-    --disable-manpages >&2
-gmake -j$MAKE_JOBS >&2
-gmake install install-doc >&2
-
-cd "$SKELBINS"/$ARCH
-"$BASS_ROOT"/build/lib/prepare-preinst-010-rdeps $NAME-$hsh $rdeps
-"$BASS_ROOT"/build/lib/mk-pkg $NAME-$hsh

diff --git a/build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do b/build/skel/multimedia/ffmpeg-n8.0.do
similarity index 100%
rename from build/skel/multimedia/ffmpeg-n7.2-dev-3093-g35a6de137a.do
rename to build/skel/multimedia/ffmpeg-n8.0.do

diff --git a/build/skel/multimedia/mpv-v0.37.0-546-g474e213f52.do b/build/skel/multimedia/mpv-v0.40.0-445-g7815181b19.do
similarity index 92%
rename from build/skel/multimedia/mpv-v0.37.0-546-g474e213f52.do
rename to build/skel/multimedia/mpv-v0.40.0-445-g7815181b19.do
index 188645d042d2ba492be0af47b5af9250a3f86c417599c6e90a030e53119fb002..b847eef5c23691203adb74f619a6a9220de1da437973823fd7c662b3284a65cc 100644 (file)
--- a/build/skel/multimedia/mpv-v0.37.0-546-g474e213f52.do
+++ b/build/skel/multimedia/mpv-v0.40.0-445-g7815181b19.do
@@ -14,10 +14,10 @@ lang/Python-3.10.14
 rdeps="
 graphics/lcms2-2.16
 lang/lua-5.2.4
-multimedia/ffmpeg-n7.2-dev-1370-g5021764413
+multimedia/ffmpeg-n8.0
 multimedia/libass-0.17.2
 "
-meson=meson-0.63.3
+meson=meson-1.7.2
 placebo=libplacebo-v6.338.0-117-g5c1e6da2
 redo-ifchange $bdeps \
     "$DISTFILES"/$NAME.tar.zst \
@@ -38,7 +38,7 @@ cd subprojects
 tar xf "$DISTFILES"/$placebo.tar.zst --options read_concatenated_archives
 mv $placebo libplacebo
 cd ..
-sed -i.tmp "/gl-x11/s/disabled/auto/" meson_options.txt
+sed -i.tmp "/gl-x11/s/disabled/auto/" meson.options
 ../$meson/meson.py setup -Dgpl=true -Dx11=enabled -Dalsa=disabled build >&2
 ../$meson/meson.py compile -C build >&2
 mkdir -p "$SKELBINS"/$ARCH/$NAME-$hsh/share/man/man1