From 4508e8ae130fb0d59d00d4a76592b0ceb6ec1bab Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 18 Jan 2024 21:38:15 -0500 Subject: [PATCH 1/4] move app files as is --- Dockerfile | 6 +----- Dockerfile.aarch64 | 6 +----- root/etc/s6-overlay/s6-rc.d/svc-emby/run | 12 ++++++------ 3 files changed, 8 insertions(+), 16 deletions(-) diff --git a/Dockerfile b/Dockerfile index e4da2ce5..3b8f54c1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,11 +30,7 @@ RUN \ dpkg-deb -xv /tmp/emby.deb /tmp/emby/ && \ mv -t \ /app/emby/ \ - /tmp/emby/opt/emby-server/system/* \ - /tmp/emby/opt/emby-server/lib/* \ - /tmp/emby/opt/emby-server/bin/ff* \ - /tmp/emby/opt/emby-server/etc \ - /tmp/emby/opt/emby-server/extra/lib/* && \ + /tmp/emby/opt/emby-server/* && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* diff --git a/Dockerfile.aarch64 b/Dockerfile.aarch64 index 7f2b34a6..65a19e6f 100644 --- a/Dockerfile.aarch64 +++ b/Dockerfile.aarch64 @@ -37,11 +37,7 @@ RUN \ dpkg-deb -xv /tmp/emby.deb /tmp/emby/ && \ mv -t \ /app/emby/ \ - /tmp/emby/opt/emby-server/system/* \ - /tmp/emby/opt/emby-server/lib/* \ - /tmp/emby/opt/emby-server/bin/ff* \ - /tmp/emby/opt/emby-server/etc \ - /tmp/emby/opt/emby-server/extra/lib/* && \ + /tmp/emby/opt/emby-server/* && \ echo "**** cleanup ****" && \ rm -rf \ /tmp/* \ diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/run b/root/etc/s6-overlay/s6-rc.d/svc-emby/run index 6fe8e581..07f0aacf 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-emby/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run @@ -2,18 +2,18 @@ # env settings APP_DIR="/app/emby" -export LD_LIBRARY_PATH="${APP_DIR}" +export LD_LIBRARY_PATH="${APP_DIR}"/lib export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts if [ -d "/lib/x86_64-linux-gnu" ]; then - export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/dri + export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/extra/lib/dri fi export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8096" \ - s6-setuidgid abc /app/emby/EmbyServer \ + s6-setuidgid abc /app/emby/bin/EmbyServer \ -programdata /config \ - -ffdetect /app/emby/ffdetect \ - -ffmpeg /app/emby/ffmpeg \ - -ffprobe /app/emby/ffprobe \ + -ffdetect /app/emby/bin/ffdetect \ + -ffmpeg /app/emby/bin/ffmpeg \ + -ffprobe /app/emby/bin/ffprobe \ -restartexitcode 3 From 96e6da9c13b0a84ad57ea15631f626cb11acf4c7 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 18 Jan 2024 21:40:37 -0500 Subject: [PATCH 2/4] fix binary path --- root/etc/s6-overlay/s6-rc.d/svc-emby/run | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/run b/root/etc/s6-overlay/s6-rc.d/svc-emby/run index 07f0aacf..0914704f 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-emby/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run @@ -11,7 +11,7 @@ export SSL_CERT_FILE="${APP_DIR}"/etc/ssl/certs/ca-certificates.crt exec \ s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 8096" \ - s6-setuidgid abc /app/emby/bin/EmbyServer \ + s6-setuidgid abc /app/emby/system/EmbyServer \ -programdata /config \ -ffdetect /app/emby/bin/ffdetect \ -ffmpeg /app/emby/bin/ffmpeg \ From 8b1c3822bfcbcc39a36877dd0b4010b04b2dadb6 Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Thu, 18 Jan 2024 22:09:48 -0500 Subject: [PATCH 3/4] update lib paths --- root/etc/s6-overlay/s6-rc.d/svc-emby/run | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-emby/run b/root/etc/s6-overlay/s6-rc.d/svc-emby/run index 0914704f..a030c875 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-emby/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-emby/run @@ -2,8 +2,11 @@ # env settings APP_DIR="/app/emby" -export LD_LIBRARY_PATH="${APP_DIR}"/lib +export LD_LIBRARY_PATH="${APP_DIR}"/lib:"${APP_DIR}"/extra/lib export FONTCONFIG_PATH="${APP_DIR}"/etc/fonts +export OCL_ICD_VENDORS="${APP_DIR}"/extra/etc/OpenCL/vendors +export AMDGPU_IDS="${APP_DIR}"/extra/share/libdrm/amdgpu.ids +export PCI_IDS_PATH="${APP_DIR}"/share/hwdata/pci.ids if [ -d "/lib/x86_64-linux-gnu" ]; then export LIBVA_DRIVERS_PATH=/usr/lib/x86_64-linux-gnu/dri:"${APP_DIR}"/extra/lib/dri fi From ef25c34f6312801b966f218f807a0792ac97378b Mon Sep 17 00:00:00 2001 From: aptalca <541623+aptalca@users.noreply.github.com> Date: Fri, 19 Jan 2024 09:21:59 -0500 Subject: [PATCH 4/4] update changelog --- README.md | 1 + readme-vars.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/README.md b/README.md index 5d6e8954..247e487d 100644 --- a/README.md +++ b/README.md @@ -339,6 +339,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64 ## Versions +* **19.01.24:** - Fix tonemapping so it's done with hw acceleration. * **06.07.23:** - Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf) * **08.06.23:** - Fix package extraction so it doesn't change /tmp perms. * **31.05.23:** - Use upstream deb packages instead of rpm. diff --git a/readme-vars.yml b/readme-vars.yml index 842331ec..f4d27d67 100644 --- a/readme-vars.yml +++ b/readme-vars.yml @@ -83,6 +83,7 @@ app_setup_block: | ``` # changelog changelogs: + - {date: "19.01.24:", desc: "Fix tonemapping so it's done with hw acceleration."} - {date: "06.07.23:", desc: "Deprecate armhf. As announced [here](https://www.linuxserver.io/blog/a-farewell-to-arm-hf)"} - {date: "08.06.23:", desc: "Fix package extraction so it doesn't change /tmp perms."} - {date: "31.05.23:", desc: "Use upstream deb packages instead of rpm."}