Subject: Re: pkg/33781: devel/SDL Xlibint (xorg bug???) _XData32 Xlibint.[ch]
To: None <pkg-manager@NetBSD.org, gnats-admin@NetBSD.org,>
From: Gilles Dauphin <Gilles.Dauphin@enst.fr>
List: pkgsrc-bugs
Date: 06/21/2006 16:14:54
> Subject: pkg/33781: devel/SDL Xlibint (xorg bug???) _XData32 Xlibint.[ch]
>
> I am working on a specific patch.
>
And here is the patch for Makefile and patch-da:
------------------diff Makefile------------------------------------------
--- Makefile.orig Thu Jun 15 11:45:05 2006
+++ Makefile Wed Jun 21 15:44:43 2006
@@ -52,6 +52,8 @@
AM_CFLAGS= -D_PATH_DEV_DSP="\"${DEVOSSAUDIO}\""
MAKE_ENV+= AM_CFLAGS=${AM_CFLAGS:Q}
+CFLAGS.SunOS+= -DXDATA32_MATCH_XORG_SOURCE
+
# Irix comes with GL, which works fine for SDL
.if ${OPSYS} != "IRIX"
.include "../../graphics/MesaLib/buildlink3.mk"
-------------------------------------------------------
-------------patches/patch-da------------------
[root@u2 1592] less patches/patch-da
--- src/video/x11/SDL_x11sym.h.orig Mon May 8 08:34:00 2006
+++ src/video/x11/SDL_x11sym.h Wed Jun 21 15:09:41 2006
@@ -162,7 +162,13 @@
*/
#ifdef LONG64
SDL_X11_MODULE(IO_32BIT)
+/* See PR from pkgsrc pkg/33781 */
+/* remove when the xorg source code XlibInt.c match Xlibint.h */
+#ifdef XDATA32_MATCH_XORG_SOURCE
+SDL_X11_SYM(void,_XData32,(Display *dpy, long *data,unsigned long len),(dpy,data,len),)
+#else
SDL_X11_SYM(int,_XData32,(Display *dpy,register long *data,unsigned len),(dpy,data,len),return)
+#endif
SDL_X11_SYM(void,_XRead32,(Display *dpy,register long *data,long len),(dpy,data,len),)
#endif
--------------------------------------------------