* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-03-05 18:15 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-03-05 18:15 UTC (permalink / raw
To: gentoo-commits
commit: ce8b1e2ed84bd7e70e9027d68e68b96ddfffd41d
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Mar 5 18:13:55 2013 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Mar 5 18:13:55 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=ce8b1e2e
[media-libs/libsdl] Bump to 6963 revision, remove old obsolete 1.2.14 and buggy 9999-r2,
metadata cleanup.
Package-Manager: portage-2.1.11.52
Manifest-Sign-Key: A018DE8C
---
media-libs/libsdl/ChangeLog | 10 +
.../libsdl/files/libsdl-1.2.13-sdl-config.patch | 20 --
media-libs/libsdl/files/libsdl-1.2.14-click.patch | 23 ---
.../files/libsdl-1.2.14-disappearingcursor.diff | 19 --
media-libs/libsdl/libsdl-1.2.14-r3.ebuild | 155 ----------------
media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild | 12 +-
..._pre6799.ebuild => libsdl-2.0.0_pre6963.ebuild} | 12 +-
media-libs/libsdl/libsdl-9999-r2.ebuild | 187 --------------------
media-libs/libsdl/metadata.xml | 12 +-
9 files changed, 24 insertions(+), 426 deletions(-)
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 74bf865..60b8f6a 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -2,6 +2,16 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libsdl-2.0.0_pre6963 (05 Mar 2013)
+
+ 05 Mar 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>
+ +libsdl-2.0.0_pre6963.ebuild, -Manifest,
+ -files/libsdl-1.2.13-sdl-config.patch, -files/libsdl-1.2.14-click.patch,
+ -files/libsdl-1.2.14-disappearingcursor.diff, -libsdl-1.2.14-r3.ebuild,
+ -libsdl-9999-r2.ebuild, libsdl-2.0.0_pre6799.ebuild, metadata.xml:
+ [media-libs/libsdl] Bump to 6963 revision, remove old obsolete 1.2.14 and
+ buggy 9999-r2, metadata cleanup.
+
07 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> libsdl-2.0.0_pre6799.ebuild:
Use versionator eclass for getting revision
diff --git a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch b/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
deleted file mode 100644
index f430428..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.13-sdl-config.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Only output -L -rpath cruft if using a non-standard install location.
-
-Makes ABI / cross-compiling easier on the soul.
-
---- sdl-config.in
-+++ sdl-config.in
-@@ -44,7 +44,12 @@
- echo -I@includedir@/SDL @SDL_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ if test x"${prefix}" != x"/usr" ; then
-+@ENABLE_SHARED_TRUE@ libdirs="-L@libdir@"
-+@ENABLE_SHARED_TRUE@ else
-+@ENABLE_SHARED_TRUE@ libdirs=""
-+@ENABLE_SHARED_TRUE@ fi
-+@ENABLE_SHARED_TRUE@ echo $libdirs @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@ ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
deleted file mode 100644
index 7d3e5ac..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-click.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- SDL-1.2.14/src/video/x11/SDL_x11events.c.orig 2010-04-08 11:57:05.003169834 -0700
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-08 12:33:51.690926340 -0700
-@@ -423,12 +423,15 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
-- if ( this->input_grab == SDL_GRAB_OFF ) {
-- posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+ if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+ (xevent.xcrossing.mode != NotifyUngrab) ) {
-+ if ( this->input_grab == SDL_GRAB_OFF ) {
-+ posted = SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-+ }
-+ posted = SDL_PrivateMouseMotion(0, 0,
-+ xevent.xcrossing.x,
-+ xevent.xcrossing.y);
- }
-- posted = SDL_PrivateMouseMotion(0, 0,
-- xevent.xcrossing.x,
-- xevent.xcrossing.y);
- }
- break;
-
diff --git a/media-libs/libsdl/files/libsdl-1.2.14-disappearingcursor.diff b/media-libs/libsdl/files/libsdl-1.2.14-disappearingcursor.diff
deleted file mode 100644
index bb637b9..0000000
--- a/media-libs/libsdl/files/libsdl-1.2.14-disappearingcursor.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-This was retrieved from the debian patch tracker, and fixes an issue caused by the clicks patch,
-which we seem to have also gotten from debian.
-Index: SDL-1.2.14/src/video/x11/SDL_x11events.c
-===================================================================
---- SDL-1.2.14.orig/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400
-+++ SDL-1.2.14/src/video/x11/SDL_x11events.c 2010-04-30 09:16:35.000000000 -0400
-@@ -444,8 +444,10 @@
- if ( xevent.xcrossing.mode == NotifyUngrab )
- printf("Mode: NotifyUngrab\n");
- #endif
-- if ( xevent.xcrossing.detail != NotifyInferior ) {
-- if ( this->input_grab == SDL_GRAB_OFF ) {
-+ if ( (xevent.xcrossing.mode != NotifyGrab) &&
-+ (xevent.xcrossing.mode != NotifyUngrab) &&
-+ (xevent.xcrossing.detail != NotifyInferior) ) {
-+ if ( this->input_grab == SDL_GRAB_OFF ) {
- posted = SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
- } else {
- posted = SDL_PrivateMouseMotion(0, 0,
diff --git a/media-libs/libsdl/libsdl-1.2.14-r3.ebuild b/media-libs/libsdl/libsdl-1.2.14-r3.ebuild
deleted file mode 100644
index 174dcb9..0000000
--- a/media-libs/libsdl/libsdl-1.2.14-r3.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.14-r2.ebuild,v 1.1 2010/04/08 20:25:47 mr_bones_ Exp $
-
-EAPI=2
-inherit flag-o-matic multilib toolchain-funcs eutils libtool
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
-# WARNING:
-# if you disable the audio, video, joystick use flags or turn on the custom-cflags use flag
-# in USE and something breaks, you pick up the pieces. Be prepared for
-# bug reports to be marked INVALID.
-IUSE="oss alsa nas X dga xv xinerama fbcon directfb ggi svga tslib aalib opengl libcaca +audio +video +joystick custom-cflags pulseaudio ps3 static-libs"
-
-RDEPEND="audio? ( >=media-libs/audiofile-0.1.9 )
- alsa? ( media-libs/alsa-lib )
- nas? (
- media-libs/nas
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libX11
- )
- X? (
- x11-libs/libXt
- x11-libs/libXext
- x11-libs/libX11
- x11-libs/libXrandr
- )
- directfb? ( >=dev-libs/DirectFB-0.9.19 )
- ggi? ( >=media-libs/libggi-2.0_beta3 )
- svga? ( >=media-libs/svgalib-1.4.2 )
- aalib? ( media-libs/aalib )
- libcaca? ( >=media-libs/libcaca-0.9-r1 )
- opengl? ( virtual/opengl virtual/glu )
- ppc64? ( ps3? ( sys-libs/libspe2 ) )
- tslib? ( x11-libs/tslib )
- pulseaudio? ( media-sound/pulseaudio )"
-DEPEND="${RDEPEND}
- nas? (
- x11-proto/xextproto
- x11-proto/xproto
- )
- X? (
- x11-proto/xextproto
- x11-proto/xproto
- )
- x86? ( || ( >=dev-lang/yasm-0.6.0 >=dev-lang/nasm-0.98.39-r3 ) )"
-
-S=${WORKDIR}/SDL-${PV}
-
-pkg_setup() {
- if use !audio || use !video || use !joystick ; then
- ewarn "Since you've chosen to turn off some of libsdl's functionality,"
- ewarn "don't bother filing libsdl-related bugs until trying to remerge"
- ewarn "libsdl with the audio, video, and joystick flags in USE."
- ewarn "You need to know what you're doing to selectively turn off parts of libsdl."
- epause 30
- fi
- if use custom-cflags ; then
- ewarn "Since you've chosen to use possibly unsafe CFLAGS,"
- ewarn "don't bother filing libsdl-related bugs until trying to remerge"
- ewarn "libsdl without the custom-cflags use flag in USE."
- epause 10
- fi
-}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-1.2.13-sdl-config.patch \
- "${FILESDIR}"/${P}-click.patch \
- "${FILESDIR}"/${P}-disappearingcursor.diff
-
- elibtoolize
-}
-
-src_configure() {
- local myconf=
- if [[ $(tc-arch) != "x86" ]] ; then
- myconf="${myconf} --disable-nasm"
- else
- myconf="${myconf} --enable-nasm"
- fi
- use custom-cflags || strip-flags
- use audio || myconf="${myconf} --disable-audio"
- use video \
- && myconf="${myconf} --enable-video-dummy" \
- || myconf="${myconf} --disable-video"
- use joystick || myconf="${myconf} --disable-joystick"
-
- local directfbconf="--disable-video-directfb"
- if use directfb ; then
- # since DirectFB can link against SDL and trigger a
- # dependency loop, only link against DirectFB if it
- # isn't broken #61592
- echo 'int main(){}' > directfb-test.c
- $(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
- && directfbconf="--enable-video-directfb" \
- || ewarn "Disabling DirectFB since libdirectfb.so is broken"
- fi
-
- myconf="${myconf} ${directfbconf}"
-
- econf \
- --disable-rpath \
- --disable-arts \
- --disable-esd \
- --enable-events \
- --enable-cdrom \
- --enable-threads \
- --enable-timers \
- --enable-file \
- --enable-cpuinfo \
- --disable-alsa-shared \
- --disable-esd-shared \
- --disable-pulseaudio-shared \
- --disable-arts-shared \
- --disable-nas-shared \
- --disable-x11-shared \
- --disable-osmesa-shared \
- $(use_enable oss) \
- $(use_enable alsa) \
- $(use_enable pulseaudio) \
- $(use_enable nas) \
- $(use_enable X video-x11) \
- $(use_enable dga) \
- $(use_enable xv video-x11-xv) \
- $(use_enable xinerama video-x11-xinerama) \
- $(use_enable X video-x11-xrandr) \
- $(use_enable dga video-dga) \
- $(use_enable fbcon video-fbcon) \
- $(use_enable ggi video-ggi) \
- $(use_enable svga video-svga) \
- $(use_enable aalib video-aalib) \
- $(use_enable libcaca video-caca) \
- $(use_enable opengl video-opengl) \
- $(use_enable ps3 video-ps3) \
- $(use_enable tslib input-tslib) \
- $(use_with X x) \
- $(use_enable static-libs static) \
- --disable-video-x11-xme \
- ${myconf}
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die "emake install failed"
- use static-libs || rm -f "${D}"/usr/$(get_libdir)/lib*.la
- dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew
- dohtml -r ./
-}
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
index fcae24b..0ec7027 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
@@ -17,7 +17,7 @@ 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 +xcursor +xinput xinerama xscreensaver xrandr xvidmode"
+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.
RDEPEND="
@@ -95,12 +95,12 @@ src_configure() {
$(cmake-utils_use tslib INPUT_TSLIB)
$(cmake-utils_use video VIDEO_DUMMY)
$(cmake-utils_use X VIDEO_X11)
- $(cmake-utils_use xcursor VIDEO_X11_XCURSOR)
- $(cmake-utils_use xinerama VIDEO_X11_XINERAMA)
- $(cmake-utils_use xinput VIDEO_X11_XINPUT)
- $(cmake-utils_use xrandr VIDEO_X11_XRANDR)
+ $(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 xvidmode VIDEO_X11_XVM)
+ $(cmake-utils_use X VIDEO_X11_XVM)
#$(cmake-utils_use joystick SDL_JOYSTICK)
)
cmake-utils_src_configure
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre6963.ebuild
similarity index 88%
copy from media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
copy to media-libs/libsdl/libsdl-2.0.0_pre6963.ebuild
index fcae24b..0ec7027 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre6963.ebuild
@@ -17,7 +17,7 @@ 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 +xcursor +xinput xinerama xscreensaver xrandr xvidmode"
+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.
RDEPEND="
@@ -95,12 +95,12 @@ src_configure() {
$(cmake-utils_use tslib INPUT_TSLIB)
$(cmake-utils_use video VIDEO_DUMMY)
$(cmake-utils_use X VIDEO_X11)
- $(cmake-utils_use xcursor VIDEO_X11_XCURSOR)
- $(cmake-utils_use xinerama VIDEO_X11_XINERAMA)
- $(cmake-utils_use xinput VIDEO_X11_XINPUT)
- $(cmake-utils_use xrandr VIDEO_X11_XRANDR)
+ $(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 xvidmode VIDEO_X11_XVM)
+ $(cmake-utils_use X VIDEO_X11_XVM)
#$(cmake-utils_use joystick SDL_JOYSTICK)
)
cmake-utils_src_configure
diff --git a/media-libs/libsdl/libsdl-9999-r2.ebuild b/media-libs/libsdl/libsdl-9999-r2.ebuild
deleted file mode 100644
index da4ea64..0000000
--- a/media-libs/libsdl/libsdl-9999-r2.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-EAPI=5
-
-# Enable Bash strictness.
-set -e
-
-# SDL 2.0 officially distributes both autotools- and CMake-based builds. Due to
-# all the usual autotools problems, the former essentially doesn't work. The
-# latter, however, does. CMake it is!
-inherit cmake-utils eutils flag-o-matic mercurial multilib toolchain-funcs
-
-DESCRIPTION="Simple Direct Media Layer"
-HOMEPAGE="http://www.libsdl.org"
-EHG_REPO_URI="http://hg.libsdl.org/SDL"
-
-LICENSE="ZLIB"
-SLOT="2"
-KEYWORDS=""
-
-#FIXME: Add "test".
-# SDL 1.2 ebuilds prohibited unsafe CFLAGS unless "custom-flags" was enabled.
-# This appears to have been overly judicious, as the query "How does one build
-# an optimized SDL library?" at
-# http://osdl.sourceforge.net/main/documentation/rendering/SDL-optimizing.html
-# suggests. SDL supports at least a modicum of extreme optimization. If users
-# enable unsafe CFLAGS, SDL breaking is the least of their concerns.
-IUSE="
-+audio feedback joystick +threads static-libs +video
-3dnow altivec mmx sse sse2
-alsa fusionsound nas oss pulseaudio
-X xcursor xinerama xinput xrandr xscreensaver xvidmode
-aqua directfb gles opengl tslib
-"
-REQUIRED_USE="
- feedback? ( joystick )
- alsa? ( audio )
- fusionsound? ( audio )
- nas? ( audio )
- oss? ( audio )
- pulseaudio? ( audio )
- aqua? ( video )
- directfb? ( video )
- gles? ( video )
- opengl? ( video )
- tslib? ( video )
- X? ( video )
- xcursor? ( X )
- xinerama? ( X )
- xinput? ( X )
- xrandr? ( X )
- xscreensaver? ( X )
- xvidmode? ( X )
-"
-
-#FIXME: Replace "gles" deps with "virtual/opengles", after hitting Portage.
-RDEPEND="
- nas? (
- media-libs/nas
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXt
- )
- X? (
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXt
- x11-libs/libXrender
- )
- xcursor? ( x11-libs/libXcursor )
- xinerama? ( x11-libs/libXinerama )
- xinput? ( x11-libs/libXi )
- xrandr? ( x11-libs/libXrandr )
- xvidmode? ( x11-libs/libXxf86vm )
- xscreensaver? ( x11-libs/libXScrnSaver )
- alsa? ( media-libs/alsa-lib )
- fusionsound? ( >=media-libs/FusionSound-1.1.1 )
- pulseaudio? ( >=media-sound/pulseaudio-0.9 )
- directfb? ( >=dev-libs/DirectFB-1.0.0 )
- 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/xextproto
- x11-proto/xproto
- x11-proto/renderproto
- )
- xinerama? ( x11-proto/xineramaproto )
- xinput? ( x11-proto/inputproto )
- xrandr? ( x11-proto/randrproto )
- xrandr? ( x11-proto/randrproto )
- xvidmode? ( x11-proto/xf86vidmodeproto )
- xscreensaver? ( x11-proto/scrnsaverproto )
-"
-
-CMAKE_MIN_VERSION=2.6 # ...if "CMakeLists.txt" is to be believed.
-
-src_unpack() {
- [[ -d "${EHG_STORE_DIR}/${PN}" ]] ||
- einfo 'Cloning may take up to several minutes on slow connections.'
- mercurial_src_unpack
-}
-
-#FIXME: SDL2's current "CMakeLists.txt" file leaks LDFLAGS into pkg-config
-#files, as confirmed by a QA notice. The offending CMake line appears to be:
-#
-# target_link_libraries(SDL2 ${EXTRA_LIBS} ${EXTRA_LDFLAGS})
-#
-#Since target_link_libraries() is a core CMake function, it's unclear whether
-#we can patch around this on our end. I'm surprised I haven't seen similar
-#complaints from other CMake-dependent ebuilds, and thus suspect the issue *IS*
-#our fault. Somehow, anyway...
-src_prepare() {
- epatch "${FILESDIR}/${PV}-sdl2-config.in.patch"
-}
-
-src_configure() {
- # DirectFB can link against SDL, triggering a dependency loop. Link against
- # DirectFB only if it isn't currently being installed. (See issue #61592.)
- local use_directfb="-DVIDEO_DIRECTFB=ON"
- if use directfb; then
- echo 'int main(){}' > directfb-test.c
- $(tc-getCC) directfb-test.c -ldirectfb 2>/dev/null \
- && use_directfb="-DVIDEO_DIRECTFB=OFF" \
- || ewarn "Disabling DirectFB, since \"libdirectfb.so\" is broken."
- rm directfb-test.c
- fi
-
- # Required by cmake-utils_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
- ${use_directfb}
- $(cmake-utils_use static-libs SDL_STATIC)
- $(cmake-utils_use audio SDL_AUDIO)
- $(cmake-utils_use feedback SDL_HAPTIC)
- $(cmake-utils_use joystick SDL_JOYSTICK)
- $(cmake-utils_use video SDL_VIDEO)
- $(cmake-utils_use threads SDL_THREADS)
- $(cmake-utils_use threads PTHREADS)
- $(cmake-utils_use threads PTHREADS_SEM)
- $(cmake-utils_use 3dnow)
- $(cmake-utils_use altivec)
- $(cmake-utils_use mmx)
- $(cmake-utils_use sse)
- $(cmake-utils_use sse SSEMATH)
- $(cmake-utils_use sse2)
- $(cmake-utils_use alsa)
- $(cmake-utils_use fusionsound)
- $(cmake-utils_use nas)
- $(cmake-utils_use oss)
- $(cmake-utils_use pulseaudio)
- $(cmake-utils_use tslib INPUT_TSLIB)
- $(cmake-utils_use X VIDEO_X11)
- $(cmake-utils_use xcursor VIDEO_X11_XCURSOR)
- $(cmake-utils_use xinerama VIDEO_X11_XINERAMA)
- $(cmake-utils_use xinput VIDEO_X11_XINPUT)
- $(cmake-utils_use xrandr VIDEO_X11_XRANDR)
- $(cmake-utils_use xscreensaver VIDEO_X11_XSCRNSAVER)
- $(cmake-utils_use xvidmode VIDEO_X11_XVM)
- $(cmake-utils_use aqua VIDEO_COCOA)
- $(cmake-utils_use gles VIDEO_OPENGLES)
- $(cmake-utils_use opengl VIDEO_OPENGL)
- )
-
- cmake-utils_src_configure
-}
-
-src_install() {
- # cmake-utils_src_install() installs all docs, except...
- cmake-utils_src_install
- for docfile in README* TODO BUGS CREDITS WhatsNew; do
- dodoc "${docfile}"
- done
-}
diff --git a/media-libs/libsdl/metadata.xml b/media-libs/libsdl/metadata.xml
index 18a5a9c..6a3aa9f 100644
--- a/media-libs/libsdl/metadata.xml
+++ b/media-libs/libsdl/metadata.xml
@@ -2,8 +2,8 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer>
- <email>leycec@gmail.com</email>
- <name>leycec</name>
+ <email>azamat.hackimov@gmail.com</email>
+ <name>Azamat H. Hackimov</name>
</maintainer>
<longdescription>
Simple DirectMedia Layer is a cross-platform multimedia library designed
@@ -28,18 +28,10 @@ Pike, Pliant, Python, Ruby, Smalltalk, and Tcl.
</upstream>
<use>
<!--flag name="directx">Adds support for Windows DirectX audio and video</flag-->
- <flag name="audio">Support video devices (strongly recommended!)</flag>
<flag name="asm">Enable assembly for optimization (3dnow, mmx, sse, sse2)</flag>
- <flag name="feedback">Support tactile feedback (e.g., vibration) devices</flag>
<flag name="fusionsound">Enable FusionSound audio support</flag>
<flag name="gles">Enable OpenGL ES video support</flag>
- <flag name="joystick">Support joystick devices</flag>
- <flag name="ps3">Build the PS3 video driver</flag>
<flag name="tslib">Enable tslib-based touchscreen device support</flag>
<flag name="video">Control video support (disable at your own risk)</flag>
- <flag name="xcursor">Enable Xcursor-based cursor theme support</flag>
- <flag name="xinput">Enable xinput-based touchscreen and multiple input device support (recommended)</flag>
- <flag name="xrandr">Enable XRandR-based resolution switching (recommended)</flag>
- <flag name="xvidmode">Enable XVidMode-based resolution switching (not recommended)</flag>
</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-03-12 16:38 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-03-12 16:38 UTC (permalink / raw
To: gentoo-commits
commit: 0f33a3757d00b19504347fc196ea146383305b53
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Mar 12 16:38:34 2013 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Mar 12 16:38:34 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=0f33a375
[media-libs/libsdl] 2.0.0_pre6963-r2 with patch that creates proper library symlinks (including libSDL2-2.0.so). Should fix problem with Steam now.
Package-Manager: portage-2.1.11.52
Manifest-Sign-Key: A018DE8C
---
media-libs/libsdl/ChangeLog | 9 +++
media-libs/libsdl/files/9999-sdl2-config.in.patch | 17 ------
.../files/libsdl-add-libtool-export-cmake-v2.patch | 54 ++++++++++++++++++++
...e6799.ebuild => libsdl-2.0.0_pre6963-r2.ebuild} | 14 ++++-
4 files changed, 74 insertions(+), 20 deletions(-)
diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index eaeefae..1ad8f0d 100644
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -2,6 +2,15 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*libsdl-2.0.0_pre6963-r2 (12 Mar 2013)
+
+ 12 Mar 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>
+ +files/libsdl-add-libtool-export-cmake-v2.patch,
+ +libsdl-2.0.0_pre6963-r2.ebuild, -files/9999-sdl2-config.in.patch,
+ -libsdl-2.0.0_pre6799.ebuild:
+ [media-libs/libsdl] 2.0.0_pre6963-r2 with patch that creates proper library
+ symlinks (including libSDL2-2.0.so). Should fix problem with Steam now.
+
*libsdl-2.0.0_pre6963-r1 (11 Mar 2013)
11 Mar 2013; Azamat H. Hackimov <azamat.hackimov@gmail.com>
diff --git a/media-libs/libsdl/files/9999-sdl2-config.in.patch b/media-libs/libsdl/files/9999-sdl2-config.in.patch
deleted file mode 100644
index 902a8b2..0000000
--- a/media-libs/libsdl/files/9999-sdl2-config.in.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-If installing to "/usr", do not embed RPATH entries in SDL shared libraries;
-otherwise, do. (RPATH is demonstrably terrible, unless absolutely needed on
-Gentoo Prefix and/or for cross-compilation.)
-
---- sdl2-config.in 2012-08-22 23:22:01.344325854 -0500
-+++ sdl2-config.in.new 2012-08-25 17:34:36.573610492 -0500
-@@ -45,7 +45,9 @@
- echo -I@includedir@/SDL2 @SDL_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ libdirs=
-+@ENABLE_SHARED_TRUE@ test x"${prefix}" == x"/usr" || libdirs="-L@libdir@"
-+@ENABLE_SHARED_TRUE@ echo ${libdirs} @SDL_RLD_FLAGS@ @SDL_LIBS@
- @ENABLE_SHARED_TRUE@ ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
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
new file mode 100644
index 0000000..4a072b6
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-add-libtool-export-cmake-v2.patch
@@ -0,0 +1,54 @@
+# 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/libsdl-2.0.0_pre6799.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre6963-r2.ebuild
similarity index 87%
rename from media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
rename to media-libs/libsdl/libsdl-2.0.0_pre6963-r2.ebuild
index 0ec7027..6563793 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre6799.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre6963-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit cmake-utils mercurial versionator
+inherit cmake-multilib mercurial versionator
REV="$(get_version_component_range 4)"
@@ -66,6 +66,14 @@ DEPEND="${RDEPEND}
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"
+}
+
src_configure() {
mycmakeargs=(
# Disable assertion tests.
@@ -103,9 +111,9 @@ src_configure() {
$(cmake-utils_use X VIDEO_X11_XVM)
#$(cmake-utils_use joystick SDL_JOYSTICK)
)
- cmake-utils_src_configure
+ cmake-multilib_src_configure
}
src_install() {
- cmake-utils_src_install
+ cmake-multilib_src_install
}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-03-18 16:08 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-03-18 16:08 UTC (permalink / raw
To: gentoo-commits
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
+}
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-05-31 21:28 Vadim A. Misbakh-Soloviov
0 siblings, 0 replies; 8+ messages in thread
From: Vadim A. Misbakh-Soloviov @ 2013-05-31 21:28 UTC (permalink / raw
To: gentoo-commits
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() {
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-06-02 15:16 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-06-02 15:16 UTC (permalink / raw
To: gentoo-commits
commit: 67971e2499537a24b49434435a39db6010e9e719
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Jun 2 15:15:33 2013 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Sun Jun 2 15:15:33 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=67971e24
[media-libs/libsdl] Downgrade to revision based tarballs.
Checksums has been changed and someone, uhh, cared about it.
This version also includes patch for libX11 compilation error.
Package-Manager: portage-2.1.11.62
Manifest-Sign-Key: A018DE8C
---
.../files/libsdl-fix-compilation-libX11.patch | 126 +++++++++++++++++++++
media-libs/libsdl/files/libsdl-xdata32_fix.patch | 15 ---
...dl-2.0.0.ebuild => libsdl-2.0.0_pre7250.ebuild} | 9 +-
3 files changed, 131 insertions(+), 19 deletions(-)
diff --git a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch
new file mode 100644
index 0000000..077673e
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch
@@ -0,0 +1,126 @@
+# HG changeset patch
+# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
+# Date 1370182818 -21600
+# Node ID cb19a074e0b1c3e03a4eacca149c8a6599ed9bc5
+# Parent 23a5c8f4b312d0b285667e78b9038d403d94c240
+Fix compilation with libX11 >= 1.5.99.902.
+
+These changes fixes bug #1769 for SDL2
+(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
+
+diff -r 23a5c8f4b312 -r cb19a074e0b1 cmake/sdlchecks.cmake
+--- a/cmake/sdlchecks.cmake Sun Jun 02 14:27:54 2013 +0200
++++ b/cmake/sdlchecks.cmake Sun Jun 02 20:20:18 2013 +0600
+@@ -356,6 +356,14 @@
+ set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1)
+ endif(HAVE_XGENERICEVENT)
+
++ check_c_source_compiles("
++ #include <X11/Xlibint.h>
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
++ if(HAVE_CONST_XDATA32)
++ set(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1)
++ endif(HAVE_CONST_XDATA32)
++
+ check_function_exists(XkbKeycodeToKeysym SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM)
+
+ if(VIDEO_X11_XCURSOR AND HAVE_XCURSOR_H)
+diff -r 23a5c8f4b312 -r cb19a074e0b1 configure
+--- a/configure Sun Jun 02 14:27:54 2013 +0200
++++ b/configure Sun Jun 02 20:20:18 2013 +0600
+@@ -19492,6 +19492,35 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_XextAddDisplay" >&5
+ $as_echo "$have_const_param_XextAddDisplay" >&6; }
+
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const parameter to _XData32" >&5
++$as_echo_n "checking for const parameter to _XData32... " >&6; }
++ have_const_param_xdata32=no
++ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++/* end confdefs.h. */
++
++ #include <X11/Xlibint.h>
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++
++int
++main ()
++{
++
++
++ ;
++ return 0;
++}
++_ACEOF
++if ac_fn_c_try_compile "$LINENO"; then :
++
++ have_const_param_xdata32=yes
++ $as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1" >>confdefs.h
++
++
++fi
++rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_xdata32" >&5
++$as_echo "$have_const_param_xdata32" >&6; }
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGenericEvent" >&5
+ $as_echo_n "checking for XGenericEvent... " >&6; }
+ have_XGenericEvent=no
+diff -r 23a5c8f4b312 -r cb19a074e0b1 configure.in
+--- a/configure.in Sun Jun 02 14:27:54 2013 +0200
++++ b/configure.in Sun Jun 02 20:20:18 2013 +0600
+@@ -1144,6 +1144,18 @@
+ ])
+ AC_MSG_RESULT($have_const_param_XextAddDisplay)
+
++ AC_MSG_CHECKING(for const parameter to _XData32)
++ have_const_param_xdata32=no
++ AC_TRY_COMPILE([
++ #include <X11/Xlibint.h>
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++ ],[
++ ],[
++ have_const_param_xdata32=yes
++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
++ ])
++ AC_MSG_RESULT($have_const_param_xdata32)
++
+ dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
+ AC_MSG_CHECKING([for XGenericEvent])
+ have_XGenericEvent=no
+diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.cmake
+--- a/include/SDL_config.h.cmake Sun Jun 02 14:27:54 2013 +0200
++++ b/include/SDL_config.h.cmake Sun Jun 02 20:20:18 2013 +0600
+@@ -266,6 +266,7 @@
+ #cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@
+ #cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@
+ #cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@
++#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32@
+ #cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@
+ #cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@
+
+diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.in
+--- a/include/SDL_config.h.in Sun Jun 02 14:27:54 2013 +0200
++++ b/include/SDL_config.h.in Sun Jun 02 20:20:18 2013 +0600
+@@ -268,6 +268,7 @@
+ #undef SDL_VIDEO_DRIVER_X11_XSHAPE
+ #undef SDL_VIDEO_DRIVER_X11_XVIDMODE
+ #undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
++#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
+ #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY
+ #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
+
+diff -r 23a5c8f4b312 -r cb19a074e0b1 src/video/x11/SDL_x11sym.h
+--- a/src/video/x11/SDL_x11sym.h Sun Jun 02 14:27:54 2013 +0200
++++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:20:18 2013 +0600
+@@ -203,7 +203,11 @@
+ */
+ #ifdef LONG64
+ SDL_X11_MODULE(IO_32BIT)
++#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
++SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
++#else
+ SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
++#endif
+ SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
+ #endif
+
diff --git a/media-libs/libsdl/files/libsdl-xdata32_fix.patch b/media-libs/libsdl/files/libsdl-xdata32_fix.patch
deleted file mode 100644
index 8590cd9..0000000
--- a/media-libs/libsdl/files/libsdl-xdata32_fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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_pre7250.ebuild
similarity index 93%
rename from media-libs/libsdl/libsdl-2.0.0.ebuild
rename to media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild
index 130c8ae..029d8c3 100644
--- a/media-libs/libsdl/libsdl-2.0.0.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild
@@ -10,7 +10,7 @@ MY_PV=${PV/_pre/-}
DESCRIPTION="Simple Direct Media Layer"
HOMEPAGE="http://www.libsdl.org/"
-SRC_URI="http://www.libsdl.org/tmp/release/SDL2-${MY_PV}.tar.gz"
+SRC_URI="http://www.libsdl.org/tmp/SDL-${MY_PV}.tar.gz"
LICENSE="ZLIB"
SLOT="2"
KEYWORDS="~amd64 ~x86"
@@ -63,7 +63,7 @@ DEPEND="${RDEPEND}
xscreensaver? ( x11-proto/scrnsaverproto )
"
-S="${WORKDIR}/SDL2-${MY_PV}"
+S="${WORKDIR}/SDL-${MY_PV}"
DOCS=( BUGS.txt CREDITS.txt README.txt README-hg.txt README-SDL.txt TODO.txt WhatsNew.txt )
@@ -76,8 +76,9 @@ src_prepare() {
# 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"
+ # libX11 1.5.99.902 compilation fix
+ # See http://bugzilla.libsdl.org/show_bug.cgi?id=1769
+ epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-06-05 15:32 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-06-05 15:32 UTC (permalink / raw
To: gentoo-commits
commit: 80791a5afde296bf4dd68aac3291ae1e32d83430
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Wed Jun 5 15:31:48 2013 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Wed Jun 5 15:31:48 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=80791a5a
[media-libs/libsdl] Fix checksum errors for ABI_X86
Package-Manager: portage-2.1.11.62
Manifest-Sign-Key: A018DE8C
---
.../files/libsdl-universal_xdata32_check.patch | 49 ++++++++++++++++++++++
...e7250.ebuild => libsdl-2.0.0_pre7250-r1.ebuild} | 4 ++
2 files changed, 53 insertions(+)
diff --git a/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch
new file mode 100644
index 0000000..d741025
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-universal_xdata32_check.patch
@@ -0,0 +1,49 @@
+# HG changeset patch
+# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
+# Date 1370413935 -21600
+# Node ID 00d5ada80b60f6e163a2ebbb5949515dd9646458
+# Parent 2a858d938e21eb4f6f4496f29557a1fa14b566b4
+Make _XData32 checking universal for 32 and 64 architectures.
+_XData32 is used only for 64, so there should be no regression in 32bit
+enviroment.
+This commit intended for making universal SDL_config.h in mixed 32/64
+enviroment.
+
+diff -r 2a858d938e21 -r 00d5ada80b60 cmake/sdlchecks.cmake
+--- a/cmake/sdlchecks.cmake Wed Jun 05 12:28:53 2013 +0600
++++ b/cmake/sdlchecks.cmake Wed Jun 05 12:32:15 2013 +0600
+@@ -357,6 +357,7 @@
+ endif(HAVE_XGENERICEVENT)
+
+ check_c_source_compiles("
++ #define LONG64
+ #include <X11/Xlibint.h>
+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
+diff -r 2a858d938e21 -r 00d5ada80b60 configure.in
+--- a/configure.in Wed Jun 05 12:28:53 2013 +0600
++++ b/configure.in Wed Jun 05 12:32:15 2013 +0600
+@@ -1147,14 +1147,15 @@
+ AC_MSG_CHECKING(for const parameter to _XData32)
+ have_const_param_xdata32=no
+ AC_TRY_COMPILE([
+- #include <X11/Xlibint.h>
+- extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
+- ],[
+- ],[
+- have_const_param_xdata32=yes
+- AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
+- ])
+- AC_MSG_RESULT($have_const_param_xdata32)
++ #define LONG64
++ #include <X11/Xlibint.h>
++ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
++ ],[
++ ],[
++ have_const_param_xdata32=yes
++ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
++ ])
++ AC_MSG_RESULT($have_const_param_xdata32)
+
+ dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
+ AC_MSG_CHECKING([for XGenericEvent])
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
similarity index 94%
rename from media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild
rename to media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
index 029d8c3..14ff260 100644
--- a/media-libs/libsdl/libsdl-2.0.0_pre7250.ebuild
+++ b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
@@ -74,11 +74,15 @@ src_prepare() {
# 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"
# libX11 1.5.99.902 compilation fix
# See http://bugzilla.libsdl.org/show_bug.cgi?id=1769
epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch"
+ # Make headers more universal for 32/64 archs.
+ # http://bugzilla.libsdl.org/show_bug.cgi?id=1893
+ epatch "${FILESDIR}/${PN}-universal_xdata32_check.patch"
}
src_configure() {
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-07-02 17:00 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-07-02 17:00 UTC (permalink / raw
To: gentoo-commits
commit: bc763c7b3dd040a63650215da7f501989e6dc605
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Tue Jul 2 17:00:03 2013 +0000
Commit: Azamat H. Hackimov <winterheart <AT> gentoo <DOT> ru>
CommitDate: Tue Jul 2 17:00:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gamerlay.git;a=commit;h=bc763c7b
[media-libs/libsdl] Version bump to 2.0.0_pre7338, remove old.
Package-Manager: portage-2.1.12.2
Manifest-Sign-Key: A018DE8C
---
.../files/libsdl-fix-compilation-libX11.patch | 126 ---------------------
media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild | 126 ---------------------
..._pre7304.ebuild => libsdl-2.0.0_pre7338.ebuild} | 0
3 files changed, 252 deletions(-)
diff --git a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch b/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch
deleted file mode 100644
index 077673e..0000000
--- a/media-libs/libsdl/files/libsdl-fix-compilation-libX11.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-# HG changeset patch
-# User Azamat H. Hackimov <azamat.hackimov@gmail.com>
-# Date 1370182818 -21600
-# Node ID cb19a074e0b1c3e03a4eacca149c8a6599ed9bc5
-# Parent 23a5c8f4b312d0b285667e78b9038d403d94c240
-Fix compilation with libX11 >= 1.5.99.902.
-
-These changes fixes bug #1769 for SDL2
-(http://bugzilla.libsdl.org/show_bug.cgi?id=1769).
-
-diff -r 23a5c8f4b312 -r cb19a074e0b1 cmake/sdlchecks.cmake
---- a/cmake/sdlchecks.cmake Sun Jun 02 14:27:54 2013 +0200
-+++ b/cmake/sdlchecks.cmake Sun Jun 02 20:20:18 2013 +0600
-@@ -356,6 +356,14 @@
- set(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS 1)
- endif(HAVE_XGENERICEVENT)
-
-+ check_c_source_compiles("
-+ #include <X11/Xlibint.h>
-+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
-+ int main(int argc, char **argv) {}" HAVE_CONST_XDATA32)
-+ if(HAVE_CONST_XDATA32)
-+ set(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1)
-+ endif(HAVE_CONST_XDATA32)
-+
- check_function_exists(XkbKeycodeToKeysym SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM)
-
- if(VIDEO_X11_XCURSOR AND HAVE_XCURSOR_H)
-diff -r 23a5c8f4b312 -r cb19a074e0b1 configure
---- a/configure Sun Jun 02 14:27:54 2013 +0200
-+++ b/configure Sun Jun 02 20:20:18 2013 +0600
-@@ -19492,6 +19492,35 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_XextAddDisplay" >&5
- $as_echo "$have_const_param_XextAddDisplay" >&6; }
-
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for const parameter to _XData32" >&5
-+$as_echo_n "checking for const parameter to _XData32... " >&6; }
-+ have_const_param_xdata32=no
-+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-+/* end confdefs.h. */
-+
-+ #include <X11/Xlibint.h>
-+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
-+
-+int
-+main ()
-+{
-+
-+
-+ ;
-+ return 0;
-+}
-+_ACEOF
-+if ac_fn_c_try_compile "$LINENO"; then :
-+
-+ have_const_param_xdata32=yes
-+ $as_echo "#define SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 1" >>confdefs.h
-+
-+
-+fi
-+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_const_param_xdata32" >&5
-+$as_echo "$have_const_param_xdata32" >&6; }
-+
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XGenericEvent" >&5
- $as_echo_n "checking for XGenericEvent... " >&6; }
- have_XGenericEvent=no
-diff -r 23a5c8f4b312 -r cb19a074e0b1 configure.in
---- a/configure.in Sun Jun 02 14:27:54 2013 +0200
-+++ b/configure.in Sun Jun 02 20:20:18 2013 +0600
-@@ -1144,6 +1144,18 @@
- ])
- AC_MSG_RESULT($have_const_param_XextAddDisplay)
-
-+ AC_MSG_CHECKING(for const parameter to _XData32)
-+ have_const_param_xdata32=no
-+ AC_TRY_COMPILE([
-+ #include <X11/Xlibint.h>
-+ extern int _XData32(Display *dpy,register _Xconst long *data,unsigned len);
-+ ],[
-+ ],[
-+ have_const_param_xdata32=yes
-+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32)
-+ ])
-+ AC_MSG_RESULT($have_const_param_xdata32)
-+
- dnl AC_CHECK_LIB(X11, XGetEventData, AC_DEFINE(SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS, 1, [Have XGenericEvent]))
- AC_MSG_CHECKING([for XGenericEvent])
- have_XGenericEvent=no
-diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.cmake
---- a/include/SDL_config.h.cmake Sun Jun 02 14:27:54 2013 +0200
-+++ b/include/SDL_config.h.cmake Sun Jun 02 20:20:18 2013 +0600
-@@ -266,6 +266,7 @@
- #cmakedefine SDL_VIDEO_DRIVER_X11_XSHAPE @SDL_VIDEO_DRIVER_X11_XSHAPE@
- #cmakedefine SDL_VIDEO_DRIVER_X11_XVIDMODE @SDL_VIDEO_DRIVER_X11_XVIDMODE@
- #cmakedefine SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS @SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS@
-+#cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32 @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32@
- #cmakedefine SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY @SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY@
- #cmakedefine SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM @SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM@
-
-diff -r 23a5c8f4b312 -r cb19a074e0b1 include/SDL_config.h.in
---- a/include/SDL_config.h.in Sun Jun 02 14:27:54 2013 +0200
-+++ b/include/SDL_config.h.in Sun Jun 02 20:20:18 2013 +0600
-@@ -268,6 +268,7 @@
- #undef SDL_VIDEO_DRIVER_X11_XSHAPE
- #undef SDL_VIDEO_DRIVER_X11_XVIDMODE
- #undef SDL_VIDEO_DRIVER_X11_SUPPORTS_GENERIC_EVENTS
-+#undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
- #undef SDL_VIDEO_DRIVER_X11_CONST_PARAM_XEXTADDDISPLAY
- #undef SDL_VIDEO_DRIVER_X11_HAS_XKBKEYCODETOKEYSYM
-
-diff -r 23a5c8f4b312 -r cb19a074e0b1 src/video/x11/SDL_x11sym.h
---- a/src/video/x11/SDL_x11sym.h Sun Jun 02 14:27:54 2013 +0200
-+++ b/src/video/x11/SDL_x11sym.h Sun Jun 02 20:20:18 2013 +0600
-@@ -203,7 +203,11 @@
- */
- #ifdef LONG64
- SDL_X11_MODULE(IO_32BIT)
-+#if SDL_VIDEO_DRIVER_X11_CONST_PARAM_XDATA32
-+SDL_X11_SYM(int,_XData32,(Display *dpy,register _Xconst long *data,unsigned len),(dpy,data,len),return)
-+#else
- SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
-+#endif
- SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
- #endif
-
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
deleted file mode 100644
index 14ff260..0000000
--- a/media-libs/libsdl/libsdl-2.0.0_pre7250-r1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit cmake-multilib
-
-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"
-
- # libX11 1.5.99.902 compilation fix
- # See http://bugzilla.libsdl.org/show_bug.cgi?id=1769
- epatch "${FILESDIR}/${PN}-fix-compilation-libX11.patch"
- # Make headers more universal for 32/64 archs.
- # http://bugzilla.libsdl.org/show_bug.cgi?id=1893
- epatch "${FILESDIR}/${PN}-universal_xdata32_check.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
-}
diff --git a/media-libs/libsdl/libsdl-2.0.0_pre7304.ebuild b/media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild
similarity index 100%
rename from media-libs/libsdl/libsdl-2.0.0_pre7304.ebuild
rename to media-libs/libsdl/libsdl-2.0.0_pre7338.ebuild
^ permalink raw reply related [flat|nested] 8+ messages in thread* [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/
@ 2013-08-04 8:34 Azamat H. Hackimov
0 siblings, 0 replies; 8+ messages in thread
From: Azamat H. Hackimov @ 2013-08-04 8:34 UTC (permalink / raw
To: gentoo-commits
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)
^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2013-08-04 8:34 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-05 18:15 [gentoo-commits] proj/gamerlay:master commit in: media-libs/libsdl/files/, media-libs/libsdl/ Azamat H. Hackimov
-- strict thread matches above, loose matches on Subject: below --
2013-03-12 16:38 Azamat H. Hackimov
2013-03-18 16:08 Azamat H. Hackimov
2013-05-31 21:28 Vadim A. Misbakh-Soloviov
2013-06-02 15:16 Azamat H. Hackimov
2013-06-05 15:32 Azamat H. Hackimov
2013-07-02 17:00 Azamat H. Hackimov
2013-08-04 8:34 Azamat H. Hackimov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox