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

tvheadend: fix path to ffmpeg(7) #6303

Merged
merged 5 commits into from
Dec 15, 2024
Merged

tvheadend: fix path to ffmpeg(7) #6303

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f4da160
tvheadend: fix path to ffmpeg(7)
hgy59 Nov 3, 2024
a1d82f7
tvheadend: minor adjustments
hgy59 Nov 3, 2024
7908991
Merge branch 'master' of https://github.com/hgy59/spksrc into fix_tvh…
hgy59 Nov 7, 2024
07c6a54
Merge branch 'master' of https://github.com/hgy59/spksrc into fix_tvh…
hgy59 Dec 15, 2024
3418124
update changelog
hgy59 Dec 15, 2024
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
6 changes: 3 additions & 3 deletions spk/tvheadend/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ SPK_GIT_HASH = 28de5c0
SPK_GIT_DATE = 20240928
SPK_VERS = $(SPK_SHORT_VERS).$(SPK_GIT_DATE)
TVH_VERS = $(SPK_SHORT_VERS)~$(SPK_GIT_HASH)
SPK_REV = 39
SPK_REV = 40
SPK_ICON = src/tvheadend.png
DSM_UI_DIR = app

Expand All @@ -25,7 +25,7 @@ UNSUPPORTED_ARCHS += $(ARMv5_ARCHS)

WHEELS = src/requirements-pure.txt

DEPENDS = cross/$(SPK_NAME)
DEPENDS = cross/tvheadend
DEPENDS += cross/dtv-scan-tables
DEPENDS += cross/zap2epg cross/docker-tvheadend

Expand All @@ -46,7 +46,7 @@ SERVICE_SETUP = src/service-setup.sh

# Service configuration
SERVICE_PORT = 9981
SERVICE_PORT_TITLE = Tvheadend(HTTP)
SERVICE_PORT_TITLE = Tvheadend (HTTP)

# Admin link
ADMIN_PORT = ${SERVICE_PORT}
Expand Down
6 changes: 3 additions & 3 deletions spk/tvheadend/src/service-setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Define python311 binary path
PYTHON_DIR="/var/packages/python311/target/bin"
# Define ffmpeg binary path
FFMPEG_DIR="/var/packages/ffmpeg/target/bin"
FFMPEG_DIR="/var/packages/ffmpeg7/target/bin"
# Add local bin, virtualenv along with ffmpeg and python311 to the default PATH
PATH="${SYNOPKG_PKGDEST}/env/bin:${SYNOPKG_PKGDEST}/bin:${PYTHON_DIR}:${FFMPEG_DIR}:${PATH}"

Expand Down Expand Up @@ -34,7 +34,7 @@ service_postupgrade ()
for file in ${UPGRADE_CFG_DIR}/*
do
DVR_DIR=$(grep -e 'storage\":' ${file} | awk -F'"' '{print $4}')
# Exclude directories in @appstore as ACL permissions srew up package installations
# Exclude directories in @appstore as ACL permissions skew up package installations
TRUNC_DIR=$(echo "$(realpath ${DVR_DIR})" | awk -F/ '{print "/"$3}')
if [ "${TRUNC_DIR}" = "/@appstore" ]; then
echo "Skip: ${DVR_DIR} (system directory)"
Expand All @@ -45,7 +45,7 @@ service_postupgrade ()
done

# For backwards compatibility, restore ownership of package system directories
if [ $SYNOPKG_DSM_VERSION_MAJOR == 6 ]; then
if [ $SYNOPKG_DSM_VERSION_MAJOR -lt 7 ]; then
echo "Restore '${EFF_USER}' unix permissions on package system directories"
chown ${EFF_USER}:${USER} "${SYNOPKG_PKGDEST}"
set_unix_permissions "${SYNOPKG_PKGVAR}"
Expand Down