Re: UPDATE: SDL 1.2.15

2012-02-28 Thread Donovan Watteau 
On 24/02/12 4:52 PM, Brad Smith wrote:
 On Wed, Feb 22, 2012 at 08:04:13PM -0500, Brad Smith wrote:
 On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:
 Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
 a few more. .15 should have resolved the XRandR issue that was reported
 with .14. So please test and let me know how it goes.

 An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
 port..

 Fixed bug 1390 - X11_KeyToUnicode
 Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit 
 functions
 Fixed bug 1427 - integer passed to XChangeProperty() causes crash

 Updated diff to fix a build issue on PowerPC.

Tested on macppc (my G3 which had the problems with the XrandR/gamma
patches, no such problem anymore) and loongson OK.

Re: UPDATE: SDL 1.2.15

2012-02-28 Thread Kirill Bychkov 
On Sat, February 25, 2012 00:52, Brad Smith wrote:
 On Wed, Feb 22, 2012 at 08:04:13PM -0500, Brad Smith wrote:
 On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:
  Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
  a few more. .15 should have resolved the XRandR issue that was reported
  with .14. So please test and let me know how it goes.


Everything is fine on amd64. Tested on some games from the tree and openbsd-wip.

 An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
 port..

 Fixed bug 1390 - X11_KeyToUnicode
 Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit
 functions
 Fixed bug 1427 - integer passed to XChangeProperty() causes crash

 Updated diff to fix a build issue on PowerPC.


 Index: Makefile
 ===
 RCS file: /home/cvs/ports/devel/sdl/Makefile,v
 retrieving revision 1.81
 diff -u -p -r1.81 Makefile
 --- Makefile  22 Feb 2012 08:22:39 -  1.81
 +++ Makefile  22 Feb 2012 20:21:13 -
 @@ -2,11 +2,13 @@

  COMMENT= cross-platform multimedia library

 -VERSION= 1.2.13
 +VERSION= 1.2.15
  DISTNAME=SDL-${VERSION}
  PKGNAME= ${DISTNAME:L}
 -REVISION =   17
  CATEGORIES=  devel
 +MASTER_SITES=${HOMEPAGE}release/
 +
 +SHARED_LIBS= SDL 8.0

  HOMEPAGE=http://www.libsdl.org/

 @@ -17,30 +19,29 @@ PERMIT_PACKAGE_CDROM=   Yes
  PERMIT_PACKAGE_FTP= Yes
  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_SITES0=   http://dev.beastie.hu/ \
 - http://www.beastie.hu/
 +WANTLIB= m sndio usbhid
 +
 +MODULES= converters/libiconv

  .if ${MACHINE_ARCH} == i386
 -BUILD_DEPENDS+=  devel/yasm
 +BUILD_DEPENDS+=  devel/nasm
  .endif

 -FLAVORS= aa caca no_x11 altivec
 +FLAVORS= aa no_x11
  FLAVOR?=

 +USE_GMAKE=   Yes
  USE_LIBTOOL= Yes
 -USE_GROFF =  Yes
 -MODULES= converters/libiconv
 -
  SEPARATE_BUILD=  concurrent
  CONFIGURE_STYLE= gnu
  MODGNU_CONFIG_GUESS_DIRS=${WRKSRC} ${WRKSRC}/test
 -SHARED_LIBS= SDL 8.0
 -CONFIGURE_ENV+=  X11BASE=${X11BASE} \
 - CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
 +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 +  --disable-arts \
 +  --disable-esd \
 +  --disable-oss \
 +  --disable-pulseaudio
 +CONFIGURE_ENV+=  CPPFLAGS=-I${LOCALBASE}/include \
   LDFLAGS=-L${LOCALBASE}/lib \
   WITH_SNDIO=Yes

 @@ -48,43 +49,21 @@ CONFIGURE_ENV+=   X11BASE=${X11BASE} \
  CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
   ac_cv_header_usb_h=no

 -CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 -  --disable-arts \
 -  --disable-esd \
 -  --disable-oss \
 -  --disable-pulseaudio \
 -  --enable-nasm \
 -  --enable-pthread-sem
 -
  .if ${FLAVOR:L:Maa}
 +WANTLIB+=aa
  LIB_DEPENDS+=graphics/aalib
 -WANTLIB +=   aa
  CONFIGURE_ARGS+= --enable-video-aalib
 -.else
 -CONFIGURE_ARGS+= --disable-video-aalib
 -.endif
 -
 -.if ${FLAVOR:L:Mcaca}
 -PATCH_DIST_STRIP= -p1
 -PATCHFILES=  patch-libsd1.2.7-libcaca0.9.diff:0
 -LIB_DEPENDS+=graphics/libcaca
 -WANTLIB +=   caca
 -CONFIGURE_ARGS+= --enable-video-caca
 -.else
 -SUPDISTFILES+=   patch-libsd1.2.7-libcaca0.9.diff:0
  .endif

  .if ${FLAVOR:L:Mno_x11}
  CONFIGURE_ARGS+= --without-x \
