From patchwork Thu Feb 2 07:27:48 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 722900 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vDWt3205Bz9s79 for ; Thu, 2 Feb 2017 18:32:27 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 4A3F42EEC3; Thu, 2 Feb 2017 07:32:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FTU1FTV+val4; Thu, 2 Feb 2017 07:32:19 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 8BFC331313; Thu, 2 Feb 2017 07:29:55 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id EF6BC1C048D for ; Thu, 2 Feb 2017 07:28:42 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id EC45B8AE10 for ; Thu, 2 Feb 2017 07:28:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8rdEumcHRdvD for ; Thu, 2 Feb 2017 07:28:41 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by hemlock.osuosl.org (Postfix) with ESMTPS id A60D28AE03 for ; Thu, 2 Feb 2017 07:28:38 +0000 (UTC) Received: from fwd38.aul.t-online.de (fwd38.aul.t-online.de [172.20.26.138]) by mailout09.t-online.de (Postfix) with SMTP id 07D56426AAFC; Thu, 2 Feb 2017 08:28:33 +0100 (CET) Received: from fli4l.lan.fli4l (TDo6AmZGQhzmSttjVUJmXfgM5xvZKEoYBEHCYoE776imORJO7rvfspw97mXx8bYgyx@[84.191.202.111]) by fwd38.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1cZBoh-1lWglc0; Thu, 2 Feb 2017 08:28:27 +0100 Received: from mahler.lan.fli4l ([192.168.1.1]:43462 helo=kuhls.lan.fli4l) by fli4l.lan.fli4l with esmtp (Exim 4.88) (envelope-from ) id 1cZBog-0004zz-1d; Thu, 02 Feb 2017 08:28:26 +0100 From: Bernd Kuhls To: buildroot@buildroot.org Date: Thu, 2 Feb 2017 08:27:48 +0100 Message-Id: <20170202072756.6624-30-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170202072756.6624-1-bernd.kuhls@t-online.de> References: <20170202072756.6624-1-bernd.kuhls@t-online.de> X-ID: TDo6AmZGQhzmSttjVUJmXfgM5xvZKEoYBEHCYoE776imORJO7rvfspw97mXx8bYgyx X-TOI-MSGID: e79a5751-14d0-4d3d-bb68-c3abfcef91a1 Cc: Bernd Kuhls Subject: [Buildroot] [PATCH 30/38] package/kodi-screensaver-rsxs: bump version X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" 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 --- .../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 + ac_cv_func_malloc_0_nonnull=yes + ${configure_start} --prefix= 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 + +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 7df6c22ce..8ae899b6d 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 = GPLv3 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))