public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "James Le Cuirot" <chewi@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/
Date: Tue, 26 Oct 2021 12:12:03 +0000 (UTC)	[thread overview]
Message-ID: <1635250289.1fb68a666be96f0ceaedd843d4c5437fab14e1a5.chewi@gentoo> (raw)

commit:     1fb68a666be96f0ceaedd843d4c5437fab14e1a5
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 26 12:11:29 2021 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Oct 26 12:11:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1fb68a66

games-emulation/dosbox: Fix 0.75_pre4302 with USE="-alsa glide"

Closes: https://bugs.gentoo.org/780015
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>

 games-emulation/dosbox/dosbox-0.75_pre4302.ebuild      |  2 +-
 .../dosbox/files/dosbox-0.75-glide-libdl.patch         | 18 ++++++++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
index 8ae6d980d50..4cf2a4a4d98 100644
--- a/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
+++ b/games-emulation/dosbox/dosbox-0.75_pre4302.ebuild
@@ -54,7 +54,7 @@ PATCHES=(
 )
 
 src_prepare() {
-	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff
+	use glide && eapply "${DISTDIR}"/dosbox_glide-${GLIDE_PATCH}.diff "${FILESDIR}"/${PN}-0.75-glide-libdl.patch
 	default
 	eautoreconf
 }

diff --git a/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch b/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch
new file mode 100644
index 00000000000..524c5839672
--- /dev/null
+++ b/games-emulation/dosbox/files/dosbox-0.75-glide-libdl.patch
@@ -0,0 +1,18 @@
+https://github.com/voyageur/openglide/pull/25
+
+diff -Naur dosbox.orig/configure.ac dosbox/configure.ac
+--- dosbox.orig/configure.ac	2021-10-26 13:06:35.585761330 +0100
++++ dosbox/configure.ac	2021-10-26 13:07:31.641323631 +0100
+@@ -20,6 +20,12 @@
+ AC_PROG_RANLIB
+ AM_PROG_AR
+
++dnl The dlopen() function is in the C library for *BSD and in
++dnl libdl on GLIBC-based systems
++AC_SEARCH_LIBS([dlopen], [dl dld], [], [
++  AC_MSG_ERROR([unable to find the dlopen() function])
++])
++
+ dnl Some needed libaries for OS2
+ dnl perharps join this with the other target depended checks. move them upwards
+ if test x$host = xi386-pc-os2-emx ; then


             reply	other threads:[~2021-10-26 12:12 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-26 12:12 James Le Cuirot [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-02-14 12:21 [gentoo-commits] repo/gentoo:master commit in: games-emulation/dosbox/files/, games-emulation/dosbox/ James Le Cuirot
2020-06-06  8:47 Sergei Trofimovich
2020-01-05 20:58 James Le Cuirot
2020-01-01 22:56 James Le Cuirot
2016-06-29 20:14 William Hubbs
2016-06-28 14:51 Michael Sterrett
2016-06-28  8:22 Austin English

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1635250289.1fb68a666be96f0ceaedd843d4c5437fab14e1a5.chewi@gentoo \
    --to=chewi@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox