Skip to content
Permalink
Browse files

kodi: fix cmake after move to root

  • Loading branch information...
MilhouseVH committed Dec 22, 2016
1 parent 9be1c9e commit 40644b02466ce58a39ef7c6c9220f110c1140307
@@ -35,7 +35,7 @@ PKG_AUTORECONF="no"

PKG_CMAKE_SCRIPT="$(get_build_dir kodi)/tools/depends/native/TexturePacker/CMakeLists.txt"

PKG_CMAKE_OPTS_HOST="-DCORE_SOURCE_DIR=$(get_build_dir kodi) \
PKG_CMAKE_OPTS_HOST="-DCMAKE_SOURCE_DIR=$(get_build_dir kodi) \
-Wno-dev"

pre_build_host() {
@@ -32,7 +32,7 @@ PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or X
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"

PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/project/cmake/CMakeLists.txt"
PKG_CMAKE_SCRIPT="$ROOT/$PKG_BUILD/CMakeLists.txt"

get_graphicdrivers

@@ -1,6 +1,6 @@
diff -Naur a/project/cmake/modules/FindPulseAudio.cmake b/project/cmake/modules/FindPulseAudio.cmake
--- a/project/cmake/modules/FindPulseAudio.cmake 2016-09-17 08:35:33.000000000 -0700
+++ b/project/cmake/modules/FindPulseAudio.cmake 2016-09-22 22:36:22.818788337 -0700
diff -Naur a/cmake/modules/FindPulseAudio.cmake b/cmake/modules/FindPulseAudio.cmake
--- a/cmake/modules/FindPulseAudio.cmake 2016-09-17 08:35:33.000000000 -0700
+++ b/cmake/modules/FindPulseAudio.cmake 2016-09-22 22:36:22.818788337 -0700
@@ -29,9 +29,6 @@
find_library(PULSEAUDIO_LIBRARY NAMES pulse libpulse
PATHS ${PC_PULSEAUDIO_LIBDIR} ${PC_PULSEAUDIO_LIBRARY_DIRS})
@@ -1,6 +1,6 @@
diff -Naur a/project/cmake/modules/FindPython.cmake b/project/cmake/modules/FindPython.cmake
--- a/project/cmake/modules/FindPython.cmake 2016-11-30 13:39:56.000000000 -0800
+++ b/project/cmake/modules/FindPython.cmake 2016-11-30 20:55:52.581465246 -0800
diff -Naur a/cmake/modules/FindPython.cmake b/cmake/modules/FindPython.cmake
--- a/cmake/modules/FindPython.cmake 2016-11-30 13:39:56.000000000 -0800
+++ b/cmake/modules/FindPython.cmake 2016-11-30 20:55:52.581465246 -0800
@@ -16,8 +16,6 @@
if(CMAKE_CROSSCOMPILING)
find_library(FFI_LIBRARY ffi REQUIRED)
@@ -1,6 +1,6 @@
diff -Naur a/project/cmake/modules/FindSmbClient.cmake b/project/cmake/modules/FindSmbClient.cmake
--- a/project/cmake/modules/FindSmbClient.cmake 2016-09-17 08:35:33.000000000 -0700
+++ b/project/cmake/modules/FindSmbClient.cmake 2016-09-25 13:38:38.969125892 -0700
diff -Naur a/cmake/modules/FindSmbClient.cmake b/cmake/modules/FindSmbClient.cmake
--- a/cmake/modules/FindSmbClient.cmake 2016-09-17 08:35:33.000000000 -0700
+++ b/cmake/modules/FindSmbClient.cmake 2016-09-25 13:38:38.969125892 -0700
@@ -14,7 +14,7 @@
#
# SmbClient::SmbClient - The SmbClient library
@@ -4,10 +4,10 @@ Date: Sun Sep 25 15:26:18 2016 -0700

[cmake][IMX] fix imx cmake build

diff --git a/project/cmake/CMakeLists.txt b/project/cmake/CMakeLists.txt
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 76870a4..8602a52 100644
--- a/project/cmake/CMakeLists.txt
+++ b/project/cmake/CMakeLists.txt
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -56,6 +56,7 @@ if(UNIX)
if(CORE_SYSTEM_NAME STREQUAL linux OR CORE_SYSTEM_NAME STREQUAL freebsd)
option(ENABLE_X11 "Enable X11 support?" ON)
@@ -24,11 +24,11 @@ index 76870a4..8602a52 100644
elseif(CORE_SYSTEM_NAME STREQUAL rbpi)
core_require_dep(MMAL)
endif()
diff --git a/project/cmake/modules/FindIMX.cmake b/project/cmake/modules/FindIMX.cmake
diff --git a/cmake/modules/FindIMX.cmake b/cmake/modules/FindIMX.cmake
new file mode 100644
index 0000000..4e1e838
--- /dev/null
+++ b/project/cmake/modules/FindIMX.cmake
+++ b/cmake/modules/FindIMX.cmake
@@ -0,0 +1,35 @@
+#.rst:
+# FindIMX
@@ -98,12 +98,13 @@ diff --git a/xbmc/windowing/egl/CMakeLists.txt b/xbmc/windowing/egl/CMakeLists.t
index 3ab603e..51e13ab 100644
--- a/xbmc/windowing/egl/CMakeLists.txt
+++ b/xbmc/windowing/egl/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(OPENGLES_FOUND OR AML_FOUND OR MMAL_FOUND)
+if(OPENGLES_FOUND OR AML_FOUND OR IMX_FOUND OR MMAL_FOUND)
set(SOURCES EGLWrapper.cpp)

set(HEADERS EGLNativeType.h
@@ -1,5 +1,5 @@
if (NOT MIR_FOUND)
- if(OPENGLES_FOUND OR AML_FOUND OR MMAL_FOUND)
+ if(OPENGLES_FOUND OR AML_FOUND OR IMX_FOUND OR MMAL_FOUND)
set(SOURCES EGLWrapper.cpp)

set(HEADERS EGLNativeType.h
@@ -30,6 +30,11 @@ if(MMAL_FOUND)
list(APPEND HEADERS EGLNativeTypeRaspberryPI.h)
endif()
@@ -1,18 +1,18 @@
diff -Naur a/project/cmake/scripts/linux/ExtraTargets.cmake b/project/cmake/scripts/linux/ExtraTargets.cmake
--- a/project/cmake/scripts/linux/ExtraTargets.cmake 2016-09-17 08:35:33.000000000 -0700
+++ b/project/cmake/scripts/linux/ExtraTargets.cmake 2016-09-28 00:29:12.861577741 -0700
diff -Naur a/cmake/scripts/linux/ExtraTargets.cmake b/cmake/scripts/linux/ExtraTargets.cmake
--- a/cmake/scripts/linux/ExtraTargets.cmake 2016-09-17 08:35:33.000000000 -0700
+++ b/cmake/scripts/linux/ExtraTargets.cmake 2016-09-28 00:29:12.861577741 -0700
@@ -5,8 +5,3 @@
add_executable(${APP_NAME_LC}-xrandr ${CORE_SOURCE_DIR}/xbmc-xrandr.c)
add_executable(${APP_NAME_LC}-xrandr ${CMAKE_SOURCE_DIR}/xbmc-xrandr.c)
target_link_libraries(kodi-xrandr ${SYSTEM_LDFLAGS} ${X_LIBRARIES} m ${XRANDR_LIBRARIES})
endif()
-
-# WiiRemote
-if(ENABLE_EVENTCLIENTS)
- add_subdirectory(${CORE_SOURCE_DIR}/tools/EventClients/Clients/WiiRemote build/WiiRemote)
- add_subdirectory(${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/WiiRemote build/WiiRemote)
-endif()
diff -Naur a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/linux/Install.cmake
--- a/project/cmake/scripts/linux/Install.cmake 2016-11-19 11:55:17.791608457 -0800
+++ b/project/cmake/scripts/linux/Install.cmake 2016-11-19 11:55:44.860880383 -0800
diff -Naur a/cmake/scripts/linux/Install.cmake b/cmake/scripts/linux/Install.cmake
--- a/cmake/scripts/linux/Install.cmake 2016-11-19 11:55:17.791608457 -0800
+++ b/cmake/scripts/linux/Install.cmake 2016-11-19 11:55:44.860880383 -0800
@@ -256,11 +256,6 @@
DESTINATION ${bindir}
COMPONENT kodi-eventclients-ps3)
@@ -23,5 +23,5 @@ diff -Naur a/project/cmake/scripts/linux/Install.cmake b/project/cmake/scripts/l
- COMPONENT kodi-eventclients-wiiremote)
-
# Install kodi-eventclients-xbmc-send
install(PROGRAMS "${CORE_SOURCE_DIR}/tools/EventClients/Clients/Kodi Send/kodi-send.py"
install(PROGRAMS "${CMAKE_SOURCE_DIR}/tools/EventClients/Clients/Kodi Send/kodi-send.py"
RENAME ${APP_NAME_LC}-send

0 comments on commit 40644b0

Please sign in to comment.
You can’t perform that action at this time.