Skip to content

Commit

Permalink
update platform (drop obsolete patches)
Browse files Browse the repository at this point in the history
  • Loading branch information
fritsch committed Jan 20, 2016
1 parent 3161e39 commit 4c70342
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 52 deletions.

This file was deleted.

4 changes: 2 additions & 2 deletions packages/mediacenter/platform/package.mk
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,12 @@
################################################################################

PKG_NAME="platform"
PKG_VERSION="1.0.10"
PKG_VERSION="38343e0"
PKG_REV="1"
PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.kodi.tv"
PKG_URL="http://mirrors.xbmc.org/build-deps/sources/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_URL="http://fritsch.fruehberger.net/sources/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain"
PKG_PRIORITY="optional"
PKG_SECTION="multimedia"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,30 +1,29 @@
From f91594676d1f75530addd87363ccbc6510efb84e Mon Sep 17 00:00:00 2001
From e6214e52ca2a6b65181138de886db3e4901c08d6 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Fri, 8 May 2015 11:19:42 +0300
Date: Tue, 19 Jan 2016 22:20:56 +0200
Subject: [PATCH] revert cc badness

this reverts upstream commit 68f8418
---
CMakeLists.txt | 6 ------
CMakeLists.txt | 6 ------
1 file changed, 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 73fae2e..dc3e1b5 100644
index a577410..33fbb95 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")
-set(p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform")
-IF(WIN32)
- LIST(APPEND platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/platform/windows")
- LIST(APPEND p8-platform_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/include/p8-platform/windows")
-ENDIF(WIN32)
-set(platform_LIBRARIES ${CMAKE_THREAD_LIBS_INIT})
-set(p8-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")
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
2.1.4

4 changes: 2 additions & 2 deletions tools/mkpkg/mkpkg_binary-addons
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ if [ ! -d $KODI_DIR ] ; then
fi

# p8-platform
REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $2}')
GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/platform/platform.txt | awk '{print $3}')
REPO=$(cat $KODI_DIR/project/cmake/addons/depends/common/p8-platform/p8-platform.txt | awk '{print $2}')
GIT_HASH=$(cat $KODI_DIR/project/cmake/addons/depends/common/p8-platform/p8-platform.txt | awk '{print $3}')

copy_and_package $REPO platform $GIT_HASH

Expand Down

0 comments on commit 4c70342

Please sign in to comment.