Merge pull request #54 from nyanmisaka/zscale-arm

Add zscale filter to armhf/arm64 for HDR thumbnails extraction

build.yaml

@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin-ffmpeg"
-version: "4.3.1-2"
+version: "4.3.1-3"
 packages:
   - stretch-amd64
   - stretch-armhf

debian/changelog

@@ -1,3 +1,9 @@
+jellyfin-ffmpeg (4.3.1-3) unstable; urgency=medium
+
+  * Add zscale filter to armhf/arm64 for HDR thumbnails extraction
+
+ -- nyanmisaka <nst799610810@gmail.com>  Wed, 02 Dec 2020 20:52:33 +0800
+
 jellyfin-ffmpeg (4.3.1-2) unstable; urgency=medium
 
   * Add support for Ubuntu Groovy (20.10)

debian/rules

@@ -40,6 +40,7 @@ CONFIG := --prefix=${TARGET_DIR} \
 	--enable-libx264 \
 	--enable-libx265 \
 	--enable-libzvbi \
+        --enable-libzimg \
 
 CONFIG_ARM_COMMON := --toolchain=hardened \
 	--enable-cross-compile \
@@ -56,7 +57,6 @@ CONFIG_ARM64 := ${CONFIG_ARM_COMMON} \
 	--cross-prefix=/usr/bin/aarch64-linux-gnu- \
 
 CONFIG_x86 := --arch=amd64 \
-	--enable-libzimg \
 	--enable-opencl \
 	--enable-vaapi \
 	--enable-amf \

docker-build.sh

@@ -10,6 +10,28 @@ PORTS_ADDR=http://ports.ubuntu.com/
 
 # Prepare common extra libs for amd64, armhf and arm64
 prepare_extra_common() {
+    # Download and install zimg for zscale filter
+    pushd ${SOURCE_DIR}
+    git clone --depth=1 https://github.com/sekrit-twc/zimg
+    pushd zimg
+    case ${ARCH} in
+        'amd64')
+            CROSS_OPT=""
+        ;;
+        'armhf')
+            CROSS_OPT="--host=armv7-linux-gnueabihf CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++"
+        ;;
+        'arm64')
+            CROSS_OPT="--host=aarch64-linux-gnu CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++"
+        ;;
+    esac
+    ./autogen.sh
+    ./configure --prefix=${TARGET_DIR} ${CROSS_OPT}
+    make -j $(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/zimg
+    echo "zimg${TARGET_DIR}/lib/libzimg.so* usr/lib/jellyfin-ffmpeg/lib" >> ${SOURCE_DIR}/debian/jellyfin-ffmpeg.install
+    popd
+    popd
+
     # Download and install dav1d
     pushd ${SOURCE_DIR}
     git clone --depth=1 https://code.videolan.org/videolan/dav1d.git
@@ -51,17 +73,6 @@ prepare_extra_common() {
 
 # Prepare extra headers, libs and drivers for x86_64-linux-gnu
 prepare_extra_amd64() {
-    # Download and install zimg for zscale filter
-    pushd ${SOURCE_DIR}
-    git clone --depth=1 https://github.com/sekrit-twc/zimg
-    pushd zimg
-    ./autogen.sh
-    ./configure --prefix=${TARGET_DIR}
-    make -j $(nproc) && make install && make install DESTDIR=${SOURCE_DIR}/zimg
-    echo "zimg${TARGET_DIR}/lib/libzimg.so* usr/lib/jellyfin-ffmpeg/lib" >> ${SOURCE_DIR}/debian/jellyfin-ffmpeg.install
-    popd
-    popd
-
     # Download and install the nvidia headers
     pushd ${SOURCE_DIR}
     git clone -b n9.0.18.3 --depth=1 https://git.videolan.org/git/ffmpeg/nv-codec-headers.git