--disable-video-x11
 -.else
 -WANTLIB+=X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
  .endif

  NO_REGRESS=  Yes

  pre-configure:
 - mkdir -p ${WRKSRC}/src/audio/libsndio
 - cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 + @mkdir -p ${WRKSRC}/src/audio/libsndio
 + @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio

  .include bsd.port.mk
 Index: distinfo
 ===
 RCS file: /home/cvs/ports/devel/sdl/distinfo,v
 retrieving revision 1.17
 diff -u -p -r1.17 distinfo
 --- distinfo  3 Jan 2008 17:39:40 -   1.17
 +++ distinfo  22 Feb 2012 19:40:46 -
 @@ -1,10 +1,10 @@
 -MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
 +MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
  MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
 -RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
 +RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
  RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
 -SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
 +SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
  SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
 -SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
 +SHA256 (SDL-1.2.15.tar.gz) =

Re: UPDATE: SDL 1.2.15

2012-02-25 Thread Brad Smith 

On 24/02/12 4:52 PM, Brad Smith wrote:

On Wed, Feb 22, 2012 at 08:04:13PM -0500, Brad Smith wrote:

On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:

Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
a few more. .15 should have resolved the XRandR issue that was reported
with .14. So please test and let me know how it goes.


An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
port..

Fixed bug 1390 - X11_KeyToUnicode
Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit functions
Fixed bug 1427 - integer passed to XChangeProperty() causes crash


Updated diff to fix a build issue on PowerPC.


Could someone please try out SDL on sparc64 with for example MPlayer 
using SDL as

video output?

--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Re: UPDATE: SDL 1.2.15

2012-02-24 Thread Brad Smith 
On Wed, Feb 22, 2012 at 08:04:13PM -0500, Brad Smith wrote:
 On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:
  Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
  a few more. .15 should have resolved the XRandR issue that was reported
  with .14. So please test and let me know how it goes.
 
 An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
 port..
 
 Fixed bug 1390 - X11_KeyToUnicode
 Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit 
 functions
 Fixed bug 1427 - integer passed to XChangeProperty() causes crash

Updated diff to fix a build issue on PowerPC.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 20:21:13 -
@@ -2,11 +2,13 @@
 
 COMMENT=   cross-platform multimedia library
 
-VERSION=   1.2.13
+VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION = 17
 CATEGORIES=devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0
 
 HOMEPAGE=  http://www.libsdl.org/
 
@@ -17,30 +19,29 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 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_SITES0= http://dev.beastie.hu/ \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv
 
 .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
 .endif
 
-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
 FLAVOR?=
 
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+--disable-arts \
+--disable-esd \
+--disable-oss \
+--disable-pulseaudio
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
WITH_SNDIO=Yes
 
@@ -48,43 +49,21 @@ CONFIGURE_ENV+= X11BASE=${X11BASE} \
 CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
