Fix build with latest mjpegtools, by Michael Mauch <michael.mauch@gmx.de>, bug #219063, respect ldflags and chost-prefixed g++

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27.4 x86_64

4 files changed, 67 insertions, 5 deletions

diff --git a/media-video/y4mscaler/ChangeLog b/media-video/y4mscaler/ChangeLog
index 5595881e51ab..a7197b2a8796 100644
--- a/media-video/y4mscaler/ChangeLog
+++ b/media-video/y4mscaler/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/y4mscaler
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/y4mscaler/ChangeLog,v 1.9 2008/10/31 12:14:20 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/y4mscaler/ChangeLog,v 1.10 2008/10/31 12:23:20 aballier Exp $
+
+*y4mscaler-9.0-r1 (31 Oct 2008)
+
+  31 Oct 2008; Alexis Ballier <aballier@gentoo.org>
+  +files/y4mscaler-9.0-mjpeg-1.9.patch, +y4mscaler-9.0-r1.ebuild:
+  Fix build with latest mjpegtools, by Michael Mauch <michael.mauch@gmx.de>,
+  bug #219063, respect ldflags and chost-prefixed g++
 
   31 Oct 2008; Alexis Ballier <aballier@gentoo.org> y4mscaler-9.0.ebuild:
   shorten description
diff --git a/media-video/y4mscaler/Manifest b/media-video/y4mscaler/Manifest
index de72fa2f08cd..9503e799a347 100644
--- a/media-video/y4mscaler/Manifest
+++ b/media-video/y4mscaler/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX y4mscaler-9.0-mjpeg-1.9.patch 790 RMD160 12662808df732187ba2c69a3d03441ec742787f6 SHA1 f92e2f95922f8458713db5fb551af8d80075bde4 SHA256 6d12fd6eb9c9cdc4fbdf875a8e4014f9213b9dd24f550120cc5e2c944eea8c6b
 DIST y4mscaler-9.0-src.tgz 58460 RMD160 757207963ee7eae622a3b583b02e8f0ee51d24f2 SHA1 52a9ba3bc87e07563a52737251a45dbe571b127f SHA256 99cad98aac9aa4cf9aa59ec7a9dbad172a5936124aea4d0d58103e19191cbcb9
+EBUILD y4mscaler-9.0-r1.ebuild 975 RMD160 aa1a463535b48004b3f0a818b0d57f401de864ed SHA1 453fa9d7f27335c248af0dee0f6d865f17ba2d43 SHA256 5001385e74494467eb1c9fa5bad1c004bd18fc87e9aa8ba8fc4377b98b21ebd0
 EBUILD y4mscaler-9.0.ebuild 823 RMD160 b8c78bf8823ed8e34415379eea3e85e2ce3d2eaf SHA1 397871c9d07b9a4b7a2c28e0d87cb85e9e6755fc SHA256 77df67c2ebd18fb8f8563597a56e28d4f74297d9f4bcc5243d54568cd126fa3b
-MISC ChangeLog 1388 RMD160 04c3b85a80f97277def1032cda7483b6b88d6a71 SHA1 2973f01fd095066d89e5f1e6991c580703845d07 SHA256 befa14522eb067e15f8675bc2f0fb7af21097293dd97f642ee51e23176f4745e
+MISC ChangeLog 1672 RMD160 a360a18d10bcf4fa32a3e8e5c3e2483ee6566cda SHA1 dd54cdd09d98251b29374e9477cfc1b8c903eaae SHA256 804ad92feffc8becec95a02db9d3c6a1a93e3c362e8cc8bb67948c3dfde8e5b1
 MISC metadata.xml 208 RMD160 9f2eed7fd529b0d2fe3de5a2bf17ea1234c60bfd SHA1 c3dd8c960e92abcb233fa0dc7456fc0dcd9a4a4a SHA256 e5462081319417e701f6955791ea9888602f030fe874b83cd2ff85e81e0885eb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkK9qIACgkQvFcC4BYPU0obuQCfRabpVNLMBRgcJogW3wHeAMUG
-k/kAni1kqxUKcUCPslaO971IcUSp0Skx
-=4d1q
+iEYEARECAAYFAkkK+L4ACgkQvFcC4BYPU0pNBwCghMo4oZ0yo9uyirpAj3vjmBX0
+DvUAnixAMNCqP3oF4mNoQSaplkRm/C6o
+=VGrs
 -----END PGP SIGNATURE-----
diff --git a/media-video/y4mscaler/files/y4mscaler-9.0-mjpeg-1.9.patch b/media-video/y4mscaler/files/y4mscaler-9.0-mjpeg-1.9.patch
new file mode 100644
index 000000000000..afb170bbd344
--- /dev/null
+++ b/media-video/y4mscaler/files/y4mscaler-9.0-mjpeg-1.9.patch
@@ -0,0 +1,20 @@
+--- old/y4mscaler.C	2005-12-11 21:27:03.000000000 +0100
++++ y4mscaler.C	2008-04-23 20:46:29.318734652 +0200
+@@ -194,7 +194,7 @@
+   if (source.read_stream_header(fd_in) != Y4M_OK)
+     mjpeg_error_exit1("Failed to read YUV4MPEG2 header!");
+   mjpeg_info("Input Stream Header:");
+-  source.stream().log_info(LOG_INFO, "<<< ");
++  source.stream().log_info(mjpeg_loglev_t("info"), "<<< ");
+ 
+   /* set target stream defaults from source stream */
+   target.init_stream(source);
+@@ -216,7 +216,7 @@
+   /* set up target stream */
+   target.stream().write_stream_header(fd_out);
+   mjpeg_info("Output Stream Header:");
+-  target.stream().log_info(LOG_INFO, ">>> ");
++  target.stream().log_info(mjpeg_loglev_t("info"), ">>> ");
+ 
+   /* do some scaling */
+   scaling.create_scalers(source, target);
diff --git a/media-video/y4mscaler/y4mscaler-9.0-r1.ebuild b/media-video/y4mscaler/y4mscaler-9.0-r1.ebuild
new file mode 100644
index 000000000000..821229ead630
--- /dev/null
+++ b/media-video/y4mscaler/y4mscaler-9.0-r1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/y4mscaler/y4mscaler-9.0-r1.ebuild,v 1.1 2008/10/31 12:23:20 aballier Exp $
+
+inherit eutils toolchain-funcs
+
+SRC_URI="http://www.mir.com/DMG/Software/${P}-src.tgz"
+DESCRIPTION="A video scaler which operates on YUV4MPEG2 streams, as used by the tools in the MJPEGtools project."
+HOMEPAGE="http://www.mir.com/DMG/Software/"
+LICENSE="GPL-2"
+
+DEPEND=">=media-video/mjpegtools-1.9.0_rc3"
+
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SLOT="0"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-mjpeg-1.9.patch"
+	# There's no 'configure' script (yet)
+	sed -i -e "s:CPU_OPT =:CPU_OPT = ${CXXFLAGS}:" Makefile
+	sed -i -e "s:^LDFLAGS =:LDFLAGS +=:" Makefile
+	tc-export CXX
+}
+
+src_install() {
+	# The program doesn't have an install routine (for now)
+	dobin y4mscaler || die
+	doman y4mscaler.1 || die
+	dodoc ChangeLog README TODO
+}