diff options
author | Tristan Heaven <nyhm@gentoo.org> | 2007-04-26 18:06:14 +0000 |
---|---|---|
committer | Tristan Heaven <nyhm@gentoo.org> | 2007-04-26 18:06:14 +0000 |
commit | 70d8b0861d2bbcf7e24ed01c88f4f23b093c9298 (patch) | |
tree | d158693e977373d7cf9a16c23c2e99ba7da5fa57 /app-emulation/vice | |
parent | remove unneeded media-libs/mlt snapshot mask as its now gone as there are off... (diff) | |
download | gentoo-2-70d8b0861d2bbcf7e24ed01c88f4f23b093c9298.tar.gz gentoo-2-70d8b0861d2bbcf7e24ed01c88f4f23b093c9298.tar.bz2 gentoo-2-70d8b0861d2bbcf7e24ed01c88f4f23b093c9298.zip |
Version bump
(Portage version: 2.1.2.4)
Diffstat (limited to 'app-emulation/vice')
-rw-r--r-- | app-emulation/vice/ChangeLog | 8 | ||||
-rw-r--r-- | app-emulation/vice/files/digest-vice-1.17 | 3 | ||||
-rw-r--r-- | app-emulation/vice/files/digest-vice-1.19 | 3 | ||||
-rw-r--r-- | app-emulation/vice/files/digest-vice-1.20 | 3 | ||||
-rw-r--r-- | app-emulation/vice/files/digest-vice-1.21 | 3 | ||||
-rw-r--r-- | app-emulation/vice/files/vice-1.19-64bitfix.patch | 39 | ||||
-rw-r--r-- | app-emulation/vice/files/vice-1.21-uicolor.patch | 22 | ||||
-rw-r--r-- | app-emulation/vice/vice-1.17.ebuild | 87 | ||||
-rw-r--r-- | app-emulation/vice/vice-1.19.ebuild | 95 | ||||
-rw-r--r-- | app-emulation/vice/vice-1.21.ebuild (renamed from app-emulation/vice/vice-1.20.ebuild) | 25 |
10 files changed, 47 insertions, 241 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog index 1ead72e07200..bfd78e1776c3 100644 --- a/app-emulation/vice/ChangeLog +++ b/app-emulation/vice/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-emulation/vice # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.45 2007/04/24 13:14:19 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.46 2007/04/26 18:06:14 nyhm Exp $ + +*vice-1.21 (26 Apr 2007) + + 26 Apr 2007; Tristan Heaven <nyhm@gentoo.org> + +files/vice-1.21-uicolor.patch, +vice-1.21.ebuild: + Version bump 24 Apr 2007; Gustavo Zacarias <gustavoz@gentoo.org> vice-1.20.ebuild: Stable on sparc diff --git a/app-emulation/vice/files/digest-vice-1.17 b/app-emulation/vice/files/digest-vice-1.17 deleted file mode 100644 index b9a25cfd21cc..000000000000 --- a/app-emulation/vice/files/digest-vice-1.17 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 a3b70d5fcef0b345599b6d452401e18e vice-1.17.tar.gz 4412711 -RMD160 ec73b69ee9bad49d10f7b6047082d24cc4f37009 vice-1.17.tar.gz 4412711 -SHA256 cb7bed2e200ea53d207a627f7d758c6daffe0461edf7ceb9654d1f3363c53a1d vice-1.17.tar.gz 4412711 diff --git a/app-emulation/vice/files/digest-vice-1.19 b/app-emulation/vice/files/digest-vice-1.19 deleted file mode 100644 index 013680847651..000000000000 --- a/app-emulation/vice/files/digest-vice-1.19 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 92f828f29e05f57d7a498a861d3dab6a vice-1.19.tar.gz 4796181 -RMD160 d0a62750c30e3cf8645117a8e8536a8061c260ea vice-1.19.tar.gz 4796181 -SHA256 faf354cfef53f5b31c459692fac73dd45b72d9b05d6920348bd881856d75cd7e vice-1.19.tar.gz 4796181 diff --git a/app-emulation/vice/files/digest-vice-1.20 b/app-emulation/vice/files/digest-vice-1.20 deleted file mode 100644 index 469a839e49f9..000000000000 --- a/app-emulation/vice/files/digest-vice-1.20 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 d02fe05f0f9e839820105cdf51da6b4e vice-1.20.tar.gz 5183757 -RMD160 b4f7a50257cbdd6338d4e685760e99c07ad14adb vice-1.20.tar.gz 5183757 -SHA256 be32aabeb9073c25532e6df796e782a2949c464dcccb1648ad0db27fef6fd177 vice-1.20.tar.gz 5183757 diff --git a/app-emulation/vice/files/digest-vice-1.21 b/app-emulation/vice/files/digest-vice-1.21 new file mode 100644 index 000000000000..0c87a06f1327 --- /dev/null +++ b/app-emulation/vice/files/digest-vice-1.21 @@ -0,0 +1,3 @@ +MD5 913bdee9d59d154ed33ef4e037d8a12c vice-1.21.tar.gz 5725833 +RMD160 1384cb4d80be6801de603c0424b3a5e5dd18de15 vice-1.21.tar.gz 5725833 +SHA256 511ed35e6692f68e8b58ea3d040af6428239859e31eef9d99b6187a166373389 vice-1.21.tar.gz 5725833 diff --git a/app-emulation/vice/files/vice-1.19-64bitfix.patch b/app-emulation/vice/files/vice-1.19-64bitfix.patch deleted file mode 100644 index 5961b8eea2ae..000000000000 --- a/app-emulation/vice/files/vice-1.19-64bitfix.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- vice-1.18/src/gfxoutputdrv/ffmpeg/common.h.unpatched 2005-12-25 11:57:38.000000000 +0100 -+++ vice-1.18/src/gfxoutputdrv/ffmpeg/common.h 2005-12-25 12:01:47.000000000 +0100 -@@ -18,6 +18,10 @@ - //#define A32_BITSTREAM_READER - #define LIBMPEG2_BITSTREAM_READER_HACK //add BERO - -+#if defined(WIN32) && !defined(__MINGW32__) && !defined(__CYGWIN__) && !defined(EMULATE_INTTYPES) -+# define EMULATE_INTTYPES -+#endif -+ - #ifndef M_PI - #define M_PI 3.14159265358979323846 - #endif -@@ -93,7 +97,6 @@ - #endif - #endif - --#define EMULATE_INTTYPES - #ifndef EMULATE_INTTYPES - # include <inttypes.h> - #else -@@ -255,7 +258,7 @@ - - extern const uint32_t inverse[256]; - --#ifdef ARCH_X86 -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - # define FASTDIV(a,b) \ - ({\ - int ret,dmy;\ -@@ -1219,7 +1222,7 @@ - #define MKBETAG(a,b,c,d) (d | (c << 8) | (b << 16) | (a << 24)) - - --#ifdef ARCH_X86 -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - #define MASK_ABS(mask, level)\ - asm volatile(\ - "cdq \n\t"\ diff --git a/app-emulation/vice/files/vice-1.21-uicolor.patch b/app-emulation/vice/files/vice-1.21-uicolor.patch new file mode 100644 index 000000000000..7eebf08d185a --- /dev/null +++ b/app-emulation/vice/files/vice-1.21-uicolor.patch @@ -0,0 +1,22 @@ +--- src/arch/unix/x11/gnome/uicolor.c ++++ src/arch/unix/x11/gnome/uicolor.c +@@ -166,7 +166,7 @@ + way to do this? //tvr */ + im = XCreateImage(display, GDK_VISUAL_XVISUAL(visual), + x11ui_get_display_depth(), +- ZPixmap, 0, (char *)data, 1, 1, 8, 1); ++ ZPixmap, 0, (char *)data, 1, 1, 8, 0); + if (!im) { + log_error(LOG_DEFAULT, _("XCreateImage failed.")); + free(data); +--- src/arch/unix/x11/xaw/uicolor.c ++++ src/arch/unix/x11/xaw/uicolor.c +@@ -121,7 +121,7 @@ + /* This is a kludge to map pixels to zimage values. Is there a better + way to do this? //tvr */ + im = XCreateImage(display, visual, x11ui_get_display_depth(), +- ZPixmap, 0, (char *)data, 1, 1, 8, 1); ++ ZPixmap, 0, (char *)data, 1, 1, 8, 0); + if (!im) { + log_error(LOG_DEFAULT, _("XCreateImage failed.")); + free(data); diff --git a/app-emulation/vice/vice-1.17.ebuild b/app-emulation/vice/vice-1.17.ebuild deleted file mode 100644 index 782ce3aed293..000000000000 --- a/app-emulation/vice/vice-1.17.ebuild +++ /dev/null @@ -1,87 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.17.ebuild,v 1.8 2006/11/17 23:06:10 compnerd Exp $ - -inherit eutils games - -DESCRIPTION="The Versatile Commodore 8-bit Emulator" -HOMEPAGE="http://www.viceteam.org/" -SRC_URI="ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc x86" -IUSE="X Xaw3d arts esd ffmpeg nls readline sdl" - -XDEPEND="|| ( - ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libICE - x11-libs/libSM - x11-libs/libXv - x11-libs/libXxf86dga ) - virtual/x11 )" -RDEPEND="esd? ( media-sound/esound ) - media-libs/libpng - sys-libs/zlib - arts? ( kde-base/arts ) - readline? ( sys-libs/readline ) - sdl? ( - ${XDPENED} - || ( - ( - x11-libs/libXt - x11-libs/libXmu ) - virtual/x11 ) - media-libs/libsdl ) - X? ( - ${XDEPEND} - || ( - ( - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXaw ) - virtual/x11 ) ) - Xaw3d? ( - ${XDEPEND} - x11-libs/Xaw3d ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND} - || ( - ( - x11-proto/xproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/videoproto ) - virtual/x11 )" - -src_compile() { - egamesconf \ - --disable-dependency-tracking \ - --enable-fullscreen \ - --enable-textfield \ - --enable-ethernet \ - --enable-realdevice \ - --with-resid \ - --without-midas \ - $(use_enable ffmpeg) \ - $(use_enable nls) \ - $(use_with X x) \ - $(use_with Xaw3d xaw3d) \ - $(use_with arts) \ - $(use_with esd) \ - $(use_with readline) \ - $(use_with sdl) \ - || die - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog FEEDBACK README - prepgamesdirs -} diff --git a/app-emulation/vice/vice-1.19.ebuild b/app-emulation/vice/vice-1.19.ebuild deleted file mode 100644 index 8b41ac69b5c3..000000000000 --- a/app-emulation/vice/vice-1.19.ebuild +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright 1999-2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.19.ebuild,v 1.11 2006/11/17 23:06:10 compnerd Exp $ - -inherit eutils games - -DESCRIPTION="The Versatile Commodore 8-bit Emulator" -HOMEPAGE="http://www.viceteam.org/" -SRC_URI="ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ppc sparc ~x86" -IUSE="X Xaw3d arts esd ffmpeg nls readline sdl" - -XDEPEND="|| ( - ( - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libICE - x11-libs/libSM - x11-libs/libXv - x11-libs/libXxf86dga ) - virtual/x11 )" -RDEPEND="esd? ( media-sound/esound ) - media-libs/libpng - sys-libs/zlib - arts? ( kde-base/arts ) - readline? ( sys-libs/readline ) - sdl? ( - ${XDEPEND} - || ( - ( - x11-libs/libXt - x11-libs/libXmu ) - virtual/x11 ) - media-libs/libsdl ) - X? ( - ${XDEPEND} - || ( - ( - x11-libs/libXt - x11-libs/libXmu - x11-libs/libXpm - x11-libs/libXaw ) - virtual/x11 ) ) - Xaw3d? ( - ${XDEPEND} - x11-libs/Xaw3d ) - ffmpeg? ( media-video/ffmpeg )" -DEPEND="${RDEPEND} - || ( - ( - x11-apps/bdftopcf - x11-apps/mkfontdir - x11-proto/xproto - x11-proto/xf86vidmodeproto - x11-proto/xextproto - x11-proto/xf86dgaproto - x11-proto/videoproto ) - virtual/x11 )" - -src_unpack() { - unpack ${A} - cd "${S}" - epatch "${FILESDIR}/${P}"-64bitfix.patch -} - -src_compile() { - egamesconf \ - --disable-dependency-tracking \ - --enable-fullscreen \ - --enable-textfield \ - --enable-ethernet \ - --enable-realdevice \ - --with-resid \ - --without-midas \ - $(use_enable ffmpeg) \ - $(use_enable nls) \ - $(use_with X x) \ - $(use_with Xaw3d xaw3d) \ - $(use_with arts) \ - $(use_with esd) \ - $(use_with readline) \ - $(use_with sdl) \ - || die - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - dodoc AUTHORS ChangeLog FEEDBACK README - prepgamesdirs -} diff --git a/app-emulation/vice/vice-1.20.ebuild b/app-emulation/vice/vice-1.21.ebuild index d5e7d9984720..4c69ee2cc2c3 100644 --- a/app-emulation/vice/vice-1.20.ebuild +++ b/app-emulation/vice/vice-1.21.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.20.ebuild,v 1.6 2007/04/24 13:14:19 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-1.21.ebuild,v 1.1 2007/04/26 18:06:14 nyhm Exp $ -inherit games +inherit eutils games DESCRIPTION="The Versatile Commodore 8-bit Emulator" HOMEPAGE="http://www.viceteam.org/" @@ -10,8 +10,8 @@ SRC_URI="http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/${P LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~ppc sparc x86" -IUSE="Xaw3d alsa arts esd gnome nls png readline sdl" +KEYWORDS="~amd64 ppc sparc x86" +IUSE="Xaw3d alsa arts esd ffmpeg gnome nls png readline sdl" RDEPEND="media-libs/giflib media-libs/jpeg @@ -29,6 +29,10 @@ RDEPEND="media-libs/giflib alsa? ( media-libs/alsa-lib ) arts? ( kde-base/arts ) esd? ( media-sound/esound ) + ffmpeg? ( + media-video/ffmpeg + media-sound/lame + ) gnome? ( gnome-base/libgnomeui ) nls? ( virtual/libintl ) png? ( media-libs/libpng ) @@ -51,19 +55,20 @@ src_unpack() { -e '/^gnulocaledir/s:$(prefix):/usr:' \ po/Makefile.in.in \ || die "sed failed" + sed -i \ + -e 's/getline/intlpo_getline/' \ + po/intl2po.c \ + || die "sed failed" + epatch "${FILESDIR}"/${P}-uicolor.patch #174056 } src_compile() { - # --enable-ffmpeg broken with 0.4.9_p20060530 egamesconf \ --disable-dependency-tracking \ - --disable-ffmpeg \ - --enable-ethernet \ --enable-fullscreen \ - --enable-textfield \ - --enable-realdevice \ - --with-resid \ --without-midas \ + --without-resid \ + $(use_enable ffmpeg) \ $(use_enable gnome gnomeui) \ $(use_enable nls) \ $(use_with Xaw3d xaw3d) \ |