Update the configure.in patch to fix libpng linking #51972 by Marc De Falco,

  CFLAG hard coding, and a sdl-config typo.

8 files changed, 49 insertions, 110 deletions

diff --git a/media-libs/devil/ChangeLog b/media-libs/devil/ChangeLog
index f18c96239275..9f882ab23877 100644
--- a/media-libs/devil/ChangeLog
+++ b/media-libs/devil/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for media-libs/devil
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.10 2004/04/03 23:45:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/ChangeLog,v 1.11 2004/05/30 06:53:10 vapier Exp $
+
+*devil-1.6.6-r2 (30 May 2004)
+
+  30 May 2004; Mike Frysinger <vapier@gentoo.org>
+  files/1.6.6-configure.in.patch, -devil-1.6.1.ebuild, -devil-1.6.6-r1.ebuild,
+  +devil-1.6.6-r2.ebuild, -devil-1.6.6.ebuild:
+  Update the configure.in patch to fix libpng linking #51972 by Marc De Falco,
+  CFLAG hard coding, and a sdl-config typo.
 
   03 Apr 2004; Donnie Berkholz <spyderous@gentoo.org>; devil-1.6.1.ebuild,
   devil-1.6.6-r1.ebuild, devil-1.6.6.ebuild:
diff --git a/media-libs/devil/devil-1.6.1.ebuild b/media-libs/devil/devil-1.6.1.ebuild
deleted file mode 100644
index cc2fd040e4c8..000000000000
--- a/media-libs/devil/devil-1.6.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.1.ebuild,v 1.10 2004/04/03 23:45:56 spyderous Exp $
-
-IUSE="gif png tiff sdl X opengl jpeg"
-
-inherit libtool
-
-S=${WORKDIR}/DevIL
-DESCRIPTION="DevIL image library 1.6.1"
-HOMEPAGE="http://www.imagelib.org/"
-SRC_URI="mirror://sourceforge/openil/DevIL-${PV}.tar.gz"
-RESTRICT="nomirror"
-
-SLOT="0"
-LICENSE="LGPL-2.1"
-KEYWORDS="x86 sparc "
-
-DEPEND="X? ( virtual/x11 )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	sdl? ( media-libs/libsdl )
-	jpeg? ( media-libs/jpeg )
-	tiff? ( media-libs/tiff )
-	opengl? ( virtual/opengl )"
-
-src_compile() {
-	local myconf
-	use X && myconf="${myconf} --with-x"
-	use gif || myconf="${myconf} --disable-gif"
-	use png || myconf="${myconf} --disable-png"
-	use sdl || myconf="${myconf} --disable-sdl"
-	use jpeg || myconf="${myconf} --disable-jpeg"
-	use tiff || myconf="${myconf} --disable-tiff"
-	use opengl || myconf="${myconf} --disable-opengl"
-
-	elibtoolize
-	econf \
-		${myconf} \
-		--disable-directx \
-		--disable-win32 || die "./configure failed"
-
-	make || die
-}
-
-src_install () {
-	make DESTDIR=${D} install || die
-	dodoc AUTHORS BUGS COPYING* CREDITS ChangeLog* INSTALL NEWS* README*
-}
diff --git a/media-libs/devil/devil-1.6.6-r1.ebuild b/media-libs/devil/devil-1.6.6-r2.ebuild
index d2dc89c7acc4..a70ce5e7b0e0 100644
--- a/media-libs/devil/devil-1.6.6-r1.ebuild
+++ b/media-libs/devil/devil-1.6.6-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.6-r1.ebuild,v 1.2 2004/04/03 23:45:56 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.6-r2.ebuild,v 1.1 2004/05/30 06:53:10 vapier Exp $
 
 inherit eutils libtool
 
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/openil/DevIL-${PV}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~amd64"
+KEYWORDS="x86 ppc sparc amd64"
 IUSE="X gif png sdl jpeg tiff opengl"
 
 RDEPEND="X? ( virtual/x11 )
