Skip to content

Commit 89e898b

Browse files
robertkirkmanrobertkirkman
authored
bump(tur/ffplayout): 0.25.7 (#2019)
1 parent a41bcbb commit 89e898b

File tree

3 files changed

+142
-62
lines changed

3 files changed

+142
-62
lines changed

‎tur/ffplayout/0001-fix-hardcoded-paths.patch‎

Lines changed: 123 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,123 @@
1-
--- a/engine/src/utils/mod.rs
2-
+++ b/engine/src/utils/mod.rs
3-
@@ -183,7 +183,7 @@
4-
}
5-
}
6-
7-
- let sys_path = Path::new("/usr/share/ffplayout/db");
8-
+ let sys_path = Path::new("@TERMUX_PREFIX@/share/ffplayout/db");
9-
let mut db_path = "./ffplayout.db";
10-
11-
if sys_path.is_dir() && !sys_path.writable() {
12-
@@ -191,7 +191,7 @@
13-
}
14-
15-
if sys_path.is_dir() && sys_path.writable() {
16-
- db_path = "/usr/share/ffplayout/db/ffplayout.db";
17-
+ db_path = "@TERMUX_PREFIX@/share/ffplayout/db/ffplayout.db";
18-
} else if Path::new("./assets").is_dir() {
19-
db_path = "./assets/ffplayout.db";
20-
}
1+
--- a/engine/src/db/mod.rs
2+
+++ b/engine/src/db/mod.rs
3+
@@ -17,8 +17,8 @@ use crate::{ARGS, utils::errors::ProcessError};
4+
use models::GlobalSettings;
5+
6+
pub static DB_PATH: LazyLock<Result<Cow<'static, Path>, io::Error>> = LazyLock::new(|| {
7+
- const DEFAULT_DIR: &str = "/usr/share/ffplayout/db/";
8+
- const DEFAULT_PATH: &str = "/usr/share/ffplayout/db/ffplayout.db";
9+
+ const DEFAULT_DIR: &str = "@TERMUX_PREFIX@/share/ffplayout/db/";
10+
+ const DEFAULT_PATH: &str = "@TERMUX_PREFIX@/share/ffplayout/db/ffplayout.db";
11+
const ASSET_DIR: &str = "./assets";
12+
const ASSET_PATH: &str = "./assets/ffplayout.db";
13+
const DB_NAME: &str = "ffplayout.db";
14+
--- a/engine/src/file/local.rs
15+
+++ b/engine/src/file/local.rs
16+
@@ -390,9 +390,9 @@ impl LocalStorage {
17+
let root = self.root.read().await.clone();
18+
if root.is_dir() {
19+
let target = root.join("00-assets");
20+
- let mut dummy_source = Path::new("/usr/share/ffplayout/dummy.vtt");
21+
- let mut font_source = Path::new("/usr/share/ffplayout/DejaVuSans.ttf");
22+
- let mut logo_source = Path::new("/usr/share/ffplayout/logo.png");
23+
+ let mut dummy_source = Path::new("@TERMUX_PREFIX@/share/ffplayout/dummy.vtt");
24+
+ let mut font_source = Path::new("@TERMUX_PREFIX@/share/ffplayout/DejaVuSans.ttf");
25+
+ let mut logo_source = Path::new("@TERMUX_PREFIX@/share/ffplayout/logo.png");
26+
27+
if !dummy_source.is_file() {
28+
dummy_source = Path::new("./assets/dummy.vtt");
29+
--- a/migrations/00001_create_tables.sql
30+
+++ b/migrations/00001_create_tables.sql
31+
@@ -5,10 +5,10 @@ CREATE TABLE
32+
global (
33+
id INTEGER PRIMARY KEY,
34+
secret TEXT NOT NULL,
35+
- logs TEXT NOT NULL DEFAULT "/var/log/ffplayout",
36+
- playlists TEXT NOT NULL DEFAULT "/var/lib/ffplayout/playlists",
37+
- public TEXT NOT NULL DEFAULT "/usr/share/ffplayout/public",
38+
- storage TEXT NOT NULL DEFAULT "/var/lib/ffplayout/tv-media",
39+
+ logs TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/var/log/ffplayout",
40+
+ playlists TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/var/lib/ffplayout/playlists",
41+
+ public TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/share/ffplayout/public",
42+
+ storage TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/var/lib/ffplayout/tv-media",
43+
shared INTEGER NOT NULL DEFAULT 0,
44+
mail_smtp TEXT NOT NULL DEFAULT "mail.example.org",
45+
mail_user TEXT NOT NULL DEFAULT "[email protected]",
46+
@@ -31,9 +31,9 @@ CREATE TABLE
47+
preview_url TEXT NOT NULL,
48+
extra_extensions TEXT NOT NULL DEFAULT "jpg,jpeg,png",
49+
active INTEGER NOT NULL DEFAULT 0,
50+
- public TEXT NOT NULL DEFAULT "/usr/share/ffplayout/public",
51+
- playlists TEXT NOT NULL DEFAULT "/var/lib/ffplayout/playlists",
52+
- storage TEXT NOT NULL DEFAULT "/var/lib/ffplayout/tv-media",
53+
+ public TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/share/ffplayout/public",
54+
+ playlists TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/var/lib/ffplayout/playlists",
55+
+ storage TEXT NOT NULL DEFAULT "@TERMUX_PREFIX@/var/lib/ffplayout/tv-media",
56+
last_date TEXT,
57+
time_shift REAL NOT NULL DEFAULT 0,
58+
timezone TEXT
59+
--- a/debian/postinst
60+
+++ b/debian/postinst
61+
@@ -1,28 +1,20 @@
62+
-#!/bin/sh
63+
+#!@TERMUX_PREFIX@/bin/sh
64+
#DEBHELPER#
65+
66+
-sysUser="ffpu"
67+
+sysUser="$(whoami)"
68+
69+
-if [ -f /run/.containerenv ] || [ -f /run/.dockerenv ] || [ -f /.dockerenv ] || [ -f /.dockerinit ]; then
70+
- sysUser="root"
71+
-fi
72+
-
73+
-if [ ! $(id -u $sysUser 2>/dev/null || echo -1) -ge 0 ]; then
74+
- adduser --system --create-home $sysUser > /dev/null || adduser --system --home "/home/$sysUser" $sysUser
75+
-fi
76+
-
77+
-if [ ! -d "/usr/share/ffplayout/db" ]; then
78+
- mkdir "/usr/share/ffplayout/db"
79+
- mkdir -p "/usr/share/ffplayout/public/live"
80+
- mkdir -p "/var/lib/ffplayout/playlists"
81+
- mkdir -p "/var/lib/ffplayout/tv-media"
82+
+if [ ! -d "@TERMUX_PREFIX@/share/ffplayout/db" ]; then
83+
+ mkdir "@TERMUX_PREFIX@/share/ffplayout/db"
84+
+ mkdir -p "@TERMUX_PREFIX@/share/ffplayout/public/live"
85+
+ mkdir -p "@TERMUX_PREFIX@/var/lib/ffplayout/playlists"
86+
+ mkdir -p "@TERMUX_PREFIX@/var/lib/ffplayout/tv-media"
87+
88+
- chown -R ${sysUser}: "/usr/share/ffplayout"
89+
- chown -R ${sysUser}: "/var/lib/ffplayout"
90+
+ chown -R ${sysUser}: "@TERMUX_PREFIX@/share/ffplayout"
91+
+ chown -R ${sysUser}: "@TERMUX_PREFIX@/var/lib/ffplayout"
92+
fi
93+
94+
-if [ ! -d "/var/log/ffplayout" ]; then
95+
- mkdir "/var/log/ffplayout"
96+
+if [ ! -d "@TERMUX_PREFIX@/var/log/ffplayout" ]; then
97+
+ mkdir "@TERMUX_PREFIX@/var/log/ffplayout"
98+
99+
- chown ${sysUser}: "/var/log/ffplayout"
100+
+ chown ${sysUser}: "@TERMUX_PREFIX@/var/log/ffplayout"
101+
fi
102+
--- a/debian/postrm
103+
+++ b/debian/postrm
104+
@@ -1,16 +1,13 @@
105+
-#!/bin/sh
106+
+#!@TERMUX_PREFIX@/bin/sh
107+
#DEBHELPER#
108+
109+
-sysUser="ffpu"
110+
-
111+
case "$1" in
112+
abort-install|purge)
113+
- deluser $sysUser
114+
- rm -rf /usr/share/ffplayout /var/log/ffplayout /var/lib/ffplayout /home/$sysUser
115+
+ rm -rf @TERMUX_PREFIX@/share/ffplayout @TERMUX_PREFIX@/var/log/ffplayout @TERMUX_PREFIX@/var/lib/ffplayout
116+
;;
117+
118+
remove)
119+
- rm -rf /var/log/ffplayout
120+
+ rm -rf @TERMUX_PREFIX@/var/log/ffplayout
121+
;;
122+
123+
upgrade|failed-upgrade|abort-upgrade|disappear)

‎tur/ffplayout/0002-use-pre-generated-html.patch‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎tur/ffplayout/build.sh‎

Lines changed: 19 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,23 @@ TERMUX_PKG_HOMEPAGE=https://ffplayout.github.io
22
TERMUX_PKG_DESCRIPTION="Rust and ffmpeg based playout"
33
TERMUX_PKG_LICENSE="GPL-3.0"
44
TERMUX_PKG_MAINTAINER="@termux-user-repository"
5-
TERMUX_PKG_VERSION="0.24.4"
5+
TERMUX_PKG_VERSION="0.25.7"
66
TERMUX_PKG_SRCURL=git+https://github.com/ffplayout/ffplayout
7+
TERMUX_PKG_DEPENDS="ffmpeg"
78
TERMUX_PKG_BUILD_IN_SRC=true
89
TERMUX_PKG_AUTO_UPDATE=true
910
TERMUX_PKG_UPDATE_TAG_TYPE="latest-release-tag"
10-
TERMUX_PKG_HOSTBUILD=true
1111

12-
termux_step_post_get_source() {
13-
# Remove this marker all the time
14-
rm -rf $TERMUX_HOSTBUILD_MARKER
15-
}
16-
17-
termux_step_host_build() {
12+
termux_step_make() {
13+
termux_setup_rust
1814
termux_setup_nodejs
19-
pushd $TERMUX_PKG_SRCDIR
20-
bash ./scripts/man_create.sh
21-
rm -rf public
22-
cd frontend
15+
16+
scripts/man_create.sh
17+
pushd frontend
2318
npm install
24-
npm run generate
25-
cp -r .output/public ../public
19+
npm run build
20+
cp -r dist ../public
2621
popd
27-
}
28-
29-
termux_step_make() {
30-
termux_setup_rust
3122

3223
unset CFLAGS
3324

@@ -36,14 +27,18 @@ termux_step_make() {
3627
export CARGO_TARGET_${env_host}_RUSTFLAGS+=" -C link-arg=$($CC -print-libgcc-file-name)"
3728
fi
3829

30+
cargo clean
3931
cargo build --jobs $TERMUX_PKG_MAKE_PROCESSES --release --target $CARGO_TARGET_NAME
4032
}
4133

4234
termux_step_make_install() {
43-
cp ./target/$CARGO_TARGET_NAME/release/ffplayout .
44-
tar -cvf "ffplayout-v${TERMUX_PKG_VERSION}_${CARGO_TARGET_NAME}.tar" --exclude='*.db' --exclude='*.db-shm' --exclude='*.db-wal' assets docker docs LICENSE README.md CHANGELOG.md ffplayout
45-
mkdir -p $TERMUX_PREFIX/opt/ffplayout
46-
tar -C $TERMUX_PREFIX/opt/ffplayout -xvf "ffplayout-v${TERMUX_PKG_VERSION}_${CARGO_TARGET_NAME}.tar"
47-
ln -sfr $TERMUX_PREFIX/opt/ffplayout/ffpapi $TERMUX_PREFIX/bin
48-
ln -sfr $TERMUX_PREFIX/opt/ffplayout/ffplayout $TERMUX_PREFIX/bin
35+
install -Dm755 "target/$CARGO_TARGET_NAME/release/ffplayout" "$TERMUX_PREFIX/bin/ffplayout"
36+
install -Dm644 assets/ffplayout.1.gz "$TERMUX_PREFIX/share/man/man1/ffplayout.1.gz"
37+
install -Dm644 assets/logo.png "$TERMUX_PREFIX/share/ffplayout/logo.png"
38+
install -Dm644 README.md "$TERMUX_PREFIX/share/doc/ffplayout/README"
39+
cp -a public "$TERMUX_PREFIX/share/ffplayout/"
40+
}
41+
42+
termux_step_create_debscripts() {
43+
cp -f "$TERMUX_PKG_SRCDIR"/debian/{postinst,postrm} .
4944
}

0 commit comments

Comments
 (0)