[arch-commits] Commit in sdl2/trunk (PKGBUILD cmake-include-paths.patch)

[Sven-Hendrik Haase]

    Date: Wednesday, April 11, 2018 @ 17:00:46
  Author: svenstaro
Revision: 321562

upgpkg: sdl2 2.0.8-8

Fix CMake-generated include paths

Added:
  sdl2/trunk/cmake-include-paths.patch
Modified:
  sdl2/trunk/PKGBUILD

---------------------------+
 PKGBUILD                  |   11 +++++++---
 cmake-include-paths.patch |   45 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-04-11 16:17:17 UTC (rev 321561)
+++ PKGBUILD	2018-04-11 17:00:46 UTC (rev 321562)
@@ -1,7 +1,7 @@
 # Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
 pkgname=sdl2
 pkgver=2.0.8
-pkgrel=7
+pkgrel=8
 pkgdesc="A library for portable low-level access to a video framebuffer, audio output, mouse, and keyboard (Version 2)"
 arch=('x86_64')
 url="http://www.libsdl.org"
@@ -11,13 +11,18 @@
              'wayland-protocols' 'ibus' 'fcitx' 'libxss' 'cmake')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
-source=("https://www.libsdl.org/release/SDL2-${pkgver}.tar.gz"{,.sig})
+source=("https://www.libsdl.org/release/SDL2-${pkgver}.tar.gz"{,.sig}
+        cmake-include-paths.patch)
 sha512sums=('673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869'
-            'SKIP')
+            'SKIP'
+            '53eb853153b189bd9c0978ab8c7375608b6df5fc78e22168505bf9f6e695f6fbdc553eead0b17deb734002e047c6d5ae06642363fc629aa9ab7bef0c30388c84')
 validpgpkeys=('1528635D8053A57F77D1E08630A59377A7763BE6')
 
 prepare() {
   cd SDL2-${pkgver}
+
+  patch -Np1 -i "${srcdir}"/cmake-include-paths.patch
+
   rm -rf build
   mkdir build
 }

Added: cmake-include-paths.patch
===================================================================
--- cmake-include-paths.patch	                        (rev 0)
+++ cmake-include-paths.patch	2018-04-11 17:00:46 UTC (rev 321562)
@@ -0,0 +1,45 @@
+# HG changeset patch
+# User Bastien Bouclet <bastien.bouclet at gmail.com>
+# Date 1523420183 -7200
+#      Wed Apr 11 06:16:23 2018 +0200
+# Branch cmake-include-path
+# Node ID 52f0351c30b25ec2bb5b0bced247ba858991bec2
+# Parent  fbfacc66c65c3b38ca065ecee1f69fcbc643c14a
+Fix the include path in the installed CMake target import file
+
+Previously the include path was {INSTALL_PREFIX}/include,
+it is now {INSTALL_PREFIX}/include/SDL2 to be consistent with
+the other build and package configuration systems.
+
+Fixes #4128.
+
+diff -r fbfacc66c65c -r 52f0351c30b2 CMakeLists.txt
+--- a/CMakeLists.txt	Mon Mar 26 12:38:29 2018 -0700
++++ b/CMakeLists.txt	Wed Apr 11 06:16:23 2018 +0200
+@@ -1695,7 +1695,7 @@
+ 
+ # Always build SDLmain
+ add_library(SDL2main STATIC ${SDLMAIN_SOURCES})
+-target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include>)
++target_include_directories(SDL2main PUBLIC $<INSTALL_INTERFACE:include/SDL2>)
+ set(_INSTALL_LIBS "SDL2main")
+ if (NOT ANDROID)
+   set_target_properties(SDL2main PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+@@ -1724,7 +1724,7 @@
+   endif()
+   set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
+   target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
+-  target_include_directories(SDL2 PUBLIC $<INSTALL_INTERFACE:include>)
++  target_include_directories(SDL2 PUBLIC $<INSTALL_INTERFACE:include/SDL2>)
+   if (NOT ANDROID)
+     set_target_properties(SDL2 PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+   endif()
+@@ -1750,7 +1750,7 @@
+   # libraries - do we need to consider this?
+   set(_INSTALL_LIBS "SDL2-static" ${_INSTALL_LIBS})
+   target_link_libraries(SDL2-static ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
+-  target_include_directories(SDL2-static PUBLIC $<INSTALL_INTERFACE:include>)
++  target_include_directories(SDL2-static PUBLIC $<INSTALL_INTERFACE:include/SDL2>)
+   if (NOT ANDROID)
+     set_target_properties(SDL2-static PROPERTIES DEBUG_POSTFIX ${SDL_CMAKE_DEBUG_POSTFIX})
+   endif()