Fix libpng14 detection and replace AC_CANONICAL_TARGET with AC_CANONICAL_BUILD wrt #308735 by Rafał Mużyło.

Package-Manager: portage-2.2_rc66/cvs/Linux x86_64

4 files changed, 97 insertions, 7 deletions

diff --git a/games-emulation/dosbox/ChangeLog b/games-emulation/dosbox/ChangeLog
index 2e3640f2162a..9044ed69561a 100644
--- a/games-emulation/dosbox/ChangeLog
+++ b/games-emulation/dosbox/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-emulation/dosbox
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.48 2009/11/09 22:21:27 mr_bones_ Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/ChangeLog,v 1.49 2010/03/10 11:08:52 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> dosbox-0.73.ebuild,
+  +files/dosbox-0.73-AC_CANONICAL_BUILD_and_libpng14.patch:
+  Fix libpng14 detection and replace AC_CANONICAL_TARGET with
+  AC_CANONICAL_BUILD wrt #308735 by Rafał Mużyło.
 
 *dosbox-9999 (09 Nov 2009)
 
diff --git a/games-emulation/dosbox/Manifest b/games-emulation/dosbox/Manifest
index 27c4873850a7..55ea284882db 100644
--- a/games-emulation/dosbox/Manifest
+++ b/games-emulation/dosbox/Manifest
@@ -1,5 +1,6 @@
+AUX dosbox-0.73-AC_CANONICAL_BUILD_and_libpng14.patch 2459 RMD160 7282b150bd7f5ce525ba61d0603a924c398027a3 SHA1 668e8b723bf5d5becea448440157909ac48a00f6 SHA256 aa3442bd0a3135ca970af64e12861e352f61d774239ba0699af86163babd3253
 DIST dosbox-0.73.tar.gz 1279384 RMD160 b732ee0f96024ad2abafa4cb6dd9f2ae316c7177 SHA1 e87682f8f468f3822d2f79e38e5ddb73825fa8c1 SHA256 b0a94c46164391a9c32d9571e4d0b61ff238908ff0b77e09157c22dc98a93765
-EBUILD dosbox-0.73.ebuild 1077 RMD160 80e3b27105b419c8e987406f7819aefc2d3a6567 SHA1 543a04e52b46fddf75eaa3a608d481a486cca572 SHA256 71f4ab9df5b8c60e47689d16509397f796f11a76f1a2b63e11c5c3512362faa9
+EBUILD dosbox-0.73.ebuild 1188 RMD160 35318055c51b4f26ffd83a15d0a286c3359ef00f SHA1 8b39a0faa83b46ebce994c558e50df9f2b4ee6da SHA256 49ed38b06bfcd7ab9f56daef6963343d81a399d0155764e88ea823cb4ede4078
 EBUILD dosbox-9999.ebuild 1221 RMD160 17b03ba35e67599f338c9f3709fda488c9924a7f SHA1 6b940324abfe7a292b9443926568aea8c3321c3e SHA256 8e4d11d1bda5168f5c630e69e505194e75b25508318588b8fcbf901478e20ac6
-MISC ChangeLog 6780 RMD160 924ecf1447d3623dd3eea65462f47c2b37db669f SHA1 2493310b12c6a000ea0b8bd4d1bdafba77aca483 SHA256 489328777a17eef75a22f69dc7ffe204a6361a6291b2cb9995ab7d5f9137569b
+MISC ChangeLog 7030 RMD160 b58774e5fcb233bb949585c9ade0b4b618aea212 SHA1 47ef98ce5cc132ba5f2140e3852dcf4f7b979472 SHA256 8daa53832013fc2f2fc6719b30703e644e797f15d84d4d72babaebf624bebd6e
 MISC metadata.xml 221 RMD160 617e2d275f39c937dfdc8ae1ebc0b4fac331d0a9 SHA1 e947c4afb6291420a09d464cb18472cfcf1cb498 SHA256 80c34a967b80bba5f0f27215677fdad5b1ed739678287b62db1f6c345cf69811
diff --git a/games-emulation/dosbox/dosbox-0.73.ebuild b/games-emulation/dosbox/dosbox-0.73.ebuild
index aa6bf691ed32..845d78ab1241 100644
--- a/games-emulation/dosbox/dosbox-0.73.ebuild
+++ b/games-emulation/dosbox/dosbox-0.73.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.73.ebuild,v 1.5 2009/08/18 22:21:59 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/dosbox/dosbox-0.73.ebuild,v 1.6 2010/03/10 11:08:52 ssuominen Exp $
 
 EAPI=2
