[gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/

["Azamat H. Hackimov" <winterheart@gentoo.ru>]

commit:     55b7f21fa9aa7649ef874ec100bc0f526f7d7b2b
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Mon Mar 18 16:08:05 2013 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Mon Mar 18 16:08:05 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=55b7f21f

[media-libs/libsdl] Fixing error with Header checksum mismatch on abi_x86_32 (bug #462036).
Problem with media-libs/nas linking still unresolved.

Package-Manager: portage-2.1.11.52
Manifest-Sign-Key: A018DE8C

---
 media-libs/libsdl/ChangeLog                        |    7 +
 .../files/libsdl-universal_sizeof_voidp.patch      |   18 +++
 media-libs/libsdl/libsdl-2.0.0_pre7001-r1.ebuild   |  122 ++++++++++++++++++++
 3 files changed, 147 insertions(+), 0 deletions(-)

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index bd66cbf..6407ed9 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*libsdl-2.0.0_pre7001-r1 (18 Mar 2013)
+
+  18 Mar 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>
+  +files/libsdl-universal_sizeof_voidp.patch, +libsdl-2.0.0_pre7001-r1.ebuild:
+  [media-libs/libsdl] Fixing error with Header checksum mismatch on abi_x86_32
+  (bug #462036). Problem with media-libs/nas linking still unresolved.
+
 *libsdl-2.0.0_pre7001 (14 Mar 2013)
 
   14 Mar 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>

diff --git a/media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch b/media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch
new file mode 100644
index 0000000..8d9ecea
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch
@@ -0,0 +1,18 @@
+diff -r fe82d15464d1 include/SDL_config.h.cmake
+--- a/include/SDL_config.h.cmake	Sun Mar 17 09:47:25 2013 -0700
++++ b/include/SDL_config.h.cmake	Mon Mar 18 20:31:51 2013 +0600
+@@ -37,7 +37,13 @@
+ #cmakedefine volatile @HAVE_VOLATILE@
+ 
+ /* C datatypes */
+-#cmakedefine SIZEOF_VOIDP @SIZEOF_VOIDP@
++/* Define SIZEOF_VOIDP for 64/32 architectures */
++#ifdef __LP64__
++#define SIZEOF_VOIDP 8
++#else
++#define SIZEOF_VOIDP 4
++#endif
++
+ #cmakedefine HAVE_GCC_ATOMICS @HAVE_GCC_ATOMICS@
+ #cmakedefine HAVE_GCC_SYNC_LOCK_TEST_AND_SET @HAVE_GCC_SYNC_LOCK_TEST_AND_SET@
+ #cmakedefine HAVE_PTHREAD_SPINLOCK @HAVE_PTHREAD_SPINLOCK@

diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7001-r1.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7001-r1.ebuild
new file mode 100644
index 0000000..5a52e14
--- /dev/null
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7001-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+inherit cmake-multilib mercurial versionator
+
+REV="$(get_version_component_range 4)"
+
+DESCRIPTION="Simple Direct Media Layer"
+HOMEPAGE="http://www.libsdl.org/"
+#SRC_URI=""
+EHG_REPO_URI="http://hg.libsdl.org/SDL/"
+EHG_REVISION="${REV/pre/}"
+
+LICENSE="ZLIB"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="3dnow alsa altivec +asm aqua fusionsound gles mmx nas opengl oss pulseaudio sse sse2 static-libs +threads tslib +video X xinerama xscreensaver"
+
+#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
+#FIXME: media-libs/nas no have emul-* ebuild
+RDEPEND="
+	nas? (
+		media-libs/nas
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXt
+	)
+	X? (
+		x11-libs/libX11
+		x11-libs/libXcursor
+		x11-libs/libXext
+		x11-libs/libXi
+		x11-libs/libXt
+		x11-libs/libXrandr
+		x11-libs/libXrender
+		x11-libs/libXxf86vm
+	)
+	xinerama? ( x11-libs/libXinerama )
+	xscreensaver? ( x11-libs/libXScrnSaver )
+	alsa? ( media-libs/alsa-lib )
+	fusionsound? ( >=media-libs/FusionSound-1.1.1 )
+	pulseaudio? ( >=media-sound/pulseaudio-0.9 )
+	gles? ( || ( media-libs/mesa[gles2] media-libs/mesa[gles] ) )
+	opengl? ( virtual/opengl )
+	tslib? ( x11-libs/tslib )
+"
+
+DEPEND="${RDEPEND}
+	nas? (
+		x11-proto/xextproto
+		x11-proto/xproto
+	)
+	X? (
+		x11-proto/inputproto
+		x11-proto/xextproto
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		x11-proto/randrproto
+		x11-proto/renderproto
+	)
+	xinerama? ( x11-proto/xineramaproto )
+	xscreensaver? ( x11-proto/scrnsaverproto )
+"
+
+DOCS=( BUGS CREDITS README README.HG README-SDL.txt TODO WhatsNew )
+
+src_prepare() {
+	# Currently cmake produce libsdl2.so targets,
+	# but libtool libsdl2-2.0.so, so many applications (e.g. Steam) fails to
+	# find system libsdl. This patch workaround this problem.
+	# See http://bugzilla.libsdl.org/show_bug.cgi?id=1743
+	epatch "${FILESDIR}/${PN}-add-libtool-export-cmake-v2.patch"
+	# Make headers more universal for 32/64 archs.
+	epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch"
+}
+
+src_configure() {
+	mycmakeargs=(
+		# Disable assertion tests.
+		-DASSERTIONS=disabled
+		# Avoid hard-coding RPATH entries into dynamically linked SDL libraries.
+		-DRPATH=NO
+		# Disable obsolete and/or inapplicable libraries.
+		-DARTS=NO
+		-DESD=NO
+		$(cmake-utils_use 3dnow 3DNOW)
+		$(cmake-utils_use alsa ALSA)
+		$(cmake-utils_use altivec ALTIVEC)
+		$(cmake-utils_use asm ASSEMBLY)
+		$(cmake-utils_use aqua VIDEO_COCOA)
+		$(cmake-utils_use fusionsound FUSIONSOUND)
+		$(cmake-utils_use gles VIDEO_OPENGLES)
+		$(cmake-utils_use mmx MMX)
+		$(cmake-utils_use nas NAS)
+		$(cmake-utils_use opengl VIDEO_OPENGL)
+		$(cmake-utils_use oss OSS)
+		$(cmake-utils_use pulseaudio PULSEAUDIO)
+		$(cmake-utils_use threads PTHREADS)
+		$(cmake-utils_use sse SSE)
+		$(cmake-utils_use sse SSEMATH)
+		$(cmake-utils_use sse2 SSE2)
+		$(cmake-utils_use static-libs SDL_STATIC)
+		$(cmake-utils_use tslib INPUT_TSLIB)
+		$(cmake-utils_use video VIDEO_DUMMY)
+		$(cmake-utils_use X VIDEO_X11)
+		$(cmake-utils_use X VIDEO_X11_XCURSOR)
+		$(cmake-utils_use X VIDEO_X11_XINERAMA)
+		$(cmake-utils_use X VIDEO_X11_XINPUT)
+		$(cmake-utils_use X VIDEO_X11_XRANDR)
+		$(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
+		$(cmake-utils_use X VIDEO_X11_XVM)
+		#$(cmake-utils_use joystick SDL_JOYSTICK)
+	)
+	cmake-multilib_src_configure
+}
+
+src_install() {
+	cmake-multilib_src_install
+}