diff --git a/common.sh b/common.sh index 3b9a19fe..a850d690 100644 --- a/common.sh +++ b/common.sh @@ -18,6 +18,7 @@ FFMPEG_CONFIGURE_FLAGS=( --disable-iconv # External libraries + --enable-libbluray --enable-libdav1d # FFMpeg components @@ -35,6 +36,7 @@ FFMPEG_CONFIGURE_FLAGS=( --disable-everything # FFMpeg options - enable what we need + --enable-protocol=bluray --enable-protocol=file --enable-demuxers --enable-parsers diff --git a/freebsd-x64/build.sh b/freebsd-x64/build.sh index 58354f7e..a2e8e84b 100755 --- a/freebsd-x64/build.sh +++ b/freebsd-x64/build.sh @@ -7,6 +7,13 @@ SOURCE_DIR="${SCRIPT_DIR}/../ffmpeg" mkdir -p "${SCRIPT_DIR}/output" "${SCRIPT_DIR}/build" +fetch -qo- http://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar -xjf- -C /tmp +pushd /tmp/libbluray-1.3.4 +./configure --prefix="${SCRIPT_DIR}/build" --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig +gmake +gmake install +popd + cp "${SCRIPT_DIR}/../common.sh" "${SOURCE_DIR}" cp "${SCRIPT_DIR}/compile.sh" "${SOURCE_DIR}" diff --git a/freebsd-x64/compile.sh b/freebsd-x64/compile.sh index c18fba38..63156c24 100755 --- a/freebsd-x64/compile.sh +++ b/freebsd-x64/compile.sh @@ -20,7 +20,7 @@ FFMPEG_CONFIGURE_FLAGS+=( ) ARGS=("${NATIVE_DIR_FLAGS[@]}" "${FFMPEG_CONFIGURE_FLAGS[@]}") -./configure "${ARGS[@]}" +PKG_CONFIG_PATH="${OUT_DIR}/build/lib/pkgconfig" ./configure "${ARGS[@]}" gmake -j6 gmake install diff --git a/linux-arm-vfpv3d16/Dockerfile b/linux-arm-vfpv3d16/Dockerfile index 4397ce1a..04bc2f81 100644 --- a/linux-arm-vfpv3d16/Dockerfile +++ b/linux-arm-vfpv3d16/Dockerfile @@ -33,3 +33,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static --prefix=/usr/arm-linux-gnueabihf --libdir=/usr/arm-linux-gnueabihf/lib --cross-file=/root/armhf.txt -- .. && \ ninja -v && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +CFLAGS=-mfpu=vfpv3-d16 PKG_CONFIG_PATH=/usr/arm-linux-gnueabihf/lib/pkgconfig ./configure --host=arm-linux-gnueabihf --prefix=/usr/arm-linux-gnueabihf --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install diff --git a/linux-arm/Dockerfile b/linux-arm/Dockerfile index d85a6055..747987d3 100644 --- a/linux-arm/Dockerfile +++ b/linux-arm/Dockerfile @@ -29,3 +29,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static --prefix=/usr/arm-linux-gnueabihf --libdir=/usr/arm-linux-gnueabihf/lib --cross-file=/root/armhf.txt -- .. && \ ninja && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +PKG_CONFIG_PATH=/usr/arm-linux-gnueabihf/lib/pkgconfig ./configure --host=arm-linux-gnueabihf --prefix=/usr/arm-linux-gnueabihf --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install diff --git a/linux-arm64/Dockerfile b/linux-arm64/Dockerfile index 3a2c0b7a..0d81b981 100644 --- a/linux-arm64/Dockerfile +++ b/linux-arm64/Dockerfile @@ -29,3 +29,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static --prefix=/usr/aarch64-linux-gnu --libdir=/usr/aarch64-linux-gnu/lib --cross-file=/root/aarch64.txt -- .. && \ ninja && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +PKG_CONFIG_PATH=/usr/aarch64-linux-gnu/lib/pkgconfig ./configure --host=aarch64-linux-gnu --prefix=/usr/aarch64-linux-gnu --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install diff --git a/linux-x64/Dockerfile b/linux-x64/Dockerfile index 99d586c3..518191f5 100644 --- a/linux-x64/Dockerfile +++ b/linux-x64/Dockerfile @@ -26,3 +26,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static .. && \ ninja && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +./configure --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install diff --git a/linux-x86/Dockerfile b/linux-x86/Dockerfile index 65222050..5e52f58a 100644 --- a/linux-x86/Dockerfile +++ b/linux-x86/Dockerfile @@ -33,3 +33,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static --prefix=/usr/i686-linux-gnu --libdir=/usr/i686-linux-gnu/lib --cross-file=/root/x86.txt -- .. && \ ninja && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +PKG_CONFIG_PATH=/usr/i686-linux-gnu/lib/pkgconfig ./configure --host=i686-linux-gnu --prefix=/usr/i686-linux-gnu --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install diff --git a/osx-arm64/build.sh b/osx-arm64/build.sh index 04a518e2..0304a627 100755 --- a/osx-arm64/build.sh +++ b/osx-arm64/build.sh @@ -12,6 +12,15 @@ response=$(brew fetch --force --bottle-tag=arm64_big_sur dav1d | grep "Downloade parsed=${response#Downloaded to: } brew install -v "$parsed" +rm -rf "${SCRIPT_DIR}"/libbluray +mkdir -p "${SCRIPT_DIR}"/libbluray +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj -C "${SCRIPT_DIR}/libbluray" --strip-components=1 +pushd "${SCRIPT_DIR}"/libbluray +CFLAGS="-arch arm64 -mmacosx-version-min=11.0" LDFLAGS="-arch arm64" ./configure --host=aarch64-apple-darwin prefix="${SCRIPT_DIR}/build" --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig +make +make install +popd + mkdir -p "${SCRIPT_DIR}/output" "${SCRIPT_DIR}/build" cp "${SCRIPT_DIR}/../common.sh" "${SOURCE_DIR}" diff --git a/osx-arm64/compile.sh b/osx-arm64/compile.sh index 8e9e8abd..733c5341 100755 --- a/osx-arm64/compile.sh +++ b/osx-arm64/compile.sh @@ -19,7 +19,7 @@ FFMPEG_CONFIGURE_FLAGS+=( ) ARGS=("${NATIVE_DIR_FLAGS[@]}" "${FFMPEG_CONFIGURE_FLAGS[@]}") -CFLAGS="-arch arm64" LDFLAGS="-arch arm64" ./configure "${ARGS[@]}" +CFLAGS="-arch arm64" LDFLAGS="-arch arm64 -framework CoreFoundation -framework DiskArbitration" PKG_CONFIG_PATH="${OUT_DIR}/build/lib/pkgconfig" ./configure "${ARGS[@]}" make -j6 make install diff --git a/osx-x64/build.sh b/osx-x64/build.sh index 91e006d1..d2200932 100755 --- a/osx-x64/build.sh +++ b/osx-x64/build.sh @@ -9,6 +9,15 @@ brew install automake shtool nasm dav1d dylibbundler mkdir -p "${SCRIPT_DIR}/output" "${SCRIPT_DIR}/build" +rm -rf "${SCRIPT_DIR}"/libbluray +mkdir -p "${SCRIPT_DIR}"/libbluray +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj -C "${SCRIPT_DIR}/libbluray" --strip-components=1 +pushd "${SCRIPT_DIR}"/libbluray +CFLAGS="-mmacosx-version-min=10.13" ./configure --prefix="${SCRIPT_DIR}/build" --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig +make +make install +popd + cp "${SCRIPT_DIR}/../common.sh" "${SOURCE_DIR}" cp "${SCRIPT_DIR}/compile.sh" "${SOURCE_DIR}" diff --git a/osx-x64/compile.sh b/osx-x64/compile.sh index ab87ec63..b14f41c7 100755 --- a/osx-x64/compile.sh +++ b/osx-x64/compile.sh @@ -16,7 +16,7 @@ FFMPEG_CONFIGURE_FLAGS+=( ) ARGS=("${NATIVE_DIR_FLAGS[@]}" "${FFMPEG_CONFIGURE_FLAGS[@]}") -./configure "${ARGS[@]}" +LDFLAGS="-framework CoreFoundation -framework DiskArbitration" PKG_CONFIG_PATH="${OUT_DIR}/build/lib/pkgconfig" ./configure "${ARGS[@]}" make -j6 make install diff --git a/win-x64/Dockerfile b/win-x64/Dockerfile index 8020c97f..455a45d3 100644 --- a/win-x64/Dockerfile +++ b/win-x64/Dockerfile @@ -27,3 +27,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static --prefix=/usr/x86_64-w64-mingw32 --libdir=/usr/x86_64-w64-mingw32/lib --cross-file=../package/crossfiles/x86_64-w64-mingw32.meson .. && \ ninja && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +PKG_CONFIG_PATH=/usr/x86_64-w64-mingw32/lib/pkgconfig ./configure --host=x86_64-w64-mingw32 --prefix=/usr/x86_64-w64-mingw32 --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install diff --git a/win-x86/Dockerfile b/win-x86/Dockerfile index 08a6293b..adda8ff2 100644 --- a/win-x86/Dockerfile +++ b/win-x86/Dockerfile @@ -27,3 +27,10 @@ cd /dav1d/build && \ meson setup -Denable_tools=false -Denable_tests=false --default-library=static --prefix=/usr/i686-w64-mingw32 --libdir=/usr/i686-w64-mingw32/lib --cross-file=../package/crossfiles/i686-w64-mingw32.meson .. && \ ninja && \ ninja install + +RUN mkdir /libbluray && \ +wget -qO- https://download.videolan.org/videolan/libbluray/1.3.4/libbluray-1.3.4.tar.bz2 | tar xj --strip-components=1 -C /libbluray && \ +cd /libbluray && \ +PKG_CONFIG_PATH=/usr/i686-w64-mingw32/lib/pkgconfig ./configure --host=i686-w64-mingw32 --prefix=/usr/i686-w64-mingw32 --disable-shared --disable-dependency-tracking --disable-silent-rules --disable-bdjava-jar --disable-examples --without-external-libudfread --without-libxml2 --without-freetype --without-fontconfig && \ +make && \ +make install