svn commit: r445140 - in head/devel/sdl12: . files

[Jan Beich]

Author: jbeich
Date: Thu Jul  6 12:07:46 2017
New Revision: 445140
URL: https://svnweb.freebsd.org/changeset/ports/445140

Log:
  devel/sdl12: backport crashfix for sparc64
  
  Obtained from:	upstream (via PkgSrc and OpenBSD Ports)
  MFH:		2017Q3 (no hardware to confirm)

Added:
  head/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c   (contents, props changed)
Modified:
  head/devel/sdl12/Makefile   (contents, props changed)

Modified: head/devel/sdl12/Makefile
==============================================================================
--- head/devel/sdl12/Makefile	Thu Jul  6 12:07:23 2017	(r445139)
+++ head/devel/sdl12/Makefile	Thu Jul  6 12:07:46 2017	(r445140)
@@ -3,7 +3,7 @@
 
 PORTNAME=	sdl
 PORTVERSION=	1.2.15
-PORTREVISION=	9
+PORTREVISION=	10
 PORTEPOCH=	2
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/

Added: head/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/sdl12/files/patch-src_video_x11_SDL__x11video.c	Thu Jul  6 12:07:46 2017	(r445140)
@@ -0,0 +1,30 @@
+https://bugzilla.libsdl.org/show_bug.cgi?id=1427
+https://hg.libsdl.org/SDL/rev/57a55e457ef6
+
+--- src/video/x11/SDL_x11video.c.orig	2012-01-19 06:30:06 UTC
++++ src/video/x11/SDL_x11video.c
+@@ -418,16 +418,21 @@ static void create_aux_windows(_THIS)
+     }
+ 
+ 	{
+-		pid_t pid = getpid();
++		union align_pid {
++			pid_t pid;
++			long dummy;
++		} a_pid;
+ 		char hostname[256];
++		
++		a_pid.pid = getpid();
+ 
+-		if (pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) {
++		if (a_pid.pid > 0 && gethostname(hostname, sizeof(hostname)) > -1) {
+ 			Atom _NET_WM_PID = XInternAtom(SDL_Display, "_NET_WM_PID", False);
+ 			Atom WM_CLIENT_MACHINE = XInternAtom(SDL_Display, "WM_CLIENT_MACHINE", False);
+ 			
+ 			hostname[sizeof(hostname)-1] = '\0';
+ 			XChangeProperty(SDL_Display, WMwindow, _NET_WM_PID, XA_CARDINAL, 32,
+-					PropModeReplace, (unsigned char *)&pid, 1);
++					PropModeReplace, (unsigned char *)&(a_pid.pid), 1);
+ 			XChangeProperty(SDL_Display, WMwindow, WM_CLIENT_MACHINE, XA_STRING, 8,
+ 					PropModeReplace, (unsigned char *)hostname, SDL_strlen(hostname));
+ 		}