ac_cv_header_usb_h=no
 
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
---disable-arts \
---disable-esd \
---disable-oss \
---disable-pulseaudio \
---enable-nasm \
---enable-pthread-sem
-
 .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
 LIB_DEPENDS+=  graphics/aalib
-WANTLIB += aa
 CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
 .endif
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
 
 pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
 MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
 RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
 SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
 SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE

Re: UPDATE: SDL 1.2.15

2012-02-24 Thread Richard Toohey 
Re-compiled an emulator I'm working on (beebem-unix) - all OK with
1.2.15.

$ ./run_beebem.sh  
We compiled against SDL version 1.2.15 ...
But we are linking against SDL version 1.2.15.

i386.

Sound, graphics  keys all OK, and I got the Caps Lock change I really wanted
from 1.2.14, so thanks!

Also quick runs of frodo, frozen-bubble  pingus - no issues seen.

(Sorry, not subscribed to the list so haven't got all the context here.)

UPDATE: SDL 1.2.15

2012-02-22 Thread Brad Smith 
Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
a few more. .15 should have resolved the XRandR issue that was reported
with .14. So please test and let me know how it goes.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 19:46:31 -
@@ -2,11 +2,13 @@
 
 COMMENT=   cross-platform multimedia library
 
-VERSION=   1.2.13
+VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION = 17
 CATEGORIES=devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0
 
 HOMEPAGE=  http://www.libsdl.org/
 
@@ -17,37 +19,23 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 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_SITES0= http://dev.beastie.hu/ \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv
 
 .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
 .endif
 
-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
 FLAVOR?=
 
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
-   LDFLAGS=-L${LOCALBASE}/lib \
-   WITH_SNDIO=Yes
-
-# in case devel/usb is installed, don't pick it up.
-CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
-   ac_cv_header_usb_h=no
-
 CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 --disable-arts \
 --disable-esd \
@@ -55,36 +43,29 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
 --disable-pulseaudio \
 --enable-nasm \
 --enable-pthread-sem
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
+   LDFLAGS=-L${LOCALBASE}/lib \
+   WITH_SNDIO=Yes
+
+# in case devel/usb is installed, don't pick it up.
+CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
+   ac_cv_header_usb_h=no
 
 .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
 LIB_DEPENDS+=  graphics/aalib
-WANTLIB += aa
 CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
 .endif
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
 
 pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
 MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
 RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
 SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
 SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE (SDL-1.2.15.tar.gz) = 3920622
 SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
Index: patches/patch-Makefile_in
===
RCS file: /home/cvs/ports/devel/sdl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   22 Sep 2007 01:12:38 -  1.3
+++ patches/patch-Makefile_in

Re: UPDATE: SDL 1.2.15

2012-02-22 Thread Brad Smith 
On Wed, Feb 22, 2012 at 02:58:25PM -0500, Brad Smith wrote:
 Here is an update to SDL 1.2.15. .14 fixed a lot of bugs and .15 fixed
 a few more. .15 should have resolved the XRandR issue that was reported
 with .14. So please test and let me know how it goes.

An updated diff rolling in 3 fixes from upstream and two minor tweaks to the
port..

Fixed bug 1390 - X11_KeyToUnicode
Fixed bug 1424 - Handling of alpha channel in Altivec accelerated blit functions
Fixed bug 1427 - integer passed to XChangeProperty() causes crash


Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 20:21:13 -
@@ -2,11 +2,13 @@
 
 COMMENT=   cross-platform multimedia library
 
-VERSION=   1.2.13
+VERSION=   1.2.15
 DISTNAME=  SDL-${VERSION}
 PKGNAME=   ${DISTNAME:L}
-REVISION = 17
 CATEGORIES=devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0
 
 HOMEPAGE=  http://www.libsdl.org/
 
@@ -17,30 +19,29 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP= Yes
 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_SITES0= http://dev.beastie.hu/ \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv
 
 .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
 .endif
 
-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
 FLAVOR?=
 
+USE_GMAKE= Yes
 USE_LIBTOOL=   Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
 SEPARATE_BUILD=concurrent
 CONFIGURE_STYLE= gnu
 MODGNU_CONFIG_GUESS_DIRS=  ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+--disable-arts \
+--disable-esd \
+--disable-oss \
+--disable-pulseaudio
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
WITH_SNDIO=Yes
 
@@ -48,43 +49,21 @@ CONFIGURE_ENV+= X11BASE=${X11BASE} \
 CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
ac_cv_header_usb_h=no
 
-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
---disable-arts \
---disable-esd \
---disable-oss \
---disable-pulseaudio \
---enable-nasm \
---enable-pthread-sem
-
 .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
 LIB_DEPENDS+=  graphics/aalib
-WANTLIB += aa
 CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
 .endif
 
 .if ${FLAVOR:L:Mno_x11}
 CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
 .endif
 
 NO_REGRESS=Yes
 
 pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
 MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
 RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
 SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
 SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE (SDL-1.2.15.tar.gz) = 3920622
 SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
Index: patches/patch-Makefile_in

Re: UPDATE: SDL 1.2.15

2012-02-22 Thread Gonzalo L. R. 

works fine on i386 brad.

El 02/22/12 22:04, Brad Smith escribió:

Index: Makefile
===
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.81
diff -u -p -r1.81 Makefile
--- Makefile22 Feb 2012 08:22:39 -  1.81
+++ Makefile22 Feb 2012 20:21:13 -
@@ -2,11 +2,13 @@

  COMMENT=  cross-platform multimedia library

-VERSION=   1.2.13
+VERSION=   1.2.15
  DISTNAME= SDL-${VERSION}
  PKGNAME=  ${DISTNAME:L}
-REVISION = 17
  CATEGORIES=   devel
+MASTER_SITES=  ${HOMEPAGE}release/
+
+SHARED_LIBS=   SDL 8.0

  HOMEPAGE= http://www.libsdl.org/

@@ -17,30 +19,29 @@ PERMIT_PACKAGE_CDROM=   Yes
  PERMIT_PACKAGE_FTP= Yes
  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_SITES0= http://dev.beastie.hu/  \
-   http://www.beastie.hu/
+WANTLIB=   m sndio usbhid
+
+MODULES=   converters/libiconv

  .if ${MACHINE_ARCH} == i386
-BUILD_DEPENDS+=devel/yasm
+BUILD_DEPENDS+=devel/nasm
  .endif

-FLAVORS=   aa caca no_x11 altivec
+FLAVORS=   aa no_x11
  FLAVOR?=

+USE_GMAKE= Yes
  USE_LIBTOOL=  Yes
-USE_GROFF =Yes
-MODULES=   converters/libiconv
-
  SEPARATE_BUILD=   concurrent
  CONFIGURE_STYLE= gnu
  MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test
-SHARED_LIBS=   SDL 8.0
-CONFIGURE_ENV+=X11BASE=${X11BASE} \
-   CFLAGS=${CFLAGS} -I${LOCALBASE}/include \
+CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+--disable-arts \
+--disable-esd \
+--disable-oss \
+--disable-pulseaudio
+CONFIGURE_ENV+=CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
WITH_SNDIO=Yes

@@ -48,43 +49,21 @@ CONFIGURE_ENV+= X11BASE=${X11BASE} \
  CONFIGURE_ENV+= ac_cv_lib_usb_hid_init=no \
ac_cv_header_usb_h=no

-CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
---disable-arts \
---disable-esd \
---disable-oss \
---disable-pulseaudio \
---enable-nasm \
---enable-pthread-sem
-
  .if ${FLAVOR:L:Maa}
+WANTLIB+=  aa
  LIB_DEPENDS+= graphics/aalib
-WANTLIB += aa
  CONFIGURE_ARGS+= --enable-video-aalib
-.else
-CONFIGURE_ARGS+= --disable-video-aalib
-.endif
-
-.if ${FLAVOR:L:Mcaca}
-PATCH_DIST_STRIP= -p1
-PATCHFILES=patch-libsd1.2.7-libcaca0.9.diff:0
-LIB_DEPENDS+=  graphics/libcaca
-WANTLIB += caca
-CONFIGURE_ARGS+= --enable-video-caca
-.else
-SUPDISTFILES+= patch-libsd1.2.7-libcaca0.9.diff:0
  .endif

  .if ${FLAVOR:L:Mno_x11}
  CONFIGURE_ARGS+= --without-x \
 --disable-video-x11
-.else
-WANTLIB+=  X11=10 Xau Xdmcp Xext Xrandr Xrender pthread-stubs xcb
  .endif

  NO_REGRESS=   Yes

  pre-configure:
-   mkdir -p ${WRKSRC}/src/audio/libsndio
-   cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio
+   @mkdir -p ${WRKSRC}/src/audio/libsndio
+   @cp ${FILESDIR}/SDL_libsndioaudio.{c,h} ${WRKSRC}/src/audio/libsndio

  .includebsd.port.mk
Index: distinfo
===
RCS file: /home/cvs/ports/devel/sdl/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo3 Jan 2008 17:39:40 -   1.17
+++ distinfo22 Feb 2012 19:40:46 -
@@ -1,10 +1,10 @@
-MD5 (SDL-1.2.13.tar.gz) = xmYP7qKmg03hC8cbL45NiA==
+MD5 (SDL-1.2.15.tar.gz) = nZbfhBdXKir7eBp8TIEahQ==
  MD5 (patch-libsd1.2.7-libcaca0.9.diff) = 3/bPX8l0lNvgWICGbhUWYA==
-RMD160 (SDL-1.2.13.tar.gz) = 7Ygl/Jj0s3Wc+eXPg1fXHFDfmSU=
+RMD160 (SDL-1.2.15.tar.gz) = 1IAqCQy0ok7rDIzlaQgC9ZbTlMM=
  RMD160 (patch-libsd1.2.7-libcaca0.9.diff) = 50oezoZFd7b9r4UWqeS0AJWOV1s=
-SHA1 (SDL-1.2.13.tar.gz) = UfyqPh1cAf2BPqCGiHgPhrGc9Tk=
+SHA1 (SDL-1.2.15.tar.gz) = DF8ZPO2BCw1846sG2AjLte7wOiw=
  SHA1 (patch-libsd1.2.7-libcaca0.9.diff) = Tk0/XwKG5pYODlza0vkMVJl6bAQ=
-SHA256 (SDL-1.2.13.tar.gz) = lPmd8dYPKWtX9HQGUKcbZCXaZUBEyjD48M40k0Qp4TI=
+SHA256 (SDL-1.2.15.tar.gz) = 1tMWp5Pl40gVXw3ZO5eXmJM/uYqh7evMEIgp1kdKrQA=
  SHA256 (patch-libsd1.2.7-libcaca0.9.diff) = 
fnf1KYlqBfccSHTtjR9npVtt976i2zFrClxN/ejoAS8=
-SIZE (SDL-1.2.13.tar.gz) = 3373673
+SIZE (SDL-1.2.15.tar.gz) = 3920622
  SIZE (patch-libsd1.2.7-libcaca0.9.diff) = 28259
Index: patches/patch-Makefile_in
===
RCS file: /home/cvs/ports/devel/sdl/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in   22 Sep 2007 01:12:38 -  1.3
+++ patches/patch-Makefile_in   22 Feb 2012 18:46:36 -
@@ -1,7 +1,7 @@
  $OpenBSD: patch-Makefile_in,v 1.3 2007/09/22 01:12:38 pvalchev Exp $
 Makefile.in.orig   Sat Sep  8 22:26:45 2007
-+++