From 5857dc6f4432f71500fc541408acc983260d31e1 Mon Sep 17 00:00:00 2001
From: "Joshua M. Boniface" <joshua@boniface.me>
Date: Thu, 16 May 2019 10:47:02 -0400
Subject: [PATCH] Add libfontconfig and update nvidia headers

The latter was forced due to the old .deb going away.

Also move chown into Docker build rather than after.
---
 build            |  3 ---
 debian/changelog |  7 +++++++
 debian/control   |  2 ++
 debian/rules     | 19 ++++++++++---------
 docker-build.sh  |  4 +++-
 5 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/build b/build
index a2fec9f7c37..68a67ed8e0e 100755
--- a/build
+++ b/build
@@ -90,9 +90,6 @@ make -f Dockerfile.make DISTRO=${release} GCC_VER=${gcc_version} ARCH=${arch}
 docker build . -t "${image_name}"
 # Build the APKs and copy out to ${package_temporary_dir}
 docker run --rm -e "RELEASE=${release}" -v "${package_temporary_dir}:/dist" "${image_name}"
-# Correct ownership on the APKs (as current user, then as root if that fails)
-chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null \
-  || sudo chown -R "${current_user}" "${package_temporary_dir}" &>/dev/null
 # Move the APKs to the parent directory
 mkdir ../bin &>/dev/null || true
 mmv "${package_temporary_dir}/deb/*.deb" "../bin/#1.deb"
diff --git a/debian/changelog b/debian/changelog
index db32d56f316..d36fa006006 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+jellyfin-ffmpeg (4.0.4-3) unstable; urgency=medium
+
+  * Use libfontconfig to allow baked-in subtitle support
+  * Upgrade nVidia headers to 9.0.18.1
+
+ -- Joshua Boniface <joshua@boniface.me>  Tue, 14 May 2019 23:24:39 -0400
+
 jellyfin-ffmpeg (4.0.4-2) unstable; urgency=medium
 
   * Correct build bug and reenable nvenc/nvdec
diff --git a/debian/control b/debian/control
index b73d340372f..adcf9fdd657 100644
--- a/debian/control
+++ b/debian/control
@@ -21,6 +21,8 @@ Build-Depends:
  libbluray-dev,
 # --enable-libdrm
  libdrm-dev,
+# --enable-libfontconfig
+ libfontconfig-dev,
 # --enable-libfreetype
  libfreetype6-dev,
 # --enable-fribidi
diff --git a/debian/rules b/debian/rules
index 70569a96ac3..2b6bae9b44c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@ ORIG_VERSION := $(shell dpkg-parsechangelog -S version)
 VERSION_SUFFIX := $(shell lsb_release -c -s)
 # Set the current "testing" explicitly to "buster"
 ifeq ($(VERSION_SUFFIX),testing)
-    VERSION_SUFFIX := buster
+	VERSION_SUFFIX := buster
 endif
 PACKAGEVERSION := "$(ORIG_VERSION)-$(VERSION_SUFFIX)"
 
@@ -17,12 +17,13 @@ CONFIG := --toolchain=hardened \
 	--extra-cflags='--static' \
 	--enable-gpl \
 	--enable-static \
-    --disable-doc \
+	--disable-doc \
 	--disable-ffplay \
 	--disable-shared \
 	--disable-libxcb \
 	--disable-sdl2 \
 	--disable-xlib \
+	--enable-libfontconfig \
 	--enable-fontconfig \
 	--enable-gmp \
 	--enable-gnutls \
@@ -54,21 +55,21 @@ CONFIG_ARM64 := --enable-cross-compile \
 	--arch=arm64
 
 CONFIG_x86 := --arch=amd64 \
-    --enable-nvenc --enable-nvdec
+	--enable-nvenc --enable-nvdec
 
 HOST_ARCH := $(shell arch)
 BUILD_ARCH := ${DEB_HOST_MULTIARCH}
 ifeq ($(BUILD_ARCH),x86_64-linux-gnu)
-    # Native amd64 build
-    CONFIG += $(CONFIG_x86)
+	# Native amd64 build
+	CONFIG += $(CONFIG_x86)
 endif
 ifeq ($(BUILD_ARCH),arm-linux-gnueabihf)
-    # Cross-building ARM on AMD64
-    CONFIG += $(CONFIG_ARM)
+	# Cross-building ARM on AMD64
+	CONFIG += $(CONFIG_ARM)
 endif
 ifeq ($(BUILD_ARCH),aarch64-linux-gnu)
-    # Cross-building ARM64 on AMD64
-    CONFIG += $(CONFIG_ARM64)
+	# Cross-building ARM64 on AMD64
+	CONFIG += $(CONFIG_ARM64)
 endif
 
 %:
diff --git a/docker-build.sh b/docker-build.sh
index ebf4c7da196..baa3a9d5194 100755
--- a/docker-build.sh
+++ b/docker-build.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-NVCH_VERSION="8.2.15.8-dmo1"
+#NVCH_VERSION="8.2.15.8-dmo1"
+NVCH_VERSION="9.0.18.1-dmo1"
 
 # Builds the DEB inside the Docker container
 
@@ -115,3 +116,4 @@ popd
 # Move the artifacts out
 mkdir -p ${ARTIFACT_DIR}/deb
 mv /jellyfin-ffmpeg_* ${ARTIFACT_DIR}/deb/
+chown -Rc $(stat -c %u:%g ${ARTIFACT_DIR}) ${ARTIFACT_DIR}