mirror of
https://github.com/narrrl/proton-stream.git
synced 2026-11-10 17:27:03 +01:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e3dcbec1f2 | ||
|
|
99abc8f205 |
No files matched your search
@@ -39,8 +39,8 @@ env:
|
|||||||
CARGO_TERM_COLOR: always
|
CARGO_TERM_COLOR: always
|
||||||
ANDROID_API: '36'
|
ANDROID_API: '36'
|
||||||
ANDROID_BUILD_TOOLS: '37.0.0'
|
ANDROID_BUILD_TOOLS: '37.0.0'
|
||||||
ANDROID_NDK: '29.0.14206865'
|
ANDROID_NDK: '30.0.16248370'
|
||||||
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/29.0.14206865
|
ANDROID_NDK_HOME: /usr/local/lib/android/sdk/ndk/30.0.16248370
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
|
|||||||
Generated
+7
-7
@@ -4359,7 +4359,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-android"
|
name = "pstr-android"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android_logger",
|
"android_logger",
|
||||||
"jni 0.21.1",
|
"jni 0.21.1",
|
||||||
@@ -4378,7 +4378,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-app"
|
name = "pstr-app"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -4409,7 +4409,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-cli"
|
name = "pstr-cli"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"clap",
|
"clap",
|
||||||
@@ -4427,7 +4427,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-core"
|
name = "pstr-core"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"directories",
|
"directories",
|
||||||
"futures",
|
"futures",
|
||||||
@@ -4445,7 +4445,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-meta"
|
name = "pstr-meta"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"pstr-core",
|
"pstr-core",
|
||||||
"reqwest",
|
"reqwest",
|
||||||
@@ -4458,7 +4458,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-player"
|
name = "pstr-player"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"libloading",
|
"libloading",
|
||||||
@@ -4473,7 +4473,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pstr-stream"
|
name = "pstr-stream"
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"futures",
|
"futures",
|
||||||
|
|||||||
+1
-1
@@ -11,7 +11,7 @@ members = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "1.1.0"
|
version = "1.1.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
license = "MIT"
|
license = "MIT"
|
||||||
repository = "https://github.com/narrrl/proton-stream"
|
repository = "https://github.com/narrrl/proton-stream"
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ distributions.
|
|||||||
| Component | License |
|
| Component | License |
|
||||||
|---|---|
|
|---|---|
|
||||||
| mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
|
| mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
|
||||||
| LLVM libc++ shared runtime (Android NDK r29) | Apache-2.0 WITH LLVM-exception |
|
| LLVM libc++ shared runtime (Android NDK r30) | Apache-2.0 WITH LLVM-exception |
|
||||||
| AndroidX and Jetpack Compose | Apache-2.0 |
|
| AndroidX and Jetpack Compose | Apache-2.0 |
|
||||||
| Kotlin | Apache-2.0 |
|
| Kotlin | Apache-2.0 |
|
||||||
| JNA | Apache-2.0 or LGPL-2.1-or-later |
|
| JNA | Apache-2.0 or LGPL-2.1-or-later |
|
||||||
|
|||||||
@@ -47,7 +47,7 @@ android {
|
|||||||
namespace = "io.narl.protonstream"
|
namespace = "io.narl.protonstream"
|
||||||
compileSdk = 36
|
compileSdk = 36
|
||||||
buildToolsVersion = "37.0.0"
|
buildToolsVersion = "37.0.0"
|
||||||
ndkVersion = "29.0.14206865"
|
ndkVersion = "30.0.16248370"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
applicationId = "io.narl.protonstream"
|
applicationId = "io.narl.protonstream"
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ complete GNU GPL version 3 text is packaged beside this file as `GPL-3.0.txt`.
|
|||||||
| Component | License |
|
| Component | License |
|
||||||
|---|---|
|
|---|---|
|
||||||
| mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
|
| mpv/libmpv | GPL-2.0-or-later by default; verify the pinned build configuration |
|
||||||
| LLVM libc++ shared runtime (Android NDK r29) | Apache-2.0 WITH LLVM-exception |
|
| LLVM libc++ shared runtime (Android NDK r30) | Apache-2.0 WITH LLVM-exception |
|
||||||
| AndroidX and Jetpack Compose | Apache-2.0 |
|
| AndroidX and Jetpack Compose | Apache-2.0 |
|
||||||
| Kotlin | Apache-2.0 |
|
| Kotlin | Apache-2.0 |
|
||||||
| JNA | Apache-2.0 or LGPL-2.1-or-later |
|
| JNA | Apache-2.0 or LGPL-2.1-or-later |
|
||||||
|
|||||||
+1
-1
@@ -10,7 +10,7 @@ reimplementing it in Kotlin.
|
|||||||
## Toolchain
|
## Toolchain
|
||||||
|
|
||||||
Install JDK 17, Android SDK Platform/Build Tools 36, NDK
|
Install JDK 17, Android SDK Platform/Build Tools 36, NDK
|
||||||
`29.0.14206865`, Rust 1.96, Gradle 8.13, and the native helpers:
|
`30.0.16248370`, Rust 1.96, Gradle 8.13, and the native helpers:
|
||||||
|
|
||||||
```bash
|
```bash
|
||||||
rustup target add aarch64-linux-android x86_64-linux-android
|
rustup target add aarch64-linux-android x86_64-linux-android
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
# builds from the registry alone.
|
# builds from the registry alone.
|
||||||
|
|
||||||
pkgname=proton-stream
|
pkgname=proton-stream
|
||||||
pkgver=1.1.0
|
pkgver=1.1.1
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Netflix-style desktop client for Proton Drive public links: browse and stream a share"
|
pkgdesc="Netflix-style desktop client for Proton Drive public links: browse and stream a share"
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ set -euo pipefail
|
|||||||
script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
script_dir="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" && pwd)"
|
||||||
repo_root="$(cd -- "$script_dir/.." && pwd)"
|
repo_root="$(cd -- "$script_dir/.." && pwd)"
|
||||||
source_dir="${PSTR_MPV_SOURCE_DIR:-$repo_root/.build/mpv-android}"
|
source_dir="${PSTR_MPV_SOURCE_DIR:-$repo_root/.build/mpv-android}"
|
||||||
revision=20a3fa526fac6d3fe267aee0d4c349893fee65a3
|
revision=687c7fd586d826fd0387809e14bec7a2b4fc45a1
|
||||||
destination="$repo_root/android/app/build/generated/mpv"
|
destination="$repo_root/android/app/build/generated/mpv"
|
||||||
|
|
||||||
# The staged tree depends only on the pinned revision and on this script, which
|
# The staged tree depends only on the pinned revision and on this script, which
|
||||||
@@ -32,19 +32,19 @@ git -C "$source_dir" submodule update --init --recursive
|
|||||||
if [[ -n "${ANDROID_NDK_HOME:-}" ]]; then
|
if [[ -n "${ANDROID_NDK_HOME:-}" ]]; then
|
||||||
ndk_dir="$ANDROID_NDK_HOME"
|
ndk_dir="$ANDROID_NDK_HOME"
|
||||||
elif [[ -n "${ANDROID_HOME:-}" ]]; then
|
elif [[ -n "${ANDROID_HOME:-}" ]]; then
|
||||||
ndk_dir="$ANDROID_HOME/ndk/29.0.14206865"
|
ndk_dir="$ANDROID_HOME/ndk/30.0.16248370"
|
||||||
else
|
else
|
||||||
echo "error: set ANDROID_NDK_HOME or ANDROID_HOME to an Android NDK r29 installation" >&2
|
echo "error: set ANDROID_NDK_HOME or ANDROID_HOME to an Android NDK r30 installation" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
if [[ ! -f "$ndk_dir/source.properties" ]] ||
|
if [[ ! -f "$ndk_dir/source.properties" ]] ||
|
||||||
! grep -q '^Pkg.Revision = 29\.0\.14206865$' "$ndk_dir/source.properties"; then
|
! grep -q '^Pkg.Revision = 30\.0\.16248370$' "$ndk_dir/source.properties"; then
|
||||||
echo "error: libmpv requires Android NDK 29.0.14206865: $ndk_dir" >&2
|
echo "error: libmpv requires Android NDK 30.0.16248370: $ndk_dir" >&2
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
ndk_dir="$(cd -- "$ndk_dir" && pwd -P)"
|
ndk_dir="$(cd -- "$ndk_dir" && pwd -P)"
|
||||||
mpv_sdk_dir="$source_dir/buildscripts/sdk"
|
mpv_sdk_dir="$source_dir/buildscripts/sdk"
|
||||||
mpv_ndk_link="$mpv_sdk_dir/android-ndk-r29"
|
mpv_ndk_link="$mpv_sdk_dir/android-ndk-r30"
|
||||||
mkdir -p "$mpv_sdk_dir"
|
mkdir -p "$mpv_sdk_dir"
|
||||||
if [[ -e "$mpv_ndk_link" && ! -L "$mpv_ndk_link" ]]; then
|
if [[ -e "$mpv_ndk_link" && ! -L "$mpv_ndk_link" ]]; then
|
||||||
echo "error: refusing to replace non-symlink NDK path: $mpv_ndk_link" >&2
|
echo "error: refusing to replace non-symlink NDK path: $mpv_ndk_link" >&2
|
||||||
|
|||||||
Reference in new issue
Block a user