app-emulation/fs-uae[-launcher] : Added development version 2.9.6

7 files changed, 232 insertions, 0 deletions

diff --git a/app-emulation/fs-uae-launcher/Manifest b/app-emulation/fs-uae-launcher/Manifest
index c170275..2fd0c9e 100644
--- a/app-emulation/fs-uae-launcher/Manifest
+++ b/app-emulation/fs-uae-launcher/Manifest
@@ -1 +1,2 @@
 DIST fs-uae-launcher-2.8.3.tar.gz 8784242 SHA256 8ce764031013516daab76e996eff9e9fdead6c0f00b4e497fc927f7719d8a233 SHA512 4eaa5979fe2e8f2c792d4878e9a9ad0a0433206aac42aa380d97aee21e4ba29a54caced2437b83357c2c4d2fab121bfb821fdb8a883ead971766866b02067a2d WHIRLPOOL 411349bb6ffa1ed1f9fa7ab9b89cdba1b0b4ed8fc98e3102b5e88464f66dfe7015c56a84ab66bb9f1f959ee4268dd29ae93023b88e24005fede80f6c40633052
+DIST fs-uae-launcher-2.9.6dev.tar.gz 9970136 SHA256 0b05819004de8be63d276d3e0d287da6928b9556d27ed576a4c53af2405689d4 SHA512 7a34842ebb4c6628340466c7c5e6ccb7e75d485935757b5d2ddd28fe48a878b7c203cae7eed8f0f920a8d76e8fd9c88a8d3f8fb8090f943461779067fb075f0e WHIRLPOOL 999e716a6eec467de90530364b8355981818d0594ce36ea146b4c2681ed1b2e12dbf050e4278d5fe5ff4253c48d6b41d552fee17dd5bf8766629a636747509b2
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.9.6-German-ROMs.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.9.6-German-ROMs.patch
new file mode 100644
index 0000000..41843d5
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.9.6-German-ROMs.patch
@@ -0,0 +1,21 @@
+--- a/fsgs/amiga/roms.py	2017-07-06 16:50:33.351036624 +0200
++++ b/fsgs/amiga/roms.py	2017-07-06 16:52:58.335040977 +0200
+@@ -11,6 +11,8 @@
+     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[!]
+     # Kickstart v1.3 r34.5 (1987)(Commodore)(A500-A1000-A2000-CDTV)[o] (patch)
+     "891e9a547772fe0c6c19b610baf8bc4ea7fcb785",
++    # kick13.rom - from Upgrade Commodore Amiga 500 (1989)
++    "90933936cce43ca9bc6bf375662c076b27e3c458",
+ ]
+ 
+ A500P_KICKSTARTS = [
+@@ -55,6 +57,9 @@
+ 
+     # Kickstart v3.1 r40.68 (1993)(Commodore)(A4000)[h Cloanto]
+     # "c3c481160866e60d085e436a24db3617ff60b5f9",
++
++    # Kickstart v3.1 r40.10 (15.7.93) from german A4000
++    "3b7f1493b27e212830f989f26ca76c02049f09ca",
+ ]
+ 
+ CD32_KICKSTARTS = [
diff --git a/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.9.6-Makefile.patch b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.9.6-Makefile.patch
new file mode 100644
index 0000000..46f06af
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/files/fs-uae-launcher-2.9.6-Makefile.patch
@@ -0,0 +1,23 @@
+--- a/Makefile	2017-07-06 14:58:57.292835593 +0200
++++ b/Makefile	2017-07-06 15:11:42.309858561 +0200
+@@ -3,8 +3,8 @@
+ dist_name = fs-uae-launcher-$(version)
+ dist_dir := $(build_dir)/$(dist_name)
+ 
+-DESTDIR :=
+-prefix := /usr/local
++DESTDIR ?=
++prefix := $(PREFIX)
+ 
+ ifeq ($(wildcard OpenGL),)
+ 	OpenGL_dir := "."
+@@ -118,9 +118,6 @@
+ 	mkdir -p $(DESTDIR)$(prefix)/share
+ 	cp -a share/* $(DESTDIR)$(prefix)/share
+ 
+-	mkdir -p $(DESTDIR)$(prefix)/share/doc/fs-uae-launcher
+-	cp -a README COPYING $(DESTDIR)$(prefix)/share/doc/fs-uae-launcher
+-
+ install: install-data install-program
+ 
+ dist_dir := fs-uae-launcher-$(version)
diff --git a/app-emulation/fs-uae-launcher/fs-uae-launcher-2.9.6.ebuild b/app-emulation/fs-uae-launcher/fs-uae-launcher-2.9.6.ebuild
new file mode 100644
index 0000000..7893106
--- /dev/null
+++ b/app-emulation/fs-uae-launcher/fs-uae-launcher-2.9.6.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit eutils python-r1
+
+DESCRIPTION="PyQT5 based Launcher for FS-UAE."
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/devel/${PV}dev/${P}dev.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	${PYTHON_DEPS}
+	app-emulation/fs-uae
+	dev-python/PyQt5
+"
+
+DEPEND="${RDEPEND}
+"
+
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-Makefile.patch
+	"${FILESDIR}"/${P}-German-ROMs.patch
+)
+
+DOCS=( COPYING README )
+
+S="${S}dev"
+
+src_compile() {
+	emake PREFIX="${EPREFIX}/usr"
+}
+
+src_install() {
+	einstalldocs
+	emake install PREFIX="${EPREFIX}/usr" DESTDIR="${D}"
+}
+
+pkg_postinst() {
+	einfo "Some important information:"
+	einfo
+	einfo " - Do not use QtCurve, it will crash PyQt5!"
+	einfo
+	einfo " - By default, FS-UAE creates its directories under"
+	einfo "   Documents/FS-UAE. If your Documents directory is not"
+	einfo "   configured according to the XDG user dir spec, ~/FS-UAE"
+	einfo "   will be used as a fallback."
+	einfo
+	einfo " - You can override this by putting the path to the desired base"
+	einfo "   directory in a special config file. The config file will be"
+	einfo "   read by both FS-UAE and FS-UAE Launcher if it exists:"
+	einfo "     ~/.config/fs-uae/base-dir"
+	einfo "   Alternatively, you can start FS-UAE and/or FS-UAE Launcher"
+	einfo "   with --base-dir=/path/to/desired/dir"
+}
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 60d417a..1e522e3 100644
--- a/app-emulation/fs-uae/Manifest
+++ b/app-emulation/fs-uae/Manifest
@@ -1 +1,2 @@
 DIST fs-uae-2.8.3.tar.gz 5017047 SHA256 e2d5414d07c8bd5b740716471183bc5516bec0ae2989449c3026374dc4b86292 SHA512 1ccab4329a6b678a97f336b963bfaf9ea26bccccba31c90f1b7a8c2a6d3a9f343f9095733be744d4357495c808216d32c08a2bd8ce05bba73017147616d5e8cf WHIRLPOOL 39f5a839a021ed28647a1d9fe0ec67fdba6b31482daddedfccb6b1a79178fc249f1ddbd791387d313bce717e6bb3fabc97bda24454b90618e0c2bf9ec484801e
+DIST fs-uae-2.9.6dev.tar.gz 5042852 SHA256 ea464f3d092f72dd607df3911599ea1ad68dce88c6ca22878dc5fe7467375947 SHA512 e1135e08a47daab9eacf8a42befeee06c39b7c31ad67272e7a00782488a1aa4ab199f7b70ea4ecbabb67ac80adf855c0db75e3c4dfba8e80f44ced4850128e89 WHIRLPOOL 35d207564cb49ea4efc4ac3a7377dc93a5f346d9a606290a64f0f97c1f769162523004d6e8ba68b6bf363ee89bda6a428ae8e447f1dd1bea895685adb448a44b
diff --git a/app-emulation/fs-uae/files/fs-uae-2.9.6_libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-2.9.6_libmpeg2.patch
new file mode 100644
index 0000000..6216117
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-2.9.6_libmpeg2.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac	2017-07-06 06:57:02.138151321 +0200
++++ b/configure.ac	2017-07-06 07:01:33.440159466 +0200
+@@ -177,13 +177,14 @@
+     AC_DEFINE([WITH_GLEW], [1], [Define to 1 to use GLEW])
+ ])
+ 
++have_libmpeg2=no
+ AC_ARG_WITH(libmpeg2, AS_HELP_STRING(
+     [--without-libmpeg2], [or --with-libmpeg=builtin to use included version]))
+ AM_CONDITIONAL([BUILTIN_LIBMPEG2], [test x$with_libmpeg2 = xbuiltin])
+ AS_IF([test "x$with_libmpeg2" != xno], [
+     AS_IF([test "x$with_libmpeg2" = xbuiltin], [
+     ], [
+-        PKG_CHECK_MODULES([LIBMPEG2], [libmpeg2 libmpeg2convert])
++        PKG_CHECK_MODULES([LIBMPEG2], [libmpeg2 libmpeg2convert], [have_libmpeg2=yes])
+     ])
+     AC_DEFINE([WITH_LIBMPEG2], [1], [Define to 1 to use libmpeg2])
+ ])
+@@ -750,7 +751,11 @@
+ 
+ AC_DEFINE([FPU_UAE], [1], [Define to 1])
+ 
+-AC_CONFIG_SUBDIRS([libmpeg2])
++AS_IF([test "x$have_libmpeg2" != xyes], [
++    AS_IF([test "x$with_libmpeg2" = xbuiltin], [
++        AC_CONFIG_SUBDIRS([libmpeg2])
++    ])
++])
+ 
+ # Write Makefile
+ 
diff --git a/app-emulation/fs-uae/fs-uae-2.9.6.ebuild b/app-emulation/fs-uae/fs-uae-2.9.6.ebuild
new file mode 100644
index 0000000..0cab0ec
--- /dev/null
+++ b/app-emulation/fs-uae/fs-uae-2.9.6.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="FS-UAE integrates the most accurate Amiga emulation code available from WinUAE."
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/devel/${PV}dev/${P}dev.tar.gz"
+LICENSE="GPL-2"
+KEYWORDS=""
+SLOT="0"
+IUSE="drivers glew qt5"
+
+RDEPEND="
+	glew?	( media-libs/glew:0 )
+	qt5?	( dev-qt/qtgui:5 )
+	media-libs/libmpeg2
+	media-libs/libpng:0
+	media-libs/libsdl2[opengl]
+	media-libs/openal
+	virtual/opengl
+	x11-libs/libdrm
+	x11-libs/libX11
+"
+
+DEPEND="sys-devel/gettext
+	${RDEPEND}
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_libmpeg2.patch
+)
+
+S="${S}dev"
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf	--enable-a2065 \
+		--enable-action-replay \
+		--enable-aga \
+		--enable-arcadia \
+		--enable-bsdsocket \
+		--enable-caps \
+		--enable-cd32 \
+		--enable-cdtv \
+		--enable-codegen \
+		--enable-dms \
+		--enable-drivesound \
+		--enable-fdi2raw \
+		--enable-gfxboard \
+		--with-glad \
+		--enable-jit \
+		--enable-jit-fpu \
+		--enable-ncr9x \
+		--enable-ncr \
+		--enable-netplay \
+		--enable-parallel-port \
+		--enable-prowizard \
+		--enable-qemu-cpu \
+		--enable-qemu-slirp \
+		--enable-savestate \
+		--enable-scp \
+		--enable-serial-port \
+		--enable-slirp \
+		--enable-softfloat \
+		--with-libmpeg2 \
+		--enable-uaenative \
+		--enable-uaenet \
+		--enable-uaescsi \
+		--enable-uaeserial \
+		--enable-udis86 \
+		--enable-vpar \
+		--enable-xml-shader \
+		--enable-zip \
+		$(use_enable drivers) \
+		$(use_with glew) \
+		$(use_with qt5 qt)
+}
+
+pkg_postinst() {
+	elog
+	elog "Install app-emulation/fs-uae-launcher for a graphical interface."
+	elog
+}