All of lore.kernel.org
 help / color / mirror / Atom feed
From: Bernd Kuhls <bernd.kuhls@t-online.de>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v2 41/54] package/kodi-screensaver-rsxs: bump version
Date: Tue,  2 Mar 2021 08:07:36 +0100	[thread overview]
Message-ID: <20210302070749.647742-42-bernd.kuhls@t-online.de> (raw)
In-Reply-To: <20210302070749.647742-1-bernd.kuhls@t-online.de>

Removed patch 0001, ImageMagick code was removed upstream:
https://github.com/xbmc/screensavers.rsxs/commit/e3793a1e5d120b0354d07d6bf9dc175af883e134#diff-f9e414fa2a69e3c79d590dd6e91236778d803a84669f93f0e550483f7be105e9L31

Removed various dependencies after upstream cleanup:
https://github.com/xbmc/screensavers.rsxs/commit/e3793a1e5d120b0354d07d6bf9dc175af883e134

Switched opengl dependency to render system used by Kodi.

Switch license file to LICENSE.md.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../0001-Disable-drempels.patch               | 40 -------------------
 package/kodi-screensaver-rsxs/Config.in       | 10 ++---
 .../kodi-screensaver-rsxs.hash                |  4 +-
 .../kodi-screensaver-rsxs.mk                  |  6 +--
 4 files changed, 8 insertions(+), 52 deletions(-)
 delete mode 100644 package/kodi-screensaver-rsxs/0001-Disable-drempels.patch

