* [gentoo-commits] repo/gentoo:master commit in: app-emulation/fs-uae/files/, app-emulation/fs-uae/
@ 2019-07-21 20:58 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2019-07-21 20:58 UTC (permalink / raw
To: gentoo-commits
commit: 8da99c730e3f9737f875acdaf614bfcfc47da052
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 21 20:56:33 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Jul 21 20:56:33 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8da99c73
app-emulation/fs-uae: Version bump to 3.0.0
Closes: https://bugs.gentoo.org/689994
Package-Manager: Portage-2.3.69, Repoman-2.3.13
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
app-emulation/fs-uae/Manifest | 1 +
.../fs-uae/files/fs-uae-3.0.0-libmpeg2.patch | 48 +++++++++
app-emulation/fs-uae/fs-uae-3.0.0.ebuild | 117 +++++++++++++++++++++
3 files changed, 166 insertions(+)
diff --git a/app-emulation/fs-uae/Manifest b/app-emulation/fs-uae/Manifest
index 7ddd296728c..57bd86b287d 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 BLAKE2B 3d921446381b56d39410e4d68291c1cb696abd5e1b25105bdcc367c07112e79197d8267cfcb21f3f844cf5ac0a02a19ebec76611f34e747c6d03fefc2858a020 SHA512 1ccab4329a6b678a97f336b963bfaf9ea26bccccba31c90f1b7a8c2a6d3a9f343f9095733be744d4357495c808216d32c08a2bd8ce05bba73017147616d5e8cf
+DIST fs-uae-3.0.0.tar.gz 4841427 BLAKE2B 318bf457cca60e763a938d3d1a846e72a50f9b899dd8eefd79bc331f385a3529cb2bf2adc1616c1c5a04c1a1c92d4257c88593ada103d3e05847656a26a1c435 SHA512 3ceee2434b3aa3f545370a17149b3cda8d2eeb1bd093a45869a897a00b82ae4395efc52c129124e44262b47b7f56337e1adb9f58b0a1562efa73ee3ea3915b68
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 00000000000..ad77dab4cda
--- /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-3.0.0.ebuild b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
new file mode 100644
index 00000000000..376c782ca59
--- /dev/null
+++ b/app-emulation/fs-uae/fs-uae-3.0.0.ebuild
@@ -0,0 +1,117 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools xdg-utils
+
+DESCRIPTION="Integrates the most accurate Amiga emulation code available from WinUAE"
+HOMEPAGE="https://fs-uae.net/"
+SRC_URI="https://fs-uae.net/stable/${PV}/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="fmv glew"
+
+RDEPEND="
+ dev-libs/glib:2
+ media-libs/libpng:0=
+ media-libs/libsdl2[opengl]
+ media-libs/openal
+ virtual/opengl
+ x11-libs/libdrm
+ x11-libs/libX11
+ fmv? ( media-libs/libmpeg2 )
+ glew? ( media-libs/glew:0= )
+"
+
+DEPEND="
+ ${RDEPEND}
+ x11-base/xorg-proto
+"
+
+BDEPEND="
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
+)
+
+src_prepare() {
+ default
+ AT_NO_RECURSIVE=1 eautoreconf
+
+ # 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 libmpeg2/ libudis86/ || die
+}
+
+src_configure() {
+ # Qt and Udis86 are unused.
+ 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 \
+ --enable-jit \
+ --enable-jit-fpu \
+ --enable-netplay \
+ --enable-ncr \
+ --enable-ncr9x \
+ --enable-parallel-port \
+ --enable-prowizard \
+ --enable-savestate \
+ --enable-scp \
+ --enable-serial-port \
+ --enable-slirp \
+ --enable-softfloat \
+ --enable-qemu-cpu \
+ --enable-qemu-slirp \
+ --enable-uaenative \
+ --enable-uaenet \
+ --enable-uaescsi \
+ --enable-uaeserial \
+ --disable-udis86 \
+ --enable-vpar \
+ --enable-xml-shader \
+ --enable-zip \
+ --with-glad \
+ --without-qt \
+ $(use_with fmv libmpeg2) \
+ $(use_with glew)
+}
+
+src_install() {
+ default
+
+ # Needed for QEMU-UAE.
+ insinto /usr/include/uae
+ doins src/include/uae/{api,attributes,log,ppc,qemu,types}.h
+}
+
+pkg_postinst() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+
+ elog "Install app-emulation/fs-uae-launcher for a better graphical interface."
+}
+
+pkg_postrm() {
+ xdg_desktop_database_update
+ xdg_mimeinfo_database_update
+ xdg_icon_cache_update
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/fs-uae/files/, app-emulation/fs-uae/
@ 2021-10-18 16:31 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2021-10-18 16:31 UTC (permalink / raw
To: gentoo-commits
commit: 1a3cdc7e4e06d62b30c081c0e5c655414cb5a414
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 16:31:37 2021 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 16:31:37 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a3cdc7e
app-emulation/fs-uae: Fix 3.1.35 build on musl
Closes: https://bugs.gentoo.org/818757
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../fs-uae/files/fs-uae-3.1.35-deepbind.patch | 43 ++++++++++++++++++++++
app-emulation/fs-uae/fs-uae-3.1.35.ebuild | 1 +
2 files changed, 44 insertions(+)
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.35-deepbind.patch b/app-emulation/fs-uae/files/fs-uae-3.1.35-deepbind.patch
new file mode 100644
index 00000000000..0a60301772f
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.1.35-deepbind.patch
@@ -0,0 +1,43 @@
+From c5b02df4598c5fbe7a034b67ee06c506abeb3828 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Mon, 18 Oct 2021 10:22:09 +0100
+Subject: [PATCH] Don't assume RTLD_DEEPBIND is always present on Linux
+
+It's not supported by musl.
+---
+ configure.ac | 5 +++++
+ src/dlopen.cpp | 2 +-
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 6e41d68e..2cac2dac 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -655,6 +655,11 @@ AC_CHECK_FUNCS([gettimeofday])
+ AC_CHECK_DECLS([CLOCK_MONOTONIC], [], [], [#include <time.h>])
+
+
++# RTLD_DEEPBIND is not supported by all C libraries.
++
++AC_CHECK_DECLS([RTLD_DEEPBIND], [], [], [#include <dlfcn.h>])
++
++
+ # Check for POSIX support.
+
+ AS_CASE([$host_os],
+diff --git a/src/dlopen.cpp b/src/dlopen.cpp
+index f79c401b..14edbc02 100644
+--- a/src/dlopen.cpp
++++ b/src/dlopen.cpp
+@@ -22,7 +22,7 @@ UAE_DLHANDLE uae_dlopen(const TCHAR *path)
+ }
+ #ifdef _WIN32
+ result = LoadLibrary(path);
+-#elif defined(LINUX)
++#elif HAVE_DECL_RTLD_DEEPBIND == 1
+ result = dlopen(path, RTLD_NOW | RTLD_DEEPBIND);
+ #else
+ result = dlopen(path, RTLD_NOW);
+--
+2.32.0
+
diff --git a/app-emulation/fs-uae/fs-uae-3.1.35.ebuild b/app-emulation/fs-uae/fs-uae-3.1.35.ebuild
index d60ff90041d..be1afebd83d 100644
--- a/app-emulation/fs-uae/fs-uae-3.1.35.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.1.35.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
"${FILESDIR}"/${PN}-3.1.35-ar.patch
+ "${FILESDIR}"/${PN}-3.1.35-deepbind.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: app-emulation/fs-uae/files/, app-emulation/fs-uae/
@ 2022-04-17 9:41 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2022-04-17 9:41 UTC (permalink / raw
To: gentoo-commits
commit: c3d65847f6bf6ab9b8366eb6c5edcc381309b8ef
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 09:39:49 2022 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 09:41:15 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3d65847
app-emulation/fs-uae: Patch to fix musl build
Closes: https://bugs.gentoo.org/838469
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
.../fs-uae/files/fs-uae-3.1.66-musl.patch | 35 ++++++++++++++++++++++
app-emulation/fs-uae/fs-uae-3.1.66.ebuild | 1 +
2 files changed, 36 insertions(+)
diff --git a/app-emulation/fs-uae/files/fs-uae-3.1.66-musl.patch b/app-emulation/fs-uae/files/fs-uae-3.1.66-musl.patch
new file mode 100644
index 000000000000..cc78261ebe40
--- /dev/null
+++ b/app-emulation/fs-uae/files/fs-uae-3.1.66-musl.patch
@@ -0,0 +1,35 @@
+From 5d7287d1aa99f100e560b5a2d231e49b64a18da3 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Sun, 17 Apr 2022 10:29:22 +0100
+Subject: [PATCH] Don't return NULL in mapped_malloc when a bool is expected
+
+This was apparently breaking the build under musl.
+---
+ src/memory.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/memory.cpp b/src/memory.cpp
+index 3cd7dee6..18d1283a 100644
+--- a/src/memory.cpp
++++ b/src/memory.cpp
+@@ -1872,7 +1872,7 @@ bool mapped_malloc (addrbank *ab)
+ if (id == -1) {
+ nocanbang ();
+ if (recurse)
+- return NULL;
++ return false;
+ recurse++;
+ mapped_malloc (ab);
+ recurse--;
+@@ -1904,7 +1904,7 @@ bool mapped_malloc (addrbank *ab)
+ return ab->baseaddr != NULL;
+ }
+ if (recurse)
+- return NULL;
++ return false;
+ nocanbang ();
+ recurse++;
+ mapped_malloc (ab);
+--
+2.34.1
+
diff --git a/app-emulation/fs-uae/fs-uae-3.1.66.ebuild b/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
index 5cb3b91f1ede..2853da73fb7d 100644
--- a/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
+++ b/app-emulation/fs-uae/fs-uae-3.1.66.ebuild
@@ -41,6 +41,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-3.0.0-libmpeg2.patch
"${FILESDIR}"/${PN}-3.0.0-Xatom.h.patch
"${FILESDIR}"/${PN}-3.1.35-deepbind.patch
+ "${FILESDIR}"/${PN}-3.1.66-musl.patch
)
src_prepare() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-04-17 9:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-07-21 20:58 [gentoo-commits] repo/gentoo:master commit in: app-emulation/fs-uae/files/, app-emulation/fs-uae/ James Le Cuirot
-- strict thread matches above, loose matches on Subject: below --
2021-10-18 16:31 James Le Cuirot
2022-04-17 9:41 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox