- Move ports/branches/xorg-dev to ports/trunk/

git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@388 058c260c-8361-11dd-a0ac-aa2bafec7d09

1 files changed, 32 insertions, 0 deletions

diff --git a/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
new file mode 100644
index 0000000..46eb72e
--- /dev/null
+++ b/x11-drivers/xf86-video-intel/files/extra-uxa_uxa-priv.h
@@ -0,0 +1,32 @@
+--- uxa/uxa-priv.h.orig	2009-05-12 19:12:11.000000000 -0500
++++ uxa/uxa-priv.h	2010-02-21 12:27:32.000000000 -0600
+@@ -42,8 +42,7 @@
+ #define NEED_EVENTS
+ #include <X11/Xproto.h>
+ #ifdef MITSHM
+-#define _XSHM_SERVER_
+-#include <X11/extensions/shmstr.h>
++#include <X11/extensions/shmproto.h>
+ #endif
+ #include "scrnintstr.h"
+ #include "pixmapstr.h"
+@@ -319,17 +318,11 @@
+ extern const GCOps uxa_ops;
+ 
+ #ifdef MITSHM
+-extern ShmFuncs uxa_shm_funcs;
+-
+ /* XXX these come from shmint.h, which isn't exported by the server */
+-void
+-ShmRegisterFuncs(ScreenPtr pScreen, ShmFuncsPtr funcs);
+ 
+-void
+-ShmSetPixmapFormat(ScreenPtr pScreen, int format);
++#include "shmint.h"
+ 
+-void
+-fbShmPutImage(XSHM_PUT_IMAGE_ARGS);
++extern ShmFuncs uxa_shm_funcs;
+ 
+ #endif
+