Skip to content
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

Jump to bottom

Remove OMX and MMAL from ARM builds #77

Merged
merged 4 commits into from
Dec 31, 2021
Merged

Remove OMX and MMAL from ARM builds #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2aab689
Remove OMX and MMAL from ARM builds
ferferga Nov 16, 2021
0eccbca
Add missing changelog from #65
ferferga Dec 27, 2021
d61644f
Install curl to avoid git errors while building
ferferga Dec 27, 2021
9e9c6e0
Remove svn and use git exclusively
ferferga Dec 27, 2021
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
4 changes: 3 additions & 1 deletion Dockerfile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,12 @@ ENV CFLAGS="-I${TARGET_DIR}/include $CFLAGS"

# Prepare Debian build environment
RUN apt-get update \
&& yes | apt-get install -y apt-transport-https ninja-build debhelper gnupg wget devscripts mmv equivs git nasm cmake pkg-config subversion dh-autoreconf libdrm-dev libpciaccess-dev python3-pip
&& yes | apt-get install -y apt-transport-https curl ninja-build debhelper gnupg wget devscripts mmv equivs git nasm cmake pkg-config subversion dh-autoreconf libdrm-dev libpciaccess-dev python3-pip

#Install meson
RUN pip3 install meson
# Avoids timeouts when using git
RUN git config --global http.postbuffer 524288000
# Link to docker-build script
RUN ln -sf ${SOURCE_DIR}/docker-build.sh /docker-build.sh

Expand Down
12 changes: 12 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,15 @@
jellyfin-ffmpeg (4.4.1-3) unstable; urgency=medium

* Remove OMX and MMAL from ARM builds

-- ferferga <ferferga@hotmail.com> Sun, 26 Dec 2021 19:58:10 +0100
ferferga marked this conversation as resolved.
Show resolved Hide resolved

jellyfin-ffmpeg (4.4.1-2) unstable; urgency=medium

* Enable Link Time Optimization (LTO)

-- Bond-009 <bond.009@outlook.com> Thu Apr 8 13:57:13 2021 +0200

jellyfin-ffmpeg (4.4.1-1) unstable; urgency=medium

* New upstream version 4.4.1
Expand Down
3 changes: 0 additions & 3 deletions debian/rules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,8 @@ CONFIG := --prefix=${TARGET_DIR} \

CONFIG_ARM_COMMON := --toolchain=hardened \
--enable-cross-compile \
--enable-omx \
--enable-omx-rpi \

CONFIG_ARM := ${CONFIG_ARM_COMMON} \
--enable-mmal \
--arch=armhf \
--cross-prefix=/usr/bin/arm-linux-gnueabihf- \

Expand Down
8 changes: 4 additions & 4 deletions docker-build-win64.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -431,8 +431,8 @@ popd
popd

# OpenCL headers
svn checkout https://github.com/KhronosGroup/OpenCL-Headers/trunk/CL
pushd CL
git clone --depth=1 https://github.com/KhronosGroup/OpenCL-Headers
pushd OpenCL-Headers/CL
mkdir -p ${FF_DEPS_PREFIX}/include/CL
mv * ${FF_DEPS_PREFIX}/include/CL
popd
Expand Down Expand Up @@ -477,8 +477,8 @@ make PREFIX=${FF_DEPS_PREFIX} install
popd

# AMF
svn checkout https://github.com/GPUOpen-LibrariesAndSDKs/AMF/trunk/amf/public/include
pushd include
git clone --depth=1 https://github.com/GPUOpen-LibrariesAndSDKs/AMF
pushd AMF/amf/public/include
mkdir -p ${FF_DEPS_PREFIX}/include/AMF
mv * ${FF_DEPS_PREFIX}/include/AMF
popd
Expand Down
22 changes: 2 additions & 20 deletions docker-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,8 +95,8 @@ prepare_extra_amd64() {

# Download and setup AMD AMF headers
# https://www.ffmpeg.org/general.html#AMD-AMF_002fVCE
svn checkout https://github.com/GPUOpen-LibrariesAndSDKs/AMF/trunk/amf/public/include
pushd include
git clone --depth=1 https://github.com/GPUOpen-LibrariesAndSDKs/AMF
pushd AMF/amf/public/include
mkdir -p /usr/include/AMF
mv * /usr/include/AMF
popd
Expand Down Expand Up @@ -213,15 +213,6 @@ EOF
ln -fs /usr/share/zoneinfo/America/Toronto /etc/localtime
yes | apt-get install -y -o APT::Immediate-Configure=0 gcc-${GCC_VER}-source gcc-${GCC_VER}-arm-linux-gnueabihf g++-${GCC_VER}-arm-linux-gnueabihf libstdc++6-armhf-cross binutils-arm-linux-gnueabihf bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip libc6-dev:armhf linux-libc-dev:armhf libgcc1:armhf libcurl4-openssl-dev:armhf libfontconfig1-dev:armhf libfreetype6-dev:armhf liblttng-ust0:armhf libstdc++6:armhf
popd

# Fetch RasPi headers to build MMAL and OMX-RPI support
pushd ${SOURCE_DIR}
svn checkout https://github.com/raspberrypi/firmware/trunk/opt/vc/include rpi/include
svn checkout https://github.com/raspberrypi/firmware/trunk/opt/vc/lib rpi/lib
cp -a rpi/include/* /usr/include
cp -a rpi/include/IL/* /usr/include
cp -a rpi/lib/* /usr/lib
popd
}
prepare_crossbuild_env_arm64() {
# Prepare the Ubuntu-specific cross-build requirements
Expand Down Expand Up @@ -255,15 +246,6 @@ EOF
ln -fs /usr/share/zoneinfo/America/Toronto /etc/localtime
yes | apt-get install -y -o APT::Immediate-Configure=0 gcc-${GCC_VER}-source gcc-${GCC_VER}-aarch64-linux-gnu g++-${GCC_VER}-aarch64-linux-gnu libstdc++6-arm64-cross binutils-aarch64-linux-gnu bison flex libtool gdb sharutils netbase libmpc-dev libmpfr-dev libgmp-dev systemtap-sdt-dev autogen expect chrpath zlib1g-dev zip libc6-dev:arm64 linux-libc-dev:arm64 libgcc1:arm64 libcurl4-openssl-dev:arm64 libfontconfig1-dev:arm64 libfreetype6-dev:arm64 liblttng-ust0:arm64 libstdc++6:arm64
popd

# Fetch RasPi headers to build MMAL and OMX-RPI support
pushd ${SOURCE_DIR}
svn checkout https://github.com/raspberrypi/firmware/trunk/opt/vc/include rpi/include
svn checkout https://github.com/raspberrypi/firmware/trunk/opt/vc/lib rpi/lib
cp -a rpi/include/* /usr/include
cp -a rpi/include/IL/* /usr/include
cp -a rpi/lib/* /usr/lib
popd
}

# Set the architecture-specific options
Expand Down