diff options
author | Diogo Pereira <sir.suriv@gmail.com> | 2017-12-10 01:22:13 +0000 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2017-12-12 21:01:11 +0100 |
commit | 69a81325c5375b158cbd9ca95fb865c50ffef773 (patch) | |
tree | ac04f57a3ecdfc486f370d4d4d467f0a14105302 /media-libs/libgroove | |
parent | app-cdr/disc-cover: Update header, update homepage. (diff) | |
download | gentoo-69a81325c5375b158cbd9ca95fb865c50ffef773.tar.gz gentoo-69a81325c5375b158cbd9ca95fb865c50ffef773.tar.bz2 gentoo-69a81325c5375b158cbd9ca95fb865c50ffef773.zip |
media-libs/libgroove: fix build with libsdl2-2.0.6.
Reported-by: Toralf Förster <toralf@gentoo.org>
Closes: https://bugs.gentoo.org/634470
Closes: https://github.com/gentoo/gentoo/pull/6496
Package-Manager: Portage-2.3.13, Repoman-2.3.3
Diffstat (limited to 'media-libs/libgroove')
-rw-r--r-- | media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch | 13 | ||||
-rw-r--r-- | media-libs/libgroove/libgroove-4.3.0-r1.ebuild | 3 |
2 files changed, 15 insertions, 1 deletions
diff --git a/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch b/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch new file mode 100644 index 000000000000..7967c23c973e --- /dev/null +++ b/media-libs/libgroove/files/libgroove-4.3.0_sdl2_include_dir.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a1e8541..80a96c2 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -208,7 +208,7 @@ else() + endif() + add_dependencies(grooveplayer groove) + target_link_libraries(grooveplayer LINK_PRIVATE ${SDL2_LIBRARY}) +- include_directories(${SDL2_INCLUDE_DIR}) ++ include_directories(${SDL2_INCLUDE_DIR} "${SDL2_INCLUDE_DIR}/SDL2") + + install(FILES "grooveplayer/player.h" DESTINATION "include/grooveplayer") + install(TARGETS grooveplayer DESTINATION lib) diff --git a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild index 2b555731b7e2..2cfafff6daef 100644 --- a/media-libs/libgroove/libgroove-4.3.0-r1.ebuild +++ b/media-libs/libgroove/libgroove-4.3.0-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -22,6 +22,7 @@ DEPEND="libav? ( media-video/libav ) RDEPEND="${DEPEND}" PATCHES=( "${FILESDIR}/${P}_cflags.patch" + "${FILESDIR}/${P}_sdl2_include_dir.patch" "${FILESDIR}/${P}_GNUInstallDirs.patch" ) src_configure() { |