[pkgsrc/trunk]: pkgsrc/graphics/libvideogfx Fix build with latest XShm from x...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/badf40088f2d
branches:  trunk
changeset: 576484:badf40088f2d
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat Jun 12 14:05:40 2010 +0000

description:
Fix build with latest XShm from xsrc. Hopefully still works with other
Xs. (If not, fix emulators/vice as well, same type of fix.)

diffstat:

 graphics/libvideogfx/distinfo         |   4 ++--
 graphics/libvideogfx/patches/patch-ac |  13 +++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (42 lines):

diff -r a41c46eb5abe -r badf40088f2d graphics/libvideogfx/distinfo
--- a/graphics/libvideogfx/distinfo     Sat Jun 12 12:50:44 2010 +0000
+++ b/graphics/libvideogfx/distinfo     Sat Jun 12 14:05:40 2010 +0000
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2006/01/15 20:34:13 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/06/12 14:05:40 wiz Exp $
 
 SHA1 (libvideogfx-1.0.3.tar.gz) = 1f78e185a05bf063a5f2c9ea4afae1a2d2715b89
 RMD160 (libvideogfx-1.0.3.tar.gz) = db64375cc2e298b2cd0c7ff95401b913d4cc5236
 Size (libvideogfx-1.0.3.tar.gz) = 332532 bytes
 SHA1 (patch-aa) = 35f558789c9a8704a0324691c1ab53dbc5310850
 SHA1 (patch-ab) = 69e0eee594c5930f181241b963cd59f6c022beb4
-SHA1 (patch-ac) = c86809f7fe594d44039039f0eac9c58e86def1dc
+SHA1 (patch-ac) = 720cac4ec2a0df8bb44fb4834dd245dc8e693166
 SHA1 (patch-ad) = 9189a999ef64636562014306b7a3e5e138776273
 SHA1 (patch-ae) = 6462a94b85a7be12fcff1d36c17b83f640f27b43
 SHA1 (patch-af) = 06704cb9bfe2a940c676880104c976d2948afe83
diff -r a41c46eb5abe -r badf40088f2d graphics/libvideogfx/patches/patch-ac
--- a/graphics/libvideogfx/patches/patch-ac     Sat Jun 12 12:50:44 2010 +0000
+++ b/graphics/libvideogfx/patches/patch-ac     Sat Jun 12 14:05:40 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.1 2006/01/15 20:34:13 joerg Exp $
+$NetBSD: patch-ac,v 1.2 2010/06/12 14:05:40 wiz Exp $
 
---- libvideogfx/x11/dispimg.cc.orig    2006-01-15 20:20:09.000000000 +0000
+--- libvideogfx/x11/dispimg.cc.orig    2002-05-27 14:02:43.000000000 +0000
 +++ libvideogfx/x11/dispimg.cc
 @@ -19,6 +19,7 @@
  
@@ -10,3 +10,12 @@
  #include <assert.h>
  #include <time.h>
  #include <sys/ipc.h>
+@@ -32,6 +33,8 @@ using namespace std;
+ 
+ namespace X11 {
+ #include <X11/Xlib.h>
++#include <X11/Xmd.h>
++#include <X11/extensions/shmproto.h>
+ #include <X11/extensions/XShm.h>
+ #include <X11/Xutil.h>
+