Added patch xmps-0.2.0_motion_comp.c.gentoo.diff which fixes bug #2822.

4 files changed, 99 insertions, 1 deletions

diff --git a/media-video/xmps/ChangeLog b/media-video/xmps/ChangeLog
index 269bb8c952c2..1be0d8ccdd80 100644
--- a/media-video/xmps/ChangeLog
+++ b/media-video/xmps/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for media-video/xmps
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/ChangeLog,v 1.4 2003/02/12 07:43:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/ChangeLog,v 1.5 2003/03/05 01:34:21 pfeifer Exp $
+
+*xmps-0.2.0-r3 (04 Mar 2003)
+
+  04 Mar 2003; Jay Pfeifer <pfeifer@gentoo.org> xmps-0.2.0-r3.ebuild :
+
+  Fixed compile issue in motion_comp.c.
+  
+  Created patch xmps-0.2.0_motion_comp.c.gentoo.diff
+  
+  Closed bug #2822.
 
 *xmps-0.2.0-r2 (23 Oct 2002)
 
diff --git a/media-video/xmps/files/digest-xmps-0.2.0-r3 b/media-video/xmps/files/digest-xmps-0.2.0-r3
new file mode 100644
index 000000000000..c1b94a8b8fac
--- /dev/null
+++ b/media-video/xmps/files/digest-xmps-0.2.0-r3
@@ -0,0 +1 @@
+MD5 87937db0d26e599003f0e8db4284e16b xmps-0.2.0.tar.gz 809839
diff --git a/media-video/xmps/files/xmps-0.2.0_motion_comp.c.gentoo.diff b/media-video/xmps/files/xmps-0.2.0_motion_comp.c.gentoo.diff
new file mode 100644
index 000000000000..72cb8fd76c65
--- /dev/null
+++ b/media-video/xmps/files/xmps-0.2.0_motion_comp.c.gentoo.diff
@@ -0,0 +1,20 @@
+--- xmps-0.2.0.orig/codecs/video/mpeg3/motion_comp.c	2000-11-20 12:57:37.000000000 -0600
++++ xmps-0.2.0/codecs/video/mpeg3/motion_comp.c	2003-03-01 18:16:41.000000000 -0600
+@@ -66,7 +66,7 @@
+ // mc function template
+ 
+ #define MC_FUNC(op,xy)						\
+-static void motion_comp_##op####xy##_16x16_c (uint8_t * dest,	\
++static void motion_comp_##op##xy##_16x16_c (uint8_t * dest,	\
+ 					      uint8_t * ref,	\
+ 					      int stride,	\
+ 					      int height)	\
+@@ -92,7 +92,7 @@
+ 	dest += stride;						\
+     } while (--height);						\
+ }								\
+-static void motion_comp_##op####xy##_8x8_c (uint8_t * dest,	\
++static void motion_comp_##op##xy##_8x8_c (uint8_t * dest,	\
+ 					    uint8_t * ref,	\
+ 					    int stride,		\
+ 					    int height)		\
diff --git a/media-video/xmps/xmps-0.2.0-r3.ebuild b/media-video/xmps/xmps-0.2.0-r3.ebuild
new file mode 100644
index 000000000000..f5e0d003ae53
--- /dev/null
+++ b/media-video/xmps/xmps-0.2.0-r3.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/xmps/xmps-0.2.0-r3.ebuild,v 1.1 2003/03/05 01:34:21 pfeifer Exp $
+
+IUSE="nls gnome"
+
+S=${WORKDIR}/${P}
+DESCRIPTION="X Movie Player System"
+SRC_URI="http://xmps.sourceforge.net/sources/${P}.tar.gz"
+HOMEPAGE="http://xmps.sourceforge.net"
+
+DEPEND="=x11-libs/gtk+-1.2*
+	x86? ( >=dev-lang/nasm-0.98 )
+	>=dev-libs/popt-1.5
+	gnome? ( >=gnome-base/gnome-libs-1.4.1.2-r1 )"
+
+RDEPEND=">=media-libs/smpeg-0.4.4-r1
+	nls? ( sys-devel/gettext )"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86"
+
+
+src_unpack() {
+	unpack ${A}
+
+	# Fixes compile issues on motion_comp.c (Bug #2822)
+	cd ${S}
+	patch -p1 < ${FILESDIR}/xmps-0.2.0_motion_comp.c.gentoo.diff || die
+}
+
+src_compile() {
+
+	local myconf
+
+	use gnome && myconf="--enable-gnome"
+
+	use nls || myconf="${myconf} --disable-nls"
+
+	econf ${myconf} || die "econf failed"
+
+	for file in `find . -iname "Makefile"`;do
+		mv ${file} ${file}.orig
+		sed -e "s:-Werror::g;s:-ldb1:-ldb:g" \
+			${file}.orig > ${file} || die "sed-fu failed"
+	done
+
+	mv intl/l10nflist.c intl/l10nflist.c.orig
+	sed -e "s:\(#ifdef HAVE_CONFIG_H\):#define _LIBC 1\n\1:" \
+		intl/l10nflist.c.orig > intl/l10nflist.c
+
+	mv Makefile Makefile.orig
+	sed -e "s:\$(bindir)/xmps-config:\$(DESTDIR)\$(bindir)/xmps-config:" \
+		Makefile.orig > Makefile
+
+	emake || die "emake failed"
+
+}
+
+src_install () {
+
+	einstall || die "einstall failed"
+
+	dodoc AUTHORS ChangeLog COPYING NEWS README TODO
+
+}