public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Vadim A. Misbakh-Soloviov" <mva@mva.name>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
Date: Fri, 31 May 2013 21:28:13 +0000 (UTC)	[thread overview]
Message-ID: <1370024837.0831a442afc2926f4a95c7d1bbf432cd032cb6eb.mva@gentoo> (raw)

commit:     0831a442afc2926f4a95c7d1bbf432cd032cb6eb
Author:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
AuthorDate: Fri May 31 18:27:17 2013 +0000
Commit:     Vadim A. Misbakh-Soloviov <mva <AT> mva <DOT> name>
CommitDate: Fri May 31 18:27:17 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0831a442

[media-libs/libsdl] compilation fix (xdata32-related)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva <AT> mva.name>

---
 media-libs/libsdl/files/libsdl-xdata32_fix.patch | 15 +++++++++++++++
 media-libs/libsdl/libsdl-2.0.0.ebuild            |  3 +++
 2 files changed, 18 insertions(+)

diff --git a/media-libs/libsdl/files/libsdl-xdata32_fix.patch b/media-libs/libsdl/files/libsdl-xdata32_fix.patch
new file mode 100644
index 0000000..8590cd9
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-xdata32_fix.patch
@@ -0,0 +1,15 @@
+libX11-1.5.99.901 has changed prototype of _XData32
+
+<http://bugzilla.libsdl.org/show_bug.cgi?id=1769>
+
+diff -r b6b2829cd7ef src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h	Wed Feb 27 15:20:31 2013 -0800
++++ b/src/video/x11/SDL_x11sym.h	Wed Mar 27 16:07:23 2013 +0100
+@@ -165,7 +165,7 @@
+  */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
+-SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
\ No newline at end of file

diff --git a/media-libs/libsdl/libsdl-2.0.0.ebuild b/media-libs/libsdl/libsdl-2.0.0.ebuild
index 7d92c7f..130c8ae 100644
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0.ebuild
@@ -75,6 +75,9 @@ src_prepare() {
 	epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch"
 	# Make headers more universal for 32/64 archs.
 	epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch"
+
+	# Build failure on 64bit systems fix:
+	epatch "${FILESDIR}/${PN}-xdata32_fix.patch"
 }
 
 src_configure() {


             reply	other threads:[~2013-05-31 21:28 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-05-31 21:28 Vadim A. Misbakh-Soloviov [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-08-04  8:34 [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/ Azamat H. Hackimov
2013-07-02 17:00 Azamat H. Hackimov
2013-06-05 15:32 Azamat H. Hackimov
2013-06-02 15:16 Azamat H. Hackimov
2013-03-18 16:08 Azamat H. Hackimov
2013-03-12 16:38 Azamat H. Hackimov
2013-03-05 18:15 Azamat H. Hackimov

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=1370024837.0831a442afc2926f4a95c7d1bbf432cd032cb6eb.mva@gentoo \
    --to=mva@mva.name \
    --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