[v5,28/34] package/kodi-screensaver-rsxs: bump version

Submitted by Bernd Kuhls on April 17, 2017, 7:54 p.m.

Details

Message ID 20170417195433.26672-29-bernd.kuhls@t-online.de
State New
Headers show

Commit Message

Bernd Kuhls April 17, 2017, 7:54 p.m.
ac_cv_type__Bool=yes is needed to fix compilation with gcc >= 5.
Added patch to fix X.org includes.
Added dependency for libpng previously provided by Kodi.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 .../kodi-screensaver-rsxs/0001-cross-compile.patch |  2 +-
 .../0002-fix-default-include-dir.patch             | 28 ++++++++++++++++++++++
 package/kodi-screensaver-rsxs/Config.in            |  1 +
 .../kodi-screensaver-rsxs.hash                     |  2 +-
 .../kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk |  5 ++--
 5 files changed, 33 insertions(+), 5 deletions(-)
 create mode 100644 package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch

Comments

Yann E. MORIN April 23, 2017, 10:15 a.m.
Bernd, All,

On 2017-04-17 21:54 +0200, Bernd Kuhls spake thusly:
> ac_cv_type__Bool=yes is needed to fix compilation with gcc >= 5.
> Added patch to fix X.org includes.
> Added dependency for libpng previously provided by Kodi.
> 
> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
> ---
>  .../kodi-screensaver-rsxs/0001-cross-compile.patch |  2 +-
>  .../0002-fix-default-include-dir.patch             | 28 ++++++++++++++++++++++
>  package/kodi-screensaver-rsxs/Config.in            |  1 +
>  .../kodi-screensaver-rsxs.hash                     |  2 +-
>  .../kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk |  5 ++--
>  5 files changed, 33 insertions(+), 5 deletions(-)
>  create mode 100644 package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
> 
> diff --git a/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
> index 56c2f4e4b..a7b2053d7 100644
> --- a/package/kodi-screensaver-rsxs/0001-cross-compile.patch
> +++ b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
> @@ -27,7 +27,7 @@ diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLi
>   endif()
>   externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
>  -                    CONFIGURE_COMMAND ${configure_start}
> -+                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no
> ++                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ac_cv_type__Bool=yes

Please backport upstream fix instead:

    https://github.com/notspiff/screensavers.rsxs/commit/5aa385d60bb19265cfdf510fc0f0300c52a47b15

>  +                                      ac_cv_func_malloc_0_nonnull=yes
>  +                                      ${configure_start}
>                                         --prefix=<INSTALL_DIR>
> diff --git a/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
> new file mode 100644
> index 000000000..a7e7c74b0
> --- /dev/null
> +++ b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
> @@ -0,0 +1,28 @@
> +Fix X include path to prevent error during configure
> +
> +Downloaded from
> +https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/patches/screensavers.rsxs-0002-fix-default-include-dir.patch
> +
> +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>

This does not seem to have been sent upstream. Please do so...

