Date: Sun, 14 Oct 2007 20:48:33 GMT From: "Pedro F. Giffuni" <giffunip@tutopia.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/117193: update devel/sdl12 to version 1.2.12 Message-ID: <200710142048.l9EKmX3B035014@www.freebsd.org> Resent-Message-ID: <200710142050.l9EKo1Uc033456@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 117193 >Category: ports >Synopsis: update devel/sdl12 to version 1.2.12 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Oct 14 20:50:01 UTC 2007 >Closed-Date: >Last-Modified: >Originator: Pedro F. Giffuni >Release: 6.2-Release >Organization: >Environment: FreeBSD kakumen.cable.net.co 6.2-RELEASE FreeBSD 6.2-RELEASE #0: Fri Jan 12 08:43:30 UTC 2007 root@portnoy.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP amd64 >Description: This release includes the FreeBSD USB Joystick changes and fixes several general errors. Also: * Fixed detection of X11 DGA mouse support. * Improved XIM support for asian character sets. * The GFX_Display has been added to the X11 window information in SDL_syswm.h. * Fixed hang or crash at startup if aRts can't access the hardware. * Fixed relative mouse mode when the cursor starts outside the X11 window. * Fixed accidental free of stack memory in X11 mouse acceleration code. * Closed minor memory leak in XME code. * Fixed TEXTRELs in the library to resolve some PIC issues. I disabled the libsvga target because I am using amd64 and I suspect those ugly hacks are not possible here, otherwise the port was pretty much the same as the previous one. >How-To-Repeat: >Fix: patch: diff -ruN sdl12.orig/Makefile sdl12/Makefile --- sdl12.orig/Makefile Sun Oct 14 15:20:36 2007 +++ sdl12/Makefile Sun Oct 14 15:21:55 2007 @@ -6,8 +6,7 @@ # PORTNAME= sdl -PORTVERSION= 1.2.11 -PORTREVISION= 1 +PORTVERSION= 1.2.12 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= http://www.libsdl.org/release/ @@ -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 -ruN sdl12.orig/distinfo sdl12/distinfo --- sdl12.orig/distinfo Sun Oct 14 15:20:36 2007 +++ sdl12/distinfo Sun Oct 14 15:24:50 2007 @@ -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 -ruN sdl12.orig/files/patch-Makefile.in sdl12/files/patch-Makefile.in --- sdl12.orig/files/patch-Makefile.in Sun Oct 14 15:20:36 2007 +++ sdl12/files/patch-Makefile.in Sun Oct 14 15:29:58 2007 @@ -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 Sun Oct 14 15:25:32 2007 ++++ Makefile.in Sun Oct 14 15:28:59 2007 +@@ -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 -ruN sdl12.orig/files/patch-src_joystick_bsd_SDL__sysjoystick.c sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c --- sdl12.orig/files/patch-src_joystick_bsd_SDL__sysjoystick.c Sun Oct 14 15:20:36 2007 +++ sdl12/files/patch-src_joystick_bsd_SDL__sysjoystick.c Wed Dec 31 19:00:00 1969 @@ -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]) { >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200710142048.l9EKmX3B035014>