package/kodi-visualisation-goom: new package
PATCH v4 1/2 package/kodi-visualisation-goom: new package
Signed-off-by Bernd Kuhls <[email protected]>
---
v4. bumped version, changed _LICENSE_FILES back to ./COPYING,
upstream clarified its license:
https://github.com/notspiff/visualization.goom/commit/f8dea024abe2385a91061a7e8e98bdeed3c8f74e
v3: added hash, sent patch upstream, updated _LICENSE_FILES (Thomas)
v2: rebased
Config.in.legacy | 7 +++++ .../0001-cross-compile.patch | 32 ++++++++++++++++++++++ package/kodi-visualisation-goom/Config.in | 10 +++++++ .../kodi-visualisation-goom.hash | 2 ++ .../kodi-visualisation-goom.mk | 14 ++++++++++ package/kodi/Config.in | 10 +------ package/kodi/kodi.mk | 7 +---- 7 files changed, 67 insertions(+), 15 deletions(-) create mode 100644 package/kodi-visualisation-goom/0001-cross-compile.patch create mode 100644 package/kodi-visualisation-goom/Config.in create mode 100644 package/kodi-visualisation-goom/kodi-visualisation-goom.hash create mode 100644 package/kodi-visualisation-goom/kodi-visualisation-goom.mk
Config.in.legacy +7 -0
@@ -107,6 +107,13 @@ endif ############################################################################### comment "Legacy options removed in 2015.11" +config BR2_PACKAGE_KODI_GOOM + select BR2_LEGACY + bool "Goom support in Kodi was moved to an addon" + select BR2_PACKAGE_KODI_VISUALISATION_GOOM + help + Goom support in Kodi was moved to an addon + config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_REAL bool "gst1-plugins-bad real plugin has been removed" select BR2_LEGACY
package/kodi-visualisation-goom/0001-cross-compile.patch new file +32 -0
@@ -0,0 +1,32 @@ +Fix cross-compilation + +Use the cross-compiler and not the host version. + +Patch sent upstream: +https://github.com/notspiff/visualization.goom/pull/4 + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt +--- visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305.org/CMakeLists.txt 2014-10-31 11:34:21.000000000 +0100 ++++ visualization.goom-fb5933ba5b2143d055cc7749dc60a82f6002b305/CMakeLists.txt 2015-07-19 19:49:43.340054342 +0200 +@@ -13,6 +13,10 @@ + ${KODI_INCLUDE_DIR} + ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/src) + ++get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) ++string( REGEX REPLACE "-[^-]+$" "" ++ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) ++ + include(ExternalProject) + set(update_command "") + if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) +@@ -20,7 +24,7 @@ + endif() + externalproject_add(libgoom SOURCE_DIR ${PROJECT_SOURCE_DIR}/lib/goom2k4-0 + "${update_command}" +- CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix=<INSTALL_DIR> ++ CONFIGURE_COMMAND ${PROJECT_SOURCE_DIR}/lib/goom2k4-0/configure --disable-shared --enable-static --with-pic --prefix=<INSTALL_DIR> --host=${TOOLCHAIN_NAME} + BUILD_COMMAND ${MAKE} + INSTALL_COMMAND "") +
package/kodi-visualisation-goom/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_KODI_VISUALISATION_GOOM + bool "kodi-visualisation-goom" + depends on BR2_PACKAGE_KODI_GL + help + GOOM visualiser for Kodi + + https://github.com/notspiff/visualization.goom + +comment "goom needs an OpenGL backend" + depends on !BR2_PACKAGE_KODI_GL
package/kodi-visualisation-goom/kodi-visualisation-goom.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally computed +sha256 70e2506a0ae78fffb90ed5a87fa796a6caa5be517c15a52abb91cc4c145960e9 kodi-visualisation-goom-f8dea024abe2385a91061a7e8e98bdeed3c8f74e.tar.gz
package/kodi-visualisation-goom/kodi-visualisation-goom.mk new file +14 -0
@@ -0,0 +1,14 @@ +################################################################################ +# +# kodi-visualisation-goom +# +################################################################################ + +KODI_VISUALISATION_GOOM_VERSION = f8dea024abe2385a91061a7e8e98bdeed3c8f74e +KODI_VISUALISATION_GOOM_SITE = $(call github,notspiff,visualization.goom,$(KODI_VISUALISATION_GOOM_VERSION)) +KODI_VISUALISATION_GOOM_LICENSE = GPLv2+ +KODI_VISUALISATION_GOOM_LICENSE_FILES = COPYING + +KODI_VISUALISATION_GOOM_DEPENDENCIES = kodi + +$(eval $(cmake-package))
package/kodi/Config.in +1 -9
@@ -136,15 +136,6 @@ config BR2_PACKAGE_KODI_LIBBLURAY comment "libbluray support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_KODI_GOOM - bool "goom screensaver" - depends on BR2_PACKAGE_KODI_GL - help - Enable goom screensaver - -comment "goom needs an OpenGL backend" - depends on !BR2_PACKAGE_KODI_GL - config BR2_PACKAGE_KODI_RSXS bool "rsxs screensaver" depends on BR2_PACKAGE_KODI_GL
@@ -306,6 +297,7 @@ menu "Screensavers" endmenu menu "Visualisations" + source "package/kodi-visualisation-goom/Config.in" source "package/kodi-visualisation-shadertoy/Config.in" source "package/kodi-visualisation-spectrum/Config.in" source "package/kodi-visualisation-waveforhue/Config.in"
package/kodi/kodi.mk +1 -6
@@ -30,6 +30,7 @@ KODI_CONF_ENV = \ KODI_CONF_OPTS += \ --with-ffmpeg=shared \ + --disable-goom \ --disable-joystick \ --disable-openmax \ --disable-projectm \
@@ -116,12 +117,6 @@ KODI_CONF_OPTS += --disable-gles endif endif -ifeq ($(BR2_PACKAGE_KODI_GOOM),y) -KODI_CONF_OPTS += --enable-goom -else -KODI_CONF_OPTS += --disable-goom -endif - ifeq ($(BR2_PACKAGE_KODI_LIBUSB),y) KODI_DEPENDENCIES += libusb-compat KODI_CONF_OPTS += --enable-libusb
Signature · 1 line
2.6.1
PATCH v4 2/2 package/kodi-screensaver-rsxs: new package
Also remove options BR2_PACKAGE_XLIB_XMU and BR2_PACKAGE_XLIB_XMU as well, they are not needed and never worked anyway due to typos ;)
Signed-off-by Bernd Kuhls <[email protected]>
---
v4: no changes
v3: added hash, sent patch upstream, added license infos (Thomas)
v2: rebased
Config.in.legacy | 7 ++++ .../kodi-screensaver-rsxs/0001-cross-compile.patch | 37 ++++++++++++++++++++++ package/kodi-screensaver-rsxs/Config.in | 10 ++++++ .../kodi-screensaver-rsxs.hash | 2 ++ .../kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk | 14 ++++++++ package/kodi/Config.in | 12 +------ package/kodi/kodi.mk | 20 ++---------- 7 files changed, 73 insertions(+), 29 deletions(-) create mode 100644 package/kodi-screensaver-rsxs/0001-cross-compile.patch create mode 100644 package/kodi-screensaver-rsxs/Config.in create mode 100644 package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash create mode 100644 package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
Config.in.legacy +7 -0
@@ -107,6 +107,13 @@ endif ############################################################################### comment "Legacy options removed in 2015.11" +config BR2_PACKAGE_KODI_RSXS + select BR2_LEGACY + bool "rsxs support in Kodi was moved to an addon" + select BR2_PACKAGE_KODI_SCREENSAVER_RSXS + help + rsxs support in Kodi was moved to an addon + config BR2_PACKAGE_KODI_GOOM select BR2_LEGACY bool "Goom support in Kodi was moved to an addon"
package/kodi-screensaver-rsxs/0001-cross-compile.patch new file +37 -0
@@ -0,0 +1,37 @@ +Fix cross-compilation + +Use the cross-compiler and not the host version. + +Patch sent upstream: +https://github.com/notspiff/screensavers.rsxs/pull/5 + +Signed-off-by: Bernd Kuhls <[email protected]> + +diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt +--- screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLists.txt 2015-03-19 12:20:23.000000000 +0100 ++++ screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259/CMakeLists.txt 2015-07-19 20:26:16.660481032 +0200 +@@ -33,6 +33,11 @@ + ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/skyrocket + ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src/solarwinds) + ++ ++get_filename_component( COMPILER_FILENAME "${CMAKE_C_COMPILER}" NAME ) ++string( REGEX REPLACE "-[^-]+$" "" ++ TOOLCHAIN_NAME "${COMPILER_FILENAME}" ) ++ + include(ExternalProject) + set(update_command "") + if(BOOTSTRAP_IN_TREE OR NOT DEFINED BOOTSTRAP_IN_TREE) +@@ -46,8 +51,11 @@ + endif() + endif() + externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir} +- CONFIGURE_COMMAND ${configure_start} ++ CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ++ ac_cv_func_malloc_0_nonnull=yes ++ ${configure_start} + --prefix=<INSTALL_DIR> ++ --host=${TOOLCHAIN_NAME} + --without-xscreensaver + --disable-cyclone + --disable-euphoria
package/kodi-screensaver-rsxs/Config.in new file +10 -0
@@ -0,0 +1,10 @@ +config BR2_PACKAGE_KODI_SCREENSAVER_RSXS + bool "kodi-screensaver-rsxs" + depends on BR2_PACKAGE_KODI_GL # libglu + help + RSXS screensaver add-ons for Kodi + + https://github.com/notspiff/screensavers.rsxs + +comment "rsxs needs an OpenGL backend" + depends on !BR2_PACKAGE_KODI_GL
package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash new file +2 -0
@@ -0,0 +1,2 @@ +# Locally computed +sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz
package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk new file +14 -0
@@ -0,0 +1,14 @@ +################################################################################ +# +# kodi-screensaver-rsxs +# +################################################################################ + +KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259 +KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION)) +KODI_SCREENSAVER_RSXS_LICENSE = GPLv3 +KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING + +KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi + +$(eval $(cmake-package))
package/kodi/Config.in +1 -11
@@ -81,9 +81,7 @@ menuconfig BR2_PACKAGE_KODI select BR2_PACKAGE_TIFF select BR2_PACKAGE_TINYXML select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_XMU if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver select BR2_PACKAGE_XLIB_XRANDR if BR2_PACKAGE_KODI_GL - select BR2_PACKAGE_XLIB_XT if BR2_PACKAGE_KODI_GL # needed by rsxs screensaver select BR2_PACKAGE_YAJL select BR2_PACKAGE_ZLIB select BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY if BR2_TOOLCHAIN_USES_GLIBC # runtime UTF conversion support
@@ -136,15 +134,6 @@ config BR2_PACKAGE_KODI_LIBBLURAY comment "libbluray support needs a toolchain w/ dynamic library" depends on BR2_STATIC_LIBS -config BR2_PACKAGE_KODI_RSXS - bool "rsxs screensaver" - depends on BR2_PACKAGE_KODI_GL - help - Enable goom screensaver - -comment "rsxs needs an OpenGL backend" - depends on !BR2_PACKAGE_KODI_GL - config BR2_PACKAGE_KODI_LIBCEC bool "hdmi cec" depends on !BR2_STATIC_LIBS # libcec
@@ -293,6 +282,7 @@ menu "Screensavers" source "package/kodi-screensaver-greynetic/Config.in" source "package/kodi-screensaver-pingpong/Config.in" source "package/kodi-screensaver-pyro/Config.in" + source "package/kodi-screensaver-rsxs/Config.in" source "package/kodi-screensaver-stars/Config.in" endmenu
package/kodi/kodi.mk +2 -18
@@ -35,6 +35,7 @@ KODI_CONF_OPTS += \ --disable-openmax \ --disable-projectm \ --disable-pulse \ + --disable-rsxs \ --disable-vdpau \ --disable-vtbdecoder \ --enable-optimizations
@@ -89,24 +90,8 @@ ifeq ($(BR2_PACKAGE_KODI_GL),y) KODI_DEPENDENCIES += libglew libglu libgl xlib_libX11 xlib_libXext \ xlib_libXmu xlib_libXrandr xlib_libXt libdrm KODI_CONF_OPTS += --enable-gl --enable-x11 --disable-gles -ifeq ($(BR2_PACKAGE_KODI_RSXS),y) -# fix rsxs compile -# gcc5: http://trac.kodi.tv/ticket/16006#comment:6 -# make sure target libpng-config is used, options taken from rsxs-0.9/acinclude.m4 -KODI_CONF_ENV += \ - ac_cv_type__Bool=yes \ - jm_cv_func_gettimeofday_clobber=no \ - mac_cv_pkg_png=$(STAGING_DIR)/usr/bin/libpng-config \ - mac_cv_pkg_cppflags="`$(STAGING_DIR)/usr/bin/libpng-config --I_opts --cppflags`" \ - mac_cv_pkg_cxxflags="`$(STAGING_DIR)/usr/bin/libpng-config --ccopts`" \ - mac_cv_pkg_ldflags="`$(STAGING_DIR)/usr/bin/libpng-config --L_opts --R_opts`" \ - mac_cv_pkg_libs="`$(STAGING_DIR)/usr/bin/libpng-config --libs`" -KODI_CONF_OPTS += --enable-rsxs else -KODI_CONF_OPTS += --disable-rsxs -endif -else -KODI_CONF_OPTS += --disable-gl --disable-rsxs --disable-x11 +KODI_CONF_OPTS += --disable-gl --disable-x11 ifeq ($(BR2_PACKAGE_KODI_EGL_GLES),y) KODI_DEPENDENCIES += libegl libgles KODI_CONF_ENV += CXXFLAGS="$(TARGET_CXXFLAGS) `$(PKG_CONFIG_HOST_BINARY) --cflags --libs egl`"
@@ -224,7 +209,6 @@ endef KODI_PRE_CONFIGURE_HOOKS += KODI_BOOTSTRAP define KODI_CLEAN_UNUSED_ADDONS - rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/screensaver.rsxs.plasma rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.milkdrop rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.projectm rm -Rf $(TARGET_DIR)/usr/share/kodi/addons/visualization.itunes
Signature · 1 line
2.6.1
PATCH v4 1/2 package/kodi-visualisation-goom: new package
In reply to Bernd KuhlsBernd,
package/kodi-visualisation-goom/0001-cross-compile.patch line 6
Quoted 12 lines · Bernd Kuhls
package/kodi-visualisation-goom/0001-cross-compile.patch new file +6
-0@@ -0,0 +1,32 @@ +Fix cross-compilation + +Use the cross-compiler and not the host version. + +Patch sent upstream: +https://github.com/notspiff/visualization.goom/pull/4
Seems like upstream feedback wasn't very good on this, and with some good reason I believe since it's quite hackish, no?
Don't you think we can find a better solution to pass down the --host value ? Maybe an explicit CMakeLists.txt option ?
This packaging is really weird :-/
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v4 1/2 package/kodi-visualisation-goom: new package
In reply to Bernd KuhlsDear Bernd Kuhls,
Quoted 7 lines · Bernd Kuhls
Signed-off-by Bernd Kuhls <[email protected]>---
v4. bumped version, changed_LICENSE_FILESback to ./COPYING,
upstream clarified its license:
https://github.com/notspiff/visualization.goom/commit/f8dea024abe2385a91061a7e8e98bdeed3c8f74e
v3: added hash, sent patch upstream, updated_LICENSE_FILES(Thomas)
v2: rebased
Am I right that your upcoming Kodi 16 series will carry a patch adding this package, and ditto for the rsxs thing?
If that's the case, can you mark
http://patchwork.ozlabs.org/patch/538512/ and
http://patchwork.ozlabs.org/patch/538513/ as Superseded in patchwork?
Thanks!
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com
PATCH v4 1/2 package/kodi-visualisation-goom: new package
Am Sun, 20 Dec 2015 14:24:38 +0100 schrieb Thomas Petazzoni:
Quoted 9 lines
Dear Bernd Kuhls,
Quoted 6 lines · Bernd Kuhls
Signed-off-by: Bernd Kuhls <[email protected]>
---
v4. bumped version, changed_LICENSE_FILESback to ./COPYING,
upstream clarified its license:
https://github.com/notspiff/visualization.goom/commit/
f8dea024abe2385a91061a7e8e98bdeed3c8f74e
Quoted 5 lines
Quoted 2 lines
v3: added hash, sent patch upstream, updated
_LICENSE_FILES(Thomas)
v2: rebasedAm I right that your upcoming Kodi 16 series will carry a patch adding this package, and ditto for the rsxs thing?
Hi Thomas,
yes, because Kodi 16 does not include the code for Goom and rsxs anymore. But my Goom/rsxs patches are meant to be used with the current 15.2 version of Kodi already, they do not depend on Kodi 16 and can be applied to buildroot after review at any time.
Regards, Bernd