games-fps/gzdoom: Disable automagic fluidsynth detection

svn path=/sunrise/; revision=11323

diff --git a/games-fps/gzdoom/ChangeLog b/games-fps/gzdoom/ChangeLog
index 466aa3aecf7afe200583fbf7785024bf58e5ed87..d6203f4c3a8835ea132052eecd510b6e1e05c8d9 100644 (file)
--- a/games-fps/gzdoom/ChangeLog
+++ b/games-fps/gzdoom/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  16 Sep 2010; Mike MacDonald (crazymykl) <crazymykl@gmail.com>
+  gzdoom-1.5.2.ebuild, gzdoom-9999.ebuild,
+  +files/gzdoom-respect-fluidsynth-useflag.patch:
+  Disable automagic fluidsynth detection
+
   15 Sep 2010; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   gzdoom-1.5.2.ebuild, gzdoom-9999.ebuild:
   Warn only if media-sound/fluid-soundfont is not installed

diff --git a/games-fps/gzdoom/Manifest b/games-fps/gzdoom/Manifest
index f2694a75e73f117923db09b68c1a3457404c1dbc..9fc94c85ec8db492c53bbe5d8df5c7f6df65cc41 100644 (file)
--- a/games-fps/gzdoom/Manifest
+++ b/games-fps/gzdoom/Manifest
@@ -1,5 +1,6 @@
+AUX gzdoom-respect-fluidsynth-useflag.patch 1543 RMD160 b104bca99792102fbfd4b67bbd35dc5a876c6f4b SHA1 da5bea93a8542672687c37f1fa4b3f7d39d7846b SHA256 d8ac175c57bd673e0fe1ea7c9b592c74f27b0457cfcc84cb711c819528a3469c
 DIST gzdoom-1.5.2.tar.bz2 3680980 RMD160 429d02a9b4bfcbb8329cc2e8cc32fb8122c83f0f SHA1 895f39817a4af121b0e58a220ec4c9b648eaf8be SHA256 5d441289a220f68e316ffd509bf10d7c6deb06e0532a108645ee794cc1485af2
-EBUILD gzdoom-1.5.2.ebuild 1666 RMD160 e7683c0eb5ce92148b8822f96cc8cd3fe2b753f7 SHA1 344efa9f90d030869a8e5cb777907e8dd6518077 SHA256 4f73d8461240f22cf4ab887b753242cb44296bce537ab52364aba92955da6cd5
-EBUILD gzdoom-9999.ebuild 1767 RMD160 05c9b8fce95db9665a56c5651fa27f550a391c29 SHA1 2c7688d64eeae2df06173c087ba2918d13e726a1 SHA256 f2357cbceae02d1b7e95aeec9c2706b5e4fa497d29cae7dff126491c482c2034
-MISC ChangeLog 1313 RMD160 ad70f7e2ed2aae1ec3ce145a67a1a39cf3e956ab SHA1 ae5f3fac24f10e9456100804dd59a128802910ec SHA256 2f6e3ca3d9d8b6214d20900505f1084c5f0b11cb049222f8ab5ce34d8ecefb8e
+EBUILD gzdoom-1.5.2.ebuild 1734 RMD160 8c93967201ee41705ca0d0d1c648c51c64d1717f SHA1 39629248d02b7c893ea80190a340088d564bbe60 SHA256 dfe440ce6f85b902ab9002b5343ccb4438f3889555530ef830c14f00a56d3542
+EBUILD gzdoom-9999.ebuild 1882 RMD160 34bb5826a110efec310d19940d1bb66dd9f1d8e2 SHA1 4ce32270146add2271cb62e07c99f4c6670bac79 SHA256 f76627c3b740ba3ee5f388b8491548187b9ac579801c1e894e404581d45c6240
+MISC ChangeLog 1512 RMD160 491ff510e4b7f95f5eda89d796af634565290d0a SHA1 a7991b2cbb96886543ea34ef5bed7e4f55bb6339 SHA256 556b51294666c4c758e2dcc00c28b802209b2a9a55b1f99e0f3ffd769d8a26ed
 MISC metadata.xml 314 RMD160 b5fdfa7bd0d9f6ac4099a7ab1e5ecc0dc38b4f80 SHA1 cc7a61959fc27a463dfcb5dc00dbb2add2fd2d9f SHA256 969cf7d5c38ba9ebf828e362d9290960d355ccabf340b0bf2c489610eb8a874c

