We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] SDL12-osf1.patch

SDL12-osf1.patch (text/plain), 4.61 KB, created by Hayashi Naoyuki on 2006-01-26 12:55:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Hayashi Naoyuki

Created: 2006-01-26 12:55:12 UTC

Size: 4.61 KB

patch

obsolete

>diff -cr SDL12-orig/configure.in SDL12/configure.in
>*** SDL12-orig/configure.in	2006-01-19 17:42:59.000000000 +0900
>--- SDL12/configure.in	2006-01-27 00:16:28.000000000 +0900
>***************
>*** 619,624 ****
>--- 619,628 ----
>                      x11_lib='/usr/X11R6/lib/libX11.6.dylib'
>                      x11ext_lib='/usr/X11R6/lib/libXext.6.dylib'
>                      ;;
>+                 *-*-osf* )
>+                     x11_lib='libX11.so'
>+                     x11ext_lib='libXext.so'
>+                     ;;
>                  *)
>                      x11_lib='libX11.so.6'
>                      x11ext_lib='libXext.so.6'
>***************
>*** 2585,2590 ****
>--- 2589,2601 ----
>          if test x$enable_timers = xyes; then
>              COPY_ARCH_SRC(src/timer, linux, SDL_systimer.c)
>          fi
>+         # FIXME: If building without -lX11, you get the following messages.
>+         # Xlib: connection to ":0.0" refused by server
>+         # Xlib: XDM authorization key matches an existing client!
>+         # It only has to run xhost +localhost in a such case.
>+         #if test x$enable_x11_shared = xyes; then
>+         #    SYSTEM_LIBS="$SYSTEM_LIBS -lX11"
>+         #fi
>          ;;
>      *-*-qnx*)
>          ARCH=qnx
>diff -cr SDL12-orig/src/video/x11/SDL_x11dyn.h SDL12/src/video/x11/SDL_x11dyn.h
>*** SDL12-orig/src/video/x11/SDL_x11dyn.h	2006-01-14 17:15:38.000000000 +0900
>--- SDL12/src/video/x11/SDL_x11dyn.h	2006-01-27 01:12:49.000000000 +0900
>***************
>*** 72,81 ****
>  #define _XFlushGCCache p_XFlushGCCache
>  #define _XReply p_XReply
>  #define _XSend p_XSend
>- #define _XData32 p_XData32
>  #define XFree pXFree
>  #endif
>  
>  int SDL_X11_LoadSymbols(void);
>  void SDL_X11_UnloadSymbols(void);
>  
>--- 72,92 ----
>  #define _XFlushGCCache p_XFlushGCCache
>  #define _XReply p_XReply
>  #define _XSend p_XSend
>  #define XFree pXFree
>+ 
>+ #if !defined(__osf__) || defined(X11_DYNAMIC)
>+ #define _XData32 p_XData32
>  #endif
>  
>+ #if defined(__osf__) && defined(X11_DYNAMIC)
>+ #define _SmtBufferOverflow p_SmtBufferOverflow
>+ #define _SmtIpError p_SmtIpError
>+ #define ipAllocateData pipAllocateData
>+ #define ipUnallocateAndSendData pipUnallocateAndSendData
>+ #endif
>+ 
>+ #endif /* !__SDL_NO_REDEFINE_X11_HEADER_SYMS */
>+ 
>  int SDL_X11_LoadSymbols(void);
>  void SDL_X11_UnloadSymbols(void);
>  
>diff -cr SDL12-orig/src/video/x11/SDL_x11sym.h SDL12/src/video/x11/SDL_x11sym.h
>*** SDL12-orig/src/video/x11/SDL_x11sym.h	2006-01-14 17:15:38.000000000 +0900
>--- SDL12/src/video/x11/SDL_x11sym.h	2006-01-27 00:16:28.000000000 +0900
>***************
>*** 139,149 ****
>   * These don't exist in 32-bit versions and are removed by Xlib macros, but
>   *  64+ bit systems will use them.
>   */
>! #ifdef LONG64
>  SDL_X11_SYM(1,int,_XData32,(Display *dpy,register long *data,unsigned len))
>  SDL_X11_SYM(1,void,_XRead32,(Display *dpy,register long *data,long len))
>  #endif
>  
>  #if NeedWidePrototypes
>  SDL_X11_SYM(1,KeySym,XKeycodeToKeysym,(Display*,unsigned int,int))
>  #else
>--- 139,156 ----
>   * These don't exist in 32-bit versions and are removed by Xlib macros, but
>   *  64+ bit systems will use them.
>   */
>! #if defined(LONG64) && !defined(__osf__) || defined(X11_DYNAMIC)
>  SDL_X11_SYM(1,int,_XData32,(Display *dpy,register long *data,unsigned len))
>  SDL_X11_SYM(1,void,_XRead32,(Display *dpy,register long *data,long len))
>  #endif
>  
>+ #if defined(__osf__) && defined(X11_DYNAMIC)
>+ SDL_X11_SYM(1,void,_SmtBufferOverflow,(Display *dpy,register smtDisplayPtr))
>+ SDL_X11_SYM(1,void,_SmtIpError,(Display *dpy,register smtDisplayPtr, int))
>+ SDL_X11_SYM(1,int,ipAllocateData,(ChannelPtr, IPCard, IPDataPtr *))
>+ SDL_X11_SYM(1,int,ipUnallocateAndSendData,(ChannelPtr, IPCard))
>+ #endif
>+ 
>  #if NeedWidePrototypes
>  SDL_X11_SYM(1,KeySym,XKeycodeToKeysym,(Display*,unsigned int,int))
>  #else
>diff -cr SDL12-orig/src/video/x11/SDL_x11video.c SDL12/src/video/x11/SDL_x11video.c
>*** SDL12-orig/src/video/x11/SDL_x11video.c	2006-01-14 17:15:38.000000000 +0900
>--- SDL12/src/video/x11/SDL_x11video.c	2006-01-27 00:16:28.000000000 +0900
>***************
>*** 436,441 ****
>--- 436,455 ----
>  		local_X11 = 0;
>  	}
>  	SDL_Display = pXOpenDisplay(display);
>+ #if defined(__osf__) && defined(X11_DYNAMIC)
>+ 	/* On Tru64 if linking without -lX11, it fails and you get following message.
>+ 	 * Xlib: connection to ":0.0" refused by server
>+ 	 * Xlib: XDM authorization key matches an existing client!
>+ 	 *
>+ 	 * It succeeds if retrying 1 second later
>+ 	 * or if running xhost +localhost on shell.
>+ 	 *
>+ 	 */
>+ 	if ( SDL_Display == NULL ) {
>+ 		SDL_Delay(1000);
>+ 		SDL_Display = pXOpenDisplay(display);
>+ 	}
>+ #endif
>  	if ( SDL_Display == NULL ) {
>  		SDL_SetError("Couldn't open X11 display");
>  		return(-1);

Actions: View | Diff

Attachments on bug 87: 42

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.