diff options
Diffstat (limited to 'app-emulation/fs-uae')
-rw-r--r-- | app-emulation/fs-uae/Manifest | 6 | ||||
-rw-r--r-- | app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch | 36 | ||||
-rw-r--r-- | app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch | 48 | ||||
-rw-r--r-- | app-emulation/fs-uae/fs-uae-3.0.0.ebuild (renamed from app-emulation/fs-uae/fs-uae-2.8.3.ebuild) | 15 |
4 files changed, 59 insertions, 46 deletions
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest index 1d5e8792ef26..d909494b1d87 100644 --- a/app-emulation/fs-uae/Manifest +++ b/app-emulation/fs-uae/Manifest @@ -1,4 +1,4 @@ -AUX fs-uae-2.8.3-libmpeg2.patch 1094 BLAKE2B a06d43e624cf254f21cddf73f010b5255609ac42d4c02b6ed65ce62581b6ff6c2d23e3fc184795f49cfb33fc518a0bc931102764ec4c86adfc24a74008136fe3 SHA512 ba4cc78a57d806cded8ee18076888b75ef4ecf55f0dc1a1fdc0d3186f1be58e0ffb6b46f8dd3a090775707ffc1d0a219830457af9d2b5f8c8ceec6005ba34c9d -DIST fs-uae-2.8.3.tar.gz 5017047 BLAKE2B 3d921446381b56d39410e4d68291c1cb696abd5e1b25105bdcc367c07112e79197d8267cfcb21f3f844cf5ac0a02a19ebec76611f34e747c6d03fefc2858a020 SHA512 1ccab4329a6b678a97f336b963bfaf9ea26bccccba31c90f1b7a8c2a6d3a9f343f9095733be744d4357495c808216d32c08a2bd8ce05bba73017147616d5e8cf -EBUILD fs-uae-2.8.3.ebuild 2376 BLAKE2B ff74f28954ff805502fceac894d0e4a55d34983af8262924d1c0b6136d8a7bbf408a8fd8e52629f70e3371ff4d2b245d334f5d4bd97d0a32e1e76e0d1cf5df44 SHA512 55969c91529ab07a139400e4efd16b8afc137ccfaf52f8f2fde47482e56fb718ab0a2b6155397e843a0da9e707fdafc3178a244bf8cb6309e4ae14bfa385e425 +AUX fs-uae-3.0.0-libmpeg2.patch 1078 BLAKE2B 119d797854beb0148af9a77003b7b06696d9a474645ff15181044dcffd783a91f89a66cf90b072603c4f324b95a4a0cf124abefc6adc71b9be4b8a92f36060ac SHA512 8624c3404b627321a2b6673271be27daa24924a8c56903c870fd5a6f2dc50c18fd97810a1aab3cd684a5a97544c1e64f68c855c822d3e5bb5981faf264d28ae7 +DIST fs-uae-3.0.0.tar.gz 4841427 BLAKE2B 318bf457cca60e763a938d3d1a846e72a50f9b899dd8eefd79bc331f385a3529cb2bf2adc1616c1c5a04c1a1c92d4257c88593ada103d3e05847656a26a1c435 SHA512 3ceee2434b3aa3f545370a17149b3cda8d2eeb1bd093a45869a897a00b82ae4395efc52c129124e44262b47b7f56337e1adb9f58b0a1562efa73ee3ea3915b68 +EBUILD fs-uae-3.0.0.ebuild 2381 BLAKE2B cb6322fdb9c6308d7bc23aa81a3b547207e79c3268b86e04e663b580750df4157b4c861ef4e055ab19c142bac962698f7a9d318eefaf67abe0aa426c8c307ae4 SHA512 83e2a675df0ea3e94924b26d3e8a88bda0e4e178f5c63580c733750f2f22c8b26e69b1777996b5809e8e5d91213eeb61eed3e222143b4c9b8ffc072f82938e4a MISC metadata.xml 533 BLAKE2B 5082ca2fc578b6fcb5a13825c2264a0c1cd6c227f8d85d1d8dfd056bd12b54784b90dca1b7e61c8d127c5d06dfb1b5a45f97125831f6ef42804a00d8fd992b2d SHA512 84eb6bf83f3ccfe871a33517117968f8aaae75a3af79ab29f96f3bff839badbd9c16c1296b1693e8c293e5a1363de12e650c0406b8dbbb1026e64acea5bbd745 diff --git a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch deleted file mode 100644 index 660cd2fc9036..000000000000 --- a/app-emulation/fs-uae/files/fs-uae-2.8.3-libmpeg2.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 5937f7587de5b96cbab120e99b6ae3a0cd722c53 Mon Sep 17 00:00:00 2001 -From: James Le Cuirot <chewi@gentoo.org> -Date: Fri, 19 Apr 2019 21:56:58 +0100 -Subject: [PATCH] Only run configure in libmpeg2 when using built-in version - ---- - configure.ac | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 39958ad..941391a 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -200,7 +200,7 @@ AS_IF([test "x$with_glew" = xyes], [ - ]) - - AC_ARG_WITH(libmpeg2, AS_HELP_STRING( -- [--without-libmpeg2], [or --with-libmpeg=builtin to use included version])) -+ [--without-libmpeg2], [or --with-libmpeg2=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], [ -@@ -776,7 +776,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip], - - AC_DEFINE([FPU_UAE], [1], [Define to 1]) - --AC_CONFIG_SUBDIRS([libmpeg2]) -+AS_IF([test "x$with_libmpeg2" = xbuiltin], [ -+ AC_CONFIG_SUBDIRS([libmpeg2]) -+]) - - # Write Makefile - --- -2.20.1 - diff --git a/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch b/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch new file mode 100644 index 000000000000..ad77dab4cdab --- /dev/null +++ b/app-emulation/fs-uae/files/fs-uae-3.0.0-libmpeg2.patch @@ -0,0 +1,48 @@ +From b10a8c60fb2cc4d80eb5a95591a9e79681f7830a Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Fri, 19 Apr 2019 21:56:58 +0100 +Subject: [PATCH] Only run configure in libmpeg2 when using built-in version + +--- + Makefile.am | 3 +++ + configure.ac | 4 +++- + 2 files changed, 6 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 66356baa..eece9f1e 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,6 +1,7 @@ + # Makefile.am for FS-UAE + + SUBDIRS = ++DIST_SUBDIRS = + + WARNINGS = + +@@ -1262,6 +1263,7 @@ endif + + if BUILTIN_LIBMPEG2 + SUBDIRS += libmpeg2 ++DIST_SUBDIRS += libmpeg2 + AM_CPPFLAGS += -I$(s)/libmpeg2/include + fs_uae_LDADD += \ + libmpeg2/libmpeg2/.libs/libmpeg2.a \ +diff --git a/configure.ac b/configure.ac +index 5dd3bfbd..4d4849fd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -801,7 +801,9 @@ OPT_FEATURE([A_ZIP], [zip], [zip], + + AC_DEFINE([FPU_UAE], [1], [Define to 1]) + +-AC_CONFIG_SUBDIRS([libmpeg2]) ++AS_IF([test "x$with_libmpeg2" = xbuiltin], [ ++ AC_CONFIG_SUBDIRS([libmpeg2]) ++]) + + # Write Makefile + +-- +2.21.0 + diff --git a/app-emulation/fs-uae/fs-uae-2.8.3.ebuild b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild index 698c12210c57..376c782ca59f 100644 --- a/app-emulation/fs-uae/fs-uae-2.8.3.ebuild +++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild @@ -27,6 +27,7 @@ RDEPEND=" DEPEND=" ${RDEPEND} + x11-base/xorg-proto " BDEPEND=" @@ -35,18 +36,18 @@ BDEPEND=" " PATCHES=( - "${FILESDIR}"/${PN}-2.8.3-libmpeg2.patch + "${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch ) src_prepare() { default AT_NO_RECURSIVE=1 eautoreconf - # Ensure bundled libraries are not used. GLee and Udis86 are unused + # Ensure bundled libraries are not used. Udis86 is unused # regardless. Only FLAC headers are bundled and the library is never # used? Lua is bundled but differs from upstream. We keep the # default of disabling the Lua feature anyway as it is unfinished. - rm -r glee/ libmpeg2/ libudis86/ || die + rm -r libmpeg2/ libudis86/ || die } src_configure() { @@ -67,18 +68,18 @@ src_configure() { --enable-gfxboard \ --enable-jit \ --enable-jit-fpu \ - --enable-ncr9x \ - --enable-ncr \ --enable-netplay \ + --enable-ncr \ + --enable-ncr9x \ --enable-parallel-port \ --enable-prowizard \ - --enable-qemu-cpu \ - --enable-qemu-slirp \ --enable-savestate \ --enable-scp \ --enable-serial-port \ --enable-slirp \ --enable-softfloat \ + --enable-qemu-cpu \ + --enable-qemu-slirp \ --enable-uaenative \ --enable-uaenet \ --enable-uaescsi \ |