Mercurial > mxe-octave

comparison src/of-video-1-fixes.patch @ 4653:00e61c4a5657

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes for package build errors due to API changes
author John W. Eaton <jwe@octave.org>
date Mon, 09 Apr 2018 12:12:44 -0400
parents 3d2263062bbd
children
comparison
equal deleted inserted replaced
4652:2f14bc0c6d0c 4653:00e61c4a5657
121 +AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile]) 121 +AC_CHECK_PROG([MKOCTFILE], [mkoctfile], [mkoctfile])
122 +if test -z "$MKOCTFILE"; then 122 +if test -z "$MKOCTFILE"; then
123 AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME]) 123 AC_MSG_ERROR([mkoctfile required to install $PACKAGE_NAME])
124 fi 124 fi
125 125
126 diff -uNr a/src/aviinfo.cc b/src/aviinfo.cc
127 --- a/src/aviinfo.cc 2017-05-28 10:27:02.824900272 -0400
128 +++ b/src/aviinfo.cc 2018-04-09 15:26:03.042616699 -0400
129 @@ -39,9 +39,9 @@
130 // remove -Wno-deprecated-delarations from src/Makefile.in; remember
131 // to adjust 'Depends' to Octave >= 4.2 in DESCRIPTION)
132
133 - octave_time file_mod = file_stat (fn).mtime ();
134 + octave::sys::time file_mod = octave::sys::file_stat (fn).mtime ();
135
136 - return octave_localtime (file_mod).strftime ("%d-%b-%Y %H:%M:%S");
137 + return octave::sys::localtime (file_mod).strftime ("%d-%b-%Y %H:%M:%S");
138 }
139
140 DEFUN_DLD(aviinfo, args, ,