Added fix for high cpu usage when compiled with --disable-audio.

Package-Manager: portage-2.1.2.7

5 files changed, 185 insertions, 15 deletions

diff --git a/app-emulation/e-uae/ChangeLog b/app-emulation/e-uae/ChangeLog
index 21acfe397d5a..4848912db66d 100644
--- a/app-emulation/e-uae/ChangeLog
+++ b/app-emulation/e-uae/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/e-uae
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.37 2007/05/09 20:18:47 kevquinn Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.38 2007/05/26 10:23:38 pva Exp $
+
+*e-uae-0.8.29_rc4-r1 (26 May 2007)
+
+  26 May 2007; <pva@gentoo.org>
+  +files/e-uae-0.8.29_rc4-high-cpu-usage.patch, +e-uae-0.8.29_rc4-r1.ebuild:
+  Added fix for high cpu usage when compiled with --disable-audio.
 
   09 May 2007; Kevin F. Quinn <kevquinn@gentoo.org> e-uae-0.8.28-r3.ebuild,
   e-uae-0.8.29_rc4.ebuild:
diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest
index a13b9f118aad..5508bb4572bc 100644
--- a/app-emulation/e-uae/Manifest
+++ b/app-emulation/e-uae/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX e-uae-0.8.28-fix-JIT-cache-on-NX-cpu.patch 660 RMD160 7ec2b0f92dcbf39cdd9cd61dfb7990dce2f66c60 SHA1 40f61eadb99213ff9b6016c00083da98a0478778 SHA256 2563d4625dfa42ce7910cbfe4d7734f72796abed9b1d8a6c23bb74c2d33481aa
 MD5 781bdea3cdebd0d2b11de41508613ab5 files/e-uae-0.8.28-fix-JIT-cache-on-NX-cpu.patch 660
 RMD160 7ec2b0f92dcbf39cdd9cd61dfb7990dce2f66c60 files/e-uae-0.8.28-fix-JIT-cache-on-NX-cpu.patch 660
@@ -25,20 +22,28 @@ AUX e-uae-0.8.28-themes_rendering_fix.diff 5832 RMD160 0fbcf0d77176f09ccad6b037b
 MD5 4c3572a4f40235e86bf1a769eba1e6f9 files/e-uae-0.8.28-themes_rendering_fix.diff 5832
 RMD160 0fbcf0d77176f09ccad6b037b835002b47b9c084 files/e-uae-0.8.28-themes_rendering_fix.diff 5832
 SHA256 164acc45e9353f2b8551c133e892237fa087aaeda66eaf2cd23820254f7a5eb2 files/e-uae-0.8.28-themes_rendering_fix.diff 5832
+AUX e-uae-0.8.29_rc4-high-cpu-usage.patch 395 RMD160 4e2df2996111580f8a4a571e3cb987a41a63ce4b SHA1 78e037989621e01bc130172658caaa213569c4a7 SHA256 4edff4299b93b98659249958bd656c460b985419a471cb18527007c956520379
+MD5 6f635fdf6f85af3ad134085ccf9a45c8 files/e-uae-0.8.29_rc4-high-cpu-usage.patch 395
+RMD160 4e2df2996111580f8a4a571e3cb987a41a63ce4b files/e-uae-0.8.29_rc4-high-cpu-usage.patch 395
+SHA256 4edff4299b93b98659249958bd656c460b985419a471cb18527007c956520379 files/e-uae-0.8.29_rc4-high-cpu-usage.patch 395
 DIST e-uae-0.8.28.tar.bz2 1148790 RMD160 7e9fa21fa14b0ca3a32a28ccb236b9d7628a7f69 SHA1 11e647ed64420f85893ac77c072e268b650ae183 SHA256 afc8b30fb9aa0819a4e53b3eb0db8e658e5a2b23d7dbf436f6b5a49b2269da86
 DIST e-uae-0.8.29-WIP4.tar.bz2 1122718 RMD160 823810cd4c41ee31c394fcea9302f4ca680f0567 SHA1 f8c78fef04e6bcd7be36921790d71fcc6e47d00b SHA256 9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456
 EBUILD e-uae-0.8.28-r3.ebuild 4012 RMD160 e3e7f0c1aeb214ff06a0300a64198e8f47234991 SHA1 be71c65c1934da2255e901ce0635522be227c6ae SHA256 a21fc63e9a4d9d333b38d6885ea93179ae296362955e4a2320c4104c2c565a50
 MD5 2f9534ddaec702039382d6c58ebbe35d e-uae-0.8.28-r3.ebuild 4012
 RMD160 e3e7f0c1aeb214ff06a0300a64198e8f47234991 e-uae-0.8.28-r3.ebuild 4012
 SHA256 a21fc63e9a4d9d333b38d6885ea93179ae296362955e4a2320c4104c2c565a50 e-uae-0.8.28-r3.ebuild 4012
