diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-01-02 15:05:08 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2003-01-02 15:05:08 +0000 |
commit | 10732f785756dae58e751c0e3c35ff4b44f707a8 (patch) | |
tree | 7c01bec4b0246a2d337fadc3758bbfd5546932d2 /devel/sdl12 | |
parent | Update to 0.9.9.p.1 (diff) |
Update to 1.2.5.
Notes
Notes:
svn path=/head/; revision=72209
Diffstat (limited to 'devel/sdl12')
-rw-r--r-- | devel/sdl12/Makefile | 3 | ||||
-rw-r--r-- | devel/sdl12/distinfo | 2 | ||||
-rw-r--r-- | devel/sdl12/files/patch-ac | 22 | ||||
-rw-r--r-- | devel/sdl12/files/patch-ak | 20 | ||||
-rw-r--r-- | devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c | 77 | ||||
-rw-r--r-- | devel/sdl12/pkg-plist | 2 |
6 files changed, 18 insertions, 108 deletions
diff --git a/devel/sdl12/Makefile b/devel/sdl12/Makefile index a7dc3dcf6a58..cf1655c68a4b 100644 --- a/devel/sdl12/Makefile +++ b/devel/sdl12/Makefile @@ -6,8 +6,7 @@ # PORTNAME= sdl -PORTVERSION= 1.2.4 -PORTREVISION= 1 +PORTVERSION= 1.2.5 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 d8f33419f044..e56c33942f3c 100644 --- a/devel/sdl12/distinfo +++ b/devel/sdl12/distinfo @@ -1 +1 @@ -MD5 (SDL-1.2.4.tar.gz) = 116c083aad99faae691c6ca8dcdf406d +MD5 (SDL-1.2.5.tar.gz) = cacacf4e4cca546de168fedc23b9b44b diff --git a/devel/sdl12/files/patch-ac b/devel/sdl12/files/patch-ac index 48def1ccf2de..96238ceb10c2 100644 --- a/devel/sdl12/files/patch-ac +++ b/devel/sdl12/files/patch-ac @@ -1,9 +1,9 @@ $FreeBSD$ ---- configure.orig Sun Apr 14 02:57:31 2002 -+++ configure Fri May 10 01:04:55 2002 -@@ -670,9 +670,9 @@ +--- configure.orig Sun Oct 6 23:35:02 2002 ++++ configure Thu Jan 2 12:39:34 2003 +@@ -674,9 +674,9 @@ # libtool versioning LT_RELEASE=$SDL_MAJOR_VERSION.$SDL_MINOR_VERSION @@ -15,7 +15,7 @@ $FreeBSD$ -@@ -2786,7 +2786,7 @@ +@@ -2794,7 +2794,7 @@ SDL_CFLAGS="" @@ -24,7 +24,7 @@ $FreeBSD$ case "$target" in -@@ -5737,8 +5737,8 @@ +@@ -5840,8 +5840,8 @@ # pthread_cflags="-D_REENTRANT -D_THREAD_SAFE" ;; *-*-freebsd*) @@ -35,15 +35,3 @@ $FreeBSD$ ;; *-*-netbsd*) pthread_cflags="-I/usr/pkg/include -D_REENTRANT" -@@ -6700,8 +6700,9 @@ - #fi - # Set up files for the joystick library - if test x$enable_joystick = xyes; then -- JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS bsd" -- JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS bsd/libjoystick_bsd.la" -+ JOYSTICK_SUBDIRS="$JOYSTICK_SUBDIRS dummy" -+ JOYSTICK_DRIVERS="$JOYSTICK_DRIVERS dummy/libjoystick_dummy.la" -+ SYSTEM_LIBS="$SYSTEM_LIBS $USB_LIBS" - 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 6f314dfef790..2ef464dff72f 100644 --- a/devel/sdl12/files/patch-ak +++ b/devel/sdl12/files/patch-ak @@ -1,8 +1,8 @@ $FreeBSD$ ---- sdl-config.in 2002/04/17 10:56:17 1.1 -+++ sdl-config.in 2002/04/17 10:57:31 +--- sdl-config.in.orig Mon Sep 9 08:28:06 2002 ++++ sdl-config.in Thu Jan 2 12:44:39 2003 @@ -5,7 +5,7 @@ exec_prefix_set=no @@ -12,12 +12,12 @@ $FreeBSD$ if test $# -eq 0; then echo "${usage}" 1>&2 -@@ -45,7 +45,7 @@ - - includes=-I@includedir@ - fi -- echo $includes -I@includedir@/SDL @SDL_CFLAGS@ -+ echo $includes -I@includedir@/SDL11 @SDL_CFLAGS@ +@@ -39,7 +39,7 @@ + echo @SDL_VERSION@ ;; - @ENABLE_SHARED_TRUE@ --libs) - @ENABLE_SHARED_TRUE@ libdirs="-L@libdir@ @SDL_RLD_FLAGS@" + --cflags) +- echo -I@includedir@/SDL @SDL_CFLAGS@ ++ echo -I@includedir@/SDL11 @SDL_CFLAGS@ + + # The portable way of including SDL is #include "SDL.h" + #if test @includedir@ != /usr/include ; then diff --git a/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c b/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c deleted file mode 100644 index 283d51def5b6..000000000000 --- a/devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c +++ /dev/null @@ -1,77 +0,0 @@ - -$FreeBSD$ - ---- src/joystick/bsd/SDL_sysjoystick.c.orig Sun Mar 10 05:49:25 2002 -+++ src/joystick/bsd/SDL_sysjoystick.c Thu Apr 18 10:48:00 2002 -@@ -41,7 +41,11 @@ - - #include <dev/usb/usb.h> - #include <dev/usb/usbhid.h> --#include <usbhid.h> -+#if !defined(HAVE_LIBUSBHID_H) -+#include <libusb.h> -+#else -+#include <libusbhid.h> -+#endif - - #include "SDL_error.h" - #include "SDL_joystick.h" -@@ -205,7 +209,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 +280,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 +315,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 +334,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 +386,12 @@ - { - int len; - -+#if !defined(HAVE_LIBUSBHID_H) - len = hid_report_size(rd, repinfo[repind].kind, &r->rid); -+#else -+ len = hid_report_size(rd, r->rid, repinfo[repind].kind); -+#endif -+ - if (len < 0) { - SDL_SetError("Negative HID report size"); - return (-1); -@@ -389,7 +399,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 939caba750f6..20a7f8adc491 100644 --- a/devel/sdl12/pkg-plist +++ b/devel/sdl12/pkg-plist @@ -29,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.4 +lib/libSDL-1.1.so.5 lib/libSDLmain-1.1.a share/aclocal/sdl11.m4 share/doc/SDL11/BUGS |