Update to 1.2.4.

6 files changed, 92 insertions, 19 deletions

diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile
index 8d9a3aa67d42..642916d4572d 100644
--- a/devel/sdl12/Makefile
+++ b/devel/sdl12/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sdl
-PORTVERSION=	1.2.3
-PORTREVISION=	1
+PORTVERSION=	1.2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.libsdl.org/release/ \
 		http://www.devolution.com/~slouken/SDL/release/
diff --git a/devel/sdl12/distinfo b/devel/sdl12/distinfo
index 15c3f34a3173..d8f33419f044 100644
--- a/devel/sdl12/distinfo
+++ b/devel/sdl12/distinfo
@@ -1 +1 @@
-MD5 (SDL-1.2.3.tar.gz) = a942c605c0f36752a4df5709a449ae7a
+MD5 (SDL-1.2.4.tar.gz) = 116c083aad99faae691c6ca8dcdf406d
diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac
index be1fb565b559..863d4864981c 100644
--- a/devel/sdl12/files/patch-ac
+++ b/devel/sdl12/files/patch-ac
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Thu Nov  8 09:28:08 2001
-+++ configure	Wed Dec 19 14:07:24 2001
-@@ -660,9 +660,9 @@
+--- configure.orig	Sun Apr 14 02:57:31 2002
++++ configure	Wed Apr 17 14:31:32 2002
+@@ -670,9 +670,9 @@
  
  # libtool versioning
  LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION
@@ -15,7 +15,7 @@ $FreeBSD$
  
  
  
-@@ -2774,7 +2774,7 @@
+@@ -2786,7 +2786,7 @@
  
  
  SDL_CFLAGS=""
@@ -24,7 +24,7 @@ $FreeBSD$
  
  
  case "$target" in
-@@ -5578,8 +5578,8 @@
+@@ -5737,8 +5737,8 @@
  #            pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
              ;;
          *-*-freebsd*)
@@ -35,3 +35,11 @@ $FreeBSD$
              ;;
          *-*-netbsd*)
              pthread_cflags="-I/usr/pkg/include -D_REENTRANT"
+@@ -6702,6 +6702,7 @@
+         if test x$enable_joystick = xyes; then
+             JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd"
+             JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la"
++            SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
+         fi
+         # Set up files for the cdrom library
+         if test x$enable_cdrom = xyes; then
diff --git a/devel/sdl12/files/patch-ak b/devel/sdl12/files/patch-ak
index 1f83063293f4..6f314dfef790 100644
--- a/devel/sdl12/files/patch-ak
+++ b/devel/sdl12/files/patch-ak
@@ -1,18 +1,18 @@
 
 $FreeBSD$
 
---- sdl-config.in.orig	Wed Feb 28 17:53:18 2001
-+++ sdl-config.in	Fri Mar 30 17:30:06 2001
+--- sdl-config.in	2002/04/17 10:56:17	1.1
++++ sdl-config.in	2002/04/17 10:57:31
 @@ -5,7 +5,7 @@
  exec_prefix_set=no
  
  usage="\
--Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
-+Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
+-Usage: sdl-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
++Usage: sdl11-config [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--cflags] [--libs] [--static-libs]"
  
  if test $# -eq 0; then
        echo "${usage}" 1>&2
-@@ -45,11 +45,11 @@
+@@ -45,7 +45,7 @@
  
            includes=-I@includedir@
        fi
@@ -21,8 +21,3 @@ $FreeBSD$
        ;;
  @ENABLE_SHARED_TRUE@    --libs)
  @ENABLE_SHARED_TRUE@      libdirs="-L@libdir@ @SDL_RLD_FLAGS@"
