Control: tags -1 + patch
On Sun, 23 Feb 2020 at 18:39:25 +0000, Simon McVittie wrote:
> - Fix planetblupi to stop making this assumption
> (<https://salsa.debian.org/games-team/planetblupi/merge_requests/2>,
> or equivalently the attached patch)
Sorry, here's the patch.
>From d00242ce65cb608190a0eb61fe83a6f8d404c21a Mon Sep 17 00:00:00 2001
From: Simon McVittie <s...@debian.org>
Date: Sun, 23 Feb 2020 18:24:14 +0000
Subject: [PATCH] Don't assume that SDL2 headers are in /usr/include/SDL2
Closes: #952105
---
debian/changelog | 8 ++++
...tions-about-location-of-SDL2-headers.patch | 41 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 50 insertions(+)
create mode 100644 debian/patches/Avoid-making-assumptions-about-location-of-SDL2-headers.patch
create mode 100644 debian/patches/series
diff --git a/debian/changelog b/debian/changelog
index 8d5b7c3..75f011d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+planetblupi (1.14.2-2) UNRELEASED; urgency=medium
+
+ * d/p/Avoid-making-assumptions-about-location-of-SDL2-headers.patch:
+ Don't assume that SDL2 headers are in /usr/include/SDL2
+ (Closes: #952105)
+
+ -- Simon McVittie <s...@debian.org> Sun, 23 Feb 2020 18:23:28 +0000
+
planetblupi (1.14.2-1) unstable; urgency=medium
* New 1.14.2 upstream release
diff --git a/debian/patches/Avoid-making-assumptions-about-location-of-SDL2-headers.patch b/debian/patches/Avoid-making-assumptions-about-location-of-SDL2-headers.patch
new file mode 100644
index 0000000..4737c6d
--- /dev/null
+++ b/debian/patches/Avoid-making-assumptions-about-location-of-SDL2-headers.patch
@@ -0,0 +1,41 @@
+From: Simon McVittie <s...@debian.org>
+Date: Sun, 23 Feb 2020 18:12:58 +0000
+Subject: Avoid making assumptions about location of SDL2 headers
+
+It is not an API guarantee that the SDL2 headers will be found in
+${prefix}/include/SDL2, or that SDL2 is installed in the same prefix
+as planetblupi itself. Ask pkg-config instead.
+
+Signed-off-by: Simon McVittie <s...@debian.org>
+Bug-Debian: https://bugs.debian.org/952105
+Forwarded: no
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5723efd..f067233 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -9,7 +9,6 @@ include (${CMAKE_ROOT}/Modules/ExternalProject.cmake)
+ include ("${CMAKE_SOURCE_DIR}/cmake/Ronn2Man.cmake")
+
+ include_directories (${CMAKE_INSTALL_PREFIX}/include)
+-include_directories (${CMAKE_INSTALL_PREFIX}/include/SDL2)
+ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
+
+ project (planetblupi)
+@@ -153,10 +152,13 @@ include_directories (${SDLKitchensink_INCLUDE_DIRS})
+ find_package (PkgConfig REQUIRED)
+ if (NOT BUILD_JS)
+ pkg_search_module (SDL2 REQUIRED sdl2)
++ include_directories (${SDL2_INCLUDE_DIRS})
+ set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_STATIC_LIBRARIES})
+ pkg_search_module (SDL2_IMAGE REQUIRED SDL2_image)
++ include_directories (${SDL2_IMAGE_INCLUDE_DIRS})
+ set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_IMAGE_STATIC_LIBRARIES})
+ pkg_search_module (SDL2_MIXER REQUIRED SDL2_mixer)
++ include_directories (${SDL2_MIXER_INCLUDE_DIRS})
+ set (planetblupi_DEPS ${planetblupi_DEPS} ${SDL2_MIXER_STATIC_LIBRARIES})
+ endif ()
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..322e513
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Avoid-making-assumptions-about-location-of-SDL2-headers.patch
--
2.25.1