> +diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt
> +--- screensavers.rsxs-3241d29.orig/CMakeLists.txt	2015-10-22 23:59:38.187280475 -0700
> ++++ screensavers.rsxs-3241d29/CMakeLists.txt	2015-10-23 00:00:27.228113829 -0700
> +@@ -17,7 +17,7 @@
> + include_directories(${OpenGL_INCLUDE_DIR}
> +                     ${PNG_INCLUDE_DIR}
> +                     ${KODI_INCLUDE_DIR}
> +-                    ${X_INCLUDE_DIRS}
> ++                    ${X_INCLUDE_DIR}
> +                     ${CMAKE_BINARY_DIR}/rsxs-prefix/src/rsxs-build
> +                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src
> +                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/lib
> +@@ -67,7 +67,7 @@
> +                                       --disable-skyrocket
> +                                       --disable-solarwinds
> +                                       --disable-sound
> +-                                      --x-includes=${X_INCLUDE_DIRS}
> ++                                      --x-includes=${X_INCLUDE_DIR}
> +                                       --x-libraries=${X_LIBRARIES}
> +                                       ${PNG_PATH}
> +                                       ${EXTRA_FLAGS}
> diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
> index 11546ad1f..c523ce5a1 100644
> --- a/package/kodi-screensaver-rsxs/Config.in
> +++ b/package/kodi-screensaver-rsxs/Config.in
> @@ -2,6 +2,7 @@ config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
>  	bool "kodi-screensaver-rsxs"
>  	depends on BR2_PACKAGE_HAS_LIBGL # libglu
>  	depends on BR2_PACKAGE_XORG7 # xlib_libXmu
> +	select BR2_PACKAGE_LIBPNG
>  	select BR2_PACKAGE_XLIB_LIBXMU
>  	help
>  	  RSXS screensaver add-ons for Kodi
> diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
> index 568b44b37..66d79a06f 100644
> --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
> +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
> @@ -1,2 +1,2 @@
>  # Locally computed
> -sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz
> +sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6  kodi-screensaver-rsxs-v1.3.0.tar.gz
> diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
> index 2cd94da86..8445bf88d 100644
> --- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
> +++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
> @@ -4,11 +4,10 @@
>  #
>  ################################################################################
>  
> -KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
> +KODI_SCREENSAVER_RSXS_VERSION = v1.3.0
>  KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
>  KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
>  KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
> -
> -KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu
> +KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu
>  
>  $(eval $(cmake-package))
> -- 
> 2.11.0
> 
> _______________________________________________
> buildroot mailing list
> buildroot@busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

Patch hide | download patch | download mbox

diff --git a/package/kodi-screensaver-rsxs/0001-cross-compile.patch b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
index 56c2f4e4b..a7b2053d7 100644
--- a/package/kodi-screensaver-rsxs/0001-cross-compile.patch
+++ b/package/kodi-screensaver-rsxs/0001-cross-compile.patch
@@ -27,7 +27,7 @@  diff -uNr screensavers.rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.org/CMakeLi
  endif()
  externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
 -                    CONFIGURE_COMMAND ${configure_start}
-+                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no
++                    CONFIGURE_COMMAND gl_cv_func_gettimeofday_clobber=no ac_cv_type__Bool=yes
 +                                      ac_cv_func_malloc_0_nonnull=yes
 +                                      ${configure_start}
                                        --prefix=<INSTALL_DIR>
diff --git a/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
new file mode 100644
index 000000000..a7e7c74b0
--- /dev/null
+++ b/package/kodi-screensaver-rsxs/0002-fix-default-include-dir.patch
@@ -0,0 +1,28 @@ 
+Fix X include path to prevent error during configure
+
+Downloaded from
+https://github.com/LibreELEC/LibreELEC.tv/blob/master/packages/mediacenter/kodi-binary-addons/screensavers.rsxs/patches/screensavers.rsxs-0002-fix-default-include-dir.patch
+
+Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
+
+diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt
+--- screensavers.rsxs-3241d29.orig/CMakeLists.txt	2015-10-22 23:59:38.187280475 -0700
++++ screensavers.rsxs-3241d29/CMakeLists.txt	2015-10-23 00:00:27.228113829 -0700
+@@ -17,7 +17,7 @@
+ include_directories(${OpenGL_INCLUDE_DIR}
+                     ${PNG_INCLUDE_DIR}
+                     ${KODI_INCLUDE_DIR}
+-                    ${X_INCLUDE_DIRS}
++                    ${X_INCLUDE_DIR}
+                     ${CMAKE_BINARY_DIR}/rsxs-prefix/src/rsxs-build
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/src
+                     ${PROJECT_SOURCE_DIR}/${rsxs_dir}/lib
+@@ -67,7 +67,7 @@
+                                       --disable-skyrocket
+                                       --disable-solarwinds
+                                       --disable-sound
+-                                      --x-includes=${X_INCLUDE_DIRS}
++                                      --x-includes=${X_INCLUDE_DIR}
+                                       --x-libraries=${X_LIBRARIES}
+                                       ${PNG_PATH}
+                                       ${EXTRA_FLAGS}
diff --git a/package/kodi-screensaver-rsxs/Config.in b/package/kodi-screensaver-rsxs/Config.in
index 11546ad1f..c523ce5a1 100644
--- a/package/kodi-screensaver-rsxs/Config.in
+++ b/package/kodi-screensaver-rsxs/Config.in
@@ -2,6 +2,7 @@  config BR2_PACKAGE_KODI_SCREENSAVER_RSXS
 	bool "kodi-screensaver-rsxs"
 	depends on BR2_PACKAGE_HAS_LIBGL # libglu
 	depends on BR2_PACKAGE_XORG7 # xlib_libXmu
+	select BR2_PACKAGE_LIBPNG
 	select BR2_PACKAGE_XLIB_LIBXMU
 	help
 	  RSXS screensaver add-ons for Kodi
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
index 568b44b37..66d79a06f 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.hash
@@ -1,2 +1,2 @@ 
 # Locally computed
-sha256 0797ffb720056ea2e04ac8b7ee4fc2dca1e42611ef138b347e928d8d7f3c696f kodi-screensaver-rsxs-195e0ec3fbbcb2ee2012cd560e42d05167f0f259.tar.gz
+sha256 8436c29d2f42bc65ff6f1abc2f1d05a613cc2ebb16d793e02b1f2bee296952a6  kodi-screensaver-rsxs-v1.3.0.tar.gz
diff --git a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
index 2cd94da86..8445bf88d 100644
--- a/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
+++ b/package/kodi-screensaver-rsxs/kodi-screensaver-rsxs.mk
@@ -4,11 +4,10 @@ 
 #
 ################################################################################
 
-KODI_SCREENSAVER_RSXS_VERSION = 195e0ec3fbbcb2ee2012cd560e42d05167f0f259
+KODI_SCREENSAVER_RSXS_VERSION = v1.3.0
 KODI_SCREENSAVER_RSXS_SITE = $(call github,notspiff,screensavers.rsxs,$(KODI_SCREENSAVER_RSXS_VERSION))
 KODI_SCREENSAVER_RSXS_LICENSE = GPL-3.0
 KODI_SCREENSAVER_RSXS_LICENSE_FILES = lib/rsxs-1.0/COPYING
-
-KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi xlib_libXmu
+KODI_SCREENSAVER_RSXS_DEPENDENCIES = kodi libpng xlib_libXmu
 
 $(eval $(cmake-package))