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

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

commit:     86dd5c15f102d49802bc5a52914eeba79ef0bde8
Author:     Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Aug  4 08:32:49 2013 +0000
Commit:     Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sun Aug  4 08:33:49 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=86dd5c15

[media-libs/libsdl] Version bump, removed old.
Fixed xinerama configuration (thanks to Nikoli).

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

---
 .../files/libsdl-add-libtool-export-cmake-v2.patch |  54 ---------
 .../files/libsdl-universal_sizeof_voidp.patch      |  18 ---
 media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild      | 122 ---------------------
 ..._pre7502.ebuild => libsdl-2.0.0_pre7541.ebuild} |   7 +-
 4 files changed, 1 insertion(+), 200 deletions(-)

diff --git a/media-libs/libsdl/files/libsdl-add-libtool-export-cmake-v2.patch b/media-libs/libsdl/files/libsdl-add-libtool-export-cmake-v2.patch
deleted file mode 100644
index 4a072b6..0000000
--- a/media-libs/libsdl/files/libsdl-add-libtool-export-cmake-v2.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-# HG changeset patch
-# User David Gow <david@ingeniumdigital.com>
-# Date 1362822158 -28800
-# Node ID e4ce88b90d6079ed1ef0c4bd40abd652e475a8fc
-# Parent  792af948ee02e474d9077389cde5396d8101b448
-Emulate libtool's release option in CMake
-
-diff -r 792af948ee02 -r e4ce88b90d60 CMakeLists.txt
---- a/CMakeLists.txt	Sat Mar 09 16:55:02 2013 +0800
-+++ b/CMakeLists.txt	Sat Mar 09 17:42:38 2013 +0800
-@@ -38,6 +38,8 @@
- math(EXPR LT_CURRENT "${SDL_MICRO_VERSION} - ${SDL_INTERFACE_AGE}")
- math(EXPR LT_AGE "${SDL_BINARY_AGE} - ${SDL_INTERFACE_AGE}")
- set(LT_REVISION "${SDL_INTERFACE_AGE}")
-+set(LT_RELEASE "${SDL_MAJOR_VERSION}.${SDL_MINOR_VERSION}")
-+set(LT_VERSION "${LT_CURRENT}.${LT_REVISION}.${LT_AGE}")
- 
- # General settings & flags
- set(LIBRARY_OUTPUT_DIRECTORY "build")
-@@ -1135,9 +1137,17 @@
- 
- if(SDL_SHARED)
-   add_library(SDL2 SHARED ${SOURCE_FILES})
--  set_target_properties(SDL2 PROPERTIES
--    VERSION ${SDL_VERSION}
--    SOVERSION ${LT_CURRENT})
-+  if(UNIX)
-+    set_target_properties(SDL2 PROPERTIES
-+      VERSION ${LT_VERSION}
-+      SOVERSION ${LT_CURRENT}
-+      OUTPUT_NAME "SDL2-${LT_RELEASE}")
-+  else(UNIX)
-+    set_target_properties(SDL2 PROPERTIES
-+      VERSION ${SDL_VERSION}
-+      SOVERSION ${LT_CURRENT}
-+      OUTPUT_NAME "SDL2")
-+  endif(UNIX)
-  set(_INSTALL_LIBS "SDL2" ${_INSTALL_LIBS})
-  target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
- endif(SDL_SHARED)
-@@ -1165,6 +1175,13 @@
- list(APPEND INCLUDE_FILES ${BIN_INCLUDE_FILES})
- install(FILES ${INCLUDE_FILES} DESTINATION include/SDL2)
- 
-+if(SDL_SHARED)
-+  install(CODE "
-+    execute_process(COMMAND ${CMAKE_COMMAND} -E create_symlink
-+    \"libSDL2-2.0.so\" \"libSDL2.so\")")
-+  install(FILES ${SDL2_BINARY_DIR}/libSDL2.so DESTINATION "lib${LIB_SUFFIX}")
-+endif(SDL_SHARED)
-+
- if(NOT WINDOWS OR CYGWIN)
-   if(FREEBSD)
-     # FreeBSD uses ${PREFIX}/libdata/pkgconfig

diff --git a/media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch b/media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch
deleted file mode 100644
index 8d9ecea..0000000
--- a/media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-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_pre7338.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild
deleted file mode 100644
index e1c0338..0000000
--- a/media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-multilib eutils
-
-MY_PV=${PV/_pre/-}
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/tmp/SDL-${MY_PV}.tar.gz"
-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
-#FIXME: virtual/opengl for abi_x86_32 require additional handling
-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 )
-"
-
-S="${WORKDIR}/SDL-${MY_PV}"
-
-DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt )
-
-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.
-	# See http://bugzilla.libsdl.org/show_bug.cgi?id=1893
-	epatch "${FILESDIR}/${PN}-universal_sizeof_voidp.patch"
-	epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch"
-
-	epatch_user
-}
-
-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
-}

diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7502.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild
similarity index 90%
rename from media-libs/libsdl/libsdl-2.0.0_pre7502.ebuild
rename to media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild
index af77d2d..2bc9b58 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre7502.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild
@@ -68,11 +68,6 @@ S="${WORKDIR}/SDL-${MY_PV}"
 DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt )
 
 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.
 	# See http://bugzilla.libsdl.org/show_bug.cgi?id=1893
 	epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch"
@@ -110,7 +105,7 @@ src_configure() {
 		$(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 xinerama VIDEO_X11_XINERAMA)
 		$(cmake-utils_use X VIDEO_X11_XINPUT)
 		$(cmake-utils_use X VIDEO_X11_XRANDR)
 		$(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)