From 82ac5b834f0dd16a28ff40cce06f37d7db93a1db Mon Sep 17 00:00:00 2001 From: Peter Volkov Date: Mon, 26 Feb 2007 07:19:26 +0000 Subject: Patch which ensure that cached changes don't lost during stopping emulator. Package-Manager: portage-2.1.2-r9 --- app-emulation/e-uae/ChangeLog | 9 +- app-emulation/e-uae/Manifest | 26 +++-- .../e-uae/e-uae-0.8.29_pre20070223-r1.ebuild | 130 +++++++++++++++++++++ .../e-uae/e-uae-0.8.29_pre20070223.ebuild | 123 ------------------- .../e-uae/files/digest-e-uae-0.8.29_pre20070223 | 3 - .../e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 | 3 + .../files/e-uae-0.8.29-20070223-filesys_fix.diff | 22 ++++ 7 files changed, 178 insertions(+), 138 deletions(-) create mode 100644 app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild delete mode 100644 app-emulation/e-uae/e-uae-0.8.29_pre20070223.ebuild delete mode 100644 app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223 create mode 100644 app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 create mode 100644 app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff (limited to 'app-emulation/e-uae') diff --git a/app-emulation/e-uae/ChangeLog b/app-emulation/e-uae/ChangeLog index e5890316d27c..416583cfecbd 100644 --- a/app-emulation/e-uae/ChangeLog +++ b/app-emulation/e-uae/ChangeLog @@ -1,6 +1,13 @@ # 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.32 2007/02/25 18:53:35 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/e-uae/ChangeLog,v 1.33 2007/02/26 07:19:26 pva Exp $ + +*e-uae-0.8.29_pre20070223-r1 (26 Feb 2007) + + 26 Feb 2007; + +files/e-uae-0.8.29-20070223-filesys_fix.diff, + -e-uae-0.8.29_pre20070223.ebuild, +e-uae-0.8.29_pre20070223-r1.ebuild: + Patch which ensure that cached changes don't lost during stopping emulator. *e-uae-0.8.29_pre20070223 (25 Feb 2007) diff --git a/app-emulation/e-uae/Manifest b/app-emulation/e-uae/Manifest index e5299cbac9d0..ee3cd690292a 100644 --- a/app-emulation/e-uae/Manifest +++ b/app-emulation/e-uae/Manifest @@ -22,20 +22,24 @@ 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-20070223-filesys_fix.diff 680 RMD160 4f51034e3f423e95604772334163298c92b5ade8 SHA1 6fae64b267a829f87fe236d2a730bbfeee3daf8c SHA256 5e76f618bdbc07c381aafe787a568dc409daf6dad126d19a464cd6eba045cefa +MD5 26cd00de3c7a9a1fa6379675455ff7e6 files/e-uae-0.8.29-20070223-filesys_fix.diff 680 +RMD160 4f51034e3f423e95604772334163298c92b5ade8 files/e-uae-0.8.29-20070223-filesys_fix.diff 680 +SHA256 5e76f618bdbc07c381aafe787a568dc409daf6dad126d19a464cd6eba045cefa files/e-uae-0.8.29-20070223-filesys_fix.diff 680 DIST e-uae-0.8.28.tar.bz2 1148790 RMD160 7e9fa21fa14b0ca3a32a28ccb236b9d7628a7f69 SHA1 11e647ed64420f85893ac77c072e268b650ae183 SHA256 afc8b30fb9aa0819a4e53b3eb0db8e658e5a2b23d7dbf436f6b5a49b2269da86 DIST e-uae-0.8.29-20070223.tar.bz2 1087783 RMD160 540edb66a91aa954aa4cc147fa9430abaa14f880 SHA1 d1e3f80a4b9fd444285bfe114749f1ab9a1248ae SHA256 fe915e1792eb5e4e428cb1aab9a748021fd4e88c18c21f295360d7db535938fc EBUILD e-uae-0.8.28-r3.ebuild 3861 RMD160 93d562fcc99c83229e458244929723277d7897bf SHA1 592bb9752a81b09a42719a02bcf3d97df3bb3ece SHA256 f6127827b2c94c582c6a04ac0b4fbb35259aa8fed343f15a50b648a316689d66 MD5 3ce26f09dac49030a244d8d473f7a80b e-uae-0.8.28-r3.ebuild 3861 RMD160 93d562fcc99c83229e458244929723277d7897bf e-uae-0.8.28-r3.ebuild 3861 SHA256 f6127827b2c94c582c6a04ac0b4fbb35259aa8fed343f15a50b648a316689d66 e-uae-0.8.28-r3.ebuild 3861 -EBUILD e-uae-0.8.29_pre20070223.ebuild 3786 RMD160 c16e2c8f328200698f1df1e4517276c977007870 SHA1 d83ef2410bacf8703942ba007f72d515c2ebb18f SHA256 1842679438f434526eb5d341c01223e3c3e4b03279afd68009429449c2686615 -MD5 33987332600ddc2134a6816e521d3754 e-uae-0.8.29_pre20070223.ebuild 3786 -RMD160 c16e2c8f328200698f1df1e4517276c977007870 e-uae-0.8.29_pre20070223.ebuild 3786 -SHA256 1842679438f434526eb5d341c01223e3c3e4b03279afd68009429449c2686615 e-uae-0.8.29_pre20070223.ebuild 3786 -MISC ChangeLog 5469 RMD160 52f38448fa98f149950b28becbfc4b27844d0903 SHA1 cae2875175dba5a3c070f028533eefd147373eef SHA256 d4a775a7fb5c629f4d81b3c08169f7b67b638308f6ea970d6748aa2f89073e49 -MD5 a49d8d9f188cbc6bf2831ce5cf4861fc ChangeLog 5469 -RMD160 52f38448fa98f149950b28becbfc4b27844d0903 ChangeLog 5469 -SHA256 d4a775a7fb5c629f4d81b3c08169f7b67b638308f6ea970d6748aa2f89073e49 ChangeLog 5469 +EBUILD e-uae-0.8.29_pre20070223-r1.ebuild 3899 RMD160 2f135584bee254c76773499c9aa393cdeed38241 SHA1 0d3f22990a74c34c16a1cf5149ec3938e3a96476 SHA256 c91d1cf3c0a12d9db0525004be788c916cf0ec9c636f9931bdff134e23103f53 +MD5 e4ea0862b97432d32e1953e89bdd43f5 e-uae-0.8.29_pre20070223-r1.ebuild 3899 +RMD160 2f135584bee254c76773499c9aa393cdeed38241 e-uae-0.8.29_pre20070223-r1.ebuild 3899 +SHA256 c91d1cf3c0a12d9db0525004be788c916cf0ec9c636f9931bdff134e23103f53 e-uae-0.8.29_pre20070223-r1.ebuild 3899 +MISC ChangeLog 5746 RMD160 f3447391b7d04da89c08a3bbbb666ef444497037 SHA1 fee12e93d377ed21dd28faafcc61b4ec1884804e SHA256 cbea4fdb9f05509c2b3089ec2646a15e5cf8177beecec7d550bdcac830b0aa06 +MD5 9272e985bfb411bab5726a8377862db5 ChangeLog 5746 +RMD160 f3447391b7d04da89c08a3bbbb666ef444497037 ChangeLog 5746 +SHA256 cbea4fdb9f05509c2b3089ec2646a15e5cf8177beecec7d550bdcac830b0aa06 ChangeLog 5746 MISC metadata.xml 468 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 SHA1 575564530c1b5d164d1eedcd003b4f43dc435abc SHA256 6bdc3ef9c0c895a8d4f227e52c2bb044d38fc00c17c04199ffd7a1aaa023ec0f MD5 107be5d8d010a6b3dac228473128bdf4 metadata.xml 468 RMD160 3cc57496496e8ed0e18330d5523ceb3d417bf222 metadata.xml 468 @@ -43,6 +47,6 @@ SHA256 6bdc3ef9c0c895a8d4f227e52c2bb044d38fc00c17c04199ffd7a1aaa023ec0f metadata MD5 188bf5165e1f85783a9ba7fa185f9fd3 files/digest-e-uae-0.8.28-r3 244 RMD160 754a2776d6ff1b461b1278828ea678dd002b4e3c files/digest-e-uae-0.8.28-r3 244 SHA256 82cc02576ec30a11aaafa85d5e55d9118795f73e0db80ed544cded39f1df25ac files/digest-e-uae-0.8.28-r3 244 -MD5 71cac33cab99c615336b5308bb92bb54 files/digest-e-uae-0.8.29_pre20070223 271 -RMD160 d32bb222443c8d4d697bd4fd2e5be5f082df3094 files/digest-e-uae-0.8.29_pre20070223 271 -SHA256 3157456aaa39597fdbc3ce0e9f3b8cd2247b79523c809e54491b2e39461bfa74 files/digest-e-uae-0.8.29_pre20070223 271 +MD5 71cac33cab99c615336b5308bb92bb54 files/digest-e-uae-0.8.29_pre20070223-r1 271 +RMD160 d32bb222443c8d4d697bd4fd2e5be5f082df3094 files/digest-e-uae-0.8.29_pre20070223-r1 271 +SHA256 3157456aaa39597fdbc3ce0e9f3b8cd2247b79523c809e54491b2e39461bfa74 files/digest-e-uae-0.8.29_pre20070223-r1 271 diff --git a/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild b/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild new file mode 100644 index 000000000000..cbf21f3949d2 --- /dev/null +++ b/app-emulation/e-uae/e-uae-0.8.29_pre20070223-r1.ebuild @@ -0,0 +1,130 @@ +# 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_pre20070223-r1.ebuild,v 1.1 2007/02/26 07:19:26 pva Exp $ + +inherit eutils flag-o-matic + +my_ver=${PV%%_pre*} +snap_ver=${PV##*_pre} + +DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE" +HOMEPAGE="http://www.rcdrummond.net/uae/" +SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2" + +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 ) )" + +S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver} + +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}" + + epatch "${FILESDIR}"/${PN}-${my_ver}-${snap_ver}-filesys_fix.diff +} + +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" + + # 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/e-uae-0.8.29_pre20070223.ebuild b/app-emulation/e-uae/e-uae-0.8.29_pre20070223.ebuild deleted file mode 100644 index b811470466b0..000000000000 --- a/app-emulation/e-uae/e-uae-0.8.29_pre20070223.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# 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_pre20070223.ebuild,v 1.1 2007/02/25 18:50:29 pva Exp $ - -inherit eutils flag-o-matic - -my_ver=${PV%%_pre*} -snap_ver=${PV##*_pre} - -DESCRIPTION="The Ubiquitous Amiga Emulator with an emulation core largely based on WinUAE" -HOMEPAGE="http://www.rcdrummond.net/uae/" -SRC_URI="http://www.rcdrummond.net/uae/test/${snap_ver}/${PN}-${my_ver}-${snap_ver}.tar.bz2" - -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 ) )" - -S="${WORKDIR}"/${PN}-${my_ver}-${snap_ver} - -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_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" - - # 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_pre20070223 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223 deleted file mode 100644 index 520cc3c61735..000000000000 --- a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 21738a7aa9b37f934570c33a4b147c7b e-uae-0.8.29-20070223.tar.bz2 1087783 -RMD160 540edb66a91aa954aa4cc147fa9430abaa14f880 e-uae-0.8.29-20070223.tar.bz2 1087783 -SHA256 fe915e1792eb5e4e428cb1aab9a748021fd4e88c18c21f295360d7db535938fc e-uae-0.8.29-20070223.tar.bz2 1087783 diff --git a/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 new file mode 100644 index 000000000000..520cc3c61735 --- /dev/null +++ b/app-emulation/e-uae/files/digest-e-uae-0.8.29_pre20070223-r1 @@ -0,0 +1,3 @@ +MD5 21738a7aa9b37f934570c33a4b147c7b e-uae-0.8.29-20070223.tar.bz2 1087783 +RMD160 540edb66a91aa954aa4cc147fa9430abaa14f880 e-uae-0.8.29-20070223.tar.bz2 1087783 +SHA256 fe915e1792eb5e4e428cb1aab9a748021fd4e88c18c21f295360d7db535938fc e-uae-0.8.29-20070223.tar.bz2 1087783 diff --git a/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff b/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff new file mode 100644 index 000000000000..1f6b72863534 --- /dev/null +++ b/app-emulation/e-uae/files/e-uae-0.8.29-20070223-filesys_fix.diff @@ -0,0 +1,22 @@ +Index: src/main.c +=================================================================== +RCS file: /cvsroot/uaedev/uae/src/main.c,v +retrieving revision 1.51 +diff -u -r1.51 main.c +--- src/main.c 23 Feb 2007 02:07:58 -0000 1.51 ++++ src/main.c 25 Feb 2007 19:26:10 -0000 +@@ -912,9 +912,11 @@ + + set_inhibit_frame (IHF_QUIT_PROGRAM); + +- if (uae_target_state == UAE_STATE_COLD_START || uae_target_state == UAE_STATE_WARM_START) { +- filesys_prepare_reset (); +- } ++#ifdef FILESYS ++ /* Ensure any cached changes to virtual filesystem are flushed before ++ * resetting or exitting. */ ++ filesys_prepare_reset (); ++#endif + + } /* while (!QUITTING && !STOPPED) */ + -- cgit v1.2.3-65-gdbad