diff --git a/debian/patches/build-Add-include-directories-for-all-SDL2_foo-modules.patch b/debian/patches/build-Add-include-directories-for-all-SDL2_foo-modules.patch deleted file mode 100644 index 4087d51..0000000 --- a/debian/patches/build-Add-include-directories-for-all-SDL2_foo-modules.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Simon McVittie -Date: Sun, 23 Feb 2020 14:28:29 +0000 -Subject: build: Add include directories for all SDL2_foo modules - -The build system assumed that SDL2 and all the SDL2_foo libraries were -installed with the same ${includedir}, but this is not guaranteed: -we could be using a system copy of SDL2 in conjunction with SDL2_foo -libraries in a non-standard prefix. - -This also fixes a build regression with recent Debian SDL2 packages, in -which the SDL2 headers are installed in an architecture-dependent -directory but the SDL2_foo headers are not. - -Signed-off-by: Simon McVittie -Forwarded: no -Bug-Debian: https://bugs.debian.org/951943 ---- - CMakeLists.txt | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d4d7644..91bdcbf 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,8 +60,11 @@ include_directories(${SDL2_INCLUDE_DIR}) - #Setup things that use pkg-config - find_package(PkgConfig REQUIRED) - pkg_search_module(SDL2MIXER REQUIRED SDL2_mixer) -+include_directories(${SDL2MIXER_INCLUDE_DIRS}) - pkg_search_module(SDL2IMAGE REQUIRED SDL2_image) -+include_directories(${SDL2IMAGE_INCLUDE_DIRS}) - pkg_search_module(SDL2TTF REQUIRED SDL2_ttf) -+include_directories(${SDL2TTF_INCLUDE_DIRS}) - - find_package(Boost COMPONENTS program_options REQUIRED) - diff --git a/debian/patches/series b/debian/patches/series index ce3a7ec..31f7921 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ install-path.patch -build-Add-include-directories-for-all-SDL2_foo-modules.patch