From 163a32cad2521a6a8b43cdbf9b5ee0bc8be608d0 Mon Sep 17 00:00:00 2001 From: RuralHunter Date: Tue, 12 Oct 2021 11:25:11 +0800 Subject: [PATCH] version 19.2 --- mkn1 | 2 +- .../patches/libbluray-10-set-headless-false.patch | 14 -------------- .../patches/kodi/kodi-ruralhunter-001.patch | 2 +- 3 files changed, 2 insertions(+), 16 deletions(-) delete mode 100644 packages/multimedia/libbluray/patches/libbluray-10-set-headless-false.patch diff --git a/mkn1 b/mkn1 index a3f4ccba8fc..54b94bb6a06 100755 --- a/mkn1 +++ b/mkn1 @@ -1,2 +1,2 @@ #!/bin/bash -BUILDER_NAME=RuralHunter CUSTOM_VERSION=19.1 make image +BUILDER_NAME=RuralHunter CUSTOM_VERSION=19.2 make image diff --git a/packages/multimedia/libbluray/patches/libbluray-10-set-headless-false.patch b/packages/multimedia/libbluray/patches/libbluray-10-set-headless-false.patch deleted file mode 100644 index 0e53a5d17f7..00000000000 --- a/packages/multimedia/libbluray/patches/libbluray-10-set-headless-false.patch +++ /dev/null @@ -1,14 +0,0 @@ -https://github.com/fandangos/libbluray/commit/47726b99922899bb9c4ea688356199f2068d156a -https://github.com/PojavLauncherTeam/PojavLauncher/issues/713#issuecomment-769816262 - ---- a/src/libbluray/bdj/bdj.c 2021-03-17 06:39:32.556230104 +0100 -+++ b/src/libbluray/bdj/bdj.c 2021-03-17 06:40:52.178905094 +0100 -@@ -873,6 +873,8 @@ static int _create_jvm(void *jvm_lib, co - option[n++].optionString = str_dup ("-Xms256M"); - option[n++].optionString = str_dup ("-Xmx256M"); - option[n++].optionString = str_dup ("-Xss2048k"); -+ option[n++].optionString = str_dup ("-Djava.awt.headless=false"); -+ BD_DEBUG(DBG_CRIT | DBG_BDJ, "Disable X11 check\n"); - #ifdef HAVE_BDJ_J2ME - option[n++].optionString = str_printf("-Djava.home=%s", java_home); - option[n++].optionString = str_printf("-Xbootclasspath/a:%s/lib/xmlparser.jar", java_home); diff --git a/projects/Amlogic-ce/devices/Amlogic-ng/patches/kodi/kodi-ruralhunter-001.patch b/projects/Amlogic-ce/devices/Amlogic-ng/patches/kodi/kodi-ruralhunter-001.patch index 469cffab10c..2b54218e70f 100644 --- a/projects/Amlogic-ce/devices/Amlogic-ng/patches/kodi/kodi-ruralhunter-001.patch +++ b/projects/Amlogic-ce/devices/Amlogic-ng/patches/kodi/kodi-ruralhunter-001.patch @@ -1,5 +1,5 @@ diff --git a/xbmc/cores/VideoPlayer/VideoPlayer.cpp b/xbmc/cores/VideoPlayer/VideoPlayer.cpp -index 0530f0fc60..56de7c94fc 100644 +index a8c784704a..0220df666c 100644 --- a/xbmc/cores/VideoPlayer/VideoPlayer.cpp +++ b/xbmc/cores/VideoPlayer/VideoPlayer.cpp @@ -937,10 +937,7 @@ void CVideoPlayer::OpenDefaultStreams(bool reset)