From cf8493379ad4d14631c6018e773479061faaae4d Mon Sep 17 00:00:00 2001 From: Lukas Rusak Date: Mon, 18 Apr 2016 00:50:52 -0700 Subject: [PATCH] platform: rename to p8-platform --- packages/devel/libcec/package.mk | 2 +- packages/mediacenter/kodi-platform/package.mk | 2 +- .../{platform => p8-platform}/package.mk | 9 +++--- .../p8-platform-01-revert-cc-badness.patch | 28 +++++++++++++++++ .../platform-01-revert-cc-badness.patch | 30 ------------------- 5 files changed, 35 insertions(+), 36 deletions(-) rename packages/mediacenter/{platform => p8-platform}/package.mk (86%) create mode 100644 packages/mediacenter/p8-platform/patches/p8-platform-01-revert-cc-badness.patch delete mode 100644 packages/mediacenter/platform/patches/platform-01-revert-cc-badness.patch diff --git a/packages/devel/libcec/package.mk b/packages/devel/libcec/package.mk index e24a372cc9..b1350208c1 100644 --- a/packages/devel/libcec/package.mk +++ b/packages/devel/libcec/package.mk @@ -24,7 +24,7 @@ PKG_LICENSE="GPL" PKG_SITE="http://libcec.pulse-eight.com/" PKG_URL="https://github.com/Pulse-Eight/libcec/archive/$PKG_NAME-$PKG_VERSION.tar.gz" PKG_SOURCE_DIR="$PKG_NAME-$PKG_NAME-$PKG_VERSION" -PKG_DEPENDS_TARGET="toolchain systemd lockdev platform" +PKG_DEPENDS_TARGET="toolchain systemd lockdev p8-platform" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="libCEC is an open-source dual licensed library designed for communicating with the Pulse-Eight USB - CEC Adaptor" diff --git a/packages/mediacenter/kodi-platform/package.mk b/packages/mediacenter/kodi-platform/package.mk index 27550c0811..ee72fed18a 100644 --- a/packages/mediacenter/kodi-platform/package.mk +++ b/packages/mediacenter/kodi-platform/package.mk @@ -23,7 +23,7 @@ PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/xbmc/kodi-platform/archive/$PKG_VERSION.tar.gz" -PKG_DEPENDS_TARGET="toolchain tinyxml kodi platform" +PKG_DEPENDS_TARGET="toolchain tinyxml kodi p8-platform" PKG_PRIORITY="optional" PKG_SECTION="multimedia" PKG_SHORTDESC="kodi-platform:" diff --git a/packages/mediacenter/platform/package.mk b/packages/mediacenter/p8-platform/package.mk similarity index 86% rename from packages/mediacenter/platform/package.mk rename to packages/mediacenter/p8-platform/package.mk index 0b3aae84df..2b8a8a53ec 100644 --- a/packages/mediacenter/platform/package.mk +++ b/packages/mediacenter/p8-platform/package.mk @@ -16,18 +16,19 @@ # along with OpenELEC. If not, see . ################################################################################ -PKG_NAME="platform" -PKG_VERSION="081032f" +PKG_NAME="p8-platform" +PKG_VERSION="38343e0" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://www.kodi.tv" PKG_URL="https://github.com/Pulse-Eight/platform/archive/$PKG_VERSION.tar.gz" +PKG_SOURCE_DIR="platform-$PKG_VERSION*" PKG_DEPENDS_TARGET="toolchain" PKG_PRIORITY="optional" PKG_SECTION="multimedia" -PKG_SHORTDESC="platform:" -PKG_LONGDESC="platform:" +PKG_SHORTDESC="Platform support library used by libCEC and binary add-ons for Kodi" +PKG_LONGDESC="Platform support library used by libCEC and binary add-ons for Kodi" PKG_IS_ADDON="no" PKG_AUTORECONF="no" diff --git a/packages/mediacenter/p8-platform/patches/p8-platform-01-revert-cc-badness.patch b/packages/mediacenter/p8-platform/patches/p8-platform-01-revert-cc-badness.patch new file mode 100644 index 0000000000..c060921a36 --- /dev/null +++ b/packages/mediacenter/p8-platform/patches/p8-platform-01-revert-cc-badness.patch @@ -0,0 +1,28 @@ +From f91594676d1f75530addd87363ccbc6510efb84e Mon Sep 17 00:00:00 2001 +From: Stefan Saraev +Date: Fri, 8 May 2015 11:19:42 +0300 +Subject: [PATCH] revert cc badness + +this reverts upstream commit 68f8418 +--- + CMakeLists.txt | 6 ------ + 1 file changed, 6 deletions(-) + +diff -Naur a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2016-01-05 23:58:40.000000000 +0100 ++++ b/CMakeLists.txt 2016-01-06 01:26:52.004076744 +0100 +@@ -22,12 +22,6 @@ + src/windows/os-threads.cpp) + endif() + +-set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform") +-IF(WIN32) +- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows") +-ENDIF(WIN32) +-set(p8-platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) +- + if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") + if(${CORE_SYSTEM_NAME} STREQUAL "osx" OR ${CORE_SYSTEM_NAME} STREQUAL "ios") + list(APPEND p8-platform_LIBRARIES "-framework CoreVideo -framework IOKit") +-- +1.7.10.4 diff --git a/packages/mediacenter/platform/patches/platform-01-revert-cc-badness.patch b/packages/mediacenter/platform/patches/platform-01-revert-cc-badness.patch deleted file mode 100644 index 3e7e5ebcc7..0000000000 --- a/packages/mediacenter/platform/patches/platform-01-revert-cc-badness.patch +++ /dev/null @@ -1,30 +0,0 @@ -From f91594676d1f75530addd87363ccbc6510efb84e Mon Sep 17 00:00:00 2001 -From: Stefan Saraev -Date: Fri, 8 May 2015 11:19:42 +0300 -Subject: [PATCH] revert cc badness - -this reverts upstream commit 68f8418 ---- - CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 73fae2e..dc3e1b5 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -22,12 +22,6 @@ if(WIN32) - src/windows/os-threads.cpp) - endif() - --set(platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/platform") --IF(WIN32) -- LIST(APPEND platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/platform/windows") --ENDIF(WIN32) --set(platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT}) -- - if(NOT ${CORE_SYSTEM_NAME} STREQUAL "") - if(${CORE_SYSTEM_NAME} STREQUAL "darwin" OR ${CORE_SYSTEM_NAME} STREQUAL "ios") - list(APPEND platform_LIBRARIES "-framework CoreVideo -framework IOKit") --- -1.7.10.4 -