diff --git a/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch b/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
deleted file mode 100644
index e76a9b9943..0000000000
--- a/package/kodi-screensaver-rsxs/0001-Disable-drempels.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 28c01686ba0d67d317e058776f01efba5e6471bd Mon Sep 17 00:00:00 2001
-From: Bernd Kuhls <bernd.kuhls@t-online.de>
-Date: Sat, 13 Jul 2019 14:18:12 +0200
-Subject: [PATCH] Disable drempels
-
-Does not build with ImageMagick 7.x:
-
-src/drempels/TexMgr.cpp:31:10: fatal error: magick/api.h:
- No such file or directory
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
----
- CMakeLists.txt | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index a86ccd0..b5ca03f 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,8 +40,7 @@ include_directories(${KODI_INCLUDE_DIR}/.. # Hack way with "/..", need bigger Ko
- if(ImageMagick_FOUND AND NOT ${OWN_IMAGE_MAGICK})
-   message(STATUS "ImageMagick found in the system and is used")
- else()
--  message(STATUS "ImageMagick not found or forced and add custom created")
--  add_subdirectory(lib/ImageMagick)
-+  message(STATUS "ImageMagick not found")
- endif()
- add_subdirectory(lib/kodi/gui/gl)
- add_subdirectory(lib/Implicit)
-@@ -70,7 +69,6 @@ include(src/biof/CMakeLists.txt)
- include(src/busyspheres/CMakeLists.txt)
- include(src/colorfire/CMakeLists.txt)
- include(src/cyclone/CMakeLists.txt)
--include(src/drempels/CMakeLists.txt)
- include(src/euphoria/CMakeLists.txt)
- include(src/feedback/CMakeLists.txt)
- include(src/fieldlines/CMakeLists.txt)
--- 
-2.20.1
-
diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
index 076c7effa0..e88df1fe49 100644
--- a/package/kodi-screensaver-rsxs/Config.in
+++ b/package/kodi-screensaver-rsxs/Config.in
@@ -1,17 +1,13 @@
 config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
 	bool "kodi-screensaver-rsxs"
-	depends on BR2_PACKAGE_HAS_LIBGL # libglu
+	depends on BR2_PACKAGE_KODI_RENDER_SYSTEM_GL
 	select BR2_PACKAGE_BZIP2
 	select BR2_PACKAGE_GLI
 	select BR2_PACKAGE_GLM
-	select BR2_PACKAGE_JPEG
-	select BR2_PACKAGE_LIBPNG
-	select BR2_PACKAGE_LIBTOOL
-	select BR2_PACKAGE_TIFF
 	help
 	  RSXS screensaver add-ons for Kodi
 
 	  https://github.com/xbmc/screensavers.rsxs
 
-comment "kodi-screensaver-rsxs needs an OpenGL backend"
-	depends on !BR2_PACKAGE_HAS_LIBGL
+comment "kodi-screensaver-rsxs needs OpenGL as Kodi render system"
+	depends on !BR2_PACKAGE_KODI_RENDER_SYSTEM_GL
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
index f4987a44cd..ceb8d360f7 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  22ff3f0ca9679c59ce1a90b98d918dd10a8012b789729b2e44c04d4ce8c86ad8  kodi-screensaver-rsxs-7cb648507440d87948dec10d5bfdab3b722d37fe.tar.gz
-sha256  fa0ff8b6a6267b9477be7d505aa384056633b4be17e0b9d308df9bd70d1c99f6  debian/copyright
+sha256  343ecedbf6cfb75d43bb94e805aae807d61b0cd4f681a05c126f65839e3687a3  kodi-screensaver-rsxs-21c65de59546bde770225f023747a39b345baffd.tar.gz
+sha256  310782e1abd43c4de6217c513e328bddf999d39302d67c6e05b10a59959827af  LICENSE.md
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
index aa881d0d59..9b839b3112 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-KODI_SCREENSAVER_RSXS_VERSION = 7cb648507440d87948dec10d5bfdab3b722d37fe
+KODI_SCREENSAVER_RSXS_VERSION = 21c65de59546bde770225f023747a39b345baffd
 KODI_SCREENSAVER_RSXS_SITE = $(call github,xbmc,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
 KODI_SCREENSAVER_RSXS_LICENSE = GPL-2.0+
-KODI_SCREENSAVER_RSXS_LICENSE_FILES = debian/copyright
-KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm jpeg kodi libpng libtool tiff
+KODI_SCREENSAVER_RSXS_LICENSE_FILES = LICENSE.md
+KODI_SCREENSAVER_RSXS_DEPENDENCIES = bzip2 gli glm kodi
 
 $(eval $(cmake-package))
-- 
2.29.2

  parent reply	other threads:[~2021-03-02  7:07 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-03-02  7:06 [Buildroot] [PATCH v2 00/54] package/kodi: bump version to 19.0-Matrix Bernd Kuhls
2021-03-02  7:06 ` [Buildroot] [PATCH v2 01/54] package/kodi-pvr-iptvsimple: bump version to 3.10.0-Leia Bernd Kuhls
2021-03-02  7:06 ` [Buildroot] [PATCH v2 02/54] package/kodi-pvr-zattoo: bump version to 18.1.23-Leia Bernd Kuhls
2021-03-02  7:06 ` [Buildroot] [PATCH v2 03/54] package/kodi-screensaver-crystalmorph: remove package Bernd Kuhls
2021-03-02  7:06 ` [Buildroot] [PATCH v2 04/54] package/libcec: bump version to 6.0.2 Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 05/54] package/libplatform: bump version Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 06/54] package/kodi: bump version to 19.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 07/54] package/kodi-audiodecoder-*: mass version bump Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 08/54] package/kodi-audioencoder-*: " Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 09/54] package/kodi-inputstream-adaptive: bump version to 2.6.7-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 10/54] package/kodi-inputstream-ffmpegdirect: new package Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 11/54] package/kodi-inputstream-rtmp: bump version to 3.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 12/54] package/kodi-peripheral-joystick: bump version to 1.7.1-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 13/54] package/kodi-peripheral-xarcade: bump version to 1.2.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 14/54] package/kodi-pvr-argustv: bump version to 7.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 15/54] package/kodi-pvr-dvblink: bump version to 9.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 16/54] package/kodi-pvr-dvbviewer: bump version to 7.2.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 17/54] package/kodi-pvr-filmon: bump version to 6.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 18/54] package/kodi-pvr-hdhomerun: bump version to 7.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 19/54] package/kodi-pvr-hts: bump version to 8.2.1-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 20/54] package/kodi-pvr-iptvsimple: bump version to 7.4.3-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 21/54] package/kodi-pvr-mediaportal-tvserver: bump version to 8.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 22/54] package/kodi-pvr-mythtv: bump version to 7.3.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 23/54] package/kodi-pvr-nextpvr: bump version to 8.2.1-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 24/54] package/kodi-pvr-njoy: bump version to 7.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 25/54] package/kodi-pvr-octonet: bump version to 4.1.0-2-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 26/54] package/kodi-pvr-pctv: bump version to 6.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 27/54] package/kodi-pvr-stalker: bump version to 7.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 28/54] package/kodi-pvr-vbox: bump version to 8.1.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 29/54] package/kodi-pvr-vdr-vnsi: bump version to 8.2.1-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 30/54] package/kodi-pvr-vuplus: bump version to 7.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 31/54] package/kodi-pvr-wmc: bump version to 6.1.1-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 32/54] package/kodi-pvr-zattoo: bump version to 19.7.3-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 33/54] package/kodi-screensaver-asteroids: bump version to 2.6.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 34/54] package/kodi-screensaver-asterwave: bump version to 3.3.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 35/54] package/kodi-screensaver-biogenesis: bump version to 2.5.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 36/54] package/kodi-screensaver-cpblobs: bump version to 3.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 37/54] package/kodi-screensaver-greynetic: bump version to 2.5.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 38/54] package/kodi-screensaver-matrixtrails: bump version to 2.6.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 39/54] package/kodi-screensaver-pingpong: bump version to 2.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 40/54] package/kodi-screensaver-pyro: bump version to 3.3.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` Bernd Kuhls [this message]
2021-03-02  7:07 ` [Buildroot] [PATCH v2 42/54] package/kodi-screensaver-stars: bump version to 2.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 43/54] package/kodi-skin-confluence: bump version Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 44/54] package/kodi-vfs-libarchive: new package Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 45/54] package/kodi-vfs-rar: bump version to 4.0.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 46/54] package/kodi-vfs-sftp: bump version to 2.0.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 47/54] package/kodi-visualisation-fishbmc: bump version to 6.3.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 48/54] package/kodi-visualisation-goom: bump version 3.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 49/54] package/kodi-visualisation-shadertoy: bump version to 2.3.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 50/54] package/kodi-visualisation-spectrum: bump version to 3.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 51/54] package/kodi-visualisation-starburst: bump version to 2.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 52/54] package/kodi-visualisation-waveform: bump version to 4.4.0-Matrix Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 53/54] package/kodi-visualisation-matrix: new package Bernd Kuhls
2021-03-02  7:07 ` [Buildroot] [PATCH v2 54/54] package/kodi-platform: remove package Bernd Kuhls
2021-03-06 22:03 ` [Buildroot] [PATCH v2 00/54] package/kodi: bump version to 19.0-Matrix Thomas Petazzoni
2021-03-08  9:54   ` Bernd Kuhls

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210302070749.647742-42-bernd.kuhls@t-online.de \
    --to=bernd.kuhls@t-online.de \
    --cc=buildroot@busybox.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.