diff options
author | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2013-08-04 14:32:49 +0600 |
---|---|---|
committer | Azamat H. Hackimov <azamat.hackimov@gmail.com> | 2013-08-04 14:33:49 +0600 |
commit | 86dd5c15f102d49802bc5a52914eeba79ef0bde8 (patch) | |
tree | b34a71eecca36d398647e2c260c5ce2f03376491 /media-libs | |
parent | xonotic: support SDL2, remove obsolete workarounds, -O3 is default (diff) | |
download | gamerlay-86dd5c15f102d49802bc5a52914eeba79ef0bde8.tar.gz gamerlay-86dd5c15f102d49802bc5a52914eeba79ef0bde8.tar.bz2 gamerlay-86dd5c15f102d49802bc5a52914eeba79ef0bde8.zip |
[media-libs/libsdl] Version bump, removed old.
Fixed xinerama configuration (thanks to Nikoli).
Package-Manager: portage-2.1.12.2
Manifest-Sign-Key: A018DE8C
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/libsdl/Manifest | 9 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-add-libtool-export-cmake-v2.patch | 54 | ||||
-rw-r--r-- | media-libs/libsdl/files/libsdl-universal_sizeof_voidp.patch | 18 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild | 122 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-2.0.0_pre7541.ebuild (renamed from media-libs/libsdl/libsdl-2.0.0_pre7502.ebuild) | 7 |
5 files changed, 5 insertions, 205 deletions
diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index 1912064..5c40c46 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -1,12 +1,11 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST SDL-2.0.0-7338.tar.gz 3740699 SHA256 5c799ce5c348d83cdc989fc1f6be5bf31a1d5003434612725f6fd31dc13c995a SHA512 85a89ca540604de34ff8eba17c69cebea44237f34269b105a7ef74d30fb0276f97ca09939cda01d51c2b29807c869f31e75388eaa5395a529f1a687e13af2090 WHIRLPOOL e1290a396f6b4b991a347e4e1cb1de6272a833cce20f169a3109bc5a46e323ec9bc0616c2bb03f38c651a5819c98b45ea30b7daa3556e5f507d8155d82d55a68 -DIST SDL-2.0.0-7502.tar.gz 3751614 SHA256 12a2e73284ef21f30a86e9e782fb51a6916118cc44a96e0cda786caa5c954246 SHA512 8a0a3223de0f87e5389acca6abe253d0d86ba1df2f6f3ba44d1eb5335ee581e1fbb4dd40ff8522ef7d3956d031f5248326e4daf93f86886cfb0aeb5de2f41851 WHIRLPOOL eeca821aca999ae1695ca7fb09ee097d94fc33e7073271a50d3dc491839a976abc9eeecd75b7cd89325f0dee60e553efc364220472c09eb2cb2ac23cf52fbfbd +DIST SDL-2.0.0-7541.tar.gz 3754440 SHA256 fa03c37c8997ddd72e4ea15097b9aa401c02e07c8696d4a4a8d57b0c81a48921 SHA512 2b1ad1276e09cecf4a301be14f9bfb2cb5047df017c01caf3ce71d7922345759ae43f398ccd266e5a0056b661b6affb964e581ca4f9b8a7306f8ca4ecc19c074 WHIRLPOOL 91561de6da7b01ef9cbaf0cb8819bbf3d624a00a6fa8da1994c0a46f8f266a5b0a68b6d641468e45697ddc3364bfa6f03d97532f0b26d43eb4cada8e0d943108 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.20 (GNU/Linux) -iF4EAREIAAYFAlHxS1gACgkQz+A7F6AY3oxITgEA2fdfwx2bNRL4GMfQqiplmn75 -6fJAGc6cGqBYROUWhsQBANcwyBWzAO19fFMZxOo2C1CYrO36+5AdfbrHsI1Kzjel -=WN8J +iF4EAREIAAYFAlH+EbEACgkQz+A7F6AY3oykngEAhBCCzrvKtSC/MRRYUau2rQ4T +8f6K/uxtusMF14aelpoBALZOup4Ql9dDM3aWaPz3PUjOFMf/WF7lZpowEZc8ROJ3 +=DTKX -----END PGP SIGNATURE----- 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 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) |