From b73f2a39b55e8d5a9ecd6d8adc84fd5c318fa79c Mon Sep 17 00:00:00 2001 From: Tristan Heaven Date: Thu, 15 Feb 2007 09:58:09 +0000 Subject: [PATCH] Fix QA issues, bug #116385 Package-Manager: portage-2.1.2-r9 --- games-emulation/mupen64-alsasnd/ChangeLog | 10 ++++- games-emulation/mupen64-alsasnd/Manifest | 40 ++++++++++++------- .../mupen64-alsasnd/files/0.4-gentoo.patch | 15 +++++-- ...asnd-0.4 => digest-mupen64-alsasnd-0.4-r1} | 0 ...4.ebuild => mupen64-alsasnd-0.4-r1.ebuild} | 14 ++++--- 5 files changed, 52 insertions(+), 27 deletions(-) rename games-emulation/mupen64-alsasnd/files/{digest-mupen64-alsasnd-0.4 => digest-mupen64-alsasnd-0.4-r1} (100%) rename games-emulation/mupen64-alsasnd/{mupen64-alsasnd-0.4.ebuild => mupen64-alsasnd-0.4-r1.ebuild} (74%) diff --git a/games-emulation/mupen64-alsasnd/ChangeLog b/games-emulation/mupen64-alsasnd/ChangeLog index a32a68386625..c2ecfdb89a86 100644 --- a/games-emulation/mupen64-alsasnd/ChangeLog +++ b/games-emulation/mupen64-alsasnd/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for games-emulation/mupen64-alsasnd -# Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.11 2006/10/08 23:06:15 nyhm Exp $ +# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/ChangeLog,v 1.12 2007/02/15 09:58:08 nyhm Exp $ + +*mupen64-alsasnd-0.4-r1 (15 Feb 2007) + + 15 Feb 2007; Tristan Heaven files/0.4-gentoo.patch, + -mupen64-alsasnd-0.4.ebuild, +mupen64-alsasnd-0.4-r1.ebuild: + Fix QA issues, bug #116385 08 Oct 2006; Tristan Heaven mupen64-alsasnd-0.4.ebuild: Use qt3 eclass diff --git a/games-emulation/mupen64-alsasnd/Manifest b/games-emulation/mupen64-alsasnd/Manifest index e65875ce3e44..abeb981c1328 100644 --- a/games-emulation/mupen64-alsasnd/Manifest +++ b/games-emulation/mupen64-alsasnd/Manifest @@ -1,7 +1,10 @@ -AUX 0.4-gentoo.patch 560 RMD160 b0def3dfec48dcd3e9b49ae00e5ba91eb7b6d0fd SHA1 37162c7adefa82f3010f6d8718246abcb5f1f9e9 SHA256 a05f223c25946b60d02e86756c7f06aa362bde3c68f246a7ec59913a18662013 -MD5 49a9052e77c664f4a2c6b092c62b39f6 files/0.4-gentoo.patch 560 -RMD160 b0def3dfec48dcd3e9b49ae00e5ba91eb7b6d0fd files/0.4-gentoo.patch 560 -SHA256 a05f223c25946b60d02e86756c7f06aa362bde3c68f246a7ec59913a18662013 files/0.4-gentoo.patch 560 +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA1 + +AUX 0.4-gentoo.patch 741 RMD160 c749d7fe5a2882070f3ed36021b84cca14d32d50 SHA1 8289c6dded7258021e8ac60eab0fb7fc7a586415 SHA256 6cb8372210bdf0b8a7794c84a53c38c2adf83d88d3d570653b883095cc545f33 +MD5 c2547d57d2cf46a23ea7b7c7d982e29e files/0.4-gentoo.patch 741 +RMD160 c749d7fe5a2882070f3ed36021b84cca14d32d50 files/0.4-gentoo.patch 741 +SHA256 6cb8372210bdf0b8a7794c84a53c38c2adf83d88d3d570653b883095cc545f33 files/0.4-gentoo.patch 741 AUX 0.4-gtk.patch 1203 RMD160 c335a844733d33f41348a26e4dc9d0a3ab697eac SHA1 fcac162f82010ab38be52ff379b58a888e079d92 SHA256 bf9cb3ec085b124d7de1a0e06623e1a36dc25e5e1f8bcb7019f4bcaa274195d8 MD5 15dd3b6cd3a33e7fcba000b2b38b9bd2 files/0.4-gtk.patch 1203 RMD160 c335a844733d33f41348a26e4dc9d0a3ab697eac files/0.4-gtk.patch 1203 @@ -11,18 +14,25 @@ MD5 252aa1c16f2e1919d6d761e245d9e2a0 files/mupen64-alsasnd-0.4-gcc41.patch 1131 RMD160 920f8fd1afee8720c114d3f47e45b6d221a9b93a files/mupen64-alsasnd-0.4-gcc41.patch 1131 SHA256 76fbeaeef548417e99ede5c9e087b08712c515866a7b15b9baff60842e81f3f1 files/mupen64-alsasnd-0.4-gcc41.patch 1131 DIST alsa-plugin-0.4fix.tar.bz2 26455 RMD160 4de1e0406625b7115fd612400d305e98375f77f1 SHA1 dd8a722636e801e56ab9e599f17ae2067075b590 SHA256 3d0b6eeb1c193ca4ef87da9b302eb87dc6619effe1be261bd81e0664be1261f8 -EBUILD mupen64-alsasnd-0.4.ebuild 1127 RMD160 d61f8646eeb104366bc0f59924caaaf541d222bc SHA1 8214ea7795eda3ed110812eddb1ea11a93c52729 SHA256 89753b83eae66edbabff33f6239f1e33f2d6ed0e3dbc0bf98459a7233dfc3c54 -MD5 d718d8c6c5b394351053defc55250b04 mupen64-alsasnd-0.4.ebuild 1127 -RMD160 d61f8646eeb104366bc0f59924caaaf541d222bc mupen64-alsasnd-0.4.ebuild 1127 -SHA256 89753b83eae66edbabff33f6239f1e33f2d6ed0e3dbc0bf98459a7233dfc3c54 mupen64-alsasnd-0.4.ebuild 1127 -MISC ChangeLog 1489 RMD160 cb4b9a9b770e6df2b1eba75192ab48a90ad87a63 SHA1 46872c6d636662b1051c7ed12cc57d3fa822ffe0 SHA256 b031de08a3a84d25e4ccb39adbe1da10e0388f118fd70e84e146817ab7cebd9e -MD5 43f5ecc1f013e37fe91ef845d8a47f83 ChangeLog 1489 -RMD160 cb4b9a9b770e6df2b1eba75192ab48a90ad87a63 ChangeLog 1489 -SHA256 b031de08a3a84d25e4ccb39adbe1da10e0388f118fd70e84e146817ab7cebd9e ChangeLog 1489 +EBUILD mupen64-alsasnd-0.4-r1.ebuild 1152 RMD160 30441177317780998286c65e393d02bfc828ea2a SHA1 d037c38cfc240427cb9a454d7fef9e0a989f7493 SHA256 0bfd1ab24f8e265e8f171e7e76f5f96409e56f4c0fe8ac81206f4a58bf130f00 +MD5 c6db14d62e706822dd9e8cbdcda38ffb mupen64-alsasnd-0.4-r1.ebuild 1152 +RMD160 30441177317780998286c65e393d02bfc828ea2a mupen64-alsasnd-0.4-r1.ebuild 1152 +SHA256 0bfd1ab24f8e265e8f171e7e76f5f96409e56f4c0fe8ac81206f4a58bf130f00 mupen64-alsasnd-0.4-r1.ebuild 1152 +MISC ChangeLog 1693 RMD160 e91ab384b8b453d2a6615f7db2424300326c5826 SHA1 25302cf7f4b16ab7ac68f88e98967bea1c731114 SHA256 8a108a01aa0c07d9f7f10a4c30cb16213630a03ade195dd8a5e55a390ab4e28b +MD5 02fcb4e049e21abdf5e4afef16780b78 ChangeLog 1693 +RMD160 e91ab384b8b453d2a6615f7db2424300326c5826 ChangeLog 1693 +SHA256 8a108a01aa0c07d9f7f10a4c30cb16213630a03ade195dd8a5e55a390ab4e28b ChangeLog 1693 MISC metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea SHA1 be5251fa1dacef5c41b74761bb1c8c54fb633b9e SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 MD5 f17b9b8fa07a38914fe1c03268f51678 metadata.xml 158 RMD160 cbd9984bb6b426c8c9cee5022fe0a26261612fea metadata.xml 158 SHA256 1423a4fdd4a79b1728a2056d9e300f7e1074253095d82726218d9e9b953888a3 metadata.xml 158 -MD5 b860487acd52c3f74674effe3f58e968 files/digest-mupen64-alsasnd-0.4 256 -RMD160 86985e0650d7a01097748b9c211020f5bde034bd files/digest-mupen64-alsasnd-0.4 256 -SHA256 9dd5f8f58411013bff476fadf820f6670de5dc93d82c5c2afb543ead56c913f7 files/digest-mupen64-alsasnd-0.4 256 +MD5 b860487acd52c3f74674effe3f58e968 files/digest-mupen64-alsasnd-0.4-r1 256 +RMD160 86985e0650d7a01097748b9c211020f5bde034bd files/digest-mupen64-alsasnd-0.4-r1 256 +SHA256 9dd5f8f58411013bff476fadf820f6670de5dc93d82c5c2afb543ead56c913f7 files/digest-mupen64-alsasnd-0.4-r1 256 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.2 (GNU/Linux) + +iD8DBQFF1C64dz7hIScOURERAozgAKCimZ0CdC6WxdSDjd+d6EEkRgliTgCeP/Bp +NcBJSDniGo8Krl9+aFYMKNA= +=9vV5 +-----END PGP SIGNATURE----- diff --git a/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch b/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch index 1a6481b9e7c3..470262c9d13e 100644 --- a/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch +++ b/games-emulation/mupen64-alsasnd/files/0.4-gentoo.patch @@ -1,16 +1,23 @@ ---- Makefile.orig 2003-12-27 04:24:26.397424080 -0500 -+++ Makefile 2003-12-27 04:25:01.939020936 -0500 +--- Makefile ++++ Makefile @@ -1,4 +1,3 @@ -GRAPHICAL_INTERFACE=gtk1 ifeq ($(GRAPHICAL_INTERFACE),gtk1) GUICFLAGS = -DUSE_GTK `gtk-config --cflags` -@@ -21,7 +20,7 @@ +@@ -21,13 +20,13 @@ all: $(PLUGIN) instructions DEBUGCXXFLAGS = -g -Wall -DDEBUG -CXXFLAGS = -DNO_DEBUG -DNDEBUG -O3 -Wall -mcpu=athlon -march=athlon -fomit-frame-pointer -ffast-math -fno-rtti -+CXXFLAGS += -DNO_DEBUG -DNDEBUG -fno-rtti ++CXXFLAGS += -DNO_DEBUG -DNDEBUG -fno-rtti -fPIC OBJECTS += string.o audio.o snd_plugin.o gui.o string.o: string_class.cpp string_class.h + $(CXX) $(CXXFLAGS) -c -o $@ $< + audio.o: audio.cpp audio.h +- $(CXX) $(CXXFLAGS) -c -o $@ $< ++ $(CXX) $(CXXFLAGS) -fno-strict-aliasing -c -o $@ $< + gui.o: gui.cpp gui.h + $(CXX) $(CXXFLAGS) -c -o $@ $< + snd_plugin.o: snd_interface.cpp audio.h gui.h diff --git a/games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4 b/games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4-r1 similarity index 100% rename from games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4 rename to games-emulation/mupen64-alsasnd/files/digest-mupen64-alsasnd-0.4-r1 diff --git a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild similarity index 74% rename from games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild rename to games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild index f24b1a2f1162..dec0c05cc1f9 100644 --- a/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild +++ b/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4.ebuild,v 1.16 2006/10/08 23:06:15 nyhm Exp $ +# $Header: /var/cvsroot/gentoo-x86/games-emulation/mupen64-alsasnd/mupen64-alsasnd-0.4-r1.ebuild,v 1.1 2007/02/15 09:58:09 nyhm Exp $ inherit eutils qt3 games @@ -13,7 +13,7 @@ SLOT="0" KEYWORDS="-* x86" IUSE="gtk qt3" -DEPEND=">=media-libs/alsa-lib-0.9.0 +DEPEND="media-libs/alsa-lib gtk? ( =x11-libs/gtk+-2* ) qt3? ( $(qt_min_version 3.3) ) !gtk? ( !qt3? ( =x11-libs/gtk+-2* ) )" @@ -23,8 +23,9 @@ S=${WORKDIR}/alsa_plugin src_unpack() { unpack ${A} cd "${S}" - epatch "${FILESDIR}/${PV}-gentoo.patch" \ - "${FILESDIR}/${PV}-gtk.patch" \ + epatch \ + "${FILESDIR}"/${PV}-gentoo.patch \ + "${FILESDIR}"/${PV}-gtk.patch \ "${FILESDIR}"/${P}-gcc41.patch } @@ -33,10 +34,11 @@ src_compile() { use qt3 && export GRAPHICAL_INTERFACE=qt3 use gtk && export GRAPHICAL_INTERFACE=gtk2 emake || die "emake failed" + unset GRAPHICAL_INTERFACE } src_install() { - exeinto "${GAMES_LIBDIR}/mupen64/plugins" + exeinto "${GAMES_LIBDIR}"/mupen64/plugins doexe mupen64_alsasnd-${PV}.so || die "doexe failed" dodoc README prepgamesdirs -- 2.26.2