Bump
git-svn-id: https://svn.disconnected-by-peer.at/svn/linamh/trunk/linamh@3030 6952d904-891a-0410-993b-d76249ca496b
This commit is contained in:
geos_one
parent
45c39afb37
commit
5ed962b210
@ -1,12 +1,32 @@
|
||||
# ChangeLog for app-emulation/vice
|
||||
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.72 2010/04/11 17:04:29 phajdan.jr Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.79 2011/11/10 03:42:00 ssuominen Exp $
|
||||
|
||||
01 Apr 2011; Mario Fetka <mario.fetka@gmail.com> vice-2.2-r1.ebuild:
|
||||
add keywords
|
||||
10 Nov 2011; Samuli Suominen <ssuominen@gentoo.org> -vice-2.2.ebuild,
|
||||
-files/vice-2.2-xshm.patch:
|
||||
old
|
||||
|
||||
07 Nov 2010; Mario Fetka <mario.fetka@gmail.com> ChangeLog:
|
||||
add vice with opencbm support
|
||||
24 Oct 2011; Michael Sterrett <mr_bones_@gentoo.org> vice-2.3.ebuild,
|
||||
+files/vice-2.3-notexi.patch:
|
||||
Avoid building pre-built docs (bug #379633) with patch from Jared B.
|
||||
|
||||
08 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> vice-2.3.ebuild:
|
||||
x86 stable wrt bug #385895
|
||||
|
||||
02 Aug 2011; Matt Turner <mattst88@gentoo.org> vice-2.2.ebuild,
|
||||
vice-2.3.ebuild:
|
||||
Renamed x11-libs/Xaw3d to x11-libs/libXaw3d.
|
||||
|
||||
*vice-2.3 (29 Jul 2011)
|
||||
|
||||
29 Jul 2011; Michael Sterrett <mr_bones_@gentoo.org> +vice-2.3.ebuild:
|
||||
version bump (bug #368157)
|
||||
|
||||
31 Mar 2011; Tomáš Chvátal <scarabeus@gentoo.org> vice-2.2.ebuild:
|
||||
Depend on virtual/ffmpeg instead of media-video/ffmpeg.
|
||||
|
||||
25 Feb 2011; Kevin McCarthy <signals@gentoo.org> vice-2.2.ebuild:
|
||||
Depend on virtual/jpeg instead of media-libs/jpeg
|
||||
|
||||
11 Apr 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org> vice-2.2.ebuild:
|
||||
x86 stable wrt bug #302506
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
AUX vice-2.2-xshm.patch 1691 RMD160 b5a99eb56e6f89404da4ac7fb72c123beb500a52 SHA1 731b29e46f30411d532cf57ea674b48acfe7cb7e SHA256 58d6aeaebec1fe4a52a434b8f6874b67aa7ebea40339796f1b164726a864e27a
|
||||
DIST vice-2.2.tar.gz 9597027 RMD160 d3fb33deb776ffcae297df413849437fb4e49840 SHA1 88ec1f4fefc708957b242805a28ca9b26a3e2738 SHA256 5d581bf817c97f1887651f92e73dd1f5e3c14627fa86fc70732491be7cba1551
|
||||
EBUILD vice-2.2-r1.ebuild 2997 RMD160 84a50cb499c2e587c00f3ce12064dbc2cfc4fbf1 SHA1 5f4417a1c980814a80d7596c6190408b7b63165d SHA256 766bc6b183df69fc7be0b9e1147c41377b1c06faeb0db3b2ee9b103256e3f5b7
|
||||
MISC ChangeLog 9600 RMD160 9786c41fe1d5c0d96ac7a0e704e98d466925eb46 SHA1 f788471faf17342b97c64d0ad3844b32ccadcee4 SHA256 ac5eae716aedbeaeeb46e588d6f870954c6ef6c218f904c8fc0b9f09497ae4b9
|
||||
AUX vice-2.3-notexi.patch 395 RMD160 7826ca7349482120daea173be5c838ff00d3776c SHA1 9fcb7442b97db56ecb16d5b0c8c11387f9434581 SHA256 15897692063aac52306082f5ce933a17ba94ecfe8a5c3b65f72db62d478cefbc
|
||||
DIST vice-2.3.tar.gz 11602378 RMD160 056e48ffedfaecd470892c73b97af89c1e002ff9 SHA1 5e7e1a375a4ca8c4895dc1552162955fdffce296 SHA256 b1817c8dce023069d5c15234c2b4da0a152d297ee8ed01f0b361795c4beeb50e
|
||||
EBUILD vice-2.3.ebuild 2948 RMD160 e1f2dceff51192122d97b9b2405b52c12a788f25 SHA1 da79b9178f5325d0eb25a497e309c8423ac2a3a9 SHA256 2fc53b7bf7f534cf2517350bef9c5e1771b7788f603cf19e5cd04d09dd66e817
|
||||
MISC ChangeLog 10317 RMD160 eeb982f2cb96841840a8abce064e1fb385dc848e SHA1 f02250b8596eec84ce859f6294dde8cb3e4f0f96 SHA256 54e44437784c7640d37deaadbf881a09d91e0fd0810f81d7e025bcbb8c035121
|
||||
MISC metadata.xml 355 RMD160 2be86be120d60193f7debc4eac5b87274ea71d0e SHA1 47edf967eca28ee36ba41788a9f2f55330b6a1b4 SHA256 74dd1a42d4949ea4d7e8f1267fb2b6d0f63b8cee0f1aa2cb9278f674192edb1f
|
||||
|
||||
@ -1,49 +0,0 @@
|
||||
Patch from upstream trunk for xextproto >= 7.0.99.1 compability.
|
||||
|
||||
--- configure.in
|
||||
+++ configure.in
|
||||
@@ -2192,6 +2192,11 @@
|
||||
[ X_LIBS="-lXext $X_LIBS";
|
||||
LINK_X_LIBS="-lXext $LINK_X_LIBS"],,$X_LIBS)
|
||||
|
||||
+ PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
|
||||
+ HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
|
||||
+ HAVE_XEXTPROTO_71="no")
|
||||
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
|
||||
+
|
||||
AC_MSG_CHECKING(for X11/extensions/Xvlib.h)
|
||||
AC_TRY_LINK([#include <X11/Xlib.h>
|
||||
#include <X11/extensions/Xvlib.h>],
|
||||
@@ -2391,6 +2396,11 @@
|
||||
AC_DEFINE(HAS_TRANSLATION,,[Enable internationalization support])
|
||||
fi
|
||||
|
||||
+dnl Handle the xextproto conditinal for the systems that don't use it
|
||||
+if test x"$is_unix_x11" != "xyes" -o x"$enable_sdlui" = "xyes" -o x"$enable_gnomeui" = "xyes"; then
|
||||
+ AM_CONDITIONAL(HAVE_XEXTPROTO_71, false)
|
||||
+fi
|
||||
+
|
||||
dnl CBM4Linux/OpenCBM
|
||||
AC_MSG_CHECKING([for OpenCBM support])
|
||||
if test x"$enable_realdevice" != "xno"; then
|
||||
--- src/arch/unix/x11/xaw/x11video.c
|
||||
+++ src/arch/unix/x11/xaw/x11video.c
|
||||
@@ -56,6 +56,7 @@
|
||||
#include "vice.h"
|
||||
|
||||
#include <X11/Xlib.h>
|
||||
+#include <X11/Xlibint.h>
|
||||
#include <X11/Xutil.h>
|
||||
#include <X11/Intrinsic.h>
|
||||
#include <X11/cursorfont.h>
|
||||
@@ -95,6 +96,10 @@
|
||||
#endif
|
||||
|
||||
#ifdef USE_MITSHM
|
||||
+#ifdef HAVE_XEXTPROTO_71
|
||||
+#include <X11/extensions/shmproto.h>
|
||||
+#include <X11/extensions/XShm.h>
|
||||
+#endif
|
||||
extern int shmhandler(Display* display, XErrorEvent* err);
|
||||
extern int mitshm_failed; /* will be set to true if XShmAttach() failed */
|
||||
extern int shmmajor; /* major number of MITSHM error codes */
|
||||
17
app-emulation/vice/files/vice-2.3-notexi.patch
Normal file
17
app-emulation/vice/files/vice-2.3-notexi.patch
Normal file
@ -0,0 +1,17 @@
|
||||
--- doc/Makefile.am.orig
|
||||
+++ doc/Makefile.am
|
||||
@@ -48,14 +48,7 @@
|
||||
$(srcdir)/vice.txt: vice.texi
|
||||
$(MAKEINFO) -o $(srcdir)/vice.txt --no-headers $(srcdir)/vice.texi
|
||||
|
||||
-if BUILD_PDF
|
||||
-$(srcdir)/vice.pdf: vice.texi
|
||||
- $(TEXI2DVI) -q --clean --pdf -o $(srcdir)/vice.pdf $(srcdir)/vice.texi
|
||||
-
|
||||
-PDF_DEPS=$(srcdir)/vice.pdf
|
||||
-else
|
||||
PDF_DEPS=
|
||||
-endif
|
||||
|
||||
if BUILD_AMIGAGUIDE
|
||||
$(srcdir)/vice.guide: vice.texi
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2011 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.2.ebuild,v 1.4 2010/04/11 17:04:29 phajdan.jr Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/vice-2.3.ebuild,v 1.4 2011/10/24 04:12:24 mr_bones_ Exp $
|
||||
|
||||
EAPI=2
|
||||
inherit autotools eutils games
|
||||
@ -24,7 +24,7 @@ RDEPEND="
|
||||
x11-libs/libXxf86vm
|
||||
x11-apps/xset
|
||||
app-emulation/opencbm
|
||||
Xaw3d? ( x11-libs/Xaw3d )
|
||||
Xaw3d? ( x11-libs/libXaw3d )
|
||||
!Xaw3d? ( !gnome? ( x11-libs/libXaw ) )
|
||||
alsa? ( media-libs/alsa-lib )
|
||||
gnome? (
|
||||
@ -33,7 +33,7 @@ RDEPEND="
|
||||
x11-libs/pango
|
||||
)
|
||||
lame? ( media-sound/lame )
|
||||
ffmpeg? ( >=virtual/ffmpeg-0.5 )
|
||||
ffmpeg? ( virtual/ffmpeg )
|
||||
ethernet? (
|
||||
>=net-libs/libpcap-0.9.8
|
||||
>=net-libs/libnet-1.1.2.1
|
||||
@ -43,7 +43,7 @@ RDEPEND="
|
||||
readline? ( sys-libs/readline )
|
||||
sdl? ( media-libs/libsdl )
|
||||
gif? ( media-libs/giflib )
|
||||
jpeg? ( media-libs/jpeg:0 )
|
||||
jpeg? ( virtual/jpeg )
|
||||
xv? ( x11-libs/libXv )
|
||||
dga? ( x11-libs/libXxf86dga )
|
||||
xrandr? ( x11-libs/libXrandr )"
|
||||
@ -59,14 +59,13 @@ DEPEND="${RDEPEND}
|
||||
nls? ( sys-devel/gettext )"
|
||||
|
||||
src_prepare() {
|
||||
epatch "${FILESDIR}"/${P}-xshm.patch
|
||||
epatch "${FILESDIR}"/${P}-notexi.patch
|
||||
sed -i \
|
||||
-e "s:/usr/local/lib/VICE:${GAMES_DATADIR}/${PN}:" \
|
||||
man/vice.1 \
|
||||
$(grep -rl /usr/local/lib doc) \
|
||||
|| die "sed failed"
|
||||
sed -i \
|
||||
-e 's:png_check_sig:png_sig_cmp:g' \
|
||||
-e "/VICEDIR=/s:=.*:=\"${GAMES_DATADIR}/${PN}\";:" \
|
||||
configure.in \
|
||||
|| die "sed failed"
|
||||
@ -89,7 +88,6 @@ src_configure() {
|
||||
--enable-realdevice \
|
||||
--with-resid \
|
||||
--without-arts \
|
||||
--without-esd \
|
||||
--without-midas \
|
||||
$(use_enable ffmpeg) \
|
||||
$(use_enable lame) \
|
||||
@ -102,7 +100,7 @@ src_configure() {
|
||||
$(use_with readline) \
|
||||
$(use_with sdl sdlsound) \
|
||||
$(use_enable ipv6) \
|
||||
$(use_enable oss) \
|
||||
$(use oss || echo --without-oss) \
|
||||
$(use_enable memmap) \
|
||||
$(use_enable ethernet) \
|
||||
$(use_with zlib) \
|
||||
Loading…
Reference in New Issue
Block a user