On Sun, Apr 18, 2010 at 07:36:10PM -0400, Brad wrote:
> Here is an update to SDL 1.2.14.
used by many ports. particularly games. please test.
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/sdl/Makefile,v
> retrieving revision 1.73
> diff -u -p -r1.73 Makefile
> --- Makefile 10 Aug 2009 06:31:08 -0000 1.73
> +++ Makefile 7 Nov 2009 18:17:48 -0000
> @@ -2,9 +2,9 @@
>
> COMMENT= cross-platform multimedia library
>
> -VERSION= 1.2.13
> +VERSION= 1.2.14
> DISTNAME= SDL-${VERSION}
> -PKGNAME= ${DISTNAME:L}p12
> +PKGNAME= ${DISTNAME:L}
> CATEGORIES= devel
>
> HOMEPAGE= http://www.libsdl.org/
> @@ -18,8 +18,7 @@ PERMIT_DISTFILES_CDROM= Yes
> PERMIT_DISTFILES_FTP= Yes
> WANTLIB= m sndio usbhid
>
> -MASTER_SITES= ftp://ftp.fr.freebsd.org/pub/FreeBSD/distfiles/ \
> - ${HOMEPAGE}release/
> +MASTER_SITES= ${HOMEPAGE}release/
> MASTER_SITES0= http://dev.beastie.hu/ \
> http://www.beastie.hu/
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/devel/sdl/distinfo,v
> retrieving revision 1.17
> diff -u -p -r1.17 distinfo
> --- distinfo 3 Jan 2008 17:39:40 -0000 1.17
> +++ distinfo 7 Nov 2009 18:13:36 -0000
> @@ -1,10 +1,10 @@
> -MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
> +MD5 (SDL-1.2.14.tar.gz) = 5SCG0bUI+gt2xS7jC1W+xA==
> MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
> -RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
> +RMD160 (SDL-1.2.14.tar.gz) = o6mmkfVRDrUyfKFZoDT1WnDLWAE=
> RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
> -SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
> +SHA1 (SDL-1.2.14.tar.gz) = umJbS0BFibl+ktes0WWZLevldt0=
> SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
> -SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
> +SHA256 (SDL-1.2.14.tar.gz) = XZJ+KHA0y2uw68z6OCyx0YXLETyKtRFaB1l5hkLu2bY=
> SHA256 (patch-libsd1.2.7-libcaca0.9.diff) =
> fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
> -SIZE (SDL-1.2.13.tar.gz) = 3373673
> +SIZE (SDL-1.2.14.tar.gz) = 4014154
> SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
> Index: patches/patch-configure
> ===================================================================
> RCS file: /cvs/ports/devel/sdl/patches/patch-configure,v
> retrieving revision 1.20
> diff -u -p -r1.20 patch-configure
> --- patches/patch-configure 24 Jan 2009 10:56:11 -0000 1.20
> +++ patches/patch-configure 7 Nov 2009 18:28:36 -0000
> @@ -1,7 +1,7 @@
> $OpenBSD: patch-configure,v 1.20 2009/01/24 10:56:11 jakemsr Exp $
> ---- configure.orig Sun Dec 30 21:09:39 2007
> -+++ configure Mon Sep 22 20:13:46 2008
> -@@ -25411,6 +25411,20 @@ _ACEOF
> +--- configure.orig Sat Oct 17 13:35:13 2009
> ++++ configure Sat Nov 7 13:26:01 2009
> +@@ -21386,6 +21386,20 @@ _ACEOF
> fi
> }
>
> @@ -22,7 +22,7 @@ $OpenBSD: patch-configure,v 1.20 2009/01
> CheckPulseAudio()
> {
> # Check whether --enable-pulseaudio was given.
> -@@ -26333,9 +26347,6 @@ echo "${ECHO_T}$CompileNASM_ret" >&6; }
> +@@ -22504,9 +22518,6 @@ $as_echo "$CompileNASM_ret" >&6; }
> win32)
> NASMFLAGS="-f win32"
> ;;
> @@ -32,7 +32,7 @@ $OpenBSD: patch-configure,v 1.20 2009/01
> macosx)
> NASMFLAGS="-f macho"
> ;;
> -@@ -33577,6 +33588,7 @@ _ACEOF
> +@@ -29983,6 +29994,7 @@ _ACEOF
> CheckALSA
> CheckARTSC
> CheckESD
> @@ -40,7 +40,7 @@ $OpenBSD: patch-configure,v 1.20 2009/01
> CheckPulseAudio
> CheckNAS
> CheckX11
> -@@ -33612,10 +33624,10 @@ _ACEOF
> +@@ -30020,10 +30032,10 @@ _ACEOF
> ;;
> netbsd|openbsd)
> cat >>confdefs.h <<\_ACEOF
> Index: patches/patch-sdl_pc_in
> ===================================================================
> RCS file: /cvs/ports/devel/sdl/patches/patch-sdl_pc_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-sdl_pc_in
> --- patches/patch-sdl_pc_in 20 Mar 2008 22:00:15 -0000 1.1
> +++ patches/patch-sdl_pc_in 7 Nov 2009 18:30:46 -0000
> @@ -1,11 +1,12 @@
> $OpenBSD: patch-sdl_pc_in,v 1.1 2008/03/20 22:00:15 pvalchev Exp $
> ---- sdl.pc.in.orig Thu Mar 20 07:59:18 2008
> -+++ sdl.pc.in Thu Mar 20 07:59:38 2008
> -@@ -10,5 +10,5 @@ Description: Simple DirectMedia Layer is a cross-platf
> +--- sdl.pc.in.orig Mon Oct 12 19:07:20 2009
> ++++ sdl.pc.in Sat Nov 7 13:30:12 2009
> +@@ -10,6 +10,5 @@ Description: Simple DirectMedia Layer is a cross-platf
> Version: @SDL_VERSION@
> Requires:
> Conflicts:
> -Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
> +-Libs.private: @SDL_STATIC_LIBS@
> -Cflags: -I${includedir}/SDL @SDL_CFLAGS@
> +Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@ @X_LIBS@
> +Cflags: -I${includedir}/SDL @SDL_CFLAGS@ @X_CFLAGS@
> Index: patches/patch-src_audio_SDL_audio_c
> ===================================================================
> RCS file: /cvs/ports/devel/sdl/patches/patch-src_audio_SDL_audio_c,v
> retrieving revision 1.16
> diff -u -p -r1.16 patch-src_audio_SDL_audio_c
> --- patches/patch-src_audio_SDL_audio_c 24 Jan 2009 10:56:11 -0000
> 1.16
> +++ patches/patch-src_audio_SDL_audio_c 7 Nov 2009 18:28:42 -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-src_audio_SDL_audio_c,v 1.16 2009/01/24 10:56:11 jakemsr Exp
> $
> ---- src/audio/SDL_audio.c.orig Sun Dec 30 20:47:59 2007
> -+++ src/audio/SDL_audio.c Thu Jan 22 20:40:14 2009
> +--- src/audio/SDL_audio.c.orig Tue Oct 13 06:25:35 2009
> ++++ src/audio/SDL_audio.c Sat Nov 7 13:26:01 2009
> @@ -36,6 +36,9 @@
>
> /* Available audio drivers */
> @@ -11,12 +11,3 @@ $OpenBSD: patch-src_audio_SDL_audio_c,v
> #if SDL_AUDIO_DRIVER_BSD
> &BSD_AUDIO_bootstrap,
> #endif
> -@@ -532,7 +535,7 @@ int SDL_OpenAudio(SDL_AudioSpec *desired, SDL_AudioSpe
> - return(-1);
> - }
> - if ( audio->convert.needed ) {
> -- audio->convert.len = (int) ( ((double) desired->size) /
> -+ audio->convert.len = (int) ( ((double)
> audio->spec.size) /
> - audio->convert.len_ratio );
> - audio->convert.buf =(Uint8 *)SDL_AllocAudioMem(
> - audio->convert.len*audio->convert.len_mult);
> Index: patches/patch-src_video_x11_SDL_x11modes_c
> ===================================================================
> RCS file: patches/patch-src_video_x11_SDL_x11modes_c
> diff -N patches/patch-src_video_x11_SDL_x11modes_c
> --- patches/patch-src_video_x11_SDL_x11modes_c 16 Sep 2008 20:43:10
> -0000 1.10
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,31 +0,0 @@
> -$OpenBSD: patch-src_video_x11_SDL_x11modes_c,v 1.10 2008/09/16 20:43:10
> naddy Exp $
> ---- src/video/x11/SDL_x11modes.c.orig Mon Dec 31 05:48:13 2007
> -+++ src/video/x11/SDL_x11modes.c Mon Sep 15 23:36:02 2008
> -@@ -52,8 +52,25 @@ static int cmpmodelist(const void *va, const void *vb)
> - #if SDL_VIDEO_DRIVER_X11_VIDMODE
> - Bool SDL_NAME(XF86VidModeGetModeInfo)(Display *dpy, int scr,
> SDL_NAME(XF86VidModeModeInfo) *info)
> - {
> -- SDL_NAME(XF86VidModeModeLine) *l =
> (SDL_NAME(XF86VidModeModeLine)*)((char*)info + sizeof info->dotclock);
> -- return SDL_NAME(XF86VidModeGetModeLine)(dpy, scr,
> (int*)&info->dotclock, l);
> -+ Bool retval;
> -+ int dotclock;
> -+ SDL_NAME(XF86VidModeModeLine) l;
> -+ SDL_memset(&l, 0, sizeof(l));
> -+ retval = SDL_NAME(XF86VidModeGetModeLine)(dpy, scr, &dotclock, &l);
> -+ info->dotclock = dotclock;
> -+ info->hdisplay = l.hdisplay;
> -+ info->hsyncstart = l.hsyncstart;
> -+ info->hsyncend = l.hsyncend;
> -+ info->htotal = l.htotal;
> -+ info->hskew = l.hskew;
> -+ info->vdisplay = l.vdisplay;
> -+ info->vsyncstart = l.vsyncstart;
> -+ info->vsyncend = l.vsyncend;
> -+ info->vtotal = l.vtotal;
> -+ info->flags = l.flags;
> -+ info->privsize = l.privsize;
> -+ info->private = l.private;
> -+ return retval;
> - }
> - #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */
> -
>
> --
> This message has been scanned for viruses and
> dangerous content by MailScanner, and is
> believed to be clean.
--
jake...@sdf.lonestar.org
SDF Public Access UNIX System - http://sdf.lonestar.org
