Added almost all Debian patches. A big thank you to all the authors of the patches.

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 187 insertions, 12 deletions

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index c32baf94f0d0..7c95567aa7a5 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.3 2009/09/22 19:54:06 nyhm Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.4 2009/11/24 15:58:19 joker Exp $
+
+*mupen64plus-1.5-r1 (24 Nov 2009)
+
+  24 Nov 2009; Christian Birchinger <joker@gentoo.org>
+  +mupen64plus-1.5-r1.ebuild, +files/README.gentoo-patches-20091123:
+  Added almost all Debian patches. A big thank you to all the authors of the
+  patches.
 
   22 Sep 2009; Tristan Heaven <nyhm@gentoo.org> mupen64plus-1.5.ebuild:
   Override Makefile arch detection; add ~x86 keyword
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index d735325e1cb6..074ac8fc13bb 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,18 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX README.gentoo-patches-20091123 1355 RMD160 36a949e4205699623c4a5283abe38f4062783560 SHA1 d144cc1167d6c02008f0afb25ec3792e650f066c SHA256 472ca36495f5cd59c66a23d4660dff19e890c7bca9c389352a54371f9aae5b2e
 AUX mupen64plus-1.5-flags.patch 1123 RMD160 a38f07f536c4d31a019e8742319c73644422c25d SHA1 7b5946e1826e21be0b8cf612274585f378a7f86b SHA256 a14a2e6b7972d8fe461639888eb534e62413c0c05aba91c19149c511f9e9dc10
 AUX mupen64plus-1.5-glide64-gcc44.patch 1262 RMD160 28ccdd74a669af58363501f386acf290cf6a55bd SHA1 5113cffff2c0a472bd37325fa0f582850d71fac0 SHA256 fc9665e4cfa8ae99ab1a4e8d1810d257d81f6cd2c59fc3ac4b7b5d1ec42ef069
 AUX mupen64plus-1.5-plugindir.patch 722 RMD160 905d38cd37f4afdc67d2e7ac7f8d66a5bc9a296a SHA1 d4b77ace873c4a50ebe89fe81f523c6e00dffc8d SHA256 07507a688ab77322317cf3b7fb6419f681386b343c77d26bf3fd01afa3348276
 AUX mupen64plus-1.5-unbundle-bzip2.patch 1317 RMD160 98403a2c3853fc60c666180b106a735e8c8410a3 SHA1 9ff21c4c945dc475f7c248f738913adb13d29b82 SHA256 cc5e3e15ad44b2c5483b222dd55bba8588759ac032b97667d9e3c69d590938e0
 DIST Mupen64Plus-1-5-src.tar.gz 2348443 RMD160 690d1e80d4a10a3a74e7d955c0ee23e3bd4ff996 SHA1 ef200d6ea2eb3faa969ba9c82d2a771236c3145d SHA256 58b2da6095ed8f3bcdcb5d7612bb0f1ba81cda1861ca784ef7e46991fd73cf3f
+DIST mupen64plus-1.5-patches-20091123.tar.bz2 25579 RMD160 4e956e66bedd944889c6b620a67c6a088c569bdb SHA1 dba1c3a2079cd96d5e2b8a06223ede21597ae958 SHA256 b4bebb8105d7ca083b1e3d96d23dea9f2170703d53b0ea75e09b428e73e43187
+EBUILD mupen64plus-1.5-r1.ebuild 2985 RMD160 f44e0947dba0153e690595b02f9c73e2bcf63cbd SHA1 8d439134146e57708960d1327ef7f2683a1c2f21 SHA256 a630231dccc09f802a707b8d5386fd738ca6e06d4a8a0213df491fd9eac09c21
 EBUILD mupen64plus-1.5.ebuild 3252 RMD160 ee582483c8a0b3a9129ff6fb52414e86f691491d SHA1 fbaf3b5991257a18103979d6d888aff62cbb36ba SHA256 360458e6401653bb015161503929cdc5e7c749df548a7f8435c9f3c00e88bcba
-MISC ChangeLog 1323 RMD160 6a94865fbec98e7a2c63b6c4638023141e6926d9 SHA1 57ffa93fd32fb3baddd8dcd78c781ed902b851c6 SHA256 031df4fba68ef75d05892f1b0e2fce575cd3470b57751b8630b9251f32e5d46b
+MISC ChangeLog 1572 RMD160 24dbaa63d9cab62f4eaa6df680d1b944a33dc5a8 SHA1 e8069d1d303715da67f2e237a20f845470869f3e SHA256 fd0e588d87d9fc9807edd87f5d80084291028f2cd744337d8ae018b56f3366b3
 MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkq5K2QACgkQdz7hIScOURG+rQCgsjh/ZbvXRgsIbgjo7MjTKGuI
