mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 21:56:42 +00:00
Merge pull request #1658 from lrusak/kodi-update
kodi: update to 423072a
This commit is contained in:
commit
4a5fc8946b
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="adsp.basic"
|
||||
PKG_VERSION="2ae604e"
|
||||
PKG_VERSION="a55b431"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="adsp.freesurround"
|
||||
PKG_VERSION="61568b9"
|
||||
PKG_VERSION="79fa039"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.2sf"
|
||||
PKG_VERSION="c9de26d"
|
||||
PKG_VERSION="36ebc05"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.dumb"
|
||||
PKG_VERSION="54fba3d"
|
||||
PKG_VERSION="fbe7090"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.fluidsynth"
|
||||
PKG_VERSION="e0f1809"
|
||||
PKG_VERSION="d71a3d9"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.gme"
|
||||
PKG_VERSION="8328bf2"
|
||||
PKG_VERSION="7458853"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.gsf"
|
||||
PKG_VERSION="acf4998"
|
||||
PKG_VERSION="d56eafc"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.modplug"
|
||||
PKG_VERSION="950682e"
|
||||
PKG_VERSION="0f5274e"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.ncsf"
|
||||
PKG_VERSION="f914839"
|
||||
PKG_VERSION="8004589"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.nosefart"
|
||||
PKG_VERSION="1a9f949"
|
||||
PKG_VERSION="0919ae1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.openmpt"
|
||||
PKG_VERSION="fbcbfda"
|
||||
PKG_VERSION="d90a976"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.organya"
|
||||
PKG_VERSION="bacd0ab"
|
||||
PKG_VERSION="ff7ab78"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.qsf"
|
||||
PKG_VERSION="e581a67"
|
||||
PKG_VERSION="945257e"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.sidplay"
|
||||
PKG_VERSION="4083bc5"
|
||||
PKG_VERSION="172cf89"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.snesapu"
|
||||
PKG_VERSION="b151c13"
|
||||
PKG_VERSION="dcecced"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.ssf"
|
||||
PKG_VERSION="62750ac"
|
||||
PKG_VERSION="7922312"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.stsound"
|
||||
PKG_VERSION="89ed4f3"
|
||||
PKG_VERSION="af0967e"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.timidity"
|
||||
PKG_VERSION="8bd7092"
|
||||
PKG_VERSION="f32c21c"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audiodecoder.vgmstream"
|
||||
PKG_VERSION="de21bab"
|
||||
PKG_VERSION="7397172"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audioencoder.flac"
|
||||
PKG_VERSION="f7a8daa"
|
||||
PKG_VERSION="bd1a353"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audioencoder.lame"
|
||||
PKG_VERSION="6e5c838"
|
||||
PKG_VERSION="d75255b"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audioencoder.vorbis"
|
||||
PKG_VERSION="8c928ed"
|
||||
PKG_VERSION="507a34d"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="audioencoder.wav"
|
||||
PKG_VERSION="10cc651"
|
||||
PKG_VERSION="8a1fed5"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="imagedecoder.raw"
|
||||
PKG_VERSION="37ef22e"
|
||||
PKG_VERSION="1ab2416"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="inputstream.adaptive"
|
||||
PKG_VERSION="7bde41f"
|
||||
PKG_VERSION="f1f5539"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
PKG_URL="https://github.com/liberty-developer/inputstream.adaptive/archive/$PKG_VERSION.tar.gz"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="inputstream.rtmp"
|
||||
PKG_VERSION="1052cd3"
|
||||
PKG_VERSION="d93d32d"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
PKG_URL="https://github.com/notspiff/inputstream.rtmp/archive/$PKG_VERSION.tar.gz"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="peripheral.joystick"
|
||||
PKG_VERSION="07aa1fe"
|
||||
PKG_VERSION="f49fa33"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="peripheral.steamcontroller"
|
||||
PKG_VERSION="ef527cd"
|
||||
PKG_VERSION="6842e35"
|
||||
PKG_REV="101"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.argustv"
|
||||
PKG_VERSION="8f89814"
|
||||
PKG_VERSION="b281e04"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.demo"
|
||||
PKG_VERSION="978f428"
|
||||
PKG_VERSION="ffee02b"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.dvblink"
|
||||
PKG_VERSION="b7d887c"
|
||||
PKG_VERSION="6d42eae"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.dvbviewer"
|
||||
PKG_VERSION="d099cfa"
|
||||
PKG_VERSION="3f05af6"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.filmon"
|
||||
PKG_VERSION="0f1d34d"
|
||||
PKG_VERSION="300c595"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.hdhomerun"
|
||||
PKG_VERSION="ab91169"
|
||||
PKG_VERSION="9073b99"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.hts"
|
||||
PKG_VERSION="3911c7f"
|
||||
PKG_VERSION="7f998e0"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.iptvsimple"
|
||||
PKG_VERSION="f83990a"
|
||||
PKG_VERSION="dbf6011"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.mediaportal.tvserver"
|
||||
PKG_VERSION="367b128"
|
||||
PKG_VERSION="07d73f3"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.mythtv"
|
||||
PKG_VERSION="8db66ca"
|
||||
PKG_VERSION="f2da22c"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.nextpvr"
|
||||
PKG_VERSION="e6ece9f"
|
||||
PKG_VERSION="239dbef"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.njoy"
|
||||
PKG_VERSION="296f558"
|
||||
PKG_VERSION="4785afd"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.pctv"
|
||||
PKG_VERSION="eab5f85"
|
||||
PKG_VERSION="f61e254"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.stalker"
|
||||
PKG_VERSION="62b7908"
|
||||
PKG_VERSION="151e3d3"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.vbox"
|
||||
PKG_VERSION="6001735"
|
||||
PKG_VERSION="df9efea"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.vdr.vnsi"
|
||||
PKG_VERSION="b7c3f3b"
|
||||
PKG_VERSION="40dc17d"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.vuplus"
|
||||
PKG_VERSION="78df030"
|
||||
PKG_VERSION="83a729e"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="pvr.wmc"
|
||||
PKG_VERSION="27a88ca"
|
||||
PKG_VERSION="93cebfc"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.asteroids"
|
||||
PKG_VERSION="5d6fd4e"
|
||||
PKG_VERSION="d30d588"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.asterwave"
|
||||
PKG_VERSION="8e6428c"
|
||||
PKG_VERSION="aea811d"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.biogenesis"
|
||||
PKG_VERSION="8d1ef04"
|
||||
PKG_VERSION="5d0a8db"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.cpblobs"
|
||||
PKG_VERSION="1922717"
|
||||
PKG_VERSION="2ec8294"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.greynetic"
|
||||
PKG_VERSION="e4dc6eb"
|
||||
PKG_VERSION="e75b536"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.matrixtrails"
|
||||
PKG_VERSION="b5a245f"
|
||||
PKG_VERSION="55bac2c"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.pingpong"
|
||||
PKG_VERSION="21ae78d"
|
||||
PKG_VERSION="76a9739"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.pyro"
|
||||
PKG_VERSION="1477bd4"
|
||||
PKG_VERSION="2eaaa39"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.shadertoy"
|
||||
PKG_VERSION="434f5ce"
|
||||
PKG_VERSION="2638205"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensaver.stars"
|
||||
PKG_VERSION="6c62026"
|
||||
PKG_VERSION="d05afc5"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="screensavers.rsxs"
|
||||
PKG_VERSION="579ec13"
|
||||
PKG_VERSION="219f5ab"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="vfs.rar"
|
||||
PKG_VERSION="26800eb"
|
||||
PKG_VERSION="4ce78b0"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="visualization.fishbmc"
|
||||
PKG_VERSION="611e9a9"
|
||||
PKG_VERSION="c5835e0"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="visualization.goom"
|
||||
PKG_VERSION="6bfc884"
|
||||
PKG_VERSION="89ae55a"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="visualization.projectm"
|
||||
PKG_VERSION="5bb3897"
|
||||
PKG_VERSION="5f1c7bb"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -1,94 +0,0 @@
|
||||
From 79c3a7d5e2d3ae0274a7122246a6922b74e8cdaf Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Sat, 4 Jul 2015 21:54:09 +0300
|
||||
Subject: [PATCH] Revert "changed: get rid of DATAPATH definition"
|
||||
|
||||
This reverts commit 60467a6492adb32b7487274ceaec4f76c13eec1a.
|
||||
---
|
||||
CMakeLists.txt | 2 ++
|
||||
src/Main.cpp | 28 +++-------------------------
|
||||
2 files changed, 5 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 77bcb6e..d73d069 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -13,6 +13,8 @@ find_package(GLEW REQUIRED)
|
||||
find_package(ProjectM REQUIRED)
|
||||
|
||||
add_definitions(-DHAS_SDL_OPENGL)
|
||||
+set(DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/xbmc/addons/visualization.projectm/resources")
|
||||
+add_definitions(-DDATAPATH="${DATA_PATH}")
|
||||
|
||||
set(INCLUDES ${OpenGL_INCLUDE_DIR}
|
||||
${GLEW_INCLUDE_DIR}
|
||||
diff --git a/src/Main.cpp b/src/Main.cpp
|
||||
index 449cb85..81205dc 100644
|
||||
--- a/src/Main.cpp
|
||||
+++ b/src/Main.cpp
|
||||
@@ -55,7 +55,6 @@
|
||||
|
||||
#include <xbmc_vis_dll.h>
|
||||
#include <xbmc_addon_cpp_dll.h>
|
||||
-#include <libXBMC_addon.h>
|
||||
#include <threads/mutex.h>
|
||||
|
||||
#if !defined(__APPLE__)
|
||||
@@ -79,8 +78,6 @@ bool lastLockStatus;
|
||||
int lastPresetIdx;
|
||||
unsigned int lastLoggedPresetIdx;
|
||||
|
||||
-ADDON::CHelper_libXBMC_addon *XBMC = NULL;
|
||||
-
|
||||
//-- Create -------------------------------------------------------------------
|
||||
// Called once when the visualisation is created by XBMC. Do any setup here.
|
||||
//-----------------------------------------------------------------------------
|
||||
@@ -89,15 +86,6 @@ extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
|
||||
if (!props)
|
||||
return ADDON_STATUS_UNKNOWN;
|
||||
|
||||
- if (!XBMC)
|
||||
- XBMC = new ADDON::CHelper_libXBMC_addon;
|
||||
-
|
||||
- if (!XBMC->RegisterMe(hdl))
|
||||
- {
|
||||
- delete XBMC, XBMC=NULL;
|
||||
- return ADDON_STATUS_PERMANENT_FAILURE;
|
||||
- }
|
||||
-
|
||||
VIS_PROPS* visprops = (VIS_PROPS*)props;
|
||||
|
||||
strcpy(g_visName, visprops->name);
|
||||
@@ -109,13 +97,8 @@ extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
|
||||
g_configPM.windowHeight = visprops->height;
|
||||
g_configPM.aspectCorrection = true;
|
||||
g_configPM.easterEgg = 0.0;
|
||||
- char path[1024];
|
||||
- XBMC->GetSetting("__addonpath__", path);
|
||||
- strcat(path,"/resources");
|
||||
- g_configPM.titleFontURL = path;
|
||||
- g_configPM.titleFontURL += "/Vera.ttf";
|
||||
- g_configPM.menuFontURL = path;
|
||||
- g_configPM.menuFontURL += "/VeraMono.ttf";
|
||||
+ g_configPM.titleFontURL = DATAPATH"/Vera.ttf";
|
||||
+ g_configPM.menuFontURL = DATAPATH"/VeraMono.ttf";
|
||||
lastLoggedPresetIdx = lastPresetIdx;
|
||||
|
||||
return ADDON_STATUS_NEED_SAVEDSETTINGS;
|
||||
@@ -351,12 +334,7 @@ void ChoosePresetPack(int pvalue)
|
||||
{
|
||||
g_UserPackFolder = false;
|
||||
if (pvalue == 0)
|
||||
- {
|
||||
- char path[1024];
|
||||
- XBMC->GetSetting("__addonpath__", path);
|
||||
- g_configPM.presetURL = path;
|
||||
- g_configPM.presetURL += "/resources/presets";
|
||||
- }
|
||||
+ g_configPM.presetURL = DATAPATH"/presets";
|
||||
else if (pvalue == 1) //User preset folder has been chosen
|
||||
g_UserPackFolder = true;
|
||||
}
|
||||
--
|
||||
2.1.4
|
||||
|
@ -1,25 +0,0 @@
|
||||
From 8e396c0586e511b746e377f36817e32413b7c5aa Mon Sep 17 00:00:00 2001
|
||||
From: Stefan Saraev <stefan@saraev.ca>
|
||||
Date: Sat, 4 Jul 2015 22:21:19 +0300
|
||||
Subject: [PATCH] move datapath to /storage
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index d73d069..1043f1a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -13,7 +13,7 @@ find_package(GLEW REQUIRED)
|
||||
find_package(ProjectM REQUIRED)
|
||||
|
||||
add_definitions(-DHAS_SDL_OPENGL)
|
||||
-set(DATA_PATH "${CMAKE_INSTALL_PREFIX}/share/xbmc/addons/visualization.projectm/resources")
|
||||
+set(DATA_PATH "/storage/.kodi/addons/visualization.projectm/resources")
|
||||
add_definitions(-DDATAPATH="${DATA_PATH}")
|
||||
|
||||
set(INCLUDES ${OpenGL_INCLUDE_DIR}
|
||||
--
|
||||
2.1.4
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="visualization.shadertoy"
|
||||
PKG_VERSION="ae677ac"
|
||||
PKG_VERSION="9419ec1"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="visualization.spectrum"
|
||||
PKG_VERSION="d7d9c14"
|
||||
PKG_VERSION="9ff9d71"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="visualization.waveform"
|
||||
PKG_VERSION="2a71ba0"
|
||||
PKG_VERSION="d0caa05"
|
||||
PKG_REV="2"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi-platform"
|
||||
PKG_VERSION="36fb493"
|
||||
PKG_VERSION="c8188d8"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="kodi"
|
||||
PKG_VERSION="61e98fd"
|
||||
PKG_VERSION="423072a"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
@ -37,23 +37,15 @@ PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET dbus"
|
||||
|
||||
if [ "$DISPLAYSERVER" = "x11" ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET libX11 libXext libdrm libXrandr"
|
||||
KODI_XORG="-DENABLE_X11=ON"
|
||||
else
|
||||
KODI_XORG="-DENABLE_X11=OFF"
|
||||
KODI_XORG="-DCORE_PLATFORM_NAME=x11"
|
||||
fi
|
||||
|
||||
if [ ! "$OPENGL" = "no" ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGL glu"
|
||||
KODI_OPENGL="-DENABLE_OPENGL=ON"
|
||||
else
|
||||
KODI_OPENGL="-DENABLE_OPENGL=OFF"
|
||||
fi
|
||||
|
||||
if [ "$OPENGLES_SUPPORT" = yes ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $OPENGLES"
|
||||
KODI_OPENGLES="-DENABLE_OPENGLES=ON"
|
||||
else
|
||||
KODI_OPENGLES="-DENABLE_OPENGLES=OFF"
|
||||
fi
|
||||
|
||||
if [ "$ALSA_SUPPORT" = yes ]; then
|
||||
@ -193,17 +185,17 @@ fi
|
||||
if [ ! "$KODIPLAYER_DRIVER" = default ]; then
|
||||
PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET $KODIPLAYER_DRIVER"
|
||||
if [ "$KODIPLAYER_DRIVER" = bcm2835-driver ]; then
|
||||
KODI_PLAYER="-DENABLE_MMAL=ON -DCORE_SYSTEM_NAME=rbpi"
|
||||
KODI_PLAYER="-DCORE_SYSTEM_NAME=rbpi"
|
||||
elif [ "$KODIPLAYER_DRIVER" = mesa ]; then
|
||||
KODI_PLAYER="-DCORE_SYSTEM_NAME=linux"
|
||||
KODI_PLAYER="-DCORE_PLATFORM_NAME=gbm"
|
||||
CFLAGS="$CFLAGS -DMESA_EGL_NO_X11_HEADERS"
|
||||
CXXFLAGS="$CXXFLAGS -DMESA_EGL_NO_X11_HEADERS"
|
||||
elif [ "$KODIPLAYER_DRIVER" = libfslvpuwrap ]; then
|
||||
KODI_PLAYER="-DENABLE_IMX=ON"
|
||||
KODI_PLAYER="-DCORE_PLATFORM_NAME=imx"
|
||||
CFLAGS="$CFLAGS -DHAS_IMXVPU -DLINUX -DEGL_API_FB"
|
||||
CXXFLAGS="$CXXFLAGS -DHAS_IMXVPU -DLINUX -DEGL_API_FB"
|
||||
elif [ "$KODIPLAYER_DRIVER" = libamcodec ]; then
|
||||
KODI_PLAYER="-DENABLE_AML=ON"
|
||||
KODI_PLAYER="-DCORE_PLATFORM_NAME=aml"
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -217,6 +209,7 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
|
||||
-DPYTHON_EXECUTABLE=$TOOLCHAIN/bin/python2.7 \
|
||||
-DPYTHON_INCLUDE_DIRS=$SYSROOT_PREFIX/usr/include/python2.7 \
|
||||
-DGIT_VERSION=$PKG_VERSION \
|
||||
-DWITH_FFMPEG=$(get_build_dir ffmpeg) \
|
||||
-DENABLE_INTERNAL_FFMPEG=OFF \
|
||||
-DFFMPEG_INCLUDE_DIRS=$SYSROOT_PREFIX/usr \
|
||||
-DENABLE_INTERNAL_CROSSGUID=OFF \
|
||||
@ -230,8 +223,6 @@ PKG_CMAKE_OPTS_TARGET="-DNATIVEPREFIX=$TOOLCHAIN \
|
||||
-DENABLE_EVENTCLIENTS=ON \
|
||||
-DENABLE_LDGOLD=ON \
|
||||
$KODI_ARCH \
|
||||
$KODI_OPENGL \
|
||||
$KODI_OPENGLES \
|
||||
$KODI_OPENMAX \
|
||||
$KODI_VDPAU \
|
||||
$KODI_VAAPI \
|
||||
|
@ -17,7 +17,7 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="p8-platform"
|
||||
PKG_VERSION="3219004"
|
||||
PKG_VERSION="38343e0"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://www.kodi.tv"
|
||||
|
@ -22,13 +22,20 @@ if [ -z "$1" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
KODI_DIR="kodi-$1.git"
|
||||
KODI_BRANCH="$1"
|
||||
KODI_DIR="kodi-${KODI_BRANCH}.git"
|
||||
|
||||
git_clone() {
|
||||
# git_clone https://repo.url branch ./target_dir [githash]
|
||||
echo "[mkpkg] Checking out $1 ..."
|
||||
if [ ! -d "$3" ]; then
|
||||
git clone "$1" -b $2 "$3"
|
||||
git clone "$1" "$3"
|
||||
# Try to switch to specified branch if it exist, if not then use default branch
|
||||
if [ -n "$2" ]; then
|
||||
cd "$3"
|
||||
git checkout $2 >/dev/null 2>/dev/null
|
||||
cd ..
|
||||
fi
|
||||
else
|
||||
if [ -d "$3" ] ; then
|
||||
cd "$3"
|
||||
@ -37,6 +44,7 @@ git_clone() {
|
||||
cd ..
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ ! -z "$4" ] ; then
|
||||
cd "$3"
|
||||
git fetch >/dev/null 2>/dev/null
|
||||
@ -88,8 +96,8 @@ validate_pkg_url() {
|
||||
[ "${url1}" = "${url2}" ] && return 0 || return 1
|
||||
}
|
||||
|
||||
if [ ! -d $KODI_DIR ] ; then
|
||||
git_clone https://github.com/xbmc/xbmc $1 $KODI_DIR
|
||||
if [ ! -d ${KODI_DIR} ] ; then
|
||||
git_clone https://github.com/xbmc/xbmc ${KODI_BRANCH} ${KODI_DIR}
|
||||
fi
|
||||
|
||||
# p8-platform
|
||||
@ -125,7 +133,7 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do
|
||||
ADDONS=$(cat $addontxt | awk '{print $1}')
|
||||
ADDONREPO=$(cat $addontxt | awk '{print $2}')
|
||||
GIT_HASH=$(cat $addontxt | awk '{print $3}')
|
||||
git_clone $ADDONREPO master $ADDONS.git $GIT_HASH
|
||||
git_clone $ADDONREPO ${KODI_BRANCH} $ADDONS.git $GIT_HASH
|
||||
for addon in $ADDONS.git/*.*/ ; do
|
||||
ADDON=$(basename $addon)
|
||||
|
||||
@ -146,7 +154,7 @@ for addontxt in $KODI_DIR/cmake/addons/bootstrap/repositories/*-addons.txt ; do
|
||||
fi
|
||||
|
||||
if [ -f ../../packages/mediacenter/kodi-binary-addons/$ADDON/package.mk ] ; then
|
||||
git_clone $REPO master $PKG_NAME.git $GIT_HASH
|
||||
git_clone $REPO ${KODI_BRANCH} $PKG_NAME.git $GIT_HASH
|
||||
|
||||
# update package.mk
|
||||
RESOLVED_HASH=$(resolve_hash $PKG_NAME.git $GIT_HASH)
|
||||
@ -177,7 +185,7 @@ for ADDON in $(ls -1 ../../packages/mediacenter/kodi-binary-addons); do
|
||||
# Obtain git url - ignore if not a suitable repo
|
||||
REPO="$(geturl "${ADDON}")" || continue
|
||||
|
||||
git_clone $REPO master $ADDON.git HEAD
|
||||
git_clone $REPO ${KODI_BRANCH} $ADDON.git HEAD
|
||||
|
||||
# update package.mk for stale github.com packages
|
||||
RESOLVED_HASH=$(resolve_hash ${ADDON}.git HEAD) || continue
|
||||
|
Loading…
x
Reference in New Issue
Block a user