diff --git a/media-libs/devil/devil-1.6.6.ebuild b/media-libs/devil/devil-1.6.6.ebuild
deleted file mode 100644
index 766bfdaec935..000000000000
--- a/media-libs/devil/devil-1.6.6.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/devil/devil-1.6.6.ebuild,v 1.4 2004/04/03 23:45:56 spyderous Exp $
-
-inherit libtool
-
-DESCRIPTION="DevIL image library"
-HOMEPAGE="http://www.imagelib.org/"
-SRC_URI="mirror://sourceforge/openil/DevIL-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="x86 ppc ~sparc amd64"
-IUSE="X gif png sdl jpeg tiff opengl"
-
-RDEPEND="X? ( virtual/x11 )
-	gif? ( media-libs/giflib )
-	png? ( media-libs/libpng )
-	sdl? ( media-libs/libsdl )
-	jpeg? ( media-libs/jpeg )
-	tiff? ( media-libs/tiff )
-	opengl? ( virtual/opengl )"
-
-S=${WORKDIR}/DevIL
-
-src_compile() {
-	elibtoolize
-	econf \
-		`use_with X x` \
-		`use_enable gif` \
-		`use_enable png` \
-		`use_enable sdl` \
-		`use_enable jpeg` \
-		`use_enable tiff` \
-		`use_enable opengl` \
-		--disable-directx \
-		--disable-win32 || die
-
-	emake || die "emake failed"
-}
-
-src_install() {
-	make DESTDIR=${D} install || die "make install failed"
-	dodoc AUTHORS BUGS CREDITS ChangeLog* INSTALL NEWS* README*
-}
diff --git a/media-libs/devil/files/1.6.6-configure.in.patch b/media-libs/devil/files/1.6.6-configure.in.patch
index 9e1382fc5685..4f5a319fc8a8 100644
--- a/media-libs/devil/files/1.6.6-configure.in.patch
+++ b/media-libs/devil/files/1.6.6-configure.in.patch
@@ -1,7 +1,23 @@
-diff -ur DevIL.orig/configure.in DevIL/configure.in
---- DevIL.orig/configure.in	2003-08-12 14:24:28.000000000 +1000
-+++ DevIL/configure.in	2004-02-10 01:55:18.000000000 +1100
-@@ -90,131 +90,346 @@
+--- configure.in.orig	2004-05-30 02:46:40.188827272 -0400
++++ configure.in	2004-05-30 02:47:26.065852904 -0400
+@@ -48,12 +48,10 @@
+ AM_PROG_LIBTOOL
+ AM_MAINTAINER_MODE
+ 
+-LIBIL_CFLAGS="-Wall -O3  -funroll-loops -ffast-math  -fomit-frame-pointer \
+-              -fexpensive-optimizations"
+-LIBILU_CFLAGS="-Wall -O3  -funroll-loops -ffast-math  -fomit-frame-pointer \
+-               -fexpensive-optimizations"
+-LIBILUT_CFLAGS="-Wall -O3  -funroll-loops -ffast-math  -fomit-frame-pointer \
+-               -fexpensive-optimizations"
++CFLAGS="-Wall -funroll-loops -ffast-math -fomit-frame-pointer -fexpensive-optimizations $CFLAGS"
++LIBIL_CFLAGS="$CFLAGS"
++LIBILU_CFLAGS="$CFLAGS"
++LIBILUT_CFLAGS="$CFLAGS"
+ 
+ dnl
+ dnl Default supported formats : all except lcms
+@@ -90,131 +88,346 @@
  dnl
  AC_ARG_ENABLE(bmp,
  [  --disable-bmp           Doesn't compile bmp support],
@@ -380,10 +396,21 @@ diff -ur DevIL.orig/configure.in DevIL/configure.in
  
  if test "$debug_symbols" = "yes" ; then
    LIBIL_CFLAGS="-Wall -g"
-@@ -622,4 +837,4 @@
-            src-ILUT/include/Makefile \
-            include/Makefile \
-            include/IL/Makefile ])
--AC_OUTPUT
-\ No newline at end of file
-+AC_OUTPUT
+@@ -285,7 +498,7 @@
+ AC_SUBST(LIBTIFF)
+ 
+ if test "$no_png" = "no" ; then
+-   AC_CHECK_LIB(png, png_start_read_image, LIBPNG="-lpng", LIBPNG="", )
++   AC_CHECK_LIB(png, png_start_read_image, LIBPNG="-lpng", LIBPNG="", `libpng-config --libs`)
+    if test "$LIBPNG" != "-lpng" ; then
+      no_png="yes"
+    fi
+@@ -325,7 +538,7 @@
+     LIBSDL=""
+     HSDL=""
+   else
+-    LIBSDL=`sdl-conf --libs`
++    LIBSDL=`sdl-config --libs`
+     HSDL=`sdl-config --cflags`
+   fi
+ fi
diff --git a/media-libs/devil/files/digest-devil-1.6.1 b/media-libs/devil/files/digest-devil-1.6.1
deleted file mode 100644
index 39149650d923..000000000000
--- a/media-libs/devil/files/digest-devil-1.6.1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 dd499354c679b61661fd6c884fbf981d DevIL-1.6.1.tar.gz 744568
diff --git a/media-libs/devil/files/digest-devil-1.6.6-r1 b/media-libs/devil/files/digest-devil-1.6.6-r1
deleted file mode 100644
index 2747ffd4e6a5..000000000000
--- a/media-libs/devil/files/digest-devil-1.6.6-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 57dd2156049f0335d2535724418a89ea DevIL-1.6.6.tar.gz 787878
diff --git a/media-libs/devil/files/digest-devil-1.6.6 b/media-libs/devil/files/digest-devil-1.6.6-r2
index 2747ffd4e6a5..2747ffd4e6a5 100644
--- a/media-libs/devil/files/digest-devil-1.6.6
+++ b/media-libs/devil/files/digest-devil-1.6.6-r2