forked from OpenELEC/OpenELEC.tv
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update platform (drop obsolete patches)
- Loading branch information
Showing
4 changed files
with
14 additions
and
52 deletions.
There are no files selected for viewing
37 changes: 0 additions & 37 deletions
37
packages/mediacenter/kodi-platform/patches/kodi-platform-02_no-multi-lib.patch
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 10 additions & 11 deletions
21
packages/mediacenter/platform/patches/platform-01-revert-cc-badness.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters