opentubex added

9 files changed, 113 insertions, 7 deletions

diff --git a/.forgejo/workflows/build-theme-send-core-repo.yml b/.forgejo/workflows/build-theme-send-core-repo.yml
index aea1ede..9b542c2 100644
--- a/.forgejo/workflows/build-theme-send-core-repo.yml
+++ b/.forgejo/workflows/build-theme-send-core-repo.yml
@@ -289,6 +289,21 @@ jobs:
           makepkg -s --noconfirm -f
           cp -v raveswitch-*.pkg.tar.zst /tmp/builtpkgs/
 
+      - name: Build opentubex
+        run: |
+          set -euo pipefail
+          CORE="/tmp/raveos-core-repo/x86_64"
+          cd opentubex
+          PKGVER=$(grep '^pkgver=' PKGBUILD | cut -d= -f2)
+          PKGREL=$(grep '^pkgrel=' PKGBUILD | cut -d= -f2)
+          if ls "$CORE/opentubex-${PKGVER}-${PKGREL}-"*.pkg.tar.zst 2>/dev/null | grep -q .; then
+            echo "opentubex ${PKGVER}-${PKGREL} unchanged -> skip"
+            exit 0
+          fi
+          rm -rf src pkg *.pkg.tar.zst || true
+          makepkg -s --noconfirm -f
+          cp -v opentubex-*.pkg.tar.zst /tmp/builtpkgs/
+
       - name: Sign built packages
         run: |
           set -euo pipefail
diff --git a/opentubex/.SRCINFO b/opentubex/.SRCINFO
new file mode 100644
index 0000000..cd6f72d
--- /dev/null
+++ b/opentubex/.SRCINFO
@@ -0,0 +1,21 @@
+pkgbase = opentubex
+	pkgdesc = A highly customizable, privacy-focused desktop YouTube client
+	pkgver = 0.34.1
+	pkgrel = 1
+	url = https://opentubex.org
+	arch = any
+	license = AGPL-3.0-or-later
+	makedepends = git
+	makedepends = npm
+	makedepends = pnpm
+	depends = electron43
+	optdepends = ffmpeg: Use the system FFmpeg when installed before first launch; configurable later in Settings
+	optdepends = yt-dlp: Use the system yt-dlp when installed before first launch; configurable later in Settings
+	source = opentubex-0.34.1.tar.gz::https://github.com/OpenTubeX/OpenTubeX/archive/refs/tags/v0.34.1-beta.tar.gz
+	source = opentubex.desktop
+	source = opentubex.sh
+	sha256sums = f6c3b3cac88ebdedaa6ac85c63bd6a22ea916e639d6f37b037a4e18d1f7eddf7
+	sha256sums = 03448152a98649991bc6a1f1c74fa20fb43d729f5aa7d2a17d0b2074b22a08f2
+	sha256sums = ed9c3c54f5604389cac2e53df7f917ce6952a870abc409464e5b8ba590ca3d07
+
+pkgname = opentubex
diff --git a/opentubex/PKGBUILD b/opentubex/PKGBUILD
new file mode 100644
index 0000000..34a9a20
--- /dev/null
+++ b/opentubex/PKGBUILD
@@ -0,0 +1,53 @@
+# Maintainer: severaltranscats <severaltranscats at cleo dot nyc>
+# Contributor: <d3sox at protonmail dot com>
+
+pkgname=opentubex
+_pkgname=OpenTubeX
+_ghurl="https://github.com/OpenTubeX/OpenTubeX"
+pkgver=0.34.1
+_pkgver="$pkgver-beta"
+pkgrel=1
+pkgdesc='A highly customizable, privacy-focused desktop YouTube client'
+arch=('any')
+url="https://opentubex.org"
+license=('AGPL-3.0-or-later')
+depends=('electron43')
+optdepends=('ffmpeg: Use the system FFmpeg when installed before first launch; configurable later in Settings'
+            'yt-dlp: Use the system yt-dlp when installed before first launch; configurable later in Settings')
+makedepends=('git' 'npm' 'pnpm')
+source=("$pkgname-$pkgver.tar.gz::${_ghurl}/archive/refs/tags/v${pkgver}-beta.tar.gz"
+        opentubex.desktop
+        opentubex.sh)
+sha256sums=('f6c3b3cac88ebdedaa6ac85c63bd6a22ea916e639d6f37b037a4e18d1f7eddf7'
+            '03448152a98649991bc6a1f1c74fa20fb43d729f5aa7d2a17d0b2074b22a08f2'
+            'ed9c3c54f5604389cac2e53df7f917ce6952a870abc409464e5b8ba590ca3d07')
+
+prepare() {
+  sed -i "/^export default {/a\\  electronDist: '/usr/lib/electron43'," \
+    "$srcdir/$_pkgname-$_pkgver/_scripts/ebuilder.config.mjs"
+  sed -i "/Platform\\.LINUX\\.createTarget/s/\\[[^]]*\\]/['dir']/" \
+    "$srcdir/$_pkgname-$_pkgver/_scripts/build.mjs"
+  grep -Fq "Platform.LINUX.createTarget(['dir'], arch)" \
+    "$srcdir/$_pkgname-$_pkgver/_scripts/build.mjs" || {
+    printf '%s\n' 'Failed to restrict the OpenTubeX build to the unpacked directory' >&2
+    return 1
+  }
+}
+
+build() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+  pnpm install --frozen-lockfile
+  pnpm build
+}
+
+package() {
+  install -d "${pkgdir}"/{usr/bin,usr/lib/opentubex}
+  cp -R "./$_pkgname-$_pkgver/build/linux-unpacked/resources/app.asar" "$pkgdir/usr/lib/$pkgname"
+  install -Dm755 "./opentubex.sh" "$pkgdir/usr/bin/opentubex"
+
+  cd "$_pkgname-$_pkgver"
+  install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -Dm644 "./_icons/icon.svg" "$pkgdir/usr/share/pixmaps/opentubex.svg"
+  cd ..
+  install -Dm644 "opentubex.desktop" "$pkgdir/usr/share/applications/opentubex.desktop"
+}
diff --git a/opentubex/opentubex.desktop b/opentubex/opentubex.desktop
new file mode 100644
index 0000000..73ad2b3
--- /dev/null
+++ b/opentubex/opentubex.desktop
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Name=OpenTubeX
+GenericName=YouTube Player
+Comment=A highly customizable, privacy-focused desktop YouTube client
+Exec=opentubex %U
+Terminal=false
+Type=Application
+Icon=opentubex
+MimeType=x-scheme-handler/opentubex;
+Categories=Network;Video;
+Keywords=FreeTube;YouTube;YT;Video;Privacy;Invidious;
+X-KDE-Keywords=FreeTube;YouTube;YT;Privacy;Invidious;
+StartupNotify=true
+StartupWMClass=OpenTubeX
diff --git a/opentubex/opentubex.sh b/opentubex/opentubex.sh
new file mode 100644
index 0000000..805d474
--- /dev/null
+++ b/opentubex/opentubex.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+electron43 /usr/lib/opentubex/app.asar "$@"
diff --git a/raveos-app-installer/PKGBUILD b/raveos-app-installer/PKGBUILD
index b836836..c118862 100644
--- a/raveos-app-installer/PKGBUILD
+++ b/raveos-app-installer/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=raveos-app-installer
 pkgver=3.1
