add static-libs support; add mouse click patch from Debian to try to work around...

Package-Manager: portage-2.1.7.17/cvs/Linux i686

diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog
index 9ee70c18d14e640a73f99187f2f06cbe466d39a5..92b2940ae3bf967e85bd3890598d67b964805584 100644 (file)
--- a/media-libs/libsdl/ChangeLog
+++ b/media-libs/libsdl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/libsdl
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.167 2010/03/15 18:27:56 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.168 2010/04/08 20:25:47 mr_bones_ Exp $
+
+*libsdl-1.2.14-r2 (08 Apr 2010)
+
+  08 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  +libsdl-1.2.14-r2.ebuild, +files/libsdl-1.2.14-click.patch:
+  add static-libs support; add mouse click patch from Debian to try to
+  work around bug #290695
 
 *libsdl-1.2.14-r1 (15 Mar 2010)
 

diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest
index 51c12c332d3852a10736c05a2c370af33eb82822..3a5cfdfb45bc4036c2b4050fb85d12d2f519d9f7 100644 (file)
--- a/media-libs/libsdl/Manifest
+++ b/media-libs/libsdl/Manifest
@@ -3,10 +3,12 @@ AUX libsdl-1.2.13-libcaca-new-api.patch 17411 RMD160 623fef5bc3f502e5bbf96fc7a6d
 AUX libsdl-1.2.13-pulseaudio.patch 1882 RMD160 85216ee5b297606d2cd7785294e8185270eda7c7 SHA1 0b0dbfc237d7ec071f3acb412d08b7e88254e37f SHA256 4a1233bfe237fc9cf1f77b2ad84fec2ac9871be115f0a035038b799c55ebc83f
 AUX libsdl-1.2.13-sdl-config.patch 780 RMD160 63a3f86cd25011d0d1e983d89910d4bceb965e86 SHA1 01c8d54cb8a22ea2a1e898b3ca39f9baca07dc98 SHA256 1c73cc815ae4f6fdaee3dc899a9f38e9f29f88e3997070c9fba226b36dbed015
 AUX libsdl-1.2.13-xinerama-head-0.patch 882 RMD160 41cd75c0eaeff10484c363c829a7f022c3dcc261 SHA1 ff63d7c1e8e4876a15a0b13e3b3f99fb7c14accb SHA256 612b6e5aeb0b155fa516124dce73a62a57ee5ab46b39c2ab67ae77de69ec0b8d
+AUX libsdl-1.2.14-click.patch 804 RMD160 5330dbd055bd7451ce5af133a9c8eb9446b2664f SHA1 481bd4371dd0099556435d9972a3d16274833d63 SHA256 8d178f13eb707e81f5f9d86bf7b609ae8f0bac937fb4a37ebcbf4bbc9b89e21b
 DIST SDL-1.2.13.tar.gz 3373673 RMD160 ed8825fc98f4b3759cf9e5cf8357d71c50df9925 SHA1 51fcaa3e1d5c01fd813ea08688780f86b19cf539 SHA256 94f99df1d60f296b57f4740650a71b6425da654044ca30f8f0ce34934429e132
 DIST SDL-1.2.14.tar.gz 4014154 RMD160 a3a9a691f5510eb5327ca159a034f55a70cb5801 SHA1 ba625b4b404589b97e92d7acd165992debe576dd SHA256 5d927e287034cb6bb0ebccfa382cb1d185cb113c8ab5115a0759798642eed9b6
 EBUILD libsdl-1.2.13-r1.ebuild 4408 RMD160 366a3f3f96baca55bc308eed5c5a7bb5b0234a33 SHA1 d87306a3c618de1499dc53eae95f131c58ab76f2 SHA256 f9f729e942b19ecae67c3a497bcc6387b297e0bdf10efa4b4fec607690e8b4be
 EBUILD libsdl-1.2.14-r1.ebuild 4408 RMD160 acab2efeef1bf4dfb68010ba959504256b70234d SHA1 70194a0dc921a0caffd13fc26d5ff998b3431670 SHA256 ca2acf34a6a856343500c13f95ad6e7be8c881006d93add6eb43e307bb5203a4
+EBUILD libsdl-1.2.14-r2.ebuild 4564 RMD160 d4db0b64500538d1766b2526504c3451ffe0de77 SHA1 b692d3548e7ac2cb1117c50252921f2b5473d1e8 SHA256 ccd9274858772a198ddbd388b438a0cbb93749bb0b18d149dc5ed80c1740c5ce
 EBUILD libsdl-1.2.14.ebuild 4218 RMD160 cf217f2af01d585f4f4ca0afcd5f0a01e9bc89c0 SHA1 a1ba08c8d034e5ac1eb591721c0144b65a3c9396 SHA256 e7ca5921e4625d7a73d0383b89014a5eb41866f9391857327590a58d5cf684fd
-MISC ChangeLog 25855 RMD160 41782372b7c1d1fb6ba57f5b236bcaacb81007f8 SHA1 d6018dde6e3a67f0c9af214e99a0fb9c02bfc2fc SHA256 251a500d86c1a8a216bd68e969fe960e6d90cd041c2b9f758975470efe5ff43d
+MISC ChangeLog 26103 RMD160 b3e2e08abc7642d67e5f4e7c1038766b901503e3 SHA1 32fdb632c2ff458713518b57e6692c8e4ae66b68 SHA256 43cb25ce2953c06319e68d1aca43f960d0d75be2966665e11c051a387279ea42
 MISC metadata.xml 1357 RMD160 f76f0ef20941fc2c320b8a13f497dcb43f124cc9 SHA1 e5c05312f46bc682fc7fed1c7cec23bbdb59cd07 SHA256 a19b0d85c597bbe4d3dffa744d2ed9365660f8082145ab6b6f0813e36e174827

diff --git a/media-libs/libsdl/files/libsdl-1.2.14-click.patch b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
new file mode 100644 (file)
index 0000000..7d3e5ac
--- /dev/null
+++ b/media-libs/libsdl/files/libsdl-1.2.14-click.patch
@@ -0,0 +1,23 @@
+--- 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/libsdl-1.2.14-r2.ebuild b/media-libs/libsdl/libsdl-1.2.14-r2.ebuild
new file mode 100644 (file)
index 0000000..2982248
--- /dev/null
+++ b/media-libs/libsdl/libsdl-1.2.14-r2.ebuild
@@ -0,0 +1,154 @@
+# 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
+
+       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 ./
+}