Skip to contentSkip to conversation

package/kodi-screensaver-matrixtrails: bump version to 2.2.3

PATCH New Bernd Kuhls 2 participants 2 messages Jun 21, 2020 – Jun 22, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/kodi-screensaver-matrixtrails: bump version to 2.2.3

Removed patch which was applied upstream.

Updated license hash due to copyright year update:
https://github.com/xbmc/screensaver.matrixtrails/commit/c2fdf919cfa04de45ad213da7645ea435547266d

Removed "v" from _SITE due to changes to github release names.

---
 .../0001-Add-missing-stddef-include.patch     | 25 -------------------
 .../kodi-screensaver-matrixtrails.hash        |  4 +--
 .../kodi-screensaver-matrixtrails.mk          |  4 +--
 3 files changed, 4 insertions(+), 29 deletions(-)
 delete mode 100644 package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch
package/kodi-screensaver-matrixtrails/0001-Add-missing-stddef-include.patch deleted +0 -25
deleted file mode 100644
index 75cadfcb1e..0000000000
@@ -1,25 +0,0 @@
-From 404763f096a312e12c0dc4764834987797411745 Mon Sep 17 00:00:00 2001
-From: Rechi <[email protected]>
-Date: Sun, 24 Mar 2019 11:44:05 +0100
-Subject: [PATCH] [fix] add missing stddef.h include for offsetof macro
-
-Downloaded from upstream commit:
-https://github.com/xbmc/screensaver.matrixtrails/commit/404763f096a312e12c0dc4764834987797411745
-
-Signed-off-by: Bernd Kuhls <[email protected]>
----
- src/matrixtrails.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/matrixtrails.cpp b/src/matrixtrails.cpp
-index 220855a..2817dbe 100644
---- a/src/matrixtrails.cpp
-+++ b/src/matrixtrails.cpp
-@@ -25,6 +25,7 @@
- #include "matrixtrails.h"
- #include "SOIL2/SOIL2.h"
- 
-+#include <stddef.h>
- #include <vector>
- 
- ////////////////////////////////////////////////////////////////////////////
package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.hash +2 -2
index 9a657a10dd..26b95cbc77 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  2d2c795853c5a72184bb6720247d79c48b1d9fbc97e9c2913003a707d612e3ac  kodi-screensaver-matrixtrails-2.2.1-Leia.tar.gz
-sha256  4cfbc2bc766d343a70ba0322bc7203332c232ba57b62fb57a0ee9189cca4ac27  debian/copyright
+sha256  5a2f5bca0c197eea87f06376941c6d0ddbc81cf144d8c3854ac148fdec3400ec  kodi-screensaver-matrixtrails-2.2.3-Leia.tar.gz
+sha256  385a17599b44aaea10537374c1991c21a5e06153878917b12f96fc1cf8bbc118  debian/copyright
package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +2 -2
index de2d0f504c..8e619c1b7c 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.1-Leia
-KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,v$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
+KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.3-Leia
+KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = debian/copyright
 KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi
Signature · 1 line
2.26.2
#1 lore raw

PATCH 1/1 package/kodi-screensaver-matrixtrails: bump version to 2.2.3

Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Bernd" == Bernd Kuhls <[email protected]> writes:

Removed patch which was applied upstream. Updated license hash due to copyright year update:
https://github.com/xbmc/screensaver.matrixtrails/commit/c2fdf919cfa04de45ad213da7645ea435547266d

Removed "v" from _SITE due to changes to github release names.

Committed, thanks.

package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk line 11

Quoted 7 lines
package/kodi-screensaver-matrixtrails/kodi-screensaver-matrixtrails.mk +2 -2
-KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.1-Leia
-KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,v$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
+KODI_SCREENSAVER_MATRIXTRAILS_VERSION = 2.2.3-Leia
+KODI_SCREENSAVER_MATRIXTRAILS_SITE = $(call github,xbmc,screensaver.matrixtrails,$(KODI_SCREENSAVER_MATRIXTRAILS_VERSION))
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE = GPL-2.0+
 KODI_SCREENSAVER_MATRIXTRAILS_LICENSE_FILES = debian/copyright
 KODI_SCREENSAVER_MATRIXTRAILS_DEPENDENCIES = kodi

Notice: The patch didn't apply because we have kodi libsoil in _DEPENDENCIES.

Local changes? Is libsoil no longer needed?

Signature · 1 line
Bye, Peter Korsgaard