+EBUILD e-uae-0.8.29_rc4-r1.ebuild 4467 RMD160 275f499353171a975d7ac1a96cb7e918683190e2 SHA1 0691358deeff0604e6f2a78fceeef2338d95a20d SHA256 bd81216750659981e93490f5a1a69cbc7ce37a9d5619b4d12b7c8e3a0ea99a5d
+MD5 b90583221603a45b91da107851b827b8 e-uae-0.8.29_rc4-r1.ebuild 4467
+RMD160 275f499353171a975d7ac1a96cb7e918683190e2 e-uae-0.8.29_rc4-r1.ebuild 4467
+SHA256 bd81216750659981e93490f5a1a69cbc7ce37a9d5619b4d12b7c8e3a0ea99a5d e-uae-0.8.29_rc4-r1.ebuild 4467
 EBUILD e-uae-0.8.29_rc4.ebuild 4279 RMD160 5b9eddc54d15b31147ae43066be0763ff030b81e SHA1 40e0ccec70789a0b8ab9c97a7445a01e06794257 SHA256 a9a1ad623e9a8259cc4a5cfb5288b3d140ad97c467b4bc3eb7f51d30e9c870e6
 MD5 d58bbd38d939d2776d925ac85295984a e-uae-0.8.29_rc4.ebuild 4279
 RMD160 5b9eddc54d15b31147ae43066be0763ff030b81e e-uae-0.8.29_rc4.ebuild 4279
 SHA256 a9a1ad623e9a8259cc4a5cfb5288b3d140ad97c467b4bc3eb7f51d30e9c870e6 e-uae-0.8.29_rc4.ebuild 4279
-MISC ChangeLog 6582 RMD160 6c2b946f02d16dfd804e34aa6f968ddc557ee046 SHA1 d801d2ecec29c1ec91da4667bffe223ec0446cee SHA256 c409bd27b321dba82fc20d78b58c5cefb21895787372fbf31fd640b366659680
-MD5 3a3a6ece4f668e2ba24fc68c6d68f0d7 ChangeLog 6582
-RMD160 6c2b946f02d16dfd804e34aa6f968ddc557ee046 ChangeLog 6582
-SHA256 c409bd27b321dba82fc20d78b58c5cefb21895787372fbf31fd640b366659680 ChangeLog 6582
+MISC ChangeLog 6790 RMD160 1a565c524ffc502fb45b758750bd99fe1556170e SHA1 393dec66d6dd157755fbd1a72c512f79d273374f SHA256 de378ed897eda97d510bc9517af5981dbe8613c7e8c3f9266fc8b5636b0863ed
+MD5 acae786bcfd69ab398504279e713f4a5 ChangeLog 6790
+RMD160 1a565c524ffc502fb45b758750bd99fe1556170e ChangeLog 6790
+SHA256 de378ed897eda97d510bc9517af5981dbe8613c7e8c3f9266fc8b5636b0863ed ChangeLog 6790
 MISC metadata.xml 468 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 SHA1 575564530c1b5d164d1eedcd003b4f43dc435abc SHA256 6bdc3ef9c0c895a8d4f227e52c2bb044d38fc00c17c04199ffd7a1aaa023ec0f
 MD5 107be5d8d010a6b3dac228473128bdf4 metadata.xml 468
 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 metadata.xml 468
