diff options
author | Michael Sterrett <mr_bones_@gentoo.org> | 2008-02-09 06:27:02 +0000 |
---|---|---|
committer | Michael Sterrett <mr_bones_@gentoo.org> | 2008-02-09 06:27:02 +0000 |
commit | 03091a5220324c308d9b3420da9bf734db4b6f21 (patch) | |
tree | 441716b1f336754baca39a26a487d6294587ea69 | |
parent | Fix tucnak1 to work with slang 2.1.3. (diff) | |
download | gentoo-2-03091a5220324c308d9b3420da9bf734db4b6f21.tar.gz gentoo-2-03091a5220324c308d9b3420da9bf734db4b6f21.tar.bz2 gentoo-2-03091a5220324c308d9b3420da9bf734db4b6f21.zip |
old
(Portage version: 2.1.3.19)
-rw-r--r-- | media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch | 19 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.11-r1.ebuild | 168 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.11.ebuild | 166 | ||||
-rw-r--r-- | media-libs/libsdl/libsdl-1.2.12.ebuild | 148 |
4 files changed, 0 insertions, 501 deletions
diff --git a/media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch b/media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch deleted file mode 100644 index cd484c1ffdf3..000000000000 --- a/media-libs/libsdl/files/libsdl-1.2.12-c90-comments.patch +++ /dev/null @@ -1,19 +0,0 @@ -http://bugs.gentoo.org/193404 - -Revision 3386 -Motified Sun Aug 5 03:21:18 2007 UTC by icculus -Removed some C++ style comments from the public headers. - ---- branches/SDL-1.2/include/begin_code.h 2007/08/03 04:13:03 3385 -+++ branches/SDL-1.2/include/begin_code.h 2007/08/05 03:21:18 3386 -@@ -90,8 +90,8 @@ - #elif !defined(__WINS__) - #undef DECLSPEC - #define DECLSPEC __declspec(dllexport) --#endif //EKA2 --#endif //__SYMBIAN32__ -+#endif /* !EKA2 */ -+#endif /* __SYMBIAN32__ */ - - /* Force structure packing at 4 byte alignment. - This is necessary if the header is included in code which has structure diff --git a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild b/media-libs/libsdl/libsdl-1.2.11-r1.ebuild deleted file mode 100644 index e852acc09528..000000000000 --- a/media-libs/libsdl/libsdl-1.2.11-r1.ebuild +++ /dev/null @@ -1,168 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11-r1.ebuild,v 1.7 2007/12/30 00:25:20 vapier Exp $ - -inherit flag-o-matic 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 have the noaudio, novideo, nojoystick, or custom-cflags 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 noaudio novideo nojoystick custom-cflags" - -RDEPEND="!noaudio? ( >=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 - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - X? ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - 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 )" -DEPEND="${RDEPEND} - nas? ( - x11-proto/xextproto - x11-proto/xproto - ) - X? ( - x11-proto/xextproto - x11-proto/xproto - ) - x86? ( >=dev-lang/nasm-0.98.39-r3 )" - -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 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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-libcaca-new-api.patch #40224 - epatch "${FILESDIR}"/${P}-sdl-config.patch - epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917 - epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186 - epatch "${FILESDIR}"/${P}-audioConv.patch #151991 - epatch "${FILESDIR}"/${P}-fbcon-page-header.patch #159923 #169388 - epatch "${FILESDIR}"/${P}-yasm-checks.patch #163053 - - # add yasm-compatible defines to nasm code (hopefully we - # can get this killed soonish) - local f - for f in "${S}"/src/hermes/*.asm ; do - cat <<-EOF >> "${f}" - %ifidn __YASM_OBJFMT__,elf - section ".note.GNU-stack" noalloc noexec nowrite progbits - %endif - EOF - done - - # yasm does not understand -i - # bug #147201 - sed -i \ - -e 's:NASMFLAGS -i:NASMFLAGS -I:' \ - configure.in \ - || die "sed failed" - - ./autogen.sh || die "autogen failed" - elibtoolize -} - -src_compile() { - local myconf= - if [[ $(tc-arch) != "x86" ]] ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || 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 - - myconf="${myconf} ${directfbconf}" - - econf \ - --disable-dependency-tracking \ - --disable-rpath \ - --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 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_with X x) \ - --disable-video-x11-xme \ - ${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 ./ -} diff --git a/media-libs/libsdl/libsdl-1.2.11.ebuild b/media-libs/libsdl/libsdl-1.2.11.ebuild deleted file mode 100644 index 26980c0bb608..000000000000 --- a/media-libs/libsdl/libsdl-1.2.11.ebuild +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.11.ebuild,v 1.23 2007/12/30 00:25:20 vapier Exp $ - -inherit flag-o-matic 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 have the noaudio, novideo, nojoystick, or custom-cflags 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 noaudio novideo nojoystick custom-cflags" - -RDEPEND="!noaudio? ( >=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 - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - X? ( - x11-libs/libXt - x11-libs/libXext - x11-libs/libX11 - ) - 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 )" -DEPEND="${RDEPEND} - nas? ( - x11-proto/xextproto - x11-proto/xproto - ) - X? ( - x11-proto/xextproto - x11-proto/xproto - ) - x86? ( >=dev-lang/nasm-0.98.39-r3 )" - -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 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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${P}-libcaca-new-api.patch #40224 - epatch "${FILESDIR}"/${P}-sdl-config.patch - epatch "${FILESDIR}"/${P}-xinerama-head-0.patch #145917 - epatch "${FILESDIR}"/${P}-no-inline-BlitRGBtoRGBPixelAlphaMMX3DNOW.patch #148186 - epatch "${FILESDIR}"/${P}-yasm-checks.patch #163053 - - # add yasm-compatible defines to nasm code (hopefully we - # can get this killed soonish) - local f - for f in "${S}"/src/hermes/*.asm ; do - cat <<-EOF >> "${f}" - %ifidn __YASM_OBJFMT__,elf - section ".note.GNU-stack" noalloc noexec nowrite progbits - %endif - EOF - done - - # yasm does not understand -i - # bug #147201 - sed -i \ - -e 's:NASMFLAGS -i:NASMFLAGS -I:' \ - configure.in \ - || die "sed failed" - - ./autogen.sh || die "autogen failed" - elibtoolize -} - -src_compile() { - local myconf= - if [[ $(tc-arch) != "x86" ]] ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} $(use_enable x86 nasm)" - fi - use custom-cflags || 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 - - myconf="${myconf} ${directfbconf}" - - econf \ - --disable-dependency-tracking \ - --disable-rpath \ - --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 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_with X x) \ - --disable-video-x11-xme \ - ${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 ./ -} diff --git a/media-libs/libsdl/libsdl-1.2.12.ebuild b/media-libs/libsdl/libsdl-1.2.12.ebuild deleted file mode 100644 index 2c212bd08a9b..000000000000 --- a/media-libs/libsdl/libsdl-1.2.12.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/libsdl/libsdl-1.2.12.ebuild,v 1.4 2007/12/30 00:25:20 vapier Exp $ - -inherit flag-o-matic 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 have the noaudio, novideo, nojoystick, or custom-cflags 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 noaudio novideo nojoystick custom-cflags" - -RDEPEND="!noaudio? ( >=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 - 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 )" -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 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 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_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-1.2.11-libcaca-new-api.patch #40224 - epatch "${FILESDIR}"/${PN}-1.2.11-sdl-config.patch - epatch "${FILESDIR}"/${PN}-1.2.11-xinerama-head-0.patch #145917 - epatch "${FILESDIR}"/${P}-c90-comments.patch #193404 - - ./autogen.sh || die "autogen failed" - elibtoolize -} - -src_compile() { - local myconf= - if [[ $(tc-arch) != "x86" ]] ; then - myconf="${myconf} --disable-nasm" - else - myconf="${myconf} --enable-nasm" - fi - use custom-cflags || 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 - - myconf="${myconf} ${directfbconf}" - - econf \ - --disable-dependency-tracking \ - --disable-rpath \ - --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 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_with X x) \ - --disable-video-x11-xme \ - ${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 ./ -} |