mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-02-02 11:09:29 +00:00
Code Issues Releases Activity

Update to 1.2.4.

Browse Source
This commit is contained in:
Maxim Sobolev 2002-04-17 12:36:23 +00:00
parent 969c7195c4
commit f7de855bbd
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=57805
8 changed files with 95 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devel/sdl12/Makefile
View File

@ -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/

2
devel/sdl12/distinfo
View File

@ -1 +1 @@
MD5 (SDL-1.2.3.tar.gz) = a942c605c0f36752a4df5709a449ae7a
MD5 (SDL-1.2.4.tar.gz) = 116c083aad99faae691c6ca8dcdf406d

18
devel/sdl12/files/patch-ac
View File

@ -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

15
devel/sdl12/files/patch-ak
View File

@ -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)

69
devel/sdl12/files/patch-src::joystick::bsd::SDL_sysjoystick.c Normal file
View File

@ -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();

4
devel/sdl12/pkg-plist
View File

@ -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

4
net/sdl_net/Makefile
View File

@ -6,14 +6,14 @@
#
PORTNAME= sdl_net
PORTVERSION= 1.2.3
PORTVERSION= 1.2.4
CATEGORIES= net
MASTER_SITES= http://www.libsdl.org/projects/SDL_net/release/
DISTNAME= SDL_net-${PORTVERSION}
MAINTAINER= sobomax@FreeBSD.org
LIB_DEPENDS= SDL-1.1.3:${PORTSDIR}/devel/sdl12 \
LIB_DEPENDS= SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
GUI.0:${PORTSDIR}/graphics/guilib
SDL_CONFIG?= ${LOCALBASE}/bin/sdl11-config

2
net/sdl_net/distinfo
View File

@ -1 +1 @@
MD5 (SDL_net-1.2.3.tar.gz) = c0ee9e0249ff088d5b6b75f38325253c
MD5 (SDL_net-1.2.4.tar.gz) = dca08c8935c5dbcdd18b4ad367eb2ee6