jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3099 from CvH/9.0/projectm-fix

Browse Source 
visualization.projectm: update to e6c5ab3
This commit is contained in:
Matthias Reichl 2018-11-22 19:37:08 +01:00 committed by GitHub
commit a4fe4d943a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
packages/mediacenter/kodi-binary-addons/visualization.projectm/package.mk
View File

@ -3,13 +3,13 @@
# Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
PKG_NAME="visualization.projectm"
PKG_VERSION="b5be54b5a65e6ca66e37a66b647cb8621797104a"
PKG_SHA256="4322fe167106af12300b81ce0978bc49eb21fbd24c145f12c76cc02f66521a13"
PKG_VERSION="e6c5ab35f09c634d71252f333f450095ac5e6ca2"
PKG_SHA256="96e78b1fc1e5e9bfde24b8c556ad3a178ce5ba866d5b158df2a6f2761f50d5e6"
PKG_REV="2"
PKG_ARCH="x86_64"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/notspiff/visualization.projectm"
PKG_URL="https://github.com/notspiff/visualization.projectm/archive/$PKG_VERSION.tar.gz"
PKG_SITE="https://github.com/xbmc/visualization.projectm"
PKG_URL="https://github.com/xbmc/visualization.projectm/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain kodi-platform libprojectM"
PKG_SECTION=""
PKG_SHORTDESC="visualization.projectm"
@ -24,4 +24,5 @@ fi
pre_configure_target() {
export LDFLAGS=`echo $LDFLAGS | sed -e "s|-Wl,--as-needed||"`
sed -i "s|\${PROJECTM_PREFIX}|$SYSROOT_PREFIX\/usr|" -i $PKG_BUILD/FindProjectM.cmake
}

34
packages/mediacenter/kodi-binary-addons/visualization.projectm/patches/visualization.projectm-01-fix-crash-at-stop.patch
View File

@ -1,34 +0,0 @@
From 4619d76d36e04e64a6072305b7f6dc851059376b Mon Sep 17 00:00:00 2001
From: Arne Morten Kvarving <arne.morten.kvarving@sintef.no>
Date: Wed, 17 Oct 2018 12:55:31 +0200
Subject: [PATCH] fixed: all settings are retransferred on exit
add flag that we do not want to reinit during shutdown
--- a/src/Main.cpp
+++ b/src/Main.cpp
@@ -95,6 +95,7 @@ class ATTRIBUTE_HIDDEN CVisualizationProjectM
int m_lastPresetIdx;
unsigned int m_lastLoggedPresetIdx;
bool m_lastLockStatus;
+ bool m_shutdown = false;
// some projectm globals
const static int maxSamples=512;
@@ -144,6 +145,7 @@ CVisualizationProjectM::~CVisualizationProjectM()
{
unsigned int lastindex = 0;
m_projectM->selectedPresetIndex(lastindex);
+ m_shutdown = true;
kodi::SetSettingInt("lastpresetidx", lastindex);
kodi::SetSettingString("lastpresetfolder", m_projectM->settings().presetURL);
kodi::SetSettingBoolean("lastlockedstatus", m_projectM->isPresetLocked());
@@ -299,7 +301,7 @@ ADDON_STATUS CVisualizationProjectM::SetSetting(const std::string& settingName,
else if (settingName == "beat_sens")
m_configPM.beatSensitivity = settingValue.GetInt() * 2;
- if (settingName == "beat_sens") // becomes changed in future by a additional value on function
+ if (settingName == "beat_sens" && !m_shutdown) // becomes changed in future by a additional value on function
{
if (!InitProjectM()) //The last setting value is already set so we (re)initalize
return ADDON_STATUS_UNKNOWN;