diff options
author | drochner <drochner> | 2008-03-14 14:49:53 +0000 |
---|---|---|
committer | drochner <drochner> | 2008-03-14 14:49:53 +0000 |
commit | 8349beaa24d7c2883a1865737569527bcd024811 (patch) | |
tree | 0e300aa5cb6e918a22eeec35d4b250d5f911dd0b /games/simgear/patches/patch-aa | |
parent | c3ffab4455848e7c002307b598686e5bc8a672b5 (diff) | |
download | pkgsrc-8349beaa24d7c2883a1865737569527bcd024811.tar.gz |
update flightgear/simgear to 1.0.0, from Yorick Hardy per PR pkg/38160
changes:
-many bugfixes
-UI improvements
-new and improved aircraft models
pkgsrc change: pull in SDL for fullscreen mode
Diffstat (limited to 'games/simgear/patches/patch-aa')
-rw-r--r-- | games/simgear/patches/patch-aa | 122 |
1 files changed, 58 insertions, 64 deletions
diff --git a/games/simgear/patches/patch-aa b/games/simgear/patches/patch-aa index 012020e2261..56441b85b29 100644 --- a/games/simgear/patches/patch-aa +++ b/games/simgear/patches/patch-aa @@ -1,96 +1,81 @@ -$NetBSD: patch-aa,v 1.2 2007/10/05 21:06:00 joerg Exp $ +$NetBSD: patch-aa,v 1.3 2008/03/14 14:49:53 drochner Exp $ ---- configure.orig 2006-04-05 18:25:04.000000000 +0000 -+++ configure -@@ -5968,13 +5968,13 @@ echo "${ECHO_T}$ac_cv_header_pthread_h" +--- configure.orig 2008-01-21 16:52:07.000000000 +0200 ++++ configure 2008-01-21 16:58:07.000000000 +0200 +@@ -2249,7 +2249,7 @@ + ## CFLAGS= + ;; + esac +- CXX_OPTIMIZE_FLAGS=="+K3 -O3" ++ CXX_OPTIMIZE_FLAGS="+K3 -O3" + CXX_DEBUG_FLAGS="-g +K0" + ;; + esac +@@ -7064,9 +7064,9 @@ fi --echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5 --echo $ECHO_N "checking for library containing pthread_exit... $ECHO_C" >&6 +-{ echo "$as_me:$LINENO: checking for library containing pthread_exit" >&5 +-echo $ECHO_N "checking for library containing pthread_exit... $ECHO_C" >&6; } -if test "${ac_cv_search_pthread_exit+set}" = set; then -+echo "$as_me:$LINENO: checking for library containing pthread_create" >&5 -+echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6 ++{ echo "$as_me:$LINENO: checking for library containing pthread_create" >&5 ++echo $ECHO_N "checking for library containing pthread_create... $ECHO_C" >&6; } +if test "${ac_cv_search_pthread_create+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_func_search_save_LIBS=$LIBS --ac_cv_search_pthread_exit=no -+ac_cv_search_pthread_create=no - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF -@@ -5988,11 +5988,11 @@ extern "C" +@@ -7083,11 +7083,11 @@ + #ifdef __cplusplus + extern "C" #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char pthread_exit (); +char pthread_create (); int main () { --pthread_exit (); -+pthread_create (); +-return pthread_exit (); ++return pthread_create (); ; return 0; } -@@ -6019,7 +6019,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +@@ -7133,7 +7133,7 @@ ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 (exit $ac_status); }; }; then -- ac_cv_search_pthread_exit="none required" -+ ac_cv_search_pthread_create="none required" +- ac_cv_search_pthread_exit=$ac_res ++ ac_cv_search_pthread_create=$ac_res else echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -@@ -6027,7 +6027,7 @@ sed 's/^/| /' conftest.$ac_ext >&5 +@@ -7143,21 +7143,21 @@ + + rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext +- if test "${ac_cv_search_pthread_exit+set}" = set; then ++ if test "${ac_cv_search_pthread_create+set}" = set; then + break fi - rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext --if test "$ac_cv_search_pthread_exit" = no; then -+if test "$ac_cv_search_pthread_create" = no; then - for ac_lib in pthread c_r; do - LIBS="-l$ac_lib $ac_func_search_save_LIBS" - cat >conftest.$ac_ext <<_ACEOF -@@ -6043,11 +6043,11 @@ extern "C" - #endif - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char pthread_exit (); -+char pthread_create (); - int - main () - { --pthread_exit (); -+pthread_create (); - ; - return 0; - } -@@ -6074,7 +6074,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- ac_cv_search_pthread_exit="-l$ac_lib" -+ ac_cv_search_pthread_create="-l$ac_lib" - break + done +-if test "${ac_cv_search_pthread_exit+set}" = set; then ++if test "${ac_cv_search_pthread_create+set}" = set; then + : else - echo "$as_me: failed program was:" >&5 -@@ -6087,10 +6087,10 @@ rm -f conftest.err conftest.$ac_objext \ +- ac_cv_search_pthread_exit=no ++ ac_cv_search_pthread_create=no fi + rm conftest.$ac_ext LIBS=$ac_func_search_save_LIBS fi --echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5 --echo "${ECHO_T}$ac_cv_search_pthread_exit" >&6 --if test "$ac_cv_search_pthread_exit" != no; then -- test "$ac_cv_search_pthread_exit" = "none required" || LIBS="$ac_cv_search_pthread_exit $LIBS" -+echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5 -+echo "${ECHO_T}$ac_cv_search_pthread_create" >&6 -+if test "$ac_cv_search_pthread_create" != no; then -+ test "$ac_cv_search_pthread_create" = "none required" || LIBS="$ac_cv_search_pthread_create $LIBS" +-{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_exit" >&5 +-echo "${ECHO_T}$ac_cv_search_pthread_exit" >&6; } +-ac_res=$ac_cv_search_pthread_exit ++{ echo "$as_me:$LINENO: result: $ac_cv_search_pthread_create" >&5 ++echo "${ECHO_T}$ac_cv_search_pthread_create" >&6; } ++ac_res=$ac_cv_search_pthread_create + if test "$ac_res" != no; then + test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" - fi - -@@ -6098,7 +6098,7 @@ if test "x$ac_cv_header_pthread_h" = "xy +@@ -7167,7 +7167,7 @@ CXXFLAGS="$CXXFLAGS -D_REENTRANT" CFLAGS="$CFLAGS -D_REENTRANT" @@ -99,7 +84,7 @@ $NetBSD: patch-aa,v 1.2 2007/10/05 21:06:00 joerg Exp $ CXXFLAGS="-pthread $CXXFLAGS" CFLAGS="-pthread $CFLAGS" fi -@@ -8634,7 +8634,7 @@ fi +@@ -9233,7 +9233,7 @@ esac @@ -108,3 +93,12 @@ $NetBSD: patch-aa,v 1.2 2007/10/05 21:06:00 joerg Exp $ echo echo "You *must* have the openal library installed on your system to build" echo "SimGear!" +@@ -9244,7 +9244,7 @@ + exit + fi + +-if test "$ALUT_OK" == "no"; then ++if test "$ALUT_OK" = "no"; then + echo + echo "You *must* have the alut library installed on your system to build" + echo "SimGear!" |