Mercurial > mxe-octave

comparison src/of-video-1-fixes.patch @ 5335:84b659c79f94

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add back patch for HAVE_MKOCTFILE * src/of-video-1-fixes.patch: added * dist-files.mk: add ref to patch
author John Donoghue
date Wed, 04 Mar 2020 12:20:46 -0500
parents
children
comparison
equal deleted inserted replaced
5334:53f53624ec44 5335:84b659c79f94
1 Only in video-2.0.0/src: aclocal.m4
2 diff -ur video-2.0.0.orig/src/configure video-2.0.0/src/configure
3 --- video-2.0.0.orig/src/configure 2020-03-04 11:23:26.508419633 -0500
4 +++ video-2.0.0/src/configure 2020-03-04 12:19:15.552103743 -0500
5 @@ -588,7 +588,7 @@
6 PKG_CONFIG_LIBDIR
7 PKG_CONFIG_PATH
8 PKG_CONFIG
9 -HAVE_MKOCTFILE
10 +MKOCTFILE
11 OBJEXT
12 EXEEXT
13 ac_ct_CXX
14 @@ -2280,11 +2280,11 @@
15 set dummy mkoctfile; ac_word=$2
16 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
17 $as_echo_n "checking for $ac_word... " >&6; }
18 -if ${ac_cv_prog_HAVE_MKOCTFILE+:} false; then :
19 +if ${ac_cv_prog_MKOCTFILE+:} false; then :
20 $as_echo_n "(cached) " >&6
21 else
22 - if test -n "$HAVE_MKOCTFILE"; then
23 - ac_cv_prog_HAVE_MKOCTFILE="$HAVE_MKOCTFILE" # Let the user override the test.
24 + if test -n "$MKOCTFILE"; then
25 + ac_cv_prog_MKOCTFILE="$MKOCTFILE" # Let the user override the test.
26 else
27 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
28 for as_dir in $PATH
29 @@ -2293,7 +2293,7 @@
30 test -z "$as_dir" && as_dir=.
31 for ac_exec_ext in '' $ac_executable_extensions; do
32 if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
33 - ac_cv_prog_HAVE_MKOCTFILE="yes"
34 + ac_cv_prog_MKOCTFILE="yes"
35 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
36 break 2
37 fi
38 @@ -2301,20 +2301,20 @@
39 done
40 IFS=$as_save_IFS
41
42 - test -z "$ac_cv_prog_HAVE_MKOCTFILE" && ac_cv_prog_HAVE_MKOCTFILE="no"
43 + test -z "$ac_cv_prog_MKOCTFILE" && ac_cv_prog_MKOCTFILE="no"
44 fi
45 fi
46 -HAVE_MKOCTFILE=$ac_cv_prog_HAVE_MKOCTFILE
47 -if test -n "$HAVE_MKOCTFILE"; then
48 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_MKOCTFILE" >&5
49 -$as_echo "$HAVE_MKOCTFILE" >&6; }
50 +MKOCTFILE=$ac_cv_prog_MKOCTFILE
51 +if test -n "$MKOCTFILE"; then
52 + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKOCTFILE" >&5
53 +$as_echo "$MKOCTFILE" >&6; }
54 else
55 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
56 $as_echo "no" >&6; }
57 fi
58
59
60 -if test $HAVE_MKOCTFILE = "no"; then
61 +if test "$MKOCTFILE" = "no"; then
62 as_fn_error $? "mkoctfile required to install $PACKAGE_NAME" "$LINENO" 5
63 fi
64
65 diff -ur video-2.0.0.orig/src/configure.ac video-2.0.0/src/configure.ac
66 --- video-2.0.0.orig/src/configure.ac 2020-03-04 11:23:26.508419633 -0500
67 +++ video-2.0.0/src/configure.ac 2020-03-04 12:18:54.007562316 -0500
68 @@ -12,8 +12,8 @@
69 # Define macros needed for libav
70 #AC_DEFINE(__STDC_CONSTANT_MACROS, [], [workaround for C++ programs to use C99 macros])
71
72 -AC_CHECK_PROG([HAVE_MKOCTFILE], [mkoctfile], [yes], [no])
73 -if [test $HAVE_MKOCTFILE = "no"]; then
74 +AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [yes], [no])
75 +if [test "$MKOCTFILE" = "no"]; then
76 AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME])
77 fi
78