@@ -49,10 +54,6 @@ SHA256 82cc02576ec30a11aaafa85d5e55d9118795f73e0db80ed544cded39f1df25ac files/di
 MD5 a00ed48c6f9a051d13e42c82a86fbae3 files/digest-e-uae-0.8.29_rc4 259
 RMD160 bb784dd253bd5b4386f0d978b422904cde63606c files/digest-e-uae-0.8.29_rc4 259
 SHA256 14d0cfccd6a35b27b32de57f1b7d8184d55286b8e553228e01d3a5777e7256ca files/digest-e-uae-0.8.29_rc4 259
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD8DBQFGQi1QZfNLSOUrp0sRAvpPAJ4oi119NtIUOSJA4uoGB4+GzZS36wCaAw3D
-4uHF4SfzG46veMzgIex471Q=
-=vX0Y
------END PGP SIGNATURE-----
+MD5 a00ed48c6f9a051d13e42c82a86fbae3 files/digest-e-uae-0.8.29_rc4-r1 259
+RMD160 bb784dd253bd5b4386f0d978b422904cde63606c files/digest-e-uae-0.8.29_rc4-r1 259
+SHA256 14d0cfccd6a35b27b32de57f1b7d8184d55286b8e553228e01d3a5777e7256ca files/digest-e-uae-0.8.29_rc4-r1 259
diff --git a/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild b/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild
new file mode 100644
index 000000000000..2f9b3de39971
--- /dev/null
+++ b/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/e-uae-0.8.29_rc4-r1.ebuild,v 1.1 2007/05/26 10:23:38 pva Exp $
+
+inherit eutils flag-o-matic pax-utils
+
+DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE"
+HOMEPAGE="http://www.rcdrummond.net/uae/"
+# We support _rcX for WIPX versions and _preYYYYMMDD for CVS snapshots.
+if [[ "${PV%%_rc*}" = "${PV}" ]] ; then
+	# _pre is used, cvs version
+	my_ver=${PV%%_pre*}
+	snap_ver=${PV##*_pre}
+	S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver}
+	SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2"
+else
+	my_ver=${PV%%_rc*}
+	WIP_ver=${PV##*_rc}
+	S="${WORKDIR}"/${PN}-${my_ver}-WIP${WIP_ver}
+	SRC_URI="http://www.rcdrummond.net/uae/${PN}-${my_ver}-WIP${WIP_ver}/${PN}-${my_ver}-WIP${WIP_ver}.tar.bz2"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="X dga ncurses sdl gtk alsa oss sdl-sound capslib"
+
+# Note: opposed to ./configure --help zlib support required! Check
+# src/Makefile.am that includes zfile.c unconditionaly.
+RDEPEND="X? ( || ( ( x11-libs/libXt
+					 x11-libs/libxkbfile
+					 x11-libs/libXext
+					 dga? ( x11-libs/libXxf86dga
+						    x11-libs/libXxf86vm )
+				   )
+				   virtual/x11
+				)
+			)
+		!X? ( sdl? ( media-libs/libsdl )
+			  !sdl? ( sys-libs/ncurses ) )
+		alsa? ( media-libs/alsa-lib )
+		!alsa? ( sdl-sound? ( media-libs/sdl-sound ) )
+		gtk? ( >=x11-libs/gtk+-2.0 )
+		capslib? ( >=games-emulation/caps-20060612 )
+		sys-libs/zlib
+		virtual/cdrtools"
+
+DEPEND="$RDEPEND
+		X? ( dga? ( x11-proto/xf86vidmodeproto
+					x11-proto/xf86dgaproto ) )"
+
+pkg_setup() {
+	# Sound setup.
+	if use alsa; then
+		elog "Choosing alsa as sound target to use."
+		myconf="--with-alsa --without-sdl-sound"
+	elif use sdl-sound ; then
+		if ! use sdl ; then
+			ewarn "sdl-sound is not enabled because sdl USE flag is disabled. Leaving"
+			ewarn "sound on oss autodetection."
+			myconf="--without-alsa --without-sdl-sound"
+			ebeep
+		else
+			elog "Choosing sdl-sound as sound target to use."
+			ewarn "E-UAE with the SDL audio back-end doesn't work correctly in Linux."
+			ewarn "Better use alsa... You've been warned ;)"
+			ebeep
+			myconf="--without-alsa --with-sdl-sound"
+		fi
+	elif use oss ; then
+		elog "Choosing oss as sound target to use."
+		ewarn "oss will be autodetected. See output of configure."
+		myconf="--without-alsa --without-sdl-sound"
+	else
+		ewarn "There is no alsa, sdl-sound or oss in USE. Sound target disabled!"
+		myconf="--disable-audio"
+	fi
+
+	# VIDEO setup. X is autodetected (there is no --with-X option).
+	if use X ; then
+		elog "Using X11 for video output."
+		ewarn "Fullscreen mode is not working in X11 currently. Use sdl."
+		myconf="$myconf --without-curses --without-sdl-gfx"
+		use dga && ewarn "To use dga you have to run e-uae as root."
+		use dga && myconf="$myconf --enable-dga --enable-vidmode"
+	elif use sdl ; then
+		elog "Using sdl for video output."
+		myconf="$myconf --with-sdl --with-sdl-gfx --without-curses"
+	elif use ncurses; then
+		elog "Using ncurses for video output."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+	else
+		ewarn "There is no X or sdl or ncurses in USE!"
+		ewarn "Following upstream falling back on ncurses."
+		myconf="$myconf --with-curses --without-sdl-gfx"
+		ebeep
+	fi
+
+	use gtk && myconf="$myconf --enable-ui --enable-threads"
+	use gtk || myconf="$myconf --disable-ui"
+
+	myconf="$myconf $(use_with capslib caps)"
+
+	myconf="$myconf --with-zlib"
+
+	# And explicitly state defaults:
+	myconf="$myconf --enable-aga"
+	myconf="$myconf --enable-autoconfig --enable-scsi-device --enable-cdtv --enable-cd32"
+	myconf="$myconf --enable-bsdsock"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix for high cpu use when compiled with --disable-audio
+	use alsa || use sdl-sound || use oss || epatch "${FILESDIR}"/${P}-high-cpu-usage.patch
+}
+
+src_compile() {
+	strip-flags
+
+	econf ${myconf} \
+		--with-libscg-includedir=/usr/include/scsilib \
+		|| die "./configure failed"
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# The emulator needs to be able to create executable heap
+	# - doesn't need trampoline emulation though.
+	pax-mark me "${D}/usr/bin/uae"
+
+	# Rename it to e-uae
+	mv "${D}/usr/bin/uae" "${D}/usr/bin/${PN}"
+	mv "${D}/usr/bin/readdisk" "${D}/usr/bin/e-readdisk"
+
+	dodoc docs/* README ChangeLog
+}
diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4-r1 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4-r1
new file mode 100644
index 000000000000..e00c4dc480f7
--- /dev/null
+++ b/app-emulation/e-uae/files/digest-e-uae-0.8.29_rc4-r1
@@ -0,0 +1,3 @@
+MD5 cbfd7e3d7a1b323331afbb92ea7ff4f0 e-uae-0.8.29-WIP4.tar.bz2 1122718
+RMD160 823810cd4c41ee31c394fcea9302f4ca680f0567 e-uae-0.8.29-WIP4.tar.bz2 1122718
+SHA256 9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456 e-uae-0.8.29-WIP4.tar.bz2 1122718
diff --git a/app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch
new file mode 100644
index 000000000000..ba005cece1ac
--- /dev/null
+++ b/app-emulation/e-uae/files/e-uae-0.8.29_rc4-high-cpu-usage.patch
@@ -0,0 +1,18 @@
+Index: src/sd-none/sound.c
+===================================================================
+RCS file: /cvsroot/uaedev/uae/src/sd-none/sound.c,v
+retrieving revision 1.4
+diff -u -r1.4 sound.c
+--- src/sd-none/sound.c	15 Feb 2007 04:47:38 -0000	1.4
++++ src/sd-none/sound.c	25 May 2007 14:47:35 -0000
+@@ -30,10 +30,6 @@
+ {
+ }
+ 
+-void update_sound (int freq)
+-{
+-}
+-
+ void reset_sound (void)
+ {
+ }