From 108c4581923d284591679d17c271d2222208e272 Mon Sep 17 00:00:00 2001 From: Krakinou Date: Sun, 1 May 2022 21:14:12 +0200 Subject: [PATCH 1/3] 10.20.0 10.20.0 version Fix aarch64 architecture --- check_process | 2 +- manifest.json | 4 ++-- scripts/_common.sh | 16 ++++++++++------ 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/check_process b/check_process index 1f27483..eca2a1c 100644 --- a/check_process +++ b/check_process @@ -13,7 +13,7 @@ setup_private=1 setup_public=1 upgrade=1 - upgrade=1 from_commit=9bbdfa90650d335bd5c62d7617791261de06b0b6 + upgrade=1 from_commit=791ed7fd54608553b90ad564f40eaa8508a6bdd0 backup_restore=1 multi_instance=0 port_already_use=1 diff --git a/manifest.json b/manifest.json index 0a7f3a2..b283f0b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,10 +6,10 @@ "en": "A DLNA, UPnP and HTTP(S) Media Server", "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" }, - "version": "10.19.0~ynh1", + "version": "10.20.0~ynh1", "url": "www.universalmediaserver.com", "upstream": { - "version": "10.19.0", + "version": "10.20.0", "license": "GPL-2.0-or-later", "website": "www.universalmediaserver.com", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", diff --git a/scripts/_common.sh b/scripts/_common.sh index e21eda6..6026eb7 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -9,11 +9,11 @@ pkg_dependencies="mediainfo dcraw p7zip" mach=`uname -m` -sha256_arm64=5b9a0ba69dd60bc08e09f789c3e5bc497bc0ac15cc8ae6cec947972891600b09 -sha256_armel=891bf8c965099f24742a5ee1cc98c9e44ead7d45c1ddd49c2d94ce1c82556312 -sha256_armhf=7ebf9797fc96e191b8741ce77be6efa000e4707c061f22c94f52bb26212983e7 -sha256_x86_64=bbf469c3ae5ea25312dd616c16888e9e471565d57361d44f58ecf68db8354ec6 -sha256_x86=81c3335f61de0c883f679b60dbfdcba4a0be28c4bfea77d22ad4811bf8b13ad9 +sha256_arm64=89b662b321ea30d69bc67d603f807f1cac3ad96b34efdf76928e42822d4c1d6a +sha256_armel=5cf3522442459aaef80deed1a40e673179ec59936ad3c16901d9a29d430342d4 +sha256_armhf=632de1a4a54ef1a88a2a45d38212f7463e95cd6185a709e047103ceea70d0bf7 +sha256_x86_64=55be296603b94a26c35906cba005509448b367a4bbe182d90958b5f14f088906 +sha256_x86=29231aa88d3789f58c5274e578d1ea0e16ea930ca61ca3f056c18615d4d7c6c3 case "$mach" in "armv6l" ) mach="armel" @@ -30,7 +30,11 @@ case "$mach" in pkg_dependencies="$pkg_dependencies openjdk-8-jre" fi ;; "armv8l" ) mach="arm64" - sha256=$sha256_arm64 ;; + sha256=$sha256_arm64 + pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; + "aarch64" ) mach="arm64" + sha256=$sha256_arm64 + pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; "x86_64" ) mach="x86_64" sha256=$sha256_x86_64 ;; * ) mach="x86" From 9892fd6420004530a290910d9cea1b9b8d84de68 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 1 May 2022 19:14:15 +0000 Subject: [PATCH 2/3] Auto-update README --- README.md | 2 +- README_fr.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index d3bd9f7..cf32d3f 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A DLNA, UPnP and HTTP(S) Media Server -**Shipped version:** 10.19.0 +**Shipped version:** 10.20.0 diff --git a/README_fr.md b/README_fr.md index 236dfb4..3e763fd 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un Serveur Multimedia DLNA, UPnP et HTTP(S) -**Version incluse :** 10.19.0 +**Version incluse :** 10.20.0 From 05f54d7af54eab75921e1d8ec880a7727aa06b2b Mon Sep 17 00:00:00 2001 From: Krakinou Date: Tue, 3 May 2022 00:18:32 +0200 Subject: [PATCH 3/3] openjdk-11-jre for aarch64 --- scripts/_common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/_common.sh b/scripts/_common.sh index 6026eb7..f1d0338 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -34,7 +34,7 @@ case "$mach" in pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; "aarch64" ) mach="arm64" sha256=$sha256_arm64 - pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; + pkg_dependencies="$pkg_dependencies openjdk-11-jre" ;; "x86_64" ) mach="x86_64" sha256=$sha256_x86_64 ;; * ) mach="x86"