mirror of
https://github.com/YunoHost-Apps/UMS_ynh.git
synced 2024-10-01 13:35:01 +02:00
Merge pull request #85 from YunoHost-Apps/testing
Fix openjdk-17-jre dependency
This commit is contained in:
commit
e48b15df7e
6 changed files with 12 additions and 9 deletions
|
@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
|
|||
Universal Media Server is a DLNA-compliant UPnP Media Server. It is capable of sharing video, audio and images between most modern devices.
|
||||
The program streams or transcodes many different media formats with little or no configuration. It is powered by FFmpeg, MediaInfo, OpenSubtitles, Crowdin, MEncoder, tsMuxeR, AviSynth, VLC and more, which combine to offer support for a wide range of media formats.
|
||||
|
||||
**Shipped version:** 13.8.0~ynh1
|
||||
**Shipped version:** 13.8.0~ynh2
|
||||
|
||||
## Screenshots
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po
|
|||
Universal Media Server est un serveur multimédia UPnP compatible DLNA. Il peut partager des vidéos, de l'audio et des images avec la pluparts des équipements modernes.
|
||||
Le programme stream ou transcode de nombreux formats média différents avec peu ou pas de configuration. Il utilise par FFmpeg, MediaInfo, OpenSubtitles, Crowdin, MEncoder, tsMuxeR, AviSynth, VLC et d'autres, qui se combinent pour offrir une grande variété de formats.
|
||||
|
||||
**Version incluse :** 13.8.0~ynh1
|
||||
**Version incluse :** 13.8.0~ynh2
|
||||
|
||||
## Captures d’écran
|
||||
|
||||
|
|
2
doc/PRE_UPGRADE.d/13.8.0~ynh2.md
Normal file
2
doc/PRE_UPGRADE.d/13.8.0~ynh2.md
Normal file
|
@ -0,0 +1,2 @@
|
|||
Changelog:
|
||||
Fix: - Fix dependency issue with openjdk-17-jre for armhf and arm64 systems
|
|
@ -5,7 +5,7 @@ name = "Universal Media Server"
|
|||
description.en = "A DLNA, UPnP and HTTP(S) Media Server"
|
||||
description.fr = "Un Serveur Multimedia DLNA, UPnP et HTTP(S)"
|
||||
|
||||
version = "13.8.0~ynh1"
|
||||
version = "13.8.0~ynh2"
|
||||
|
||||
maintainers = ["Krakinou"]
|
||||
|
||||
|
@ -91,3 +91,8 @@ ram.runtime = "350M"
|
|||
|
||||
[resources.apt]
|
||||
packages = "mediainfo dcraw mencoder mplayer vlc"
|
||||
packages_from_raw_bash = """
|
||||
if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]; then
|
||||
echo openjdk-17-jre
|
||||
fi
|
||||
"""
|
||||
|
|
|
@ -3,10 +3,7 @@
|
|||
#=================================================
|
||||
# COMMON VARIABLES
|
||||
#=================================================
|
||||
if [[ "$YNH_ARCH" == "armhf" ]] || [[ "$YNH_ARCH" == "arm64" ]]
|
||||
then
|
||||
pkg_dependencies+=" openjdk-17-jre"
|
||||
fi
|
||||
|
||||
#=================================================
|
||||
# PERSONAL HELPERS
|
||||
#=================================================
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
test_format = 1.0
|
||||
|
||||
[default]
|
||||
test_upgrade_from.fb78609.name = "13.5.0~ynh1"
|
||||
test_upgrade_from.8e8e839.name = "13.4.1~ynh1"
|
||||
test_upgrade_from.10d20b6.name = "13.8.0~ynh1"
|
||||
|
|
Loading…
Add table
Reference in a new issue