-iwoAn3Po19bNhMC/2ve/+TwjGvlsHfZ4
-=QuPU
------END PGP SIGNATURE-----
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20091123 b/games-emulation/mupen64plus/files/README.gentoo-patches-20091123
new file mode 100644
index 000000000000..96994d798b7a
--- /dev/null
+++ b/games-emulation/mupen64plus/files/README.gentoo-patches-20091123
@@ -0,0 +1,55 @@
+All patches below 500 are from the Debian git repository (Nov 23 12:35 CET 2009):
+
+http://git.debian.org/?p=collab-maint/mupen64plus.git;a=tree;f=debian/patches;hb=master
+
+Patches included:
+=================
+
+fix-desktop-file.patch
+destdir.patch
+dejavu-font.patch
+as-needed.patch
+system-libpng.patch
+system-zlib.patch
+system-libbz2.patch
+remove-gln64.patch
+remove-nondfsg-icons.patch
+glide64-noasm.patch
+rice-texturepack-crash.patch
+rice-screenflickering.patch
+static-binutils-libs.patch
+fix-7z-subfolder.patch
+ftbfs-dynarec.patch
+ftbfs-kfreebsd.patch
+ftbfs-debugger.patch
+debian-archs.patch
+ftbfs-glibc210.patch
+version-string.patch
+default-optimisations.patch
+gtk-open-filter.patch
+noexecstack.patch
+fix_readpng.patch
+jttl_fix_romclosed.patch
+rice_nodebug.patch
+interpreter_x86_fldcw.patch
+correct_fpr32_mapping.patch
+load_aidacrate.patch
+load_vistatus.patch
+fix_r0_override.patch
+resume_on_start.patch
+osd-pause-crash.patch
+system-liblzma.patch
+- system-liblzma got changed to work without the droped xdg-basedir.patch
+
+Patches excluded:
+=================
+
+plugin-searchpath.patch
+xdg-basedir.patch
+- Because Gentoo uses different locations like /usr/games/lib(64) and /usr/share/games.
+  The usage of xdg patch location standards would ne nice though.
+
+A big thanks to all the authors of the patches.
+
+Have fun
+Christian Birchinger <joker@gentoo.org>
diff --git a/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
new file mode 100644
index 000000000000..d0dc71b1b983
--- /dev/null
+++ b/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r1.ebuild,v 1.1 2009/11/24 15:58:19 joker Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic games
+
+MY_P="Mupen64Plus-${PV/./-}-src"
+
+PATCH_VERSION="20091123"
+
+DESCRIPTION="A fork of Mupen64 Nintendo 64 emulator"
+HOMEPAGE="http://code.google.com/p/mupen64plus/"
+SRC_URI="http://mupen64plus.googlecode.com/files/${MY_P}.tar.gz mirror://gentoo/${P}-patches-${PATCH_VERSION}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gtk libsamplerate lirc qt4 sse"
+
+# GTK+ is currently required by plugins even if no GUI support is enabled
+RDEPEND="virtual/opengl
+	media-libs/freetype:2
+	media-libs/libpng
+	media-libs/libsdl
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	x11-libs/gtk+:2
+	libsamplerate? ( media-libs/libsamplerate )
+	lirc? ( app-misc/lirc )
+	qt4? ( x11-libs/qt-gui:4
+		x11-libs/qt-core:4 )
+	app-arch/xz-utils"
+
+DEPEND="${RDEPEND}
+	dev-lang/yasm
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	if ! use gtk && ! use qt4; then
+		ewarn "Building ${PN} without any GUI! To get one, enable USE=gtk or USE=qt4."
+	elif use gtk && use qt4; then
+		ewarn "Only one GUI can be built, using GTK+ one."
+	fi
+
+	games_pkg_setup
+}
+
+src_prepare() {
+	EPATCH_SOURCE="${WORKDIR}/patches" EPATCH_SUFFIX="patch" \
+		epatch
+
+	sed -i \
+		-e "s:/usr/local/share/mupen64plus:${GAMES_DATADIR}/mupen64plus:" \
+		-e "s:%PUT_PLUGIN_PATH_HERE%:$(games_get_libdir)/${PN}/plugins/:" \
+		main/main.c || die "sed failed"
+}
+
+get_opts() {
+	if use amd64 || use x86 ; then
+		echo -n "CPU=X86 ARCH=64BITS$(use x86 && echo -n _32) "
+	fi
+
+	use libsamplerate || echo -n "NO_RESAMP=1 "
+	use lirc && echo -n "LIRC=1 "
+	use sse || echo -n "NO_ASM=1 "
+
+	echo -n GUI=
+	if use gtk; then
+		echo -n GTK2
+	elif use qt4; then
+		echo -n QT4
+	else
+		echo -n NONE
+	fi
+}
+
+src_compile() {
+	use x86 && use sse && append-flags -fomit-frame-pointer
+	emake $(get_opts) DBGSYM=1 all || die "make failed"
+}
+
+src_install() {
+	# These are:
+	# 1) prefix - not used really, printed only
+	# 2) SHAREDIR
+	# 3) BINDIR
+	# 4) 'LIBDIR' - where to put plugins in
+	# 5) 'MANDIR' - exact directory to put man file in
+	# 6) APPLICATIONSDIR - where to put .desktop in
+
+	./install.sh "${D}" \
+		"${D}${GAMES_DATADIR}/${PN}" \
+		"${D}${GAMES_BINDIR}" \
+		"${D}$(games_get_libdir)/${PN}/plugins" \
+		"${D}/usr/share/man/man1" \
+		"${D}/usr/share/applications" \
+		|| or die "install.sh failed"
+
+	# Copy icon into system-wide location
+	newicon icons/mupen64plus-large.png ${PN}.png || die "newicon failed"
+
+	# 'Move' docs into correct dir
+	rm -r "${D}${GAMES_DATADIR}/${PN}/doc"
+	dodoc README RELEASE TODO doc/*.txt "${FILESDIR}/README.gentoo-patches-${PATCH_VERSION}" || die "dodoc failed"
+
+	prepgamesdirs
+}
+
+pkg_postinst() {
+	games_pkg_postinst
+
+	if use lirc; then
+		elog "For lirc configuration see:"
+		elog "http://code.google.com/p/mupen64plus/wiki/LIRC"
+	fi
+}