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

Jellyfin: Republish with font fix #6469

Merged
merged 2 commits into from
Mar 2, 2025
+24 −4
Merged

Jellyfin: Republish with font fix #6469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3cabc2
Add dejavu font
mreid-tt Mar 2, 2025
f9a98e1
Add font configuration
mreid-tt Mar 2, 2025
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
3 changes: 3 additions & 0 deletions cross/jellyfin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ PKG_DIST_SITE = https://github.com/jellyfin/jellyfin/archive
PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
PKG_DIR = $(PKG_NAME)-$(PKG_VERS)

# font for library thumbnail
DEPENDS += cross/dejavu

HOMEPAGE = https://jellyfin.org
COMMENT = The Free Software Media System. It is an alternative to the proprietary Emby and Plex.
LICENSE = GPLv2
Expand Down
11 changes: 9 additions & 2 deletions spk/jellyfin/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Remember to also update jellyfin-web
SPK_NAME = jellyfin
SPK_VERS = 10.10.6
SPK_REV = 23
SPK_REV = 24
SPK_ICON = src/jellyfin.png

OPTIONAL_DEPENDS = cross/libstdc++
Expand Down Expand Up @@ -50,16 +50,23 @@ DEPENDS += cross/libstdc++
POST_STRIP_TARGET += jellyfin_patch_target
endif

POST_STRIP_TARGET += jellyfin_extra_install

include ../../mk/spksrc.spk.mk

.PHONY: jellyfin_custom_libe_sqlite3
jellyfin_custom_libe_sqlite3:
@$(MSG) "Replace libe_sqlite3 with version built for DSM"
mv -f $(STAGING_DIR)/lib/libe_sqlite3.so $(STAGING_DIR)/share/libe_sqlite3.so


.PHONY: jellyfin_patch_target
# Set library path to use bundled libstdc++
jellyfin_patch_target:
@$(MSG) "Set library runpath in jellyfin executable."
@patchelf --set-rpath /var/packages/$(SPK_NAME)/target/lib $(STAGING_DIR)/share/$(SPK_NAME)

.PHONY: jellyfin_extra_install
jellyfin_extra_install:
@$(MSG) "Install font configuration."
@install -m 755 -d $(STAGING_DIR)/var/fonts
@install -m 644 src/fonts/fonts.conf $(STAGING_DIR)/var/fonts/fonts.conf
7 changes: 7 additions & 0 deletions spk/jellyfin/src/fonts/fonts.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0"?>
<!DOCTYPE fontconfig SYSTEM "urn:fontconfig:fonts.dtd">

<fontconfig>
<dir prefix="xdg">fonts</dir>
<include prefix="xdg">fontconfig</include>
</fontconfig>
7 changes: 5 additions & 2 deletions spk/jellyfin/src/service-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
# https://github.com/dotnet/core/issues/4011
[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"/var/packages/jellyfin/target/var/"}/dotnet_bundle_extract"
# configure font variables
export FONTCONFIG_PATH="${SYNOPKG_PKGVAR}/fonts"
export XDG_CACHE_HOME="${SYNOPKG_PKGVAR}/fonts"
export XDG_CONFIG_HOME="${SYNOPKG_PKGDEST}/share/dejavu"
export XDG_DATA_HOME="${SYNOPKG_PKGDEST}/share/dejavu"

JELLYFIN_ARGS="--service \
--package-name synology \
Expand Down