diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-03-24 14:15:43 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-03-24 14:15:43 +0000 |
| commit | cfd1bc2c52b4064aff42b8980d56724056992b48 (patch) | |
| tree | 1f26d57f6753459985bfc35c3514d1969653d7a1 /app-emulation/vice | |
| parent | stable ppc, bug 302840 (diff) | |
| download | gentoo-2-cfd1bc2c52b4064aff42b8980d56724056992b48.tar.gz gentoo-2-cfd1bc2c52b4064aff42b8980d56724056992b48.tar.bz2 gentoo-2-cfd1bc2c52b4064aff42b8980d56724056992b48.zip | |
Use upstream patch instead.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'app-emulation/vice')
| -rw-r--r-- | app-emulation/vice/ChangeLog | 6 | ||||
| -rw-r--r-- | app-emulation/vice/files/vice-2.2-xshm.patch | 21 |
2 files changed, 20 insertions, 7 deletions
diff --git a/app-emulation/vice/ChangeLog b/app-emulation/vice/ChangeLog index 36577056d168..1f875266aadf 100644 --- a/app-emulation/vice/ChangeLog +++ b/app-emulation/vice/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/vice # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.69 2010/03/23 23:58:01 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/vice/ChangeLog,v 1.70 2010/03/24 14:15:43 ssuominen Exp $ + + 24 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> + files/vice-2.2-xshm.patch: + Use upstream patch instead. 23 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> vice-2.2.ebuild, +files/vice-2.2-xshm.patch: diff --git a/app-emulation/vice/files/vice-2.2-xshm.patch b/app-emulation/vice/files/vice-2.2-xshm.patch index 0839f15e9005..e0bc39601df6 100644 --- a/app-emulation/vice/files/vice-2.2-xshm.patch +++ b/app-emulation/vice/files/vice-2.2-xshm.patch @@ -1,7 +1,4 @@ -Check for xextproto 7.1.1 and include headers for X_ShmAttach. - -https://sourceforge.net/tracker/?func=detail&aid=2935150&group_id=223021&atid=1057617 -http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=0a4c4c5fe8ebad2dd13f5770bd90a194eebb2890 +Patch from upstream trunk for xextproto >= 7.0.99.1 compability. --- configure.in +++ configure.in @@ -10,13 +7,25 @@ http://cgit.freedesktop.org/xorg/driver/xf86-video-intel/commit/?id=0a4c4c5fe8eb 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") ++ 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 @@ |