From f3feab49c638b91f0654a1d701cedd3ce4571fd1 Mon Sep 17 00:00:00 2001 From: kenmays Date: Tue, 14 May 2019 10:43:34 -0700 Subject: [PATCH] euae: Add x86_64 and fixed GUI build (#3831) --- app-emulation/euae/euae-0.8.29~wip4.recipe | 87 ++++++++++++------- .../euae/patches/euae-0.8.29~wip4.patchset | 75 ++++++++++++++++ 2 files changed, 133 insertions(+), 29 deletions(-) create mode 100644 app-emulation/euae/patches/euae-0.8.29~wip4.patchset diff --git a/app-emulation/euae/euae-0.8.29~wip4.recipe b/app-emulation/euae/euae-0.8.29~wip4.recipe index 7f312ae22..e3dfbb3ea 100644 --- a/app-emulation/euae/euae-0.8.29~wip4.recipe +++ b/app-emulation/euae/euae-0.8.29~wip4.recipe @@ -24,58 +24,87 @@ have an Amiga from which you can legally make a ROM image, a selection of ROM \ images are available for purchase online from Cloanto - publishers of the \ Amiga Forever distribution." HOMEPAGE="https://www.rcdrummond.net/uae/" -COPYRIGHT="2004-2019 Richard Drummond" +COPYRIGHT="2004-2007 Richard Drummond" LICENSE="GNU GPL v2" -REVISION="2" +REVISION="3" SOURCE_URI="http://www.rcdrummond.net/uae/e-uae-0.8.29-WIP4/e-uae-0.8.29-WIP4.tar.bz2" CHECKSUM_SHA256="9828cb0fca783160bcb33900d0254f4bdaade1c9a41256e5f298e973d0c07456" SOURCE_DIR="e-uae-0.8.29-WIP4" +PATCHES="euae-0.8.29~wip4.patchset" -ARCHITECTURES="x86_gcc2" +ARCHITECTURES="!x86_gcc2 x86_64 ?arm" +SECONDARY_ARCHITECTURES="x86" + +commandBinDir=$binDir +commandSuffix=$secondaryArchSuffix +if [ "$targetArchitecture" = x86_gcc2 ] +then + commandBinDir=$prefix/bin + commandSuffix= +fi PROVIDES=" - euae = $portVersion - cmd:readdisk - cmd:uae + euae$secondaryArchSuffix = $portVersion + cmd:readdisk$commandSuffix + cmd:uae$commandSuffix " REQUIRES=" - haiku - lib:libbz2 - lib:libGL - lib:libglu - lib:libpng - lib:libSDL_1.2 - lib:libsdl_sound - lib:libxml2 - lib:libz + haiku$secondaryArchSuffix + lib:libbz2$secondaryArchSuffix + lib:libGL$secondaryArchSuffix + lib:libglu$secondaryArchSuffix + lib:libncurses$secondaryArchSuffix + lib:libpng16$secondaryArchSuffix + lib:libSDL_1.2$secondaryArchSuffix + lib:libsdl_sound$secondaryArchSuffix + lib:libxml2$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" - haiku_devel - devel:libbz2 - devel:libGL - devel:libglu - devel:libpng - devel:libsdl - devel:libsdl_sound - devel:libxml2 - devel:libz + haiku${secondaryArchSuffix}_devel + devel:libbz2$secondaryArchSuffix + devel:libGL$secondaryArchSuffix + devel:libglu$secondaryArchSuffix + devel:libncurses$secondaryArchSuffix + devel:libpng16$secondaryArchSuffix + devel:libsdl$secondaryArchSuffix + devel:libsdl_sound$secondaryArchSuffix + devel:libxml2$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:autoreconf cmd:awk cmd:bison cmd:flex - cmd:gcc - cmd:libtoolize + cmd:gcc$secondaryArchSuffix + cmd:libtoolize$secondaryArchSuffix cmd:make cmd:perl - cmd:pkg_config + cmd:pkg_config$secondaryArchSuffix " +defineDebugInfoPackage euae$secondaryArchSuffix \ + $commandBinDir/readdisk \ + $commandBinDir/uae \ + BUILD() { - runConfigure ./configure --with-sdl --with-sdl-gfx --with-sdl-sound \ - --enable-threads --build=i586-beos --enable-audio --enable-jit --disable-bsdsock + autoreconf -vfi + runConfigure --omit-dirs "binDir sbinDir" ./configure \ + --bindir="$commandBinDir" \ + --sbindir="$commandBinDir" \ + --with-sdl \ + --with-sdl-gfx \ + --with-sdl-sound \ + --with-sdl-gl \ + --with-curses \ + --enable-threads \ + --enable-audio \ + --enable-jit \ + --disable-bsdsock \ + --disable-dependency-tracking make $jobArgs } diff --git a/app-emulation/euae/patches/euae-0.8.29~wip4.patchset b/app-emulation/euae/patches/euae-0.8.29~wip4.patchset new file mode 100644 index 000000000..b91d55114 --- /dev/null +++ b/app-emulation/euae/patches/euae-0.8.29~wip4.patchset @@ -0,0 +1,75 @@ +From ee861ed5a5a6c940f320eaef2d6a82411ccfef21 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 4 May 2019 19:53:56 +0200 +Subject: e-uae-0.8.29_rc4-no_schily.patch from gentoo portage + + +diff --git a/configure.in b/configure.in +index 12a1f91..8d4b3a7 100644 +--- a/configure.in ++++ b/configure.in +@@ -1162,13 +1162,7 @@ typedef int BOOL; + SCSIOBJS="scsiemul.o blkdev.o blkdev-libscg.o" + UAE_DEFINES="$UAE_DEFINES -DSCSIEMU" + NEED_THREAD_SUPPORT=yes +- if [[ "$srcdir" != "." ]]; then +- AC_CONFIG_LINKS(src/libscg.a:src/libscg.a) +- AC_CONFIG_LINKS(src/libschily.a:src/libschily.a) +- UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS" +- else +- UAE_LIBS="$UAE_LIBS -L. $SCGLIBS" +- fi ++ UAE_LIBS="$UAE_LIBS $LIBSCG_LIBS" + ], + [ + AC_MSG_RESULT(no) +-- +2.21.0 + + +From 75f22cb773872c2a684eeb004a2c2dca8338be98 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 4 May 2019 19:56:22 +0200 +Subject: e-uae-0.8.29_rc4-high-cpu-usage.patch from gentoo portage + + +diff --git a/src/sd-none/sound.c b/src/sd-none/sound.c +index 6351143..6ffe4fe 100644 +--- a/src/sd-none/sound.c ++++ b/src/sd-none/sound.c +@@ -30,10 +30,6 @@ void close_sound (void) + { + } + +-void update_sound (int freq) +-{ +-} +- + void reset_sound (void) + { + } +-- +2.21.0 + + +From a67e92a02e61471698283169cb5863b370c14d67 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= +Date: Sat, 4 May 2019 20:19:32 +0200 +Subject: AC_PROG_OBJC fix + + +diff --git a/configure.in b/configure.in +index 8d4b3a7..b6cb160 100644 +--- a/configure.in ++++ b/configure.in +@@ -17,6 +17,7 @@ dnl + AC_PROG_CC + AC_PROG_CPP + AC_PROG_CXX ++AC_PROG_OBJC + AS_PROG_OBJC + AM_PROG_AS + AC_PROG_MAKE_SET +-- +2.21.0 +