--@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@      echo $libdirs @SDL_LIBS@ @SYSTEM_LIBS@
- @ENABLE_SHARED_TRUE@      ;;
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@    --static-libs)
- @ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@    --libs|--static-libs)
diff --git a/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c b/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c
new file mode 100644
index 000000000000..0365f18a0cb7
--- /dev/null
+++ b/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c
@@ -0,0 +1,69 @@
+
+$FreeBSD$
+
+--- src/joystick/bsd/SDL_sysjoystick.c	2002/04/17 11:06:43	1.1
++++ src/joystick/bsd/SDL_sysjoystick.c	2002/04/17 11:20:41
+@@ -41,7 +41,7 @@
+ 
+ #include <dev/usb/usb.h>
+ #include <dev/usb/usbhid.h>
+-#include <usbhid.h>
++#include <libusb.h>
+ 
+ #include "SDL_error.h"
+ #include "SDL_joystick.h"
+@@ -205,7 +205,8 @@
+ 	joy->nballs = 0;
+ 
+ 	while (hid_get_item(hdata, &hitem) > 0) {
+-		char *s, *sp;
++		const char *s;
++		char *sp;
+ 
+ 		switch (hitem.kind) {
+ 		case hid_collection:
+@@ -275,7 +276,7 @@
+ 	Sint32 v;
+ 	
+ 	rep = &joy->hwdata->inreport;
+-	if (read(joy->hwdata->fd, rep->buf->data, rep->size) != rep->size) {
++	if (read(joy->hwdata->fd, rep->buf->ucr_data, rep->size) != rep->size) {
+ 		return;
+ 	}
+ 	hdata = hid_start_parse(joy->hwdata->repdesc, 1 << hid_input);
+@@ -310,7 +311,7 @@
+ 					goto scaleaxe;
+ 				}
+ scaleaxe:
+-				v = (Sint32)hid_get_data(rep->buf->data, &hitem);
++				v = (Sint32)hid_get_data(rep->buf->ucr_data, &hitem);
+ 				if (v != 127) {
+ 					if (v < 127) {
+ 						v = -(256 - v);
+@@ -329,7 +330,7 @@
+ 				}
+ 				break;
+ 			case HUP_BUTTON:
+-				v = (Sint32)hid_get_data(rep->buf->data,
++				v = (Sint32)hid_get_data(rep->buf->ucr_data,
+ 				    &hitem);
+ 				if (joy->buttons[nbutton] != v) {
+ 					SDL_PrivateJoystickButton(joy,
+@@ -381,7 +382,7 @@
+ {
+ 	int len;
+ 
+-	len = hid_report_size(rd, repinfo[repind].kind, &r->rid);
++	len = hid_report_size(rd, r->rid, repinfo[repind].kind);
+ 	if (len < 0) {
+ 		SDL_SetError("Negative HID report size");
+ 		return (-1);
+@@ -389,7 +390,7 @@
+ 	r->size = len;
+ 
+ 	if (r->size > 0) {
+-		r->buf = malloc(sizeof(*r->buf) - sizeof(r->buf->data) +
++		r->buf = malloc(sizeof(*r->buf) - sizeof(r->buf->ucr_data) +
+ 		    r->size);
+ 		if (r->buf == NULL) {
+ 			SDL_OutOfMemory();
diff --git a/devel/sdl12/pkg-plist b/devel/sdl12/pkg-plist
index fac147d831d5..939caba750f6 100644
--- a/devel/sdl12/pkg-plist
+++ b/devel/sdl12/pkg-plist
@@ -15,6 +15,7 @@ include/SDL11/SDL_keysym.h
 include/SDL11/SDL_main.h
 include/SDL11/SDL_mouse.h
 include/SDL11/SDL_mutex.h
+include/SDL11/SDL_name.h
 include/SDL11/SDL_opengl.h
 include/SDL11/SDL_quit.h
 include/SDL11/SDL_rwops.h
@@ -28,7 +29,7 @@ include/SDL11/begin_code.h
 include/SDL11/close_code.h
 lib/libSDL-1.1.a
 lib/libSDL-1.1.so
-lib/libSDL-1.1.so.3
+lib/libSDL-1.1.so.4
 lib/libSDLmain-1.1.a
 share/aclocal/sdl11.m4
 share/doc/SDL11/BUGS
@@ -274,6 +275,7 @@ share/examples/SDL11/testhread.c
 share/examples/SDL11/testjoystick.c
 share/examples/SDL11/testkeys.c
 share/examples/SDL11/testlock.c
+share/examples/SDL11/testoverlay.c
 share/examples/SDL11/testpalette.c
 share/examples/SDL11/testsem.c
 share/examples/SDL11/testsprite.c