From: Mike Frysinger Date: Sun, 28 Aug 2005 22:10:40 +0000 (+0000) Subject: Version bump. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6211b82c1406998fe4adce0596d6c3bc90b45e6d;p=gentoo.git Version bump. Package-Manager: portage-2.0.51.22-r2 --- diff --git a/media-libs/libsdl/ChangeLog b/media-libs/libsdl/ChangeLog index 52e052c606b1..68ecf1a7ce3f 100644 --- a/media-libs/libsdl/ChangeLog +++ b/media-libs/libsdl/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/libsdl # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.85 2005/08/04 03:59:52 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/ChangeLog,v 1.86 2005/08/28 22:10:40 vapier Exp $ + +*libsdl-1.2.9 (28 Aug 2005) + + 28 Aug 2005; Mike Frysinger +libsdl-1.2.9.ebuild: + Version bump. 04 Aug 2005; Mike Frysinger +files/libsdl-1.2.8-no-cxx.patch, +files/libsdl-1.2.8-sdl-config.patch, diff --git a/media-libs/libsdl/Manifest b/media-libs/libsdl/Manifest index c71c2d4123d1..8eaae45d580a 100644 --- a/media-libs/libsdl/Manifest +++ b/media-libs/libsdl/Manifest @@ -2,10 +2,11 @@ Hash: SHA1 MD5 baaaa69f33ef9027dac84ee4ff02773b metadata.xml 974 +MD5 ad06d38a81fc4c950e502084516e4aac libsdl-1.2.9.ebuild 4233 MD5 7f079469132865bdd25780277639f098 libsdl-1.2.7-r3.ebuild 3960 MD5 cbbab78f5125f834ffb0f83be4957736 libsdl-1.2.6-r3.ebuild 3013 MD5 83b134ea49fabe0e7e8f1ad43a453582 libsdl-1.2.8-r1.ebuild 4884 -MD5 866304528e2b7d913587f05e8ba8e0ea ChangeLog 13118 +MD5 1f479d2077b35941a1a483ad80dd1716 ChangeLog 13236 MD5 4f1ce33c931d461bed06277f60341085 files/1.2.8-nobuggy-X.patch 568 MD5 e0c6c6ffc15475282fc864b8f52f0abf files/1.2.8-linux26.patch 1268 MD5 e71ab5ce20cb7c70631a59f9d209cce1 files/1.2.7-joystick.patch 1317 @@ -13,6 +14,7 @@ MD5 4f1ce33c931d461bed06277f60341085 files/1.2.6-nobuggy-X.patch 568 MD5 4ce5ec18eafcf0b1c6caf31c9f67cb1d files/digest-libsdl-1.2.8-r1 62 MD5 419d8c241f85b4deba895c615faa5612 files/libsdl-1.2.6-fullscreen.patch 1094 MD5 abf0c6fe9d93e5b0cc9a4dbb6d93ad87 files/1.2.7-joystick2.patch 16196 +MD5 614874c27d89a83dba0cf9754f6fad6e files/digest-libsdl-1.2.9 62 MD5 71a857d2bbcc34c4807638eb5d710f2e files/1.2.7-26headers.patch 1017 MD5 803844293dc7df2bb7d2323c03977b71 files/1.2.7-libcaca.patch 23266 MD5 0c2020ec3ce37ea0612064c52d1014b1 files/1.2.6-alsa-1.0.0.patch 557 @@ -32,7 +34,7 @@ MD5 206ddd08dd3e33819d03245d11af3014 files/1.2.7-gcc34.patch 8196 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (GNU/Linux) -iD8DBQFC8ZLMgIKl8Uu19MoRAr1kAJ9yjInAUk/SUuEJco94rSTqLtzNmQCfVVCe -rX7hjXzLpmuNu9+QmgyoZb0= -=xYp2 +iD8DBQFDEjZzgIKl8Uu19MoRAlXnAJ409XG7VGHczmz3DlaGBNldzmvaBwCeOmvD +mHLgPua4DdNahwT58xYKu6U= +=xNtn -----END PGP SIGNATURE----- diff --git a/media-libs/libsdl/files/digest-libsdl-1.2.9 b/media-libs/libsdl/files/digest-libsdl-1.2.9 new file mode 100644 index 000000000000..c3c1f27988af --- /dev/null +++ b/media-libs/libsdl/files/digest-libsdl-1.2.9 @@ -0,0 +1 @@ +MD5 80919ef556425ff82a8555ff40a579a0 SDL-1.2.9.tar.gz 2688179 diff --git a/media-libs/libsdl/libsdl-1.2.9.ebuild b/media-libs/libsdl/libsdl-1.2.9.ebuild new file mode 100644 index 000000000000..09c87bc59e4b --- /dev/null +++ b/media-libs/libsdl/libsdl-1.2.9.ebuild @@ -0,0 +1,136 @@ +# Copyright 1999-2005 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.9.ebuild,v 1.1 2005/08/28 22:10:40 vapier Exp $ + +inherit flag-o-matic toolchain-funcs eutils + +DESCRIPTION="Simple Direct Media Layer" +HOMEPAGE="http://www.libsdl.org/" +SRC_URI="http://www.libsdl.org/release/SDL-${PV}.tar.gz" + +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc-macos ~ppc64 ~sparc ~x86" +# WARNING: +# if you have the noaudio, novideo, nojoystick, or noflagstrip use flags +# in USE and something breaks, you pick up the pieces. Be prepared for +# bug reports to be marked INVALID. +IUSE="oss alsa esd arts nas X dga xv xinerama fbcon directfb ggi svga aalib opengl libcaca pic noaudio novideo nojoystick noflagstrip" + +RDEPEND=">=media-libs/audiofile-0.1.9 + alsa? ( media-libs/alsa-lib ) + esd? ( >=media-sound/esound-0.2.19 ) + arts? ( kde-base/arts ) + nas? ( media-libs/nas + virtual/x11 ) + X? ( virtual/x11 ) + 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 )" +DEPEND="${RDEPEND} + x86? ( dev-lang/nasm )" + +S=${WORKDIR}/SDL-${PV} + +pkg_setup() { + if use noaudio || use novideo || use nojoystick ; 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 without the no* flags in USE. You need to know what" + ewarn "you're doing to selectively turn off parts of libsdl." + epause 30 + fi + if use noflagstrip ; 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 noflagstrip use flag in USE." + epause 10 + fi +} + +src_unpack() { + unpack ${A} + cd "${S}" + + epatch "${FILESDIR}"/1.2.8-nobuggy-X.patch #30089 + epatch "${FILESDIR}"/libsdl-1.2.8-libcaca.patch #40224 + epatch "${FILESDIR}"/libsdl-1.2.8-sdl-config.patch + epatch "${FILESDIR}"/libsdl-1.2.8-no-cxx.patch + + ./autogen.sh || die "autogen failed" + epunt_cxx +} + +src_compile() { + local myconf= + if use x86 ; then + # silly bundled asm triggers TEXTREL ... maybe someday + # i'll fix this properly, but for now hide with USE=pic + use pic || myconf="${myconf} $(use_enable x86 nasm)" + fi + use noflagstrip || strip-flags + use noaudio && myconf="${myconf} --disable-audio" + use novideo \ + && myconf="${myconf} --disable-video" \ + || myconf="${myconf} --enable-video-dummy" + use nojoystick && 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 + + if use ppc-macos ; then + append-flags -fno-common -undefined dynamic_lookup -framework OpenGL + # fix for gcc-apple >3.3 + if [ -e libgcc_s.1.dylib ] ; then + append-ldflags -lgcc_s + fi + fi + + myconf="${myconf} ${directfbconf}" + + econf \ + --disable-dependency-tracking \ + --enable-events \ + --enable-cdrom \ + --enable-threads \ + --enable-timers \ + --enable-endian \ + --enable-file \ + --enable-cpuinfo \ + $(use_enable oss) \ + $(use_enable alsa) \ + $(use_enable esd) \ + $(use_enable arts) \ + $(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 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_with X x) \ + ${myconf} || die + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + dodoc BUGS CREDITS README README-SDL.txt README.CVS TODO WhatsNew + dohtml -r ./ +}