From: Mike Frysinger <vapier@gentoo.org>
Date: Fri, 25 Nov 2005 19:11:33 +0000 (+0000)
Subject: Fix by Henrik Dohlmann to make sure sdl libs/cflags arent used when sdl is disabled... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7bf45ef091eb4b47594bc5191c3073afb6b7c3cc;p=gentoo.git

Fix by Henrik Dohlmann to make sure sdl libs/cflags arent used when sdl is disabled #113441.
Package-Manager: portage-2.0.53_rc7
---

diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
index 33c6937ce6e3..1d4063b8eaa5 100644
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/devil
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.16 2005/09/30 18:46:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.17 2005/11/25 19:11:33 vapier Exp $
+
+  25 Nov 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/devil-1.6.7-sdl-checks.patch, devil-1.6.7-r1.ebuild:
+  Fix by Henrik Dohlmann to make sure sdl libs/cflags arent used when sdl is
+  disabled #113441.
 
   30 Sep 2005; Chris Gianelloni <wolf31o2@gentoo.org> devil-1.6.6-r2.ebuild,
   devil-1.6.7.ebuild, devil-1.6.7-r1.ebuild:
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 44da7f555330..ba7122e6a00a 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -1,10 +1,21 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 21e0c3781c36765c187c77019131e8d9 ChangeLog 2262
 MD5 c21103a12b8a4ee45f6c82baff7cf431 devil-1.6.6-r2.ebuild 1259
+MD5 88074e836a1f0d209a333fab21221769 devil-1.6.7-r1.ebuild 1398
 MD5 f1e0634fbbea8fa05f0fe8741f1b8a66 devil-1.6.7.ebuild 1171
-MD5 f99474ed9e605ff80d510378e5afd7d9 devil-1.6.7-r1.ebuild 1339
-MD5 9af1510b362834686cf07a2b0a2fc070 ChangeLog 2054
-MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
-MD5 00ece5df43475a333ec6812e0ba74af4 files/devil-1.6.7-png-types.patch 348
-MD5 28d09fde772494441e9f5a30e2b20097 files/digest-devil-1.6.7 64
 MD5 23e87e84b73b2c7994b446040df2738e files/1.6.6-configure.in.patch 8140
+MD5 00ece5df43475a333ec6812e0ba74af4 files/devil-1.6.7-png-types.patch 348
+MD5 5a6110ef13cd79613cc1f76382016cf1 files/devil-1.6.7-sdl-checks.patch 398
 MD5 6d366044841f5d55e08b7791864b0d59 files/digest-devil-1.6.6-r2 63
+MD5 28d09fde772494441e9f5a30e2b20097 files/digest-devil-1.6.7 64
 MD5 28d09fde772494441e9f5a30e2b20097 files/digest-devil-1.6.7-r1 64
+MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDh2JegIKl8Uu19MoRAo9zAJ9HYxvMATqLWJPYxIttDQ7H7P7R+wCcDN+T
+r8TW2EmYF1nD2DzpqoeZDzQ=
+=NBH9
+-----END PGP SIGNATURE-----
diff --git a/media-libs/devil/devil-1.6.7-r1.ebuild b/media-libs/devil/devil-1.6.7-r1.ebuild
index 69a6e014f50b..eabbf01b1edf 100644
--- a/media-libs/devil/devil-1.6.7-r1.ebuild
+++ b/media-libs/devil/devil-1.6.7-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.7-r1.ebuild,v 1.2 2005/09/30 18:46:56 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.7-r1.ebuild,v 1.3 2005/11/25 19:11:33 vapier Exp $
 
 inherit eutils
 
@@ -30,6 +30,8 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	epatch "${FILESDIR}"/${P}-png-types.patch
+	epatch "${FILESDIR}"/${P}-sdl-checks.patch
+	autoconf || die
 }
 
 src_compile() {
diff --git a/media-libs/devil/files/devil-1.6.7-sdl-checks.patch b/media-libs/devil/files/devil-1.6.7-sdl-checks.patch
new file mode 100644
index 000000000000..263ed311a5dc
--- /dev/null
+++ b/media-libs/devil/files/devil-1.6.7-sdl-checks.patch
@@ -0,0 +1,26 @@
+Disable SDL if not used
+
+Patch by Henrik Dohlmann
+
+http://bugs.gentoo.org/113441
+
+--- configure.in
++++ configure.in
+@@ -587,9 +587,14 @@
+ dnl
+ 
+ dnl Check for SDL
+-AM_PATH_SDL(1.2.5,,)
+-HSDL="$SDL_CFLAGS"
+-LIBSDL="$SDL_LIBS"
++if test "$use_sdl" = "yes" ; then
++  AM_PATH_SDL(1.2.5,,)
++  HSDL="$SDL_CFLAGS"
++  LIBSDL="$SDL_LIBS"
++else
++  HSDL=""
++  LIBSDL=""
++fi
+ AC_SUBST(LIBSDL)
+ AC_SUBST(HSDL)
+