On Thu, Aug 23, 2012 at 11:47:27AM +1000, Jonathan Gray wrote:
> sdl-config --cflags unconditionally sets _GNU_SOURCE,
> as non posix glibc functions are often hidden under this
> ifdef it tends to break code and I see no reason to define it.
>
> This would ideally be tested in a bulk build though.
I merged your diff into one I was working on to further clean up
the sdl-config and pkg-config files, especially to reomve the
X flags since SDL no longer links with the X libs anyway.
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/devel/sdl/Makefile,v
retrieving revision 1.86
diff -u -p -r1.86 Makefile
--- Makefile 16 May 2012 14:01:19 -0000 1.86
+++ Makefile 18 Aug 2012 16:15:50 -0000
@@ -5,7 +5,7 @@ COMMENT= cross-platform multimedia libra
VERSION= 1.2.15
DISTNAME= SDL-${VERSION}
PKGNAME= ${DISTNAME:L}
-REVISION= 2
+REVISION= 3
CATEGORIES= devel
MASTER_SITES= ${HOMEPAGE}release/
@@ -38,6 +38,7 @@ SEPARATE_BUILD= Yes
CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC} ${WRKSRC}/test
CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
+ --disable-alsa \
--disable-arts \
--disable-esd \
--disable-oss \
Index: patches/patch-configure
===================================================================
RCS file: /home/cvs/ports/devel/sdl/patches/patch-configure,v
retrieving revision 1.24
diff -u -p -r1.24 patch-configure
--- patches/patch-configure 22 Mar 2012 13:00:42 -0000 1.24
+++ patches/patch-configure 26 Aug 2012 16:13:14 -0000
@@ -1,6 +1,15 @@
$OpenBSD: patch-configure,v 1.24 2012/03/22 13:00:42 dcoppa Exp $
---- configure.orig Thu Jan 19 07:30:12 2012
-+++ configure Thu Mar 22 13:52:46 2012
+--- configure.orig Thu Jan 19 01:30:12 2012
++++ configure Sun Aug 26 12:12:59 2012
+@@ -15826,7 +15826,7 @@ case "$host" in
+ BASE_LDFLAGS="-mno-cygwin"
+ ;;
+ *)
+- BASE_CFLAGS="-D_GNU_SOURCE=1"
++ BASE_CFLAGS=""
+ BASE_LDFLAGS=""
+ ;;
+ esac
@@ -21000,6 +21000,20 @@ _ACEOF
fi
}
@@ -35,7 +44,15 @@ $OpenBSD: patch-configure,v 1.24 2012/03
*)
x11_lib=`find_lib "libX11.so.*" "$X_LIBS
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
x11ext_lib=`find_lib "libXext.so.*" "$X_LIBS
-L/usr/X11/$base_libdir -L/usr/X11R6/$base_libdir" | sed 's/.*\/\(.*\)/\1/; q'`
-@@ -29551,6 +29571,7 @@ _ACEOF
+@@ -27056,7 +27076,6 @@ _ACEOF
+ EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags"
+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib"
+ SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags"
+- SDL_LIBS="$SDL_LIBS $pthread_lib"
+
+ # Save the original compiler flags and libraries
+ ac_save_cflags="$CFLAGS"; ac_save_libs="$LIBS"
+@@ -29551,6 +29570,7 @@ _ACEOF
CheckALSA
CheckARTSC
CheckESD
@@ -43,7 +60,7 @@ $OpenBSD: patch-configure,v 1.24 2012/03
CheckPulseAudio
CheckNAS
CheckX11
-@@ -29586,7 +29607,7 @@ _ACEOF
+@@ -29586,7 +29606,7 @@ _ACEOF
SOURCES="$SOURCES $srcdir/src/audio/sun/*.c"
have_audio=yes
;;
@@ -52,3 +69,12 @@ $OpenBSD: patch-configure,v 1.24 2012/03
cat >>confdefs.h <<\_ACEOF
#define SDL_AUDIO_DRIVER_BSD 1
_ACEOF
+@@ -30264,7 +30284,7 @@ case "$ARCH" in
+ SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a
$EXTRA_LDFLAGS"
+ ;;
+ *)
+- SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
++ SDL_STATIC_LIBS="$EXTRA_LDFLAGS"
+ ;;
+ esac
+
Index: patches/patch-sdl-config_in
===================================================================
RCS file: /home/cvs/ports/devel/sdl/patches/patch-sdl-config_in,v
retrieving revision 1.6
diff -u -p -r1.6 patch-sdl-config_in
--- patches/patch-sdl-config_in 20 Mar 2008 05:14:11 -0000 1.6
+++ patches/patch-sdl-config_in 18 Aug 2012 16:35:36 -0000
@@ -1,16 +1,12 @@
$OpenBSD: patch-sdl-config_in,v 1.6 2008/03/20 05:14:11 pvalchev Exp $
---- sdl-config.in.orig Sun Dec 30 20:48:39 2007
-+++ sdl-config.in Tue Mar 18 20:33:17 2008
-@@ -42,10 +42,10 @@ while test $# -gt 0; do
- echo @SDL_VERSION@
- ;;
- --cflags)
-- echo -I@includedir@/SDL @SDL_CFLAGS@
-+ echo -I@includedir@ -I@includedir@/SDL @SDL_CFLAGS@ @X_CFLAGS@
- ;;
- @ENABLE_SHARED_TRUE@ --libs)
--@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@
-+@ENABLE_SHARED_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_LIBS@ @X_LIBS@
+--- sdl-config.in.orig Thu Jan 19 01:30:06 2012
++++ sdl-config.in Sat Aug 18 12:34:25 2012
+@@ -49,7 +49,7 @@ while test $# -gt 0; do
@ENABLE_SHARED_TRUE@ ;;
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_TRUE@ --static-libs)
@ENABLE_STATIC_TRUE@@ENABLE_SHARED_FALSE@ --libs|--static-libs)
+-@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_RLD_FLAGS@ @SDL_STATIC_LIBS@
++@ENABLE_STATIC_TRUE@ echo -L@libdir@ @SDL_LIBS@ @SDL_STATIC_LIBS@
+ @ENABLE_STATIC_TRUE@ ;;
+ *)
+ echo "${usage}" 1>&2
Index: patches/patch-sdl_pc_in
===================================================================
RCS file: patches/patch-sdl_pc_in
diff -N patches/patch-sdl_pc_in
--- patches/patch-sdl_pc_in 2 Mar 2012 09:10:38 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,12 +0,0 @@
-$OpenBSD: patch-sdl_pc_in,v 1.2 2012/03/02 09:10:38 dcoppa Exp $
---- 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@
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
