diff options
author | Max Harmathy | 2024-04-08 22:25:29 +0200 |
---|---|---|
committer | Max Harmathy | 2024-04-08 22:25:29 +0200 |
commit | 3882417bab246aff9aec8e75b292c4a1c6cd9d0d (patch) | |
tree | a92d9abf7624f4c1195eca31460a04215f3edb9f | |
parent | f0e4b6a6637491f68368898f7ca2a27e59b05f87 (diff) | |
download | aur-3882417bab246aff9aec8e75b292c4a1c6cd9d0d.tar.gz |
Sync changes from community package
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | PKGBUILD | 39 | ||||
-rw-r--r-- | mediathekview.sh | 22 |
3 files changed, 42 insertions, 28 deletions
@@ -1,7 +1,7 @@ pkgbase = mediathekview-xdg pkgdesc = Access the Mediathek of many German TV stations (store data in XDG_DATA_HOME) pkgver = 14.0.0 - pkgrel = 3 + pkgrel = 4 url = https://github.com/mediathekview/mediathekview arch = any license = GPL-3.0-or-later @@ -16,19 +16,16 @@ pkgbase = mediathekview-xdg optdepends = mplayer: for recording streams optdepends = vlc: for stream playback provides = mediathek - provides = mediathekview conflicts = mediathek - conflicts = mediathekview replaces = mediathek - replaces = mediathekview source = mediathekview-14.0.0.tar.gz::https://github.com/mediathekview/mediathekview/archive/refs/tags/14.0.0.tar.gz source = de.mediathekview.MediathekView.desktop source = mediathekview.sh sha512sums = e97844b4a06dbe42603d55854528b446638a4c0b830f824e7092c19ec2a7d308378f05887d2d0636ded48ec51354b8b2084448bf55778a7d5e31f1d145e030f2 sha512sums = 24a94a078180aca7c50ed7763ef4806c116c27f901f644ef570ee413ffc3ac795b5ebd24d696a9b2ec426e7c9b6eaf8a8b22addb5ac7c9fe9700f7c04305f64b - sha512sums = 313bf39ddefba91d0d9e90bf907c756cdeb1826e0fc1446f0cae2f08f10afaaf04be291f613c677ff30e30f763038fa0cbce8e3e39fdd6ca05613262b5e4b44f + sha512sums = 1cdae5a1311cacb7b9b16d2f34d9d2ae38a3ba730253244208663654670760dfac80a93c56b22cf327e60e25402fbe0d64fd6012f821762d2ec5e2943b52f50a b2sums = a24308a98714b05d8df34bf06d64e3854ed9b826276b0ea576c23cebdf2ffd47139c003a9d8fdd12a87cf47191b50b63c1e2e66a1e141c2bc07b8a22b5a312c9 b2sums = 6dbcdea2918009621fc132b4ff1056ef79f06e27c3299b69ccd7e3cb2b093e3a2a5f76acd6b1ab62689edd867ac1650f61bf829f2a1c575835d31e117d9b9ae5 - b2sums = 464568ce2a8a6d670d0b9bc7f65325a216839b07aedfb526c8d636cf4c01b2a694ef33a4f16f7b678e77ba505c04b0be11637a88b97b5e4175a4996f9c0abfdc + b2sums = d6e7e7acfa09c76a7439b173d55fd1c5470535356d7d307674f76c0f3cb5c201ebdd570d1c8ec5506b276b5c5c215e645aa7e9d253d02ff785f9b0c584aeb725 pkgname = mediathekview-xdg @@ -5,16 +5,26 @@ _name=MediathekView _pkgname=mediathekview pkgname=${_pkgname}-xdg pkgver=14.0.0 -pkgrel=3 +pkgrel=4 pkgdesc="Access the Mediathek of many German TV stations (store data in XDG_DATA_HOME)" arch=(any) url="https://github.com/mediathekview/mediathekview" license=(GPL-3.0-or-later) -depends=(bash hicolor-icon-theme 'java-runtime-openjdk=21' xdg-user-dirs) -makedepends=(maven strip-nondeterminism 'java-environment-openjdk=21') -conflicts=(mediathek mediathekview) -provides=(mediathek mediathekview) -replaces=(mediathek mediathekview) +_java_version=${JAVA_VERSION:-21} +depends=( + bash + hicolor-icon-theme + java-runtime-openjdk=$_java_version + xdg-user-dirs +) +makedepends=( + maven + strip-nondeterminism + java-environment-openjdk=$_java_version +) +conflicts=(mediathek) +provides=(mediathek) +replaces=(mediathek) optdepends=( 'libnotify: to use desktop notifications' 'mplayer: for recording streams' @@ -27,20 +37,25 @@ source=( ) sha512sums=('e97844b4a06dbe42603d55854528b446638a4c0b830f824e7092c19ec2a7d308378f05887d2d0636ded48ec51354b8b2084448bf55778a7d5e31f1d145e030f2' '24a94a078180aca7c50ed7763ef4806c116c27f901f644ef570ee413ffc3ac795b5ebd24d696a9b2ec426e7c9b6eaf8a8b22addb5ac7c9fe9700f7c04305f64b' - '313bf39ddefba91d0d9e90bf907c756cdeb1826e0fc1446f0cae2f08f10afaaf04be291f613c677ff30e30f763038fa0cbce8e3e39fdd6ca05613262b5e4b44f') + '1cdae5a1311cacb7b9b16d2f34d9d2ae38a3ba730253244208663654670760dfac80a93c56b22cf327e60e25402fbe0d64fd6012f821762d2ec5e2943b52f50a') b2sums=('a24308a98714b05d8df34bf06d64e3854ed9b826276b0ea576c23cebdf2ffd47139c003a9d8fdd12a87cf47191b50b63c1e2e66a1e141c2bc07b8a22b5a312c9' '6dbcdea2918009621fc132b4ff1056ef79f06e27c3299b69ccd7e3cb2b093e3a2a5f76acd6b1ab62689edd867ac1650f61bf829f2a1c575835d31e117d9b9ae5' - '464568ce2a8a6d670d0b9bc7f65325a216839b07aedfb526c8d636cf4c01b2a694ef33a4f16f7b678e77ba505c04b0be11637a88b97b5e4175a4996f9c0abfdc') + 'd6e7e7acfa09c76a7439b173d55fd1c5470535356d7d307674f76c0f3cb5c201ebdd570d1c8ec5506b276b5c5c215e645aa7e9d253d02ff785f9b0c584aeb725') -build() { +prepare() { # check for correct java version local status='' read -a javac_version < <(javac --version) || status='failed' - if [ -n "$status" ] || [ ! "${javac_version[1]%%.*}" = "21" ]; then - echo "Please set your java version to openjdk 21 unsing \"archlinux-java\"" >&2 + if [ -n "$status" ] || [ ! "${javac_version[1]%%.*}" = "$_java_version" ]; then + echo "Please set your java version to openjdk $_java_version unsing \"archlinux-java\"" >&2 return 1 fi + # set java version for wrapper script + sed "s/JAVA_VERSION/$_java_version/" $_pkgname.sh > $_pkgname +} + +build() { cd $_name-$pkgver ./mvnw clean install # Timestamps in JAR files generated by Maven do not honour SOURCE_DATE_EPOCH @@ -63,7 +78,7 @@ package() { # jar install -vDm 644 target/$_name.jar -t "$pkgdir/usr/share/java/$_pkgname/" # script - install -vDm 755 ../$_pkgname.sh "$pkgdir/usr/bin/$_pkgname" + install -vDm 755 ../$_pkgname -t "$pkgdir/usr/bin/" # XDG desktop file install -vDm 644 ../de.mediathekview.$_name.desktop -t "$pkgdir/usr/share/applications/" # icons diff --git a/mediathekview.sh b/mediathekview.sh index ed1b6a18d042..e98a1c650e73 100644 --- a/mediathekview.sh +++ b/mediathekview.sh @@ -8,15 +8,17 @@ if [ -d "$upstream_default" ] && [ ! -d "$data_directory" ]; then mv -v "$upstream_default" "$data_directory" fi -jvm_params=( - "-XX:+UseShenandoahGC" - "-XX:ShenandoahGCHeuristics=compact" - "-XX:+UseStringDeduplication" - "-XX:MaxRAMPercentage=20.0" - "--add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED" +java_options=( + # the application enforces the use of certain JVM parameters: + # https://github.com/mediathekview/MediathekView/blob/14.0.0/src/main/java/mediathek/Main.java#L286 + -XX:+UseShenandoahGC + -XX:ShenandoahGCHeuristics=compact + -XX:+UseStringDeduplication + -XX:MaxRAMPercentage=25 # use the default 25% + --add-opens=java.desktop/sun.awt.X11=ALL-UNNAMED + -DexternalUpdateCheck # disable automatic update check + -jar /usr/share/java/mediathekview/MediathekView.jar ) +PATH="/usr/lib/jvm/java-JAVA_VERSION-openjdk/bin:${PATH}" - -PATH="/usr/lib/jvm/java-21-openjdk/bin:${PATH}" -# requires preview features: https://github.com/mediathekview/MediathekView/issues/528 -java -jar "${jvm_params[@]}" /usr/share/java/mediathekview/MediathekView.jar "$@" "$data_directory" +exec java "${java_options[@]}" "$@" "$data_directory" |