Mageia Bugzilla – Attachment 10466 Details for
Bug 23362
[Update Request] alienarena 7.71.2
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
Proposal patch for the ode error taken from the Fedora version
alienarena-7.71.0-svn5638-system-ode-double.patch (text/plain), 3.29 KB, created by
Kristoffer Grundström
on 2018-11-10 10:37:25 CET
(
hide
)
Description:
Proposal patch for the ode error taken from the Fedora version
Filename:
MIME Type:
Creator:
Kristoffer Grundström
Created:
2018-11-10 10:37:25 CET
Size:
3.29 KB
patch
obsolete
>diff -up alienarena-7.71.0-svn5638/configure.ac.ode-double alienarena-7.71.0-svn5638/configure.ac >--- alienarena-7.71.0-svn5638/configure.ac.ode-double 2018-08-27 15:39:23.000000000 -0400 >+++ alienarena-7.71.0-svn5638/configure.ac 2018-08-27 16:30:53.279170793 -0400 >@@ -346,7 +346,7 @@ PKG_CHECK_MODULES([FREETYPE2],[freetype2 > ]) > > dnl ---- ODE (client) >-PKG_CHECK_MODULES( [ODE],[ode],,[ >+PKG_CHECK_MODULES( [ODE],[ode-double],,[ > AC_MSG_ERROR(["Required ODE (Open Dynamics Engine) library not found"]) > ]) > >@@ -430,7 +430,7 @@ AC_CHECK_HEADERS([ode/ode.h],, > [AC_MSG_ERROR("Required ODE header file, ode.h, not found.")] > [], > [ >-#define dDOUBLE >+#define dIDEDOUBLE > ]) > > ]) >diff -up alienarena-7.71.0-svn5638/configure.ode-double alienarena-7.71.0-svn5638/configure >--- alienarena-7.71.0-svn5638/configure.ode-double 2018-08-27 15:39:23.000000000 -0400 >+++ alienarena-7.71.0-svn5638/configure 2018-08-27 16:19:23.663242341 -0400 >@@ -6754,12 +6754,12 @@ if test -n "$ODE_CFLAGS"; then > pkg_cv_ODE_CFLAGS="$ODE_CFLAGS" > elif test -n "$PKG_CONFIG"; then > if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "ode") 2>&5 >+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode-double\""; } >&5 >+ ($PKG_CONFIG --exists --print-errors "ode-double") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >- pkg_cv_ODE_CFLAGS=`$PKG_CONFIG --cflags "ode" 2>/dev/null` >+ pkg_cv_ODE_CFLAGS=`$PKG_CONFIG --cflags "ode-double" 2>/dev/null` > test "x$?" != "x0" && pkg_failed=yes > else > pkg_failed=yes >@@ -6771,12 +6771,12 @@ if test -n "$ODE_LIBS"; then > pkg_cv_ODE_LIBS="$ODE_LIBS" > elif test -n "$PKG_CONFIG"; then > if test -n "$PKG_CONFIG" && \ >- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode\""; } >&5 >- ($PKG_CONFIG --exists --print-errors "ode") 2>&5 >+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode-double\""; } >&5 >+ ($PKG_CONFIG --exists --print-errors "ode-double") 2>&5 > ac_status=$? > $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 > test $ac_status = 0; }; then >- pkg_cv_ODE_LIBS=`$PKG_CONFIG --libs "ode" 2>/dev/null` >+ pkg_cv_ODE_LIBS=`$PKG_CONFIG --libs "ode-double" 2>/dev/null` > test "x$?" != "x0" && pkg_failed=yes > else > pkg_failed=yes >@@ -6797,9 +6797,9 @@ else > _pkg_short_errors_supported=no > fi > if test $_pkg_short_errors_supported = yes; then >- ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ode" 2>&1` >+ ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ode-double" 2>&1` > else >- ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ode" 2>&1` >+ ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ode-double" 2>&1` > fi > # Put the nasty error message in config.log where it belongs > echo "$ODE_PKG_ERRORS" >&5 >@@ -7453,7 +7453,7 @@ done > for ac_header in ode/ode.h > do : > ac_fn_c_check_header_compile "$LINENO" "ode/ode.h" "ac_cv_header_ode_ode_h" " >-#define dDOUBLE >+#define dIDEDOUBLE > > " > if test "x$ac_cv_header_ode_ode_h" = xyes; then :
diff -up alienarena-7.71.0-svn5638/configure.ac.ode-double alienarena-7.71.0-svn5638/configure.ac --- alienarena-7.71.0-svn5638/configure.ac.ode-double 2018-08-27 15:39:23.000000000 -0400 +++ alienarena-7.71.0-svn5638/configure.ac 2018-08-27 16:30:53.279170793 -0400 @@ -346,7 +346,7 @@ PKG_CHECK_MODULES([FREETYPE2],[freetype2 ]) dnl ---- ODE (client) -PKG_CHECK_MODULES( [ODE],[ode],,[ +PKG_CHECK_MODULES( [ODE],[ode-double],,[ AC_MSG_ERROR(["Required ODE (Open Dynamics Engine) library not found"]) ]) @@ -430,7 +430,7 @@ AC_CHECK_HEADERS([ode/ode.h],, [AC_MSG_ERROR("Required ODE header file, ode.h, not found.")] [], [ -#define dDOUBLE +#define dIDEDOUBLE ]) ]) diff -up alienarena-7.71.0-svn5638/configure.ode-double alienarena-7.71.0-svn5638/configure --- alienarena-7.71.0-svn5638/configure.ode-double 2018-08-27 15:39:23.000000000 -0400 +++ alienarena-7.71.0-svn5638/configure 2018-08-27 16:19:23.663242341 -0400 @@ -6754,12 +6754,12 @@ if test -n "$ODE_CFLAGS"; then pkg_cv_ODE_CFLAGS="$ODE_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ode") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode-double\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ode-double") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ODE_CFLAGS=`$PKG_CONFIG --cflags "ode" 2>/dev/null` + pkg_cv_ODE_CFLAGS=`$PKG_CONFIG --cflags "ode-double" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -6771,12 +6771,12 @@ if test -n "$ODE_LIBS"; then pkg_cv_ODE_LIBS="$ODE_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode\""; } >&5 - ($PKG_CONFIG --exists --print-errors "ode") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"ode-double\""; } >&5 + ($PKG_CONFIG --exists --print-errors "ode-double") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ODE_LIBS=`$PKG_CONFIG --libs "ode" 2>/dev/null` + pkg_cv_ODE_LIBS=`$PKG_CONFIG --libs "ode-double" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -6797,9 +6797,9 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ode" 2>&1` + ODE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "ode-double" 2>&1` else - ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ode" 2>&1` + ODE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "ode-double" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$ODE_PKG_ERRORS" >&5 @@ -7453,7 +7453,7 @@ done for ac_header in ode/ode.h do : ac_fn_c_check_header_compile "$LINENO" "ode/ode.h" "ac_cv_header_ode_ode_h" " -#define dDOUBLE +#define dIDEDOUBLE " if test "x$ac_cv_header_ode_ode_h" = xyes; then :
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 23362
:
10299
|
10392
|
10465
| 10466