summaryrefslogtreecommitdiff
path: root/devel/SDL/patches/patch-am
diff options
context:
space:
mode:
Diffstat (limited to 'devel/SDL/patches/patch-am')
-rw-r--r--devel/SDL/patches/patch-am197
1 files changed, 143 insertions, 54 deletions
diff --git a/devel/SDL/patches/patch-am b/devel/SDL/patches/patch-am
index 6b1299f6549..b235ec4b45c 100644
--- a/devel/SDL/patches/patch-am
+++ b/devel/SDL/patches/patch-am
@@ -1,7 +1,8 @@
-$NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
---- configure.orig Sun Oct 13 14:02:02 2002
-+++ configure Sun Oct 13 20:42:24 2002
-@@ -3630,10 +3630,7 @@
+$NetBSD: patch-am,v 1.8 2002/10/31 22:19:51 jlam Exp $
+
+--- configure.orig Sun Oct 6 16:35:02 2002
++++ configure
+@@ -3630,10 +3630,7 @@ fi
if test x$enable_audio = xyes -a x$enable_nas = xyes; then
echo $ac_n "checking for NAS audio support""... $ac_c" 1>&6
echo "configure:3633: checking for NAS audio support" >&5
@@ -12,7 +13,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
echo "$ac_t""$have_nas" 1>&6
if test x$have_nas = xyes; then
CFLAGS="$CFLAGS -DNAS_SUPPORT"
-@@ -3782,7 +3779,7 @@
+@@ -3782,7 +3779,7 @@ fi
NASMFLAGS="-f aoutb"
;;
*)
@@ -21,7 +22,84 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
;;
esac
-@@ -5755,19 +5752,20 @@
+@@ -5385,34 +5382,53 @@ else
+ fi
+
+ if test x$enable_video = xyes -a x$enable_video_aalib = xyes; then
+- echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
+-echo "configure:5390: checking for AAlib support" >&5
+- video_aalib=no
+- cat > conftest.$ac_ext <<EOF
+-#line 5393 "configure"
+-#include "confdefs.h"
+-
+- #include <aalib.h>
+-
+-int main() {
+-
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:5403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+- rm -rf conftest*
+-
+- video_aalib=yes
+-
++ # Extract the first word of "aalib-config", so it can be a program name with args.
++set dummy aalib-config; ac_word=$2
++echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
++echo "configure:5389: checking for $ac_word" >&5
++if eval "test \"`echo '$''{'ac_cv_path_AALIB_CONFIG'+set}'`\" = set"; then
++ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+- echo "configure: failed program was:" >&5
+- cat conftest.$ac_ext >&5
++ case "$AALIB_CONFIG" in
++ /*)
++ ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a path.
++ ;;
++ ?:/*)
++ ac_cv_path_AALIB_CONFIG="$AALIB_CONFIG" # Let the user override the test with a dos path.
++ ;;
++ *)
++ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
++ ac_dummy="$PATH"
++ for ac_dir in $ac_dummy; do
++ test -z "$ac_dir" && ac_dir=.
++ if test -f $ac_dir/$ac_word; then
++ ac_cv_path_AALIB_CONFIG="$ac_dir/$ac_word"
++ break
++ fi
++ done
++ IFS="$ac_save_ifs"
++ ;;
++esac
+ fi
+-rm -f conftest*
++AALIB_CONFIG="$ac_cv_path_AALIB_CONFIG"
++if test -n "$AALIB_CONFIG"; then
++ echo "$ac_t""$AALIB_CONFIG" 1>&6
++else
++ echo "$ac_t""no" 1>&6
++fi
++
++ echo $ac_n "checking for AAlib support""... $ac_c" 1>&6
++echo "configure:5422: checking for AAlib support" >&5
++ if test x$AALIB_CONFIG = x; then
++ video_aalib=no
++ else
++ AALIB_LIBS=`$AALIB_CONFIG --libs`
++ video_aalib=yes
++ fi
+ echo "$ac_t""$video_aalib" 1>&6
+ 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"
+@@ -5755,19 +5771,20 @@ else
fi
if test x$enable_threads = xyes -a x$enable_pth = xyes; then
@@ -33,7 +111,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:5762: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_path_PTH_CONFIG'+set}'`\" = set"; then
-+echo "configure:5760: checking for $ac_word" >&5
++echo "configure:5779: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_path_PTHREAD_CONFIG'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -49,7 +127,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
;;
*)
IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":"
-@@ -5775,34 +5773,34 @@
+@@ -5775,27 +5792,27 @@ else
for ac_dir in $ac_dummy; do
test -z "$ac_dir" && ac_dir=.
if test -f $ac_dir/$ac_word; then
@@ -85,15 +163,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
SDL_CFLAGS="$SDL_CFLAGS $PTH_CFLAGS"
SDL_LIBS="$SDL_LIBS $PTH_LIBS"
CFLAGS="$CFLAGS -DENABLE_PTH"
- use_pth=yes
- fi
- echo $ac_n "checking pth""... $ac_c" 1>&6
--echo "configure:5806: checking pth" >&5
-+echo "configure:5804: checking pth" >&5
- if test "x$use_pth" = xyes; then
- echo "$ac_t""yes" 1>&6
- else
-@@ -5844,8 +5842,8 @@
+@@ -5844,8 +5861,8 @@ fi
pthread_lib="-pthread"
;;
*-*-netbsd*)
@@ -104,7 +174,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
;;
*-*-openbsd*)
pthread_cflags="-D_REENTRANT"
-@@ -6760,66 +6758,55 @@
+@@ -6760,56 +6777,45 @@ else
echo "$ac_t""no" 1>&6
fi
@@ -117,7 +187,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
+
+ ac_safe=`echo "usbhid.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for usbhid.h""... $ac_c" 1>&6
-+echo "configure:6767: checking for usbhid.h" >&5
++echo "configure:6786: checking for usbhid.h" >&5
+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -126,7 +196,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
-cat > conftest.$ac_ext <<EOF
-#line 6773 "configure"
+ cat > conftest.$ac_ext <<EOF
-+#line 6772 "configure"
++#line 6791 "configure"
#include "confdefs.h"
-/* Override any gcc2 internal prototype to avoid an error. */
-/* We use char because int might match the return type of a gcc2
@@ -140,7 +210,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
EOF
-if { (eval echo configure:6784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:6777: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6796: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+if test -z "$ac_err"; then
rm -rf conftest*
@@ -179,24 +249,27 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
-echo "configure:6813: checking for usb.h" >&5
+ ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
-+echo "configure:6800: checking for libusbhid.h" >&5
++echo "configure:6819: checking for libusbhid.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+@@ -6814,12 +6820,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
cat > conftest.$ac_ext <<EOF
-#line 6818 "configure"
-+#line 6805 "configure"
++#line 6824 "configure"
#include "confdefs.h"
-#include <usb.h>
+#include <libusbhid.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6823: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6810: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -6835,57 +6822,74 @@
+@@ -6835,47 +6841,64 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -215,10 +288,10 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
+ fi
+ if test x$have_libusbhid_h = xyes; then
+ CFLAGS="$CFLAGS -DHAVE_LIBUSBHID_H"
-+ fi
++ fi
+ else
+ echo $ac_n "checking for hid_init in -lusb""... $ac_c" 1>&6
-+echo "configure:6839: checking for hid_init in -lusb" >&5
++echo "configure:6858: checking for hid_init in -lusb" >&5
+ac_lib_var=`echo usb'_'hid_init | sed 'y%./+-%__p_%'`
+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
@@ -228,7 +301,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
+ ac_save_LIBS="$LIBS"
+LIBS="-lusb $LIBS"
+cat > conftest.$ac_ext <<EOF
-+#line 6847 "configure"
++#line 6866 "configure"
#include "confdefs.h"
-#include <usbhid.h>
+/* Override any gcc2 internal prototype to avoid an error. */
@@ -244,7 +317,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
-{ (eval echo configure:6856: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-if test -z "$ac_err"; then
-+if { (eval echo configure:6858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:6877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
rm -rf conftest*
- eval "ac_cv_header_$ac_safe=yes"
+ eval "ac_cv_lib_$ac_lib_var=yes"
@@ -272,29 +345,32 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
- ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
-echo "configure:6879: checking for libusb.h" >&5
-+ if test x$have_libusb = xyes; then
-+ SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
++ if test x$have_libusb = xyes; then
++ SYSTEM_LIBS="$SYSTEM_LIBS -lusb"
+
-+ ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
++ ac_safe=`echo "usb.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for usb.h""... $ac_c" 1>&6
-+echo "configure:6883: checking for usb.h" >&5
++echo "configure:6902: checking for usb.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+@@ -6880,12 +6903,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
cat > conftest.$ac_ext <<EOF
-#line 6884 "configure"
-+#line 6888 "configure"
++#line 6907 "configure"
#include "confdefs.h"
-#include <libusb.h>
+#include <usb.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6889: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6912: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -6901,24 +6905,24 @@
+@@ -6901,14 +6924,14 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -307,26 +383,29 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
- ac_safe=`echo "libusbhid.h" | sed 'y%./+-%__p_%'`
-echo $ac_n "checking for libusbhid.h""... $ac_c" 1>&6
-echo "configure:6912: checking for libusbhid.h" >&5
-+ ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
++ ac_safe=`echo "libusb.h" | sed 'y%./+-%__p_%'`
+echo $ac_n "checking for libusb.h""... $ac_c" 1>&6
-+echo "configure:6916: checking for libusb.h" >&5
++echo "configure:6935: checking for libusb.h" >&5
if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
+@@ -6913,12 +6936,12 @@ if eval "test \"`echo '$''{'ac_cv_header
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
cat > conftest.$ac_ext <<EOF
-#line 6917 "configure"
-+#line 6921 "configure"
++#line 6940 "configure"
#include "confdefs.h"
-#include <libusbhid.h>
+#include <libusb.h>
EOF
ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:6922: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+{ (eval echo configure:6926: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:6945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
if test -z "$ac_err"; then
rm -rf conftest*
-@@ -6934,7 +6938,7 @@
+@@ -6934,7 +6957,7 @@ rm -f conftest*
fi
if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
echo "$ac_t""yes" 1>&6
@@ -335,7 +414,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
else
echo "$ac_t""no" 1>&6
fi
-@@ -6942,14 +6946,10 @@
+@@ -6942,14 +6965,10 @@ fi
if test x$have_usb_h = xyes; then
CFLAGS="$CFLAGS -DHAVE_USB_H"
fi
@@ -351,7 +430,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
fi
echo $ac_n "checking for usbhid""... $ac_c" 1>&6
-@@ -7313,6 +7313,7 @@
+@@ -7313,6 +7332,7 @@ __EOF__
CheckESD
CheckNAS
CheckX11
@@ -359,7 +438,7 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
CheckAAlib
CheckOpenGL
CheckPTHREAD
-@@ -7331,9 +7332,9 @@
+@@ -7331,9 +7351,9 @@ __EOF__
# Set up files for the audio library
if test x$enable_audio = xyes; then
@@ -372,21 +451,31 @@ $NetBSD: patch-am,v 1.7 2002/10/13 19:28:58 kristerw Exp $
fi
# Set up files for the cdrom library
if test x$enable_cdrom = xyes; then
-@@ -8765,6 +8766,9 @@
- 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
+@@ -7342,9 +7362,6 @@ __EOF__
+ 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
+@@ -8759,7 +8776,7 @@ fi
- case "$ARCH" in
- openbsd | netbsd | bsdi)
-@@ -9143,7 +9147,7 @@
+ # 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
+@@ -9143,7 +9160,8 @@ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
s%@PKG_CONFIG@%$PKG_CONFIG%g
s%@DIRECTFB_CFLAGS@%$DIRECTFB_CFLAGS%g
s%@DIRECTFB_LIBS@%$DIRECTFB_LIBS%g
-s%@PTH_CONFIG@%$PTH_CONFIG%g
++s%@AALIB_CONFIG@%$AALIB_CONFIG%g
+s%@PTHREAD_CONFIG@%$PTHREAD_CONFIG%g
s%@ARCH@%$ARCH%g
s%@TARGET_LINUX_TRUE@%$TARGET_LINUX_TRUE%g
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-17 05:13:46 +0000