ports/117608: [Maintainer-update]: devel/sdl12 version update to 1.2.12
Marcus von Appen
mva at sysfault.org
Sun Oct 28 17:10:02 UTC 2007
>Number: 117608
>Category: ports
>Synopsis: [Maintainer-update]: devel/sdl12 version update to 1.2.12
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Sun Oct 28 17:10:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator: Marcus von Appen
>Release: FreeBSD 6.3-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD medusa.sysfault.org 6.3-PRERELEASE FreeBSD 6.3-PRERELEASE #1: Sun Oct 28 11:05:41 CET 2007 root at medusa.sysfault.org:/usr/obj/usr/src/sys/MEDUSA i386
>Description:
SDL version update to 1.2.12.
This release fixes several issues. More details are available
at http://libsdl.org/release/changes-1.2.html
Note to commiter: This also fixes the PRs ports/117193 and
ports/115654. files/patch-src_joystick_bsd_SDL__sysjoystick.c
can be removed.
I'll take over the maintainership.
>How-To-Repeat:
>Fix:
diff -Nur sdl12/Makefile sdl12.new/Makefile
--- sdl12/Makefile 2007-10-28 13:01:32.000000000 +0100
+++ sdl12.new/Makefile 2007-10-28 17:58:40.000000000 +0100
@@ -6,14 +6,13 @@
#
PORTNAME= sdl
-PORTVERSION= 1.2.11
-PORTREVISION= 1
+PORTVERSION= 1.2.12
PORTEPOCH= 2
CATEGORIES= devel
MASTER_SITES= http://www.libsdl.org/release/
DISTNAME= SDL-${PORTVERSION}
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= mva at sysfault.org
COMMENT= Cross-platform multi-media development API
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
@@ -45,7 +44,7 @@
AALIB "Include support for AA-lib" On \
GL "Include support for OpenGL" On \
GGI "Include support for GGI" Off \
- SVGALIB "Include support for SVGALIB" On
+ SVGALIB "Include support for SVGALIB" Off
.include <bsd.port.pre.mk>
diff -Nur sdl12/distinfo sdl12.new/distinfo
--- sdl12/distinfo 2006-09-20 13:20:40.000000000 +0200
+++ sdl12.new/distinfo 2007-10-28 17:40:24.000000000 +0100
@@ -1,3 +1,3 @@
-MD5 (SDL-1.2.11.tar.gz) = 418b42956b7cd103bfab1b9077ccc149
-SHA256 (SDL-1.2.11.tar.gz) = 6985823287b224b57390b1c1b6cbc54cc9a7d7757fbf9934ed20754b4cd23730
-SIZE (SDL-1.2.11.tar.gz) = 2796407
+MD5 (SDL-1.2.12.tar.gz) = 544b4554986e51eed6d34435cf9c5f3f
+SHA256 (SDL-1.2.12.tar.gz) = df77eb883efdcc61220eaf7ade38324629c273c278ce8d700a5530369e9b6df9
+SIZE (SDL-1.2.12.tar.gz) = 2829456
diff -Nur sdl12/files/patch-Makefile.in sdl12.new/files/patch-Makefile.in
--- sdl12/files/patch-Makefile.in 2006-09-20 13:20:41.000000000 +0200
+++ sdl12.new/files/patch-Makefile.in 2007-10-28 17:42:15.000000000 +0100
@@ -1,11 +1,11 @@
---- Makefile.in.orig Wed Jul 5 00:58:18 2006
-+++ Makefile.in Wed Jul 5 01:06:48 2006
-@@ -44,7 +44,7 @@
+--- Makefile.in.orig 2007-10-28 17:41:05.000000000 +0100
++++ Makefile.in 2007-10-28 17:42:00.000000000 +0100
+@@ -48,7 +48,7 @@
LT_CURRENT = @LT_CURRENT@
LT_RELEASE = @LT_RELEASE@
LT_REVISION = @LT_REVISION@
--LT_LDFLAGS = -no-undefined -rpath $(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
-+LT_LDFLAGS = -no-undefined -rpath $(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+-LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
++LT_LDFLAGS = -no-undefined -rpath $(DESTDIR)$(libdir) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
all: $(srcdir)/configure Makefile $(objects) $(objects)/$(TARGET) $(objects)/$(SDLMAIN_TARGET)
diff -Nur sdl12/files/patch-configure sdl12.new/files/patch-configure
--- sdl12/files/patch-configure 2006-09-20 13:20:41.000000000 +0200
+++ sdl12.new/files/patch-configure 2007-10-28 17:44:09.000000000 +0100
@@ -1,6 +1,6 @@
---- configure.orig Wed Jul 5 00:52:15 2006
-+++ configure Wed Jul 5 01:01:28 2006
-@@ -29772,8 +29772,8 @@
+--- configure.orig 2007-10-28 17:42:35.000000000 +0100
++++ configure 2007-10-28 17:43:58.000000000 +0100
+@@ -30485,8 +30485,8 @@
# pthread_cflags="-D_REENTRANT -D_THREAD_SAFE"
;;
*-*-freebsd*|*-*-dragonfly*)
diff -Nur sdl12/files/patch-sdl-config.in sdl12.new/files/patch-sdl-config.in
--- sdl12/files/patch-sdl-config.in 2006-09-20 13:20:41.000000000 +0200
+++ sdl12.new/files/patch-sdl-config.in 2007-10-28 17:45:21.000000000 +0100
@@ -1,10 +1,6 @@
-#
-# Temporary hack to provide iconv include directory is well
-# (sdl explicitly includes iconv.h)
-#
---- sdl-config.in.orig Thu Aug 31 03:54:26 2006
-+++ sdl-config.in Thu Aug 31 03:54:39 2006
-@@ -41,7 +41,7 @@
+--- sdl-config.in.orig 2007-10-28 17:44:28.000000000 +0100
++++ sdl-config.in 2007-10-28 17:45:04.000000000 +0100
+@@ -42,7 +42,7 @@
echo @SDL_VERSION@
;;
--cflags)
diff -Nur sdl12/files/patch-sdl.pc.in sdl12.new/files/patch-sdl.pc.in
--- sdl12/files/patch-sdl.pc.in 2006-09-20 13:20:41.000000000 +0200
+++ sdl12.new/files/patch-sdl.pc.in 2007-10-28 17:46:29.000000000 +0100
@@ -1,9 +1,5 @@
-#
-# Temporary hack to provide iconv include directory is well
-# (sdl explicitly includes iconv.h)
-#
---- sdl.pc.in.orig Thu Aug 31 03:47:07 2006
-+++ sdl.pc.in Thu Aug 31 03:47:19 2006
+--- sdl.pc.in.orig 2007-10-28 17:45:42.000000000 +0100
++++ sdl.pc.in 2007-10-28 17:46:03.000000000 +0100
@@ -11,4 +11,4 @@
Requires:
Conflicts:
diff -Nur sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c sdl12.new/files/patch-src_joystick_bsd_SDL__sysjoystick.c
--- sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c 2006-09-20 13:20:41.000000000 +0200
+++ sdl12.new/files/patch-src_joystick_bsd_SDL__sysjoystick.c 1970-01-01 01:00:00.000000000 +0100
@@ -1,96 +0,0 @@
---- src/joystick/bsd/SDL_sysjoystick.c.orig Mon May 1 12:02:40 2006
-+++ src/joystick/bsd/SDL_sysjoystick.c Wed Jul 5 01:11:57 2006
-@@ -123,6 +123,12 @@
- struct report_desc *repdesc;
- struct report inreport;
- int axis_map[JOYAXE_count]; /* map present JOYAXE_* to 0,1,..*/
-+ int x;
-+ int y;
-+ int xmin;
-+ int ymin;
-+ int xmax;
-+ int ymax;
- };
-
- static char *joynames[MAX_JOYS];
-@@ -257,6 +263,12 @@
- joy->hwdata = hw;
- hw->fd = fd;
- hw->path = strdup(path);
-+ hw->x = 0;
-+ hw->y = 0;
-+ hw->xmin = 0xffff;
-+ hw->ymin = 0xffff;
-+ hw->xmax = 0;
-+ hw->ymax = 0;
- if (! SDL_strncmp(path, "/dev/joy", 8)) {
- hw->type = BSDJOY_JOY;
- joy->naxes = 2;
-@@ -380,43 +392,42 @@
-
- #if defined(__FREEBSD__) || SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H
- struct joystick gameport;
-- static int x, y, xmin = 0xffff, ymin = 0xffff, xmax = 0, ymax = 0;
-
- if (joy->hwdata->type == BSDJOY_JOY) {
- if (read(joy->hwdata->fd, &gameport, sizeof gameport) != sizeof gameport)
- return;
-- if (abs(x - gameport.x) > 8) {
-- x = gameport.x;
-- if (x < xmin) {
-- xmin = x;
-+ if (abs(joy->hwdata->x - gameport.x) > 8) {
-+ joy->hwdata->x = gameport.x;
-+ if (joy->hwdata->x < joy->hwdata->xmin) {
-+ joy->hwdata->xmin = joy->hwdata->x;
- }
-- if (x > xmax) {
-- xmax = x;
-+ if (joy->hwdata->x > joy->hwdata->xmax) {
-+ joy->hwdata->xmax = joy->hwdata->x;
- }
-- if (xmin == xmax) {
-- xmin--;
-- xmax++;
-+ if (joy->hwdata->xmin == joy->hwdata->xmax) {
-+ joy->hwdata->xmin--;
-+ joy->hwdata->xmax++;
- }
-- v = (Sint32)x;
-- v -= (xmax + xmin + 1)/2;
-- v *= 32768/((xmax - xmin + 1)/2);
-+ v = (Sint32)joy->hwdata->x;
-+ v -= (joy->hwdata->xmax + joy->hwdata->xmin + 1)/2;
-+ v *= 32768/((joy->hwdata->xmax - joy->hwdata->xmin + 1)/2);
- SDL_PrivateJoystickAxis(joy, 0, v);
- }
-- if (abs(y - gameport.y) > 8) {
-- y = gameport.y;
-- if (y < ymin) {
-- ymin = y;
-+ if (abs(joy->hwdata->y - gameport.y) > 8) {
-+ joy->hwdata->y = gameport.y;
-+ if (joy->hwdata->y < joy->hwdata->ymin) {
-+ joy->hwdata->ymin = joy->hwdata->y;
- }
-- if (y > ymax) {
-- ymax = y;
-+ if (joy->hwdata->y > joy->hwdata->ymax) {
-+ joy->hwdata->ymax = joy->hwdata->y;
- }
-- if (ymin == ymax) {
-- ymin--;
-- ymax++;
-+ if (joy->hwdata->ymin == joy->hwdata->ymax) {
-+ joy->hwdata->ymin--;
-+ joy->hwdata->ymax++;
- }
-- v = (Sint32)y;
-- v -= (ymax + ymin + 1)/2;
-- v *= 32768/((ymax - ymin + 1)/2);
-+ v = (Sint32)joy->hwdata->y;
-+ v -= (joy->hwdata->ymax + joy->hwdata->ymin + 1)/2;
-+ v *= 32768/((joy->hwdata->ymax - joy->hwdata->ymin + 1)/2);
- SDL_PrivateJoystickAxis(joy, 1, v);
- }
- if (gameport.b1 != joy->buttons[0]) {
diff -Nur sdl12/pkg-plist sdl12.new/pkg-plist
--- sdl12/pkg-plist 2007-04-01 03:04:05.000000000 +0200
+++ sdl12.new/pkg-plist 2007-10-28 17:55:24.000000000 +0100
@@ -5,14 +5,6 @@
include/SDL/SDL_byteorder.h
include/SDL/SDL_cdrom.h
include/SDL/SDL_config.h
-include/SDL/SDL_config_amiga.h
-include/SDL/SDL_config_dreamcast.h
-include/SDL/SDL_config_macos.h
-include/SDL/SDL_config_macosx.h
-include/SDL/SDL_config_minimal.h
-include/SDL/SDL_config_os2.h
-include/SDL/SDL_config_win32.h
-include/SDL/SDL_copying.h
include/SDL/SDL_cpuinfo.h
include/SDL/SDL_endian.h
include/SDL/SDL_error.h
@@ -279,6 +271,7 @@
%%PORTDOCS%%%%EXAMPLESDIR%%/testiconv.c
%%PORTDOCS%%%%EXAMPLESDIR%%/testjoystick.c
%%PORTDOCS%%%%EXAMPLESDIR%%/testkeys.c
+%%PORTDOCS%%%%EXAMPLESDIR%%/testloadso.c
%%PORTDOCS%%%%EXAMPLESDIR%%/testlock.c
%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay.c
%%PORTDOCS%%%%EXAMPLESDIR%%/testoverlay2.c
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list