public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/
Date: Tue,  6 Apr 2021 18:18:37 +0000 (UTC)	[thread overview]
Message-ID: <1617733106.c86aad600713909bf09a46ff9dba170c9b16df36.sam@gentoo> (raw)

commit:     c86aad600713909bf09a46ff9dba170c9b16df36
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  6 03:34:07 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr  6 18:18:26 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c86aad60

media-libs/libsdl: disable (some) broken features on Darwin

We can't get all the way there, but some features
can't be built right now for sure, so let's
disable those.

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
index 4b61e3b581f..65181ee97dc 100644
--- a/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
+++ b/media-libs/libsdl/libsdl-1.2.15_p20210224.ebuild
@@ -74,11 +74,34 @@ HTML_DOCS=( {docs,VisualC}.html docs/{html,images,index.html} )
 
 src_prepare() {
 	default
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# GCC at least has no idea what -fpascal-strings is
+		sed -i -e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -fpascal-strings"/d' configure.ac || die
+		# We have trouble building against Frameworks with GCC for now (no Blocks support, etc)
+		# error: unknown type name ‘CGImageSourceAnimationBlock’
+		sed -i \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_CARBON"/d' \
+			-e '/EXTRA_CFLAGS="$EXTRA_CFLAGS -DTARGET_API_MAC_OSX"/d' \
+			configure.ac || die
+	fi
+
 	AT_M4DIR="${EPREFIX}/usr/share/aclocal acinclude" eautoreconf
 }
 
 multilib_src_configure() {
 	local myconf=
+
+	if $(tc-is-gcc) && [[ ${CHOST} == *-darwin* ]] ; then
+		# We can't build against Cocoa because we lack Blocks + Objective C++ support in
+		# GCC (for now)
+		use video && myconf="${myconf} --disable-video-cocoa"
+		# CD support drags in audio
+		myconf="${myconf} --disable-cdrom"
+	else
+		myconf="${myconf} --enable-cdrom"
+	fi
+
 	if use !x86 && use !x86-linux ; then
 		myconf="${myconf} --disable-nasm"
 	else
@@ -96,7 +119,6 @@ multilib_src_configure() {
 		--disable-arts \
 		--disable-esd \
 		--enable-events \
-		--enable-cdrom \
 		--enable-threads \
 		--enable-timers \
 		--enable-file \


             reply	other threads:[~2021-04-06 18:18 UTC|newest]

Thread overview: 71+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-04-06 18:18 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-22  4:45 [gentoo-commits] repo/gentoo:master commit in: media-libs/libsdl/ Ionen Wolkens
2024-02-03 19:09 Sam James
2024-02-03 19:09 Sam James
2024-02-03  6:56 Sam James
2024-02-02  4:44 Sam James
2024-02-02  4:44 Sam James
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-27 20:06 Ionen Wolkens
2024-01-15  3:32 Ionen Wolkens
2024-01-12 11:59 Sam James
2023-12-22  5:14 Ionen Wolkens
2023-12-20  2:34 Ionen Wolkens
2023-12-17 23:55 Ionen Wolkens
2023-12-11  4:33 Arthur Zamarin
2023-12-10  1:38 Ionen Wolkens
2023-09-27  3:32 Sam James
2023-08-13 17:56 Andreas Sturmlechner
2023-08-01 15:42 Sam James
2023-07-02 17:31 Sam James
2023-07-02 12:10 Sam James
2023-06-12  6:01 Arthur Zamarin
2023-06-03  7:09 WANG Xuerui
2023-05-27 14:41 Pacho Ramos
2023-05-03 13:04 Arthur Zamarin
2023-05-03 12:27 Sam James
2023-05-03 11:56 Sam James
2023-05-03 11:34 Jakov Smolić
2023-05-03 11:32 Arthur Zamarin
2023-05-03 11:22 Sam James
2023-03-04 13:51 Arthur Zamarin
2023-01-13 18:48 Arthur Zamarin
2023-01-13 13:01 Arthur Zamarin
2023-01-13 12:32 Arthur Zamarin
2023-01-13 12:20 Arthur Zamarin
2023-01-08 23:56 James Le Cuirot
2023-01-08 23:56 James Le Cuirot
2022-12-18 20:32 Arthur Zamarin
2022-12-16  4:40 Sam James
2022-11-18  5:52 Sam James
2022-11-18  5:52 Sam James
2022-05-17 14:18 WANG Xuerui
2021-10-16  7:52 James Le Cuirot
2021-09-12 20:20 Ionen Wolkens
2021-05-25 14:21 Yixun Lan
2021-05-19 17:26 Sam James
2021-05-17  9:01 Agostino Sarubbo
2021-05-17  1:11 Sam James
2021-05-17  1:09 Sam James
2021-05-16 18:56 Sam James
2021-05-16 18:54 Sam James
2021-05-16 18:53 Sam James
2021-03-06 11:04 James Le Cuirot
2021-03-06 11:04 James Le Cuirot
2021-03-06  8:52 James Le Cuirot
2020-08-08  8:49 Sergei Trofimovich
2020-04-11 10:20 Sergei Trofimovich
2019-05-15 13:54 Aaron Bauman
2017-02-01  7:37 Fabian Groffen
2017-01-28 13:10 Fabian Groffen
2015-12-18  0:47 Michael Sterrett
2015-11-23  9:25 Agostino Sarubbo
2015-11-08 19:38 Mikle Kolyada
2015-11-07 12:15 Markus Meier
2015-11-05 11:20 Agostino Sarubbo
2015-10-26  5:26 Jeroen Roovers
2015-10-25 10:56 Mikle Kolyada
2015-10-19  9:27 Agostino Sarubbo
2015-10-16  5:26 Jeroen Roovers

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=1617733106.c86aad600713909bf09a46ff9dba170c9b16df36.sam@gentoo \
    --to=sam@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