diff --git a/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch b/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch
new file mode 100644 (file)
index 0000000..1b3d36d
--- /dev/null
+++ b/games-fps/gzdoom/files/gzdoom-respect-fluidsynth-useflag.patch
@@ -0,0 +1,37 @@
+Override automagic fluidsynth detection.
+
+--- FindFluidSynth.cmake
++++ FindFluidSynth.cmake
+@@ -5,19 +5,19 @@
+ #  FLUIDSYNTH_LIBRARIES   - List of libraries when using fluidsynth.
+ #  FLUIDSYNTH_FOUND       - True if fluidsynth found.
+ 
++IF (USE_FLUIDSYNTH)
++    IF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
++    # Already in cache, be silent
++    SET(FluidSynth_FIND_QUIETLY TRUE)
++    ENDIF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
+ 
+-IF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
+-  # Already in cache, be silent
+-  SET(FluidSynth_FIND_QUIETLY TRUE)
+-ENDIF (FLUIDSYNTH_INCLUDE_DIR AND FLUIDSYNTH_LIBRARIES)
++    FIND_PATH(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h)
+ 
+-FIND_PATH(FLUIDSYNTH_INCLUDE_DIR fluidsynth.h)
++    FIND_LIBRARY(FLUIDSYNTH_LIBRARIES NAMES fluidsynth )
++    MARK_AS_ADVANCED( FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR )
+ 
+-FIND_LIBRARY(FLUIDSYNTH_LIBRARIES NAMES fluidsynth )
+-MARK_AS_ADVANCED( FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR )
+-
+-# handle the QUIETLY and REQUIRED arguments and set FLUIDSYNTH_FOUND to TRUE if 
+-# all listed variables are TRUE
+-INCLUDE(FindPackageHandleStandardArgs)
+-FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth DEFAULT_MSG FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
+-
++    # handle the QUIETLY and REQUIRED arguments and set FLUIDSYNTH_FOUND to TRUE if
++    # all listed variables are TRUE
++    INCLUDE(FindPackageHandleStandardArgs)
++    FIND_PACKAGE_HANDLE_STANDARD_ARGS(FluidSynth DEFAULT_MSG FLUIDSYNTH_LIBRARIES FLUIDSYNTH_INCLUDE_DIR)
++ENDIF (USE_FLUIDSYNTH)

diff --git a/games-fps/gzdoom/gzdoom-1.5.2.ebuild b/games-fps/gzdoom/gzdoom-1.5.2.ebuild
index 8c0d25db71ec6f1726046714329486b32b75e1b6..2effc675e80b148dbaa86e8f5ce3e425086c9c75 100644 (file)
--- a/games-fps/gzdoom/gzdoom-1.5.2.ebuild
+++ b/games-fps/gzdoom/gzdoom-1.5.2.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit games cmake-utils
+inherit games cmake-utils eutils
 
 DESCRIPTION="Enhanced OpenGL port of the official DOOM source code that also supports Heretic, Hexen, and Strife"
 HOMEPAGE="http://grafzahl.drdteam.org/"
@@ -30,6 +30,7 @@ src_prepare() {
        sed -i \
                -e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
                src/sdl/i_system.h || die
+       epatch "${FILESDIR}/${PN}-respect-fluidsynth-useflag.patch"
 }
 
 src_configure() {

diff --git a/games-fps/gzdoom/gzdoom-9999.ebuild b/games-fps/gzdoom/gzdoom-9999.ebuild
index fd9d9739fe87ae54c8a2e17cf1bee0fe78b32500..9de5a99f10e07a5870e913051ef934577a014626 100644 (file)
--- a/games-fps/gzdoom/gzdoom-9999.ebuild
+++ b/games-fps/gzdoom/gzdoom-9999.ebuild
@@ -4,7 +4,7 @@
 
 EAPI="2"
 
-inherit games cmake-utils subversion
+inherit games cmake-utils subversion eutils
 
 DESCRIPTION="Enhanced OpenGL port of the official DOOM source code that also supports Heretic, Hexen, and Strife"
 HOMEPAGE="http://grafzahl.drdteam.org/"
@@ -31,12 +31,14 @@ src_prepare() {
        sed -i \
                -e "s:/usr/local/share/:${GAMES_DATADIR}/doom-data/:" \
                src/sdl/i_system.h || die
+       epatch "${FILESDIR}/${PN}-respect-fluidsynth-useflag.patch"
 }
 
 src_configure() {
        local mycmakeargs=(
                $(cmake-utils_use_no mmx ASM)
                $(cmake-utils_use_no gtk GTK)
+               $(cmake-utils_use_use fluidsynth FLUIDSYNTH)
                -DFMOD_INCLUDE_DIR=/opt/fmodex/api/inc/
                -DFMOD_LIBRARY=/opt/fmodex/api/lib/libfmodex.so
        )