iiiypuk/buildroot
1
0
Fork 0
mirror of https://github.com/MiyooCFW/buildroot.git synced 2025-09-27 22:24:19 +03:00
Code Issues Projects Releases Wiki Activity

Merge from bittboy/buildroot@26c91a9

Browse Source
This commit is contained in:
TriForceX
2021-03-13 22:13:38 -03:00
parent c77595adbd
commit b3ecc6e32d
7043 changed files with 119377 additions and 73694 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
package/kodi-visualisation-shadertoy/0001-FindOpenGLES2-also-search-for-egl-with-pkg-config.patch
View File

@@ -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

1
package/kodi-visualisation-shadertoy/Config.in
View File

@@ -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

3
package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.hash
View File

@@ -1,2 +1,3 @@
# Locally computed
sha256 4456e88bc94bcb3e2481286b27926a1f6d85d6f857de31a46d50f44fead01abd kodi-visualisation-shadertoy-1.1.5.tar.gz
sha256 07724fc59cc5f960a941b8255af326e87fa9fbc8234498c7e21d8a46050e0dd4 kodi-visualisation-shadertoy-1.2.4-Leia.tar.gz
sha256 e33ac3ac6ca1bdd4a4a411481d43579d855622e7ecc207809b5f49ea617db480 debian/copyright

8
package/kodi-visualisation-shadertoy/kodi-visualisation-shadertoy.mk
View File

@@ -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.4-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_LICENSE_FILES = debian/copyright
KODI_VISUALISATION_SHADERTOY_DEPENDENCIES = glm kodi libplatform
$(eval $(cmake-package))