Updated Debian patches to dfsg1-10. Fixed the dejavu font hardcoded location patch and added media-fonts/dejavu as dependency.

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

4 files changed, 197 insertions, 2 deletions

diff --git a/games-emulation/mupen64plus/ChangeLog b/games-emulation/mupen64plus/ChangeLog
index 71051383f022..b44520303895 100644
--- a/games-emulation/mupen64plus/ChangeLog
+++ b/games-emulation/mupen64plus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for games-emulation/mupen64plus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.11 2010/05/16 20:38:39 joker Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/ChangeLog,v 1.12 2010/07/15 10:43:30 joker Exp $
+
+*mupen64plus-1.5-r2 (15 Jul 2010)
+
+  15 Jul 2010; Christian Birchinger <joker@gentoo.org>
+  +mupen64plus-1.5-r2.ebuild, +files/README.gentoo-patches-20100507:
+  Updated Debian patches to dfsg1-10. Fixed the dejavu font hardcoded
+  location patch and added media-fonts/dejavu as dependency.
 
   16 May 2010; Christian Birchinger <joker@gentoo.org>
   mupen64plus-1.5-r1.ebuild, +files/ftbfs-gvariant-type-conflicts.patch:
diff --git a/games-emulation/mupen64plus/Manifest b/games-emulation/mupen64plus/Manifest
index 59d6b7a9ba31..680c13909685 100644
--- a/games-emulation/mupen64plus/Manifest
+++ b/games-emulation/mupen64plus/Manifest
@@ -1,8 +1,11 @@
 AUX README.gentoo-patches-20091123 1355 RMD160 36a949e4205699623c4a5283abe38f4062783560 SHA1 d144cc1167d6c02008f0afb25ec3792e650f066c SHA256 472ca36495f5cd59c66a23d4660dff19e890c7bca9c389352a54371f9aae5b2e
+AUX README.gentoo-patches-20100507 1521 RMD160 1f5f8e1fa80816df8f39763f7e82e1f24d0236f3 SHA1 77c68a0cc466252561ce1e9cc23ca5a31eccb440 SHA256 c760661690d7f466bbd8640bae085b35f1e20b6c3ec882092b7547cbd32efccd
 AUX ftbfs-gvariant-type-conflicts.patch 828 RMD160 588773a037a037f83fcf25a94ed29cc7a161e614 SHA1 f43a04f16b555fe81935fc1ba1ced2d71cba72bf SHA256 14483751e07912daeabb35b31f1b2fdae454658e00ea1a10627de29bd43881c0
 AUX mupen64plus-1.5-libpng14.patch 1404 RMD160 d6de12bd2922b79e7cbe2ead8b4419d94eabca8f SHA1 374915395ba7454da1e7a7e4839c5785f45dd62d SHA256 c0efb54eee809135dbb9429fc9869456a1d437a90929d9df09ab1102157d183f
 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
+DIST mupen64plus-1.5-patches-20100507.tar.bz2 33484 RMD160 33d1a605c4e63de079cd0182410d8b7c4db85d11 SHA1 0b72e8b56d3bb50ff94dda0d608de8e48e5aca5e SHA256 372e437ab9d53eda23fd63cede33be38114efe527f239ef41b0c904fe208e2ce
 EBUILD mupen64plus-1.5-r1.ebuild 3339 RMD160 0143efeef1abf4554b0cd4d8d7eefb1ed63cf4c6 SHA1 e2aac6c26db762b52852f09745b8bea5293a8376 SHA256 f658780a3e24f8187958b17f375b679b22e32b02573db794bee8d9bfd07dc73b
-MISC ChangeLog 2605 RMD160 ed5890049866292f502bd5394b761ea5a60a4df8 SHA1 4cddfd25347af5e2a53b10e905d81240259772c9 SHA256 79e198e67957091d9fcbe33794798b2dfb33441f112bce2f535022138afd3ede
+EBUILD mupen64plus-1.5-r2.ebuild 3200 RMD160 a22bce08197557b5102318502e5047dc161e7392 SHA1 98adca5b05d165dce5c981fecf7f462112112cf5 SHA256 820daf3c1ad9fc0c63ff32cc124bb3f5bca1d13ea5e234abc56829f8322fb68b
+MISC ChangeLog 2896 RMD160 e9ba755a37577c754e9d5999e201ff9211fe0869 SHA1 8e321dfd6938b29c6171a392d719e990536915d3 SHA256 48404b77683b1010afa1d21d3359b80040a3abb556bab902d0cd80d44a8d108f
 MISC metadata.xml 679 RMD160 a52b94f3dac0302970e9b6d9ead4341ca3722d5c SHA1 cddc937cadb60d9a67c578c815f192136b1dd701 SHA256 8cb8d6f4a9724cde575da81a562322e28c628a7bd7233de3424a3c001a006a2f
diff --git a/games-emulation/mupen64plus/files/README.gentoo-patches-20100507 b/games-emulation/mupen64plus/files/README.gentoo-patches-20100507
new file mode 100644
index 000000000000..e6b857a07d48
--- /dev/null
+++ b/games-emulation/mupen64plus/files/README.gentoo-patches-20100507
@@ -0,0 +1,59 @@
+All patches below 500 are from the Debian git repository (May 07 2010):
+
+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 adjusted the font path to the font location on Gentoo systems
+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
+ftbfs-gvariant-type-conflicts.path
+rsp_ucode2_reset.patch
+rsp_hle_bigendian.patch
+rice-crash-vendorstring.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-r2.ebuild b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
new file mode 100644
index 000000000000..bdc517cc6730
--- /dev/null
+++ b/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild
@@ -0,0 +1,126 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64plus/mupen64plus-1.5-r2.ebuild,v 1.1 2010/07/15 10:43:30 joker Exp $
+
+EAPI="2"
+
+inherit eutils flag-o-matic games
+
+MY_P="Mupen64Plus-${PV/./-}-src"
+
+PATCH_VERSION="20100507"
+
+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
+	media-fonts/dejavu
+	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"
+
+	# Fix 010_all_fix-desktop-file.patch instead of using sed on the next major bump
+	sed -i \
+		-e "s:^Icon=mupen64plus-large.xpm:Icon=mupen64plus:" \
+		mupen64plus.desktop.in || 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
+}