summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Goller <morfic@gentoo.org>2005-11-08 01:33:05 +0000
committerDaniel Goller <morfic@gentoo.org>2005-11-08 01:33:05 +0000
commit25e2debed05d6dca0a6246f7001b5c523e303e5d (patch)
tree20819ca60a4e9b6439b93185728d113a89016c9a /games-emulation
parentRemove the OLD RC1 for 1.1.12 and bump 1.1.12 to stable on x86 (i think seven... (diff)
downloadgentoo-2-25e2debed05d6dca0a6246f7001b5c523e303e5d.tar.gz
gentoo-2-25e2debed05d6dca0a6246f7001b5c523e303e5d.tar.bz2
gentoo-2-25e2debed05d6dca0a6246f7001b5c523e303e5d.zip
remove avifile dep wrt bug #111337
(Portage version: 2.0.52-r1)
Diffstat (limited to 'games-emulation')
-rw-r--r--games-emulation/mupen64/ChangeLog7
-rw-r--r--games-emulation/mupen64/files/mupen64-gentoo-avi.patch11
-rw-r--r--games-emulation/mupen64/mupen64-0.4-r2.ebuild10
3 files changed, 9 insertions, 19 deletions
diff --git a/games-emulation/mupen64/ChangeLog b/games-emulation/mupen64/ChangeLog
index fd39865e57d2..160d2fa4e92a 100644
--- a/games-emulation/mupen64/ChangeLog
+++ b/games-emulation/mupen64/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for games-emulation/mupen64
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.17 2005/09/20 15:29:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/ChangeLog,v 1.18 2005/11/08 01:33:05 morfic Exp $
+
+ 08 Nov 2005; Daniel Goller <morfic@gentoo.org>
+ -files/mupen64-gentoo-avi.patch, mupen64-0.4-r2.ebuild:
+ remove avifile dep and avi support wrt bug #111337, -amd64 since it doesn't
+ work
20 Sep 2005; Michael Sterrett <mr_bones_@gentoo.org>
mupen64-0.4-r2.ebuild:
diff --git a/games-emulation/mupen64/files/mupen64-gentoo-avi.patch b/games-emulation/mupen64/files/mupen64-gentoo-avi.patch
deleted file mode 100644
index bda3d7f2e4e3..000000000000
--- a/games-emulation/mupen64/files/mupen64-gentoo-avi.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- emu64/config.h.orig 2004-07-15 23:09:00.000000000 +0000
-+++ emu64/config.h 2004-07-15 23:05:24.000000000 +0000
-@@ -1,7 +1,7 @@
- #ifndef CONFIG_H
- #define CONFIG_H
-
- #undef WITH_HOME
--#undef VCR_SUPPORT
-+#define VCR_SUPPORT 1
-
- #endif /* CONFIG_H */
diff --git a/games-emulation/mupen64/mupen64-0.4-r2.ebuild b/games-emulation/mupen64/mupen64-0.4-r2.ebuild
index 2310929eee00..06ea34e2ee94 100644
--- a/games-emulation/mupen64/mupen64-0.4-r2.ebuild
+++ b/games-emulation/mupen64/mupen64-0.4-r2.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/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.6 2005/09/20 15:29:04 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64/mupen64-0.4-r2.ebuild,v 1.7 2005/11/08 01:33:05 morfic Exp $
inherit eutils games
@@ -13,14 +13,13 @@ SRC_URI="http://mupen64.emulation64.com/files/${PV}/mupen64_src-${PV}.tar.bz2
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 x86"
-IUSE="asm avi"
+KEYWORDS="-amd64 x86"
+IUSE="asm"
RDEPEND="sys-libs/zlib
media-libs/libsdl
virtual/glu
virtual/opengl
- avi? ( media-video/avifile )
=x11-libs/gtk+-2*"
DEPEND="${RDEPEND}
dev-util/pkgconfig"
@@ -36,9 +35,6 @@ src_unpack() {
epatch "${FILESDIR}/${PN}-makefiles.patch" \
"${FILESDIR}/${PN}-confdir.patch" \
"${FILESDIR}/${PN}-gtk2-makefile.patch"
- if use avi; then
- epatch "${FILESDIR}/${PN}-gentoo-avi.patch"
- fi
if ! use asm ; then
epatch "${FILESDIR}/${PN}-noasm.patch"