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 v9 19/23] package/kodi-visualisation-shadertoy: bump version to 1.2.3-Leia
Date: Sun, 19 Jan 2020 12:07:31 +0100	[thread overview]
Message-ID: <20200119110735.1104443-20-bernd.kuhls@t-online.de> (raw)
In-Reply-To: <20200119110735.1104443-1-bernd.kuhls@t-online.de>

Added dependency to glm.
Although glm depends on BR2_INSTALL_LIBSTDCPP this dependency was not
added because Kodi itself already depends on C++.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 ...-also-search-for-egl-with-pkg-config.patch | 44 -------------------
 .../kodi-visualisation-shadertoy/Config.in    |  1 +
 .../kodi-visualisation-shadertoy.hash         |  2 +-
 .../kodi-visualisation-shadertoy.mk           |  6 +--
 4 files changed, 5 insertions(+), 48 deletions(-)
 delete mode 100644 package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch

diff --git a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch b/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
deleted file mode 100644
index 8de96a6de3..0000000000
--- a/package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 9c428c3c9f120a11468f98546bcc754d2c3302af Mon Sep 17 00:00:00 2001
-From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-Date: Thu, 30 Jul 2015 10:02:15 +0200
-Subject: [PATCH] FindOpenGLES2: also search for egl with pkg-config
-
-The non-pkg-config path looks for both EGL *and* OpenGL ES, but not
-the pkg-config path, which might lead to missing libraries/headers if
-egl.pc has more header paths or libraries than glesv2.pc.
-
-Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
----
- CMakeLists.txt      | 2 +-
- FindOpenGLES2.cmake | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8b084cf..81bbe27 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,7 +35,7 @@
-     endif()
-   endif()
- 
--  include_directories(${OpenGL_INCLUDE_DIR}
-+  include_directories(${OpenGL_INCLUDE_DIR} ${OpenGLES2_INCLUDE_DIRS}
-                       ${KODI_INCLUDE_DIR}
-                       ${p8-platform_INCLUDE_DIRS}
-                       ${PROJECT_SOURCE_DIR}/lib/kissfft
-diff --git a/FindOpenGLES2.cmake b/FindOpenGLES2.cmake
-index e1b7d21..2a9ce0d 100644
---- a/FindOpenGLES2.cmake
-+++ b/FindOpenGLES2.cmake
-@@ -7,7 +7,7 @@
- 
- find_package(PkgConfig)
- if(PKG_CONFIG_FOUND)
--  pkg_check_modules(OpenGLES2 glesv2)
-+  pkg_check_modules(OpenGLES2 glesv2 egl)
- endif(PKG_CONFIG_FOUND)
- 
- if(NOT OPENGLES2_FOUND)
--- 
-2.5.0
-
diff --git a/package/kodi-visualisation-shadertoy/Config.in b/package/kodi-visualisation-shadertoy/Config.in
index 3b981d0bf4..1fabba5ef5 100644
--- a/package/kodi-visualisation-shadertoy/Config.in
+++ b/package/kodi-visualisation-shadertoy/Config.in
@@ -1,5 +1,6 @@
 config BR2_PACKAGE_KODI_VISUALISATION_SHADERTOY
 	bool "kodi-visualisation-shadertoy"
+	select BR2_PACKAGE_GLM
 	select BR2_PACKAGE_LIBPLATFORM
 	help
 	  Shadertoy visualiser for Kodi
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
index ae8c59ddb0..cf3e06daa7 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
@@ -1,2 +1,2 @@
 # Locally computed
-sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd  kodi-visualisation-shadertoy-1.1.5.tar.gz
+sha256 7b09de334ed3c96d2e2552e0594b8f76c11e36edfc10efd725851140132a4d4f  kodi-visualisation-shadertoy-1.2.3-Leia.tar.gz
diff --git a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
index a2b1b14d9f..add0f3ddea 100644
--- a/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
+++ b/package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-KODI_VISUALISATION_SHADERTOY_VERSION = 1.1.5
-KODI_VISUALISATION_SHADERTOY_SITE = $(call github,notspiff,visualization.shadertoy,v$(KODI_VISUALISATION_SHADERTOY_VERSION))
+KODI_VISUALISATION_SHADERTOY_VERSION = 1.2.3-Leia
+KODI_VISUALISATION_SHADERTOY_SITE = $(call github,xbmc,visualization.shadertoy,$(KODI_VISUALISATION_SHADERTOY_VERSION))
 KODI_VISUALISATION_SHADERTOY_LICENSE = GPL-2.0+
 KODI_VISUALISATION_SHADERTOY_LICENSE_FILES = src/main.cpp
-KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = kodi libplatform
+KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi libplatform
 
 $(eval $(cmake-package))
-- 
2.20.1

  parent reply	other threads:[~2020-01-19 11:07 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-01-19 11:07 [Buildroot] [PATCH v9 00/23] package/kodi: bump to version 18.5-Leia Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 01/23] package/kodi-platform: bump version Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 02/23] package/kodi: bump to version 18.5-Leia Bernd Kuhls
2020-01-23  0:04   ` Arnout Vandecappelle
2020-02-01 13:26     ` Bernd Kuhls
2020-02-01 14:16     ` Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 03/23] package/kodi-audiodecoder-*: mass version bump Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 04/23] package/kodi-audioencoder-*: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 05/23] package/kodi-inputstream-adaptive: bump version Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 06/23] package/kodi-inputstream-rtmp: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 07/23] package/kodi-peripheral-joystick: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 08/23] package/kodi-peripheral-*: mass version bump Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 09/23] package/kodi-pvr-iptvsimple: bump version Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 10/23] package/kodi-pvr-mediaportal-tvserver: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 11/23] package/kodi-pvr-stalker: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 12/23] package/kodi-pvr-vuplus: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 13/23] package/kodi-pvr-*: mass version bump Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 14/23] package/kodi-screensaver-asteroids: bump version Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 15/23] package/kodi-screensaver-rsxs: " Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 16/23] package/kodi-screensaver-*: mass version bump Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 17/23] package/kodi-skin-confluence: bump version Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 18/23] package/kodi-visualisation-goom: bump version to 2.1.0-Leia Bernd Kuhls
2020-01-19 11:07 ` Bernd Kuhls [this message]
2020-01-19 11:07 ` [Buildroot] [PATCH v9 20/23] package/kodi-visualisation-spectrum: bump version to 3.0.2-Leia Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 21/23] package/kodi-visualisation-fishbmc: bump version to 5.1.2-Leia Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 22/23] package/kodi-visualisation-waveform: bump version to 3.1.1-Leia Bernd Kuhls
2020-01-19 11:07 ` [Buildroot] [PATCH v9 23/23] package/kodi-vfs-sftp: bump version Bernd Kuhls
2020-01-23  0:05   ` Arnout Vandecappelle

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=20200119110735.1104443-20-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.