-pkgrel=13
+pkgrel=14
 pkgdesc="RaveOS graphical application installer"
 arch=('any')
 url="https://git.rp1.hu/RaveOS/raveos-app-installer"
diff --git a/raveos-app-installer/app-list.json b/raveos-app-installer/app-list.json
index bd41fa5..0c5099e 100644
--- a/raveos-app-installer/app-list.json
+++ b/raveos-app-installer/app-list.json
@@ -200,12 +200,12 @@
       "name": "OpenTubeX",
       "category": "Media",
       "desc": {
-        "hu": "Adatvédelem-barát YouTube kliens (AUR)",
-        "en": "Privacy-friendly YouTube client (AUR)"
+        "hu": "Adatvédelem-barát YouTube kliens",
+        "en": "Privacy-friendly YouTube client"
       },
-      "type": "aur",
+      "type": "pacman",
       "packages": [
-        "opentubex-bin"
+        "opentubex"
       ],
       "config_overwrite": true,
       "config_dir": "OpenTubeX",
diff --git a/raveos-tools/PKGBUILD b/raveos-tools/PKGBUILD
index 7ce740d..80f163b 100644
--- a/raveos-tools/PKGBUILD
+++ b/raveos-tools/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: nippy <nippy@tuta.io>
 pkgname=raveos-tools
 pkgver=1.0.0
-pkgrel=9
+pkgrel=10
 arch=('any')
 url="https://git.rp1.hu/RaveOS/RaveOS-PKGBUILD"
 license=('custom')
diff --git a/raveos-tools/rave b/raveos-tools/rave
index b7e4f17..3a85ef6 100644
--- a/raveos-tools/rave
+++ b/raveos-tools/rave
@@ -48,7 +48,7 @@ case ${1,,} in
             sudo mv /etc/pacman.d/mirrorlist.pacnew /etc/pacman.d/mirrorlist
         fi
         sudo pacman -Syu --noconfirm --overwrite "/etc/profile.d/*,/usr/share/backgrounds/raveos/*"
-        command -v yay >/dev/null 2>&1 && yay -S opentubex-bin --noconfirm || true
+        sudo pacman -S --needed --noconfirm opentubex || true
         sudo pacman -Rns $(pacman -Qtdq 2>/dev/null) --noconfirm 2>/dev/null || true
         sudo pacman -Sc --noconfirm
         flatpak update -y