add patchs to fix build with gcc5 and fix default include dir

This commit is contained in:
Lukas Rusak 2015-10-23 00:32:53 -07:00 committed by Stephan Raue
parent 877c630fe1
commit b659b7cc61
2 changed files with 32 additions and 0 deletions

View File

@ -0,0 +1,11 @@
diff -Naur screensavers.rsxs-3241d29.orig/CMakeLists.txt screensavers.rsxs-3241d29/CMakeLists.txt
--- screensavers.rsxs-3241d29.orig/CMakeLists.txt 2015-10-20 00:21:24.000000000 -0700
+++ screensavers.rsxs-3241d29/CMakeLists.txt 2015-10-22 23:34:37.522226204 -0700
@@ -52,6 +52,7 @@
endif()
externalproject_add(rsxs SOURCE_DIR ${PROJECT_SOURCE_DIR}/${rsxs_dir}
CONFIGURE_COMMAND ${configure_start}
+ ac_cv_type__Bool=yes
--prefix=<INSTALL_DIR>
--without-xscreensaver
--disable-cyclone

View File

@ -0,0 +1,21 @@
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}