diff options
Diffstat (limited to 'devel/SDL/patches/patch-aj')
| -rw-r--r-- | devel/SDL/patches/patch-aj | 73 |
1 files changed, 55 insertions, 18 deletions
diff --git a/devel/SDL/patches/patch-aj b/devel/SDL/patches/patch-aj index 8833f1ee0ef..e61ee50387e 100644 --- a/devel/SDL/patches/patch-aj +++ b/devel/SDL/patches/patch-aj @@ -1,7 +1,8 @@ -$NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ ---- configure.in.orig Sun Oct 13 14:01:53 2002 -+++ configure.in Sun Oct 13 20:41:57 2002 -@@ -412,10 +412,7 @@ +$NetBSD: patch-aj,v 1.15 2002/10/31 22:19:50 jlam Exp $ + +--- configure.in.orig Sun Oct 6 16:34:53 2002 ++++ configure.in +@@ -412,10 +412,7 @@ CheckNAS() , enable_nas=yes) if test x$enable_audio = xyes -a x$enable_nas = xyes; then AC_MSG_CHECKING(for NAS audio support) @@ -12,7 +13,7 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ AC_MSG_RESULT($have_nas) if test x$have_nas = xyes; then CFLAGS="$CFLAGS -DNAS_SUPPORT" -@@ -488,7 +485,7 @@ +@@ -488,7 +485,7 @@ CheckNASM() NASMFLAGS="-f aoutb" ;; *) @@ -21,7 +22,34 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ ;; esac AC_SUBST(NASMFLAGS) -@@ -1104,12 +1101,13 @@ +@@ -925,18 +922,18 @@ CheckAAlib() + [ --enable-video-aalib use AAlib video driver [default=no]], + , enable_video_aalib=no) + if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then ++ AC_PATH_PROG(AALIB_CONFIG, aalib-config) + AC_MSG_CHECKING(for AAlib support) +- video_aalib=no +- AC_TRY_COMPILE([ +- #include <aalib.h> +- ],[ +- ],[ +- video_aalib=yes +- ]) ++ if test x$AALIB_CONFIG = x; then ++ video_aalib=no ++ else ++ AALIB_LIBS=`$AALIB_CONFIG --libs` ++ video_aalib=yes ++ fi + AC_MSG_RESULT($video_aalib) + if test x$video_aalib = xyes; then + CFLAGS="$CFLAGS -DENABLE_AALIB" +- SYSTEM_LIBS="$SYSTEM_LIBS -laa" ++ SYSTEM_LIBS="$SYSTEM_LIBS $AALIB_LIBS" + + VIDEO_SUBDIRS="$VIDEO_SUBDIRS aalib" + VIDEO_DRIVERS="$VIDEO_DRIVERS aalib/libvideo_aa.la" +@@ -1104,12 +1101,13 @@ CheckPTH() [ --enable-pth use GNU pth library for multi-threading [default=yes]], , enable_pth=yes) if test x$enable_threads = xyes -a x$enable_pth = xyes; then @@ -39,7 +67,7 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS" SDL_LIBS="$SDL_LIBS $PTH_LIBS" CFLAGS="$CFLAGS -DENABLE_PTH" -@@ -1150,8 +1148,8 @@ +@@ -1150,8 +1148,8 @@ CheckPTHREAD() pthread_lib="-pthread" ;; *-*-netbsd*) @@ -50,7 +78,7 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ ;; *-*-openbsd*) pthread_cflags="-D_REENTRANT" -@@ -1566,29 +1564,31 @@ +@@ -1566,29 +1564,31 @@ CheckUSBHID() have_libusbhid=no have_libusb=no AC_CHECK_LIB(usbhid, hid_init, have_libusbhid=yes) @@ -91,7 +119,7 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ fi AC_MSG_CHECKING(for usbhid) -@@ -1834,6 +1834,7 @@ +@@ -1834,6 +1834,7 @@ case "$target" in CheckESD CheckNAS CheckX11 @@ -99,7 +127,7 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ CheckAAlib CheckOpenGL CheckPTHREAD -@@ -1842,9 +1843,9 @@ +@@ -1842,9 +1843,9 @@ case "$target" in COPY_ARCH_SRC(src/main, linux, SDL_main.c) # Set up files for the audio library if test x$enable_audio = xyes; then @@ -112,13 +140,22 @@ $NetBSD: patch-aj,v 1.14 2002/10/13 19:28:58 kristerw Exp $ fi # Set up files for the cdrom library if test x$enable_cdrom = xyes; then -@@ -2483,6 +2484,9 @@ +@@ -1853,9 +1854,6 @@ case "$target" in + fi + # Set up files for the thread library + if test x$enable_threads = xyes; then +- if test x$use_pthreads = xyes; then +- CFLAGS="$CFLAGS -D_POSIX_THREAD_SYSCALL_SOFT=1" +- fi + CopyUnixThreadSource + fi + # Set up files for the timer library +@@ -2478,7 +2476,7 @@ AM_CONDITIONAL([ENABLE_STATIC], [test "$ + + # Set runtime shared library paths as needed + +-if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi; then ++if test $ARCH = linux -o $ARCH = freebsd -o $ARCH = bsdi -o $ARCH = netbsd; then + SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib" fi if test $ARCH = solaris; then - SDL_RLD_FLAGS="-R\${exec_prefix}/lib" -+fi -+if test $ARCH = netbsd; then -+ SDL_RLD_FLAGS="-Wl,-rpath,\${exec_prefix}/lib -Wl,-rpath,${X11BASE}/lib" - fi - - case "$ARCH" in |