Skip to content

Bluray protocol support #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haegrr wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Bluray protocol support #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
14aa22b
Add build flags for bluray and make build on macOS Intel
haegrr Dec 20, 2022
40cb66c
Make build on Windows
haegrr Dec 21, 2022
db161a7
macOS Intel: rebuild libbluray without fontconfig and freetype
haegrr Dec 21, 2022
6e1e82e
macOS Intel: bundle libbluray dylib
haegrr Dec 21, 2022
7db7214
Make build on all the Linuxes except x64
haegrr Dec 21, 2022
4bd28b7
Make build on macOS ARM
haegrr Dec 21, 2022
5df6307
Use libbluray source release instead of cloning Git repo
haegrr Dec 21, 2022
1836640
Build libbluray --without-libxml2
haegrr Dec 22, 2022
b9583af
Make build on Linux x64
haegrr Dec 22, 2022
7313a5a
Make build on FreeBSD
haegrr Dec 22, 2022
e3afe3b
Fix OSX builds. Link libbluray statically.
haegrr Dec 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ FFMPEG_CONFIGURE_FLAGS=(
--disable-iconv

# External libraries
--enable-libbluray
--enable-libdav1d

# FFMpeg components
Expand All @@ -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
Expand Down
7 changes: 7 additions & 0 deletions freebsd-x64/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion freebsd-x64/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions linux-arm-vfpv3d16/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions linux-arm/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions linux-arm64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions linux-x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions linux-x86/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
9 changes: 9 additions & 0 deletions osx-arm64/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion osx-arm64/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions osx-x64/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
2 changes: 1 addition & 1 deletion osx-x64/compile.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions win-x64/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
7 changes: 7 additions & 0 deletions win-x86/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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