-inherit eutils games
+inherit autotools eutils games
 
 DESCRIPTION="DOS emulator"
 HOMEPAGE="http://dosbox.sourceforge.net/"
@@ -22,6 +22,11 @@ DEPEND="alsa? ( media-libs/alsa-lib )
 	media-libs/sdl-net
 	media-libs/sdl-sound"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-AC_CANONICAL_BUILD_and_libpng14.patch
+	eautoreconf
+}
+
 src_configure() {
 	egamesconf \
 		--disable-dependency-tracking \
diff --git a/games-emulation/dosbox/files/dosbox-0.73-AC_CANONICAL_BUILD_and_libpng14.patch b/games-emulation/dosbox/files/dosbox-0.73-AC_CANONICAL_BUILD_and_libpng14.patch
new file mode 100644
index 000000000000..ac6b007e7ef0
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.73-AC_CANONICAL_BUILD_and_libpng14.patch
@@ -0,0 +1,79 @@
+http://bugs.gentoo.org/show_bug.cgi?id=308735
+
+These can be found in dosbox sf.net bugtracking system:
+http://sourceforge.net/tracker/?group_id=52551&atid=467232
+
+--- configure.in
++++ configure.in
+@@ -5,7 +5,7 @@
+ 
+ dnl Detect the canonical host and target build environment
+ AC_CANONICAL_HOST
+-AC_CANONICAL_TARGET
++AC_CANONICAL_BUILD
+ 
+ dnl Setup for automake
+ AM_INIT_AUTOMAKE
+@@ -21,7 +21,7 @@
+ 
+ dnl Some needed libaries for OS2
+ dnl perharps join this with the other target depended checks. move them upwards
+-if test x$target = xi386-pc-os2-emx ; then
++if test x$build = xi386-pc-os2-emx ; then
+     CXXFLAGS="$CXXFLAGS -Zmt"
+     LDFLAGS="$LDFLAGS -Zomf -Zmt"
+     LIBS="$LIBS -los2me"
+@@ -231,7 +231,7 @@
+ dnl The target cpu checks for dynamic cores
+ AH_TEMPLATE(C_TARGETCPU,[The type of cpu this target has])
+ AC_MSG_CHECKING(for target cpu type) 
+-case "$target_cpu" in
++case "$build_cpu" in
+   x86_64 | amd64)
+     AC_DEFINE(C_TARGETCPU,X86_64)
+     AC_MSG_RESULT(x86-64 bit compatible)
+@@ -343,7 +343,7 @@
+ 
+ AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng])
+ AC_CHECK_HEADER(png.h,have_png_h=yes,)
+-AC_CHECK_LIB(png, png_check_sig, have_png_lib=yes, ,-lz)
++AC_CHECK_LIB(png, png_get_io_ptr, have_png_lib=yes)
+ if test x$have_png_lib = xyes -a x$have_png_h = xyes ; then
+   LIBS="$LIBS -lpng -lz"
+   AC_DEFINE(C_SSHOT,1)
+@@ -355,7 +355,7 @@
+ AH_TEMPLATE(C_IPX,[Define to 1 to enable IPX over Internet networking, requires SDL_net])
+ AC_CHECK_HEADER(SDL_net.h,have_sdl_net_h=yes,)
+ 
+-if test x$target = xi386-pc-os2-emx ; then
++if test x$build = xi386-pc-os2-emx ; then
+   AC_MSG_CHECKING(for SDLNet_Init in SDL_net);
+   LIBS_BACKUP=$LIBS;
+   LIBS="$LIBS -lSDL_Net";
+@@ -393,7 +393,7 @@
+ AC_ARG_ENABLE(opengl,AC_HELP_STRING([--disable-opengl],[Disable opengl support]),,enable_opengl=yes)
+ AC_MSG_CHECKING(whether opengl display output will be enabled) 
+ if test x$enable_opengl = xyes; then
+-case "$target" in
++case "$build" in
+     *-*-darwin*)
+        AC_MSG_RESULT(yes)
+        LIBS="$LIBS -framework OpenGL"
+@@ -448,7 +448,7 @@
+ 
+ 
+ dnl Some target detection and actions for them
+-case "$target" in
++case "$build" in
+     *-*-cygwin* | *-*-mingw32*)
+        LIBS="$LIBS -lwinmm"
+        AC_CHECK_HEADERS(ddraw.h)
+@@ -486,7 +486,7 @@
+ esac
+ 
+ dnl Some stuff for the icon.
+-case "$target" in
++case "$build" in
+     *-*-cygwin* | *-*-mingw32*)
+        dnl Some stuff for the ico
+        AC_CHECK_TOOL(WINDRES, windres, :)