Hello community, here is the log from the commit of package movit for openSUSE:Factory checked in at 2018-03-19 23:40:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/movit (Old) and /work/SRC/openSUSE:Factory/.movit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "movit" Mon Mar 19 23:40:16 2018 rev:11 rq:588706 version:1.6.2 Changes: -------- --- /work/SRC/openSUSE:Factory/movit/movit.changes 2018-02-05 10:53:35.818662740 +0100 +++ /work/SRC/openSUSE:Factory/.movit.new/movit.changes 2018-03-19 23:40:42.332315996 +0100 @@ -1,0 +2,8 @@ +Sun Mar 18 23:07:11 UTC 2018 - [email protected] + +- Update to version 1.6.2: + * fix issue with strong one-to-one effects and compute shaders + * fix compile issue with gcc5 +- cleanup with spec-cleaner + +------------------------------------------------------------------- Old: ---- movit-1.6.1.tar.gz New: ---- movit-1.6.2.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ movit.spec ++++++ --- /var/tmp/diff_new_pack.wJL8Rm/_old 2018-03-19 23:40:43.320280356 +0100 +++ /var/tmp/diff_new_pack.wJL8Rm/_new 2018-03-19 23:40:43.324280211 +0100 @@ -21,22 +21,16 @@ # Benchmark support disabled for now, looks like its .pc file can't be found %bcond_with benchmark Name: movit -Version: 1.6.1 +Version: 1.6.2 Release: 0 Summary: GPU video filter library -License: GPL-2.0+ +License: GPL-2.0-or-later Group: Development/Libraries/C and C++ Url: https://movit.sesse.net Source0: https://movit.sesse.net/movit-%{version}.tar.gz # PATCH-FIX-UPSTREAM movit-1.6.0-versioned-shaderdir.patch -- Make shader directory versioned Patch0: movit-1.6.0-versioned-shaderdir.patch BuildRequires: automake -%if 0%{?suse_version} == 1315 -# For Leap 42.3 -BuildRequires: gcc7-c++ -%else -BuildRequires: gcc-c++ -%endif BuildRequires: make BuildRequires: pkgconfig BuildRequires: pkgconfig(egl) @@ -44,6 +38,12 @@ BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(fftw3) BuildRequires: pkgconfig(sdl2) +%if 0%{?suse_version} == 1315 +# For Leap 42.3 +BuildRequires: gcc7-c++ +%else +BuildRequires: gcc-c++ +%endif %if %{with benchmark} BuildRequires: pkgconfig(benchmark) %endif @@ -121,18 +121,16 @@ %postun -n libmovit%{_sonum} -p /sbin/ldconfig %files -n libmovit%{_sonum} -%defattr(-,root,root) -%doc README NEWS COPYING +%license COPYING +%doc README NEWS %{_libdir}/libmovit.so.* %files -n movit%{_sonum}-data -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_datadir}/movit%{_sonum}/ %files devel -%defattr(-,root,root) -%doc COPYING +%license COPYING %{_libdir}/libmovit.so %{_includedir}/%{name} %{_libdir}/pkgconfig/%{name}.pc ++++++ movit-1.6.1.tar.gz -> movit-1.6.2.tar.gz ++++++ ++++ 3202 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/movit-1.6.1/NEWS new/movit-1.6.2/NEWS --- old/movit-1.6.1/NEWS 2018-01-31 23:01:23.000000000 +0100 +++ new/movit-1.6.2/NEWS 2018-03-18 16:23:37.000000000 +0100 @@ -1,3 +1,8 @@ +Movit 1.6.2, March 18th, 2018 + + - Various bugfixes. + + Movit 1.6.1, January 31st, 2018 - Loosen up some restrictions on strong one-to-one-effects. In particular, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/movit-1.6.1/autom4te.cache/requests new/movit-1.6.2/autom4te.cache/requests --- old/movit-1.6.1/autom4te.cache/requests 2018-01-31 23:02:13.000000000 +0100 +++ new/movit-1.6.2/autom4te.cache/requests 2018-03-18 16:24:07.000000000 +0100 @@ -14,146 +14,179 @@ '-', '/usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4', '/usr/share/aclocal/libtool.m4', + '/usr/share/aclocal/ltargz.m4', + '/usr/share/aclocal/ltdl.m4', '/usr/share/aclocal/ltoptions.m4', '/usr/share/aclocal/ltsugar.m4', '/usr/share/aclocal/ltversion.m4', '/usr/share/aclocal/lt~obsolete.m4', '/usr/share/aclocal/pkg.m4', + '/usr/share/aclocal-1.15/cond.m4', + '/usr/share/aclocal-1.15/substnot.m4', 'configure.ac' ], { - 'AC_LIBTOOL_OBJDIR' => 1, - 'PKG_NOARCH_INSTALLDIR' => 1, - 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - '_LT_AC_SHELL_INIT' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_AC_LANG_CXX' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - '_LT_AC_LANG_F77' => 1, - 'LTSUGAR_VERSION' => 1, - '_LT_PATH_TOOL_PREFIX' => 1, - 'AC_PATH_TOOL_PREFIX' => 1, - 'LT_LIB_M' => 1, - 'LT_PROG_GO' => 1, - 'AC_CHECK_LIBM' => 1, - 'LT_CMD_MAX_LEN' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + 'AC_WITH_LTDL' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AM_ENABLE_STATIC' => 1, + '_LT_PROG_F77' => 1, + 'LT_PATH_NM' => 1, + 'include' => 1, + 'PKG_CHECK_MODULES_STATIC' => 1, + 'AC_DISABLE_SHARED' => 1, + 'LT_PATH_LD' => 1, 'AC_LIBTOOL_FC' => 1, 'LTVERSION_VERSION' => 1, - 'AU_DEFUN' => 1, - 'LTOBSOLETE_VERSION' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - '_LT_COMPILER_OPTION' => 1, - 'PKG_INSTALLDIR' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_AC_LOCK' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'LT_AC_PROG_SED' => 1, 'AM_PROG_LIBTOOL' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, - 'AC_DEFUN_ONCE' => 1, - 'LT_PATH_LD' => 1, - '_LT_PROG_LTMAIN' => 1, + 'AC_LIBTOOL_RC' => 1, + 'LT_LANG' => 1, + 'LT_AC_PROG_EGREP' => 1, + '_LT_AC_SHELL_INIT' => 1, + '_LT_AC_SYS_COMPILER' => 1, '_LT_AC_LANG_F77_CONFIG' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'LTDL_INIT' => 1, + 'AC_LTDL_SHLIBPATH' => 1, + 'm4_include' => 1, + 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, + '_LT_DLL_DEF_P' => 1, + '_LT_AC_LANG_CXX' => 1, + 'LTSUGAR_VERSION' => 1, + '_LT_PROG_LTMAIN' => 1, 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - '_LT_AC_LANG_GCJ' => 1, + 'AM_SUBST_NOTMAKE' => 1, '_LT_AC_CHECK_DLFCN' => 1, - 'AC_PROG_LD' => 1, - 'LT_PROG_GCJ' => 1, - 'LTOPTIONS_VERSION' => 1, - 'AC_LIBTOOL_GCJ' => 1, + 'AC_ENABLE_SHARED' => 1, + '_PKG_SHORT_ERRORS_SUPPORTED' => 1, + '_LT_AC_LOCK' => 1, + 'LTDL_INSTALLABLE' => 1, 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_LIBTOOL_CONFIG' => 1, + 'LT_FUNC_ARGZ' => 1, + 'LT_AC_PROG_GCJ' => 1, + 'AC_PROG_LD_GNU' => 1, + 'LT_PROG_GCJ' => 1, + 'AC_LIBTOOL_SETUP' => 1, 'AC_DISABLE_STATIC' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, + 'AC_CHECK_LIBM' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'AC_LTDL_SHLIBEXT' => 1, + 'AM_ENABLE_SHARED' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + 'AC_PROG_LD' => 1, + 'LT_OUTPUT' => 1, + '_LT_PROG_FC' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'PKG_NOARCH_INSTALLDIR' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'AC_LIBTOOL_F77' => 1, + 'LT_LIB_M' => 1, + 'LTOPTIONS_VERSION' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'LT_AC_PROG_RC' => 1, + '_LT_LIBOBJ' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'AM_DISABLE_SHARED' => 1, + '_LTDL_SETUP' => 1, + 'AC_ENABLE_STATIC' => 1, '_AM_CONFIG_MACRO_DIRS' => 1, - 'AC_PATH_MAGIC' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AC_LTDL_OBJDIR' => 1, - 'AC_LIBTOOL_PICMODE' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'AM_PROG_NM' => 1, + '_LT_LINKER_OPTION' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AU_DEFUN' => 1, 'PKG_CHECK_MODULES' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'LT_PROG_RC' => 1, + '_m4_warn' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, + 'AC_LIB_LTDL' => 1, + 'AC_CONFIG_MACRO_DIR_TRACE' => 1, 'AC_DEFUN' => 1, - 'LT_PATH_NM' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, '_LT_AC_LANG_RC_CONFIG' => 1, - 'm4_include' => 1, - 'AM_PROG_LD' => 1, + 'AC_LTDL_DLLIB' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'LTOBSOLETE_VERSION' => 1, + '_LT_AC_LANG_F77' => 1, 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'LT_SUPPORTED_TAG' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1, 'm4_pattern_allow' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + '_LT_AC_PROG_CXXCPP' => 1, + '_LT_WITH_SYSROOT' => 1, + 'AM_PROG_LD' => 1, + 'AC_LTDL_SYMBOL_USCORE' => 1, + 'AC_LTDL_OBJDIR' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + 'AM_CONDITIONAL' => 1, + 'AM_DISABLE_STATIC' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'AC_LTDL_PREOPEN' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, '_LT_AC_LANG_C_CONFIG' => 1, - '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - 'AM_PROG_NM' => 1, - 'AM_DISABLE_SHARED' => 1, - 'AC_ENABLE_STATIC' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'PKG_CHECK_MODULES_STATIC' => 1, - 'AC_LIBTOOL_F77' => 1, - '_LT_WITH_SYSROOT' => 1, - 'LT_OUTPUT' => 1, - 'LT_LANG' => 1, + 'AC_PATH_TOOL_PREFIX' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'LT_SYS_MODULE_PATH' => 1, + '_LT_AC_TAGVAR' => 1, + 'LT_SYS_DLSEARCH_PATH' => 1, '_LT_CC_BASENAME' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, + 'AC_PROG_NM' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, '_AM_AUTOCONF_VERSION' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'PKG_CHECK_VAR' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, - 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - '_LT_LINKER_OPTION' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + 'LTDL_CONVENIENCE' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, '_LT_PROG_CXX' => 1, - 'include' => 1, - 'AC_ENABLE_SHARED' => 1, - 'LT_INIT' => 1, - '_m4_warn' => 1, + 'PKG_INSTALLDIR' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'LT_PROG_GO' => 1, + 'LT_SYS_MODULE_EXT' => 1, + 'LT_WITH_LTDL' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, 'AC_LIBTOOL_LINKER_OPTION' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - 'AM_ENABLE_SHARED' => 1, - '_LT_AC_TAGVAR' => 1, - 'AC_LIBTOOL_DLOPEN' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, - 'AM_DISABLE_STATIC' => 1, - 'AC_LIBTOOL_RC' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, + 'LT_AC_PROG_SED' => 1, 'm4_pattern_forbid' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'AC_PROG_EGREP' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, 'PKG_CHECK_EXISTS' => 1, - 'LT_AC_PROG_RC' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - '_LT_PROG_F77' => 1, - '_LT_PROG_FC' => 1, - '_LT_AC_PROG_CXXCPP' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'AC_DISABLE_SHARED' => 1, - 'AC_PROG_NM' => 1, - 'AM_ENABLE_STATIC' => 1, - 'AC_LIBTOOL_SETUP' => 1 + '_LT_AC_TAGCONFIG' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'LT_PROG_RC' => 1, + 'LT_CMD_MAX_LEN' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, + '_LT_PATH_TOOL_PREFIX' => 1, + '_LT_COMPILER_OPTION' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'LT_INIT' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'AC_PROG_EGREP' => 1, + 'PKG_CHECK_VAR' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, + 'AC_LIBTOOL_DLOPEN' => 1, + 'LT_LIB_DLLOAD' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AC_PATH_MAGIC' => 1, + 'AC_LIBTOOL_CXX' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -168,64 +201,64 @@ 'configure.ac' ], { - 'AM_POT_TOOLS' => 1, - 'AM_SILENT_RULES' => 1, - '_m4_warn' => 1, - 'm4_include' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'AM_PROG_F77_C_O' => 1, - 'include' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_SUBST_TRACE' => 1, 'LT_INIT' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'm4_pattern_forbid' => 1, - 'AC_LIBSOURCE' => 1, - '_AM_COND_ENDIF' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, + 'AC_CANONICAL_BUILD' => 1, + 'AH_OUTPUT' => 1, + 'AM_SILENT_RULES' => 1, 'LT_SUPPORTED_TAG' => 1, + 'AM_POT_TOOLS' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AM_AUTOMAKE_VERSION' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AC_INIT' => 1, + 'AM_PROG_FC_C_O' => 1, '_AM_COND_ELSE' => 1, - 'AM_PATH_GUILE' => 1, - 'm4_pattern_allow' => 1, '_AM_COND_IF' => 1, - 'AC_PROG_LIBTOOL' => 1, + 'AM_ENABLE_MULTILIB' => 1, + 'm4_pattern_allow' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, 'AC_CANONICAL_TARGET' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AM_PROG_CXX_C_O' => 1, + 'AC_FC_FREEFORM' => 1, + '_LT_AC_TAGCONFIG' => 1, + 'm4_include' => 1, + 'm4_sinclude' => 1, + 'AC_CONFIG_HEADERS' => 1, 'AC_FC_PP_DEFINE' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_INIT_AUTOMAKE' => 1, + 'AM_NLS' => 1, + 'AC_FC_SRCEXT' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AM_PATH_GUILE' => 1, + 'AM_MAINTAINER_MODE' => 1, + 'include' => 1, + 'AM_PROG_CXX_C_O' => 1, + 'AM_PROG_F77_C_O' => 1, + 'AC_SUBST' => 1, + 'AM_PROG_MOC' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'm4_pattern_forbid' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_FC_PP_SRCEXT' => 1, 'sinclude' => 1, 'AM_PROG_CC_C_O' => 1, - 'm4_sinclude' => 1, - 'AC_FC_PP_SRCEXT' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_SUBST_TRACE' => 1, - 'AC_CONFIG_AUX_DIR' => 1, + '_AM_COND_ENDIF' => 1, + 'AC_CANONICAL_HOST' => 1, 'LT_CONFIG_LTDL_DIR' => 1, - 'AC_INIT' => 1, + 'AM_PROG_AR' => 1, + '_AM_SUBST_NOTMAKE' => 1, 'AM_GNU_GETTEXT' => 1, - 'AC_FC_FREEFORM' => 1, - 'AC_CONFIG_HEADERS' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AC_CANONICAL_HOST' => 1, 'AC_CONFIG_LINKS' => 1, - 'AC_CONFIG_FILES' => 1, + 'AC_LIBSOURCE' => 1, 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AM_PROG_AR' => 1, - 'AM_NLS' => 1, - 'AH_OUTPUT' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AM_AUTOMAKE_VERSION' => 1, - 'AC_FC_SRCEXT' => 1, - 'AM_MAKEFILE_INCLUDE' => 1, - 'AM_ENABLE_MULTILIB' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_SUBST' => 1, - 'AM_PROG_MOC' => 1 + 'AM_INIT_AUTOMAKE' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + '_m4_warn' => 1 } ], 'Autom4te::Request' ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/movit-1.6.1/autom4te.cache/traces.0 new/movit-1.6.2/autom4te.cache/traces.0 --- old/movit-1.6.1/autom4te.cache/traces.0 2018-01-31 23:02:13.000000000 +0100 +++ new/movit-1.6.2/autom4te.cache/traces.0 2018-03-18 16:24:06.000000000 +0100 @@ -842,6 +842,704 @@ m4trace:/usr/share/aclocal/libtool.m4:8288: -1- AC_DEFUN([LT_AC_PROG_SED], [AC_DIAGNOSE([obsolete], [The macro `LT_AC_PROG_SED' is obsolete. You should run autoupdate.])dnl m4_if($#, 0, [AC_PROG_SED], [AC_PROG_SED($@)])]) +m4trace:/usr/share/aclocal/ltargz.m4:12: -1- AC_DEFUN([LT_FUNC_ARGZ], [ +AC_CHECK_HEADERS([argz.h], [], [], [AC_INCLUDES_DEFAULT]) + +AC_CHECK_TYPES([error_t], + [], + [AC_DEFINE([error_t], [int], + [Define to a type to use for 'error_t' if it is not otherwise available.]) + AC_DEFINE([__error_t_defined], [1], [Define so that glibc/gnulib argp.h + does not typedef error_t.])], + [#if defined(HAVE_ARGZ_H) +# include <argz.h> +#endif]) + +LT_ARGZ_H= +AC_CHECK_FUNCS([argz_add argz_append argz_count argz_create_sep argz_insert \ + argz_next argz_stringify], [], [LT_ARGZ_H=lt__argz.h; AC_LIBOBJ([lt__argz])]) + +dnl if have system argz functions, allow forced use of +dnl libltdl-supplied implementation (and default to do so +dnl on "known bad" systems). Could use a runtime check, but +dnl (a) detecting malloc issues is notoriously unreliable +dnl (b) only known system that declares argz functions, +dnl provides them, yet they are broken, is cygwin +dnl releases prior to 16-Mar-2007 (1.5.24 and earlier) +dnl So, it's more straightforward simply to special case +dnl this for known bad systems. +AS_IF([test -z "$LT_ARGZ_H"], + [AC_CACHE_CHECK( + [if argz actually works], + [lt_cv_sys_argz_works], + [[case $host_os in #( + *cygwin*) + lt_cv_sys_argz_works=no + if test no != "$cross_compiling"; then + lt_cv_sys_argz_works="guessing no" + else + lt_sed_extract_leading_digits='s/^\([0-9\.]*\).*/\1/' + save_IFS=$IFS + IFS=-. + set x `uname -r | sed -e "$lt_sed_extract_leading_digits"` + IFS=$save_IFS + lt_os_major=${2-0} + lt_os_minor=${3-0} + lt_os_micro=${4-0} + if test 1 -lt "$lt_os_major" \ + || { test 1 -eq "$lt_os_major" \ + && { test 5 -lt "$lt_os_minor" \ + || { test 5 -eq "$lt_os_minor" \ + && test 24 -lt "$lt_os_micro"; }; }; }; then + lt_cv_sys_argz_works=yes + fi + fi + ;; #( + *) lt_cv_sys_argz_works=yes ;; + esac]]) + AS_IF([test yes = "$lt_cv_sys_argz_works"], + [AC_DEFINE([HAVE_WORKING_ARGZ], 1, + [This value is set to 1 to indicate that the system argz facility works])], + [LT_ARGZ_H=lt__argz.h + AC_LIBOBJ([lt__argz])])]) + +AC_SUBST([LT_ARGZ_H]) +]) +m4trace:/usr/share/aclocal/ltdl.m4:16: -1- AC_DEFUN([LT_CONFIG_LTDL_DIR], [AC_BEFORE([$0], [LTDL_INIT]) +_$0($*) +]) +m4trace:/usr/share/aclocal/ltdl.m4:68: -1- AC_DEFUN([LTDL_CONVENIENCE], [AC_BEFORE([$0], [LTDL_INIT])dnl +dnl Although the argument is deprecated and no longer documented, +dnl LTDL_CONVENIENCE used to take a DIRECTORY orgument, if we have one +dnl here make sure it is the same as any other declaration of libltdl's +dnl location! This also ensures lt_ltdl_dir is set when configure.ac is +dnl not yet using an explicit LT_CONFIG_LTDL_DIR. +m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl +_$0() +]) +m4trace:/usr/share/aclocal/ltdl.m4:81: -1- AU_DEFUN([AC_LIBLTDL_CONVENIENCE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) +_LTDL_CONVENIENCE]) +m4trace:/usr/share/aclocal/ltdl.m4:81: -1- AC_DEFUN([AC_LIBLTDL_CONVENIENCE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBLTDL_CONVENIENCE' is obsolete. +You should run autoupdate.])dnl +_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) +_LTDL_CONVENIENCE]) +m4trace:/usr/share/aclocal/ltdl.m4:124: -1- AC_DEFUN([LTDL_INSTALLABLE], [AC_BEFORE([$0], [LTDL_INIT])dnl +dnl Although the argument is deprecated and no longer documented, +dnl LTDL_INSTALLABLE used to take a DIRECTORY orgument, if we have one +dnl here make sure it is the same as any other declaration of libltdl's +dnl location! This also ensures lt_ltdl_dir is set when configure.ac is +dnl not yet using an explicit LT_CONFIG_LTDL_DIR. +m4_ifval([$1], [_LT_CONFIG_LTDL_DIR([$1])])dnl +_$0() +]) +m4trace:/usr/share/aclocal/ltdl.m4:137: -1- AU_DEFUN([AC_LIBLTDL_INSTALLABLE], [_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) +_LTDL_INSTALLABLE]) +m4trace:/usr/share/aclocal/ltdl.m4:137: -1- AC_DEFUN([AC_LIBLTDL_INSTALLABLE], [AC_DIAGNOSE([obsolete], [The macro `AC_LIBLTDL_INSTALLABLE' is obsolete. +You should run autoupdate.])dnl +_LT_CONFIG_LTDL_DIR([m4_default([$1], [libltdl])]) +_LTDL_INSTALLABLE]) +m4trace:/usr/share/aclocal/ltdl.m4:213: -1- AC_DEFUN([_LT_LIBOBJ], [ + m4_pattern_allow([^_LT_LIBOBJS$]) + _LT_LIBOBJS="$_LT_LIBOBJS $1.$ac_objext" +]) +m4trace:/usr/share/aclocal/ltdl.m4:226: -1- AC_DEFUN([LTDL_INIT], [dnl Parse OPTIONS +_LT_SET_OPTIONS([$0], [$1]) + +dnl We need to keep our own list of libobjs separate from our parent project, +dnl and the easiest way to do that is redefine the AC_LIBOBJs macro while +dnl we look for our own LIBOBJs. +m4_pushdef([AC_LIBOBJ], m4_defn([_LT_LIBOBJ])) +m4_pushdef([AC_LIBSOURCES]) + +dnl If not otherwise defined, default to the 1.5.x compatible subproject mode: +m4_if(_LTDL_MODE, [], + [m4_define([_LTDL_MODE], m4_default([$2], [subproject])) + m4_if([-1], [m4_bregexp(_LTDL_MODE, [\(subproject\|\(non\)?recursive\)])], + [m4_fatal([unknown libltdl mode: ]_LTDL_MODE)])]) + +AC_ARG_WITH([included_ltdl], + [AS_HELP_STRING([--with-included-ltdl], + [use the GNU ltdl sources included here])]) + +if test yes != "$with_included_ltdl"; then + # We are not being forced to use the included libltdl sources, so + # decide whether there is a useful installed version we can use. + AC_CHECK_HEADER([ltdl.h], + [AC_CHECK_DECL([lt_dlinterface_register], + [AC_CHECK_LIB([ltdl], [lt_dladvise_preload], + [with_included_ltdl=no], + [with_included_ltdl=yes])], + [with_included_ltdl=yes], + [AC_INCLUDES_DEFAULT + #include <ltdl.h>])], + [with_included_ltdl=yes], + [AC_INCLUDES_DEFAULT] + ) +fi + +dnl If neither LT_CONFIG_LTDL_DIR, LTDL_CONVENIENCE nor LTDL_INSTALLABLE +dnl was called yet, then for old times' sake, we assume libltdl is in an +dnl eponymous directory: +AC_PROVIDE_IFELSE([LT_CONFIG_LTDL_DIR], [], [_LT_CONFIG_LTDL_DIR([libltdl])]) + +AC_ARG_WITH([ltdl_include], + [AS_HELP_STRING([--with-ltdl-include=DIR], + [use the ltdl headers installed in DIR])]) + +if test -n "$with_ltdl_include"; then + if test -f "$with_ltdl_include/ltdl.h"; then : + else + AC_MSG_ERROR([invalid ltdl include directory: '$with_ltdl_include']) + fi +else + with_ltdl_include=no +fi + +AC_ARG_WITH([ltdl_lib], + [AS_HELP_STRING([--with-ltdl-lib=DIR], + [use the libltdl.la installed in DIR])]) + +if test -n "$with_ltdl_lib"; then + if test -f "$with_ltdl_lib/libltdl.la"; then : + else + AC_MSG_ERROR([invalid ltdl library directory: '$with_ltdl_lib']) + fi +else + with_ltdl_lib=no +fi + +case ,$with_included_ltdl,$with_ltdl_include,$with_ltdl_lib, in + ,yes,no,no,) + m4_case(m4_default(_LTDL_TYPE, [convenience]), + [convenience], [_LTDL_CONVENIENCE], + [installable], [_LTDL_INSTALLABLE], + [m4_fatal([unknown libltdl build type: ]_LTDL_TYPE)]) + ;; + ,no,no,no,) + # If the included ltdl is not to be used, then use the + # preinstalled libltdl we found. + AC_DEFINE([HAVE_LTDL], [1], + [Define this if a modern libltdl is already installed]) + LIBLTDL=-lltdl + LTDLDEPS= + LTDLINCL= + ;; + ,no*,no,*) + AC_MSG_ERROR(['--with-ltdl-include' and '--with-ltdl-lib' options must be used together]) + ;; + *) with_included_ltdl=no + LIBLTDL="-L$with_ltdl_lib -lltdl" + LTDLDEPS= + LTDLINCL=-I$with_ltdl_include + ;; +esac +INCLTDL=$LTDLINCL + +# Report our decision... +AC_MSG_CHECKING([where to find libltdl headers]) +AC_MSG_RESULT([$LTDLINCL]) +AC_MSG_CHECKING([where to find libltdl library]) +AC_MSG_RESULT([$LIBLTDL]) + +_LTDL_SETUP + +dnl restore autoconf definition. +m4_popdef([AC_LIBOBJ]) +m4_popdef([AC_LIBSOURCES]) + +AC_CONFIG_COMMANDS_PRE([ + _ltdl_libobjs= + _ltdl_ltlibobjs= + if test -n "$_LT_LIBOBJS"; then + # Remove the extension. + _lt_sed_drop_objext='s/\.o$//;s/\.obj$//' + for i in `for i in $_LT_LIBOBJS; do echo "$i"; done | sed "$_lt_sed_drop_objext" | sort -u`; do + _ltdl_libobjs="$_ltdl_libobjs $lt_libobj_prefix$i.$ac_objext" + _ltdl_ltlibobjs="$_ltdl_ltlibobjs $lt_libobj_prefix$i.lo" + done + fi + AC_SUBST([ltdl_LIBOBJS], [$_ltdl_libobjs]) + AC_SUBST([ltdl_LTLIBOBJS], [$_ltdl_ltlibobjs]) +]) + +# Only expand once: +m4_define([LTDL_INIT]) +]) +m4trace:/usr/share/aclocal/ltdl.m4:352: -1- AU_DEFUN([AC_LIB_LTDL], [LTDL_INIT($@)]) +m4trace:/usr/share/aclocal/ltdl.m4:352: -1- AC_DEFUN([AC_LIB_LTDL], [AC_DIAGNOSE([obsolete], [The macro `AC_LIB_LTDL' is obsolete. +You should run autoupdate.])dnl +LTDL_INIT($@)]) +m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AU_DEFUN([AC_WITH_LTDL], [LTDL_INIT($@)]) +m4trace:/usr/share/aclocal/ltdl.m4:353: -1- AC_DEFUN([AC_WITH_LTDL], [AC_DIAGNOSE([obsolete], [The macro `AC_WITH_LTDL' is obsolete. +You should run autoupdate.])dnl +LTDL_INIT($@)]) +m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AU_DEFUN([LT_WITH_LTDL], [LTDL_INIT($@)]) +m4trace:/usr/share/aclocal/ltdl.m4:354: -1- AC_DEFUN([LT_WITH_LTDL], [AC_DIAGNOSE([obsolete], [The macro `LT_WITH_LTDL' is obsolete. +You should run autoupdate.])dnl +LTDL_INIT($@)]) +m4trace:/usr/share/aclocal/ltdl.m4:367: -1- AC_DEFUN([_LTDL_SETUP], [AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([LT_SYS_MODULE_EXT])dnl +AC_REQUIRE([LT_SYS_MODULE_PATH])dnl +AC_REQUIRE([LT_SYS_DLSEARCH_PATH])dnl +AC_REQUIRE([LT_LIB_DLLOAD])dnl +AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl +AC_REQUIRE([LT_FUNC_DLSYM_USCORE])dnl +AC_REQUIRE([LT_SYS_DLOPEN_DEPLIBS])dnl +AC_REQUIRE([LT_FUNC_ARGZ])dnl + +m4_require([_LT_CHECK_OBJDIR])dnl +m4_require([_LT_HEADER_DLFCN])dnl +m4_require([_LT_CHECK_DLPREOPEN])dnl +m4_require([_LT_DECL_SED])dnl + +dnl Don't require this, or it will be expanded earlier than the code +dnl that sets the variables it relies on: +_LT_ENABLE_INSTALL + +dnl _LTDL_MODE specific code must be called at least once: +_LTDL_MODE_DISPATCH + +# In order that ltdl.c can compile, find out the first AC_CONFIG_HEADERS +# the user used. This is so that ltdl.h can pick up the parent projects +# config.h file, The first file in AC_CONFIG_HEADERS must contain the +# definitions required by ltdl.c. +# FIXME: Remove use of undocumented AC_LIST_HEADERS (2.59 compatibility). +AC_CONFIG_COMMANDS_PRE([dnl +m4_pattern_allow([^LT_CONFIG_H$])dnl +m4_ifset([AH_HEADER], + [LT_CONFIG_H=AH_HEADER], + [m4_ifset([AC_LIST_HEADERS], + [LT_CONFIG_H=`echo "AC_LIST_HEADERS" | $SED 's|^[[ ]]*||;s|[[ :]].*$||'`], + [])])]) +AC_SUBST([LT_CONFIG_H]) + +AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h], + [], [], [AC_INCLUDES_DEFAULT]) + +AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])]) +AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])]) + +m4_pattern_allow([LT_LIBEXT])dnl +AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension]) + +name= +eval "lt_libprefix=\"$libname_spec\"" +m4_pattern_allow([LT_LIBPREFIX])dnl +AC_DEFINE_UNQUOTED([LT_LIBPREFIX],["$lt_libprefix"],[The archive prefix]) + +name=ltdl +eval "LTDLOPEN=\"$libname_spec\"" +AC_SUBST([LTDLOPEN]) +]) +m4trace:/usr/share/aclocal/ltdl.m4:443: -1- AC_DEFUN([LT_SYS_DLOPEN_DEPLIBS], [AC_REQUIRE([AC_CANONICAL_HOST])dnl +AC_CACHE_CHECK([whether deplibs are loaded by dlopen], + [lt_cv_sys_dlopen_deplibs], + [# PORTME does your system automatically load deplibs for dlopen? + # or its logical equivalent (e.g. shl_load for HP-UX < 11) + # For now, we just catch OSes we know something about -- in the + # future, we'll try test this programmatically. + lt_cv_sys_dlopen_deplibs=unknown + case $host_os in + aix3*|aix4.1.*|aix4.2.*) + # Unknown whether this is true for these versions of AIX, but + # we want this 'case' here to explicitly catch those versions. + lt_cv_sys_dlopen_deplibs=unknown + ;; + aix[[4-9]]*) + lt_cv_sys_dlopen_deplibs=yes + ;; + amigaos*) + case $host_cpu in + powerpc) + lt_cv_sys_dlopen_deplibs=no + ;; + esac + ;; + bitrig*) + lt_cv_sys_dlopen_deplibs=yes + ;; + darwin*) + # Assuming the user has installed a libdl from somewhere, this is true + # If you are looking for one http://www.opendarwin.org/projects/dlcompat + lt_cv_sys_dlopen_deplibs=yes + ;; + freebsd* | dragonfly*) + lt_cv_sys_dlopen_deplibs=yes + ;; + gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu) + # GNU and its variants, using gnu ld.so (Glibc) + lt_cv_sys_dlopen_deplibs=yes + ;; + hpux10*|hpux11*) + lt_cv_sys_dlopen_deplibs=yes + ;; + interix*) + lt_cv_sys_dlopen_deplibs=yes + ;; + irix[[12345]]*|irix6.[[01]]*) + # Catch all versions of IRIX before 6.2, and indicate that we don't + # know how it worked for any of those versions. + lt_cv_sys_dlopen_deplibs=unknown + ;; + irix*) + # The case above catches anything before 6.2, and it's known that + # at 6.2 and later dlopen does load deplibs. + lt_cv_sys_dlopen_deplibs=yes + ;; + netbsd* | netbsdelf*-gnu) + lt_cv_sys_dlopen_deplibs=yes + ;; + openbsd*) + lt_cv_sys_dlopen_deplibs=yes + ;; + osf[[1234]]*) + # dlopen did load deplibs (at least at 4.x), but until the 5.x series, + # it did *not* use an RPATH in a shared library to find objects the + # library depends on, so we explicitly say 'no'. + lt_cv_sys_dlopen_deplibs=no + ;; + osf5.0|osf5.0a|osf5.1) + # dlopen *does* load deplibs and with the right loader patch applied + # it even uses RPATH in a shared library to search for shared objects + # that the library depends on, but there's no easy way to know if that + # patch is installed. Since this is the case, all we can really + # say is unknown -- it depends on the patch being installed. If + # it is, this changes to 'yes'. Without it, it would be 'no'. + lt_cv_sys_dlopen_deplibs=unknown + ;; + osf*) + # the two cases above should catch all versions of osf <= 5.1. Read + # the comments above for what we know about them. + # At > 5.1, deplibs are loaded *and* any RPATH in a shared library + # is used to find them so we can finally say 'yes'. + lt_cv_sys_dlopen_deplibs=yes + ;; + qnx*) + lt_cv_sys_dlopen_deplibs=yes + ;; + solaris*) + lt_cv_sys_dlopen_deplibs=yes + ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + libltdl_cv_sys_dlopen_deplibs=yes + ;; + esac + ]) +if test yes != "$lt_cv_sys_dlopen_deplibs"; then + AC_DEFINE([LTDL_DLOPEN_DEPLIBS], [1], + [Define if the OS needs help to load dependent libraries for dlopen().]) +fi +]) +m4trace:/usr/share/aclocal/ltdl.m4:545: -1- AU_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:545: -1- AC_DEFUN([AC_LTDL_SYS_DLOPEN_DEPLIBS], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYS_DLOPEN_DEPLIBS' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_SYS_DLOPEN_DEPLIBS], [LT_SYS_DLOPEN_DEPLIBS($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:552: -1- AC_DEFUN([LT_SYS_MODULE_EXT], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl +AC_CACHE_CHECK([what extension is used for runtime loadable modules], + [libltdl_cv_shlibext], +[ +module=yes +eval libltdl_cv_shlibext=$shrext_cmds +module=no +eval libltdl_cv_shrext=$shrext_cmds + ]) +if test -n "$libltdl_cv_shlibext"; then + m4_pattern_allow([LT_MODULE_EXT])dnl + AC_DEFINE_UNQUOTED([LT_MODULE_EXT], ["$libltdl_cv_shlibext"], + [Define to the extension used for runtime loadable modules, say, ".so".]) +fi +if test "$libltdl_cv_shrext" != "$libltdl_cv_shlibext"; then + m4_pattern_allow([LT_SHARED_EXT])dnl + AC_DEFINE_UNQUOTED([LT_SHARED_EXT], ["$libltdl_cv_shrext"], + [Define to the shared library suffix, say, ".dylib".]) +fi +if test -n "$shared_archive_member_spec"; then + m4_pattern_allow([LT_SHARED_LIB_MEMBER])dnl + AC_DEFINE_UNQUOTED([LT_SHARED_LIB_MEMBER], ["($shared_archive_member_spec.o)"], + [Define to the shared archive member specification, say "(shr.o)".]) +fi +]) +m4trace:/usr/share/aclocal/ltdl.m4:580: -1- AU_DEFUN([AC_LTDL_SHLIBEXT], [m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:580: -1- AC_DEFUN([AC_LTDL_SHLIBEXT], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SHLIBEXT' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_SYS_MODULE_EXT], [LT_SYS_MODULE_EXT($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:587: -1- AC_DEFUN([LT_SYS_MODULE_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl +AC_CACHE_CHECK([what variable specifies run-time module search path], + [lt_cv_module_path_var], [lt_cv_module_path_var=$shlibpath_var]) +if test -n "$lt_cv_module_path_var"; then + m4_pattern_allow([LT_MODULE_PATH_VAR])dnl + AC_DEFINE_UNQUOTED([LT_MODULE_PATH_VAR], ["$lt_cv_module_path_var"], + [Define to the name of the environment variable that determines the run-time module search path.]) +fi +]) +m4trace:/usr/share/aclocal/ltdl.m4:599: -1- AU_DEFUN([AC_LTDL_SHLIBPATH], [m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:599: -1- AC_DEFUN([AC_LTDL_SHLIBPATH], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SHLIBPATH' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_SYS_MODULE_PATH], [LT_SYS_MODULE_PATH($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:606: -1- AC_DEFUN([LT_SYS_DLSEARCH_PATH], [m4_require([_LT_SYS_DYNAMIC_LINKER])dnl +AC_CACHE_CHECK([for the default library search path], + [lt_cv_sys_dlsearch_path], + [lt_cv_sys_dlsearch_path=$sys_lib_dlsearch_path_spec]) +if test -n "$lt_cv_sys_dlsearch_path"; then + sys_dlsearch_path= + for dir in $lt_cv_sys_dlsearch_path; do + if test -z "$sys_dlsearch_path"; then + sys_dlsearch_path=$dir + else + sys_dlsearch_path=$sys_dlsearch_path$PATH_SEPARATOR$dir + fi + done + m4_pattern_allow([LT_DLSEARCH_PATH])dnl + AC_DEFINE_UNQUOTED([LT_DLSEARCH_PATH], ["$sys_dlsearch_path"], + [Define to the system default library search path.]) +fi +]) +m4trace:/usr/share/aclocal/ltdl.m4:627: -1- AU_DEFUN([AC_LTDL_SYSSEARCHPATH], [m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:627: -1- AC_DEFUN([AC_LTDL_SYSSEARCHPATH], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYSSEARCHPATH' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_SYS_DLSEARCH_PATH], [LT_SYS_DLSEARCH_PATH($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:653: -1- AC_DEFUN([LT_LIB_DLLOAD], [m4_pattern_allow([^LT_DLLOADERS$]) +LT_DLLOADERS= +AC_SUBST([LT_DLLOADERS]) + +AC_LANG_PUSH([C]) +lt_dlload_save_LIBS=$LIBS + +LIBADD_DLOPEN= +AC_SEARCH_LIBS([dlopen], [dl], + [AC_DEFINE([HAVE_LIBDL], [1], + [Define if you have the libdl library or equivalent.]) + if test "$ac_cv_search_dlopen" != "none required"; then + LIBADD_DLOPEN=-ldl + fi + libltdl_cv_lib_dl_dlopen=yes + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#if HAVE_DLFCN_H +# include <dlfcn.h> +#endif + ]], [[dlopen(0, 0);]])], + [AC_DEFINE([HAVE_LIBDL], [1], + [Define if you have the libdl library or equivalent.]) + libltdl_cv_func_dlopen=yes + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"], + [AC_CHECK_LIB([svld], [dlopen], + [AC_DEFINE([HAVE_LIBDL], [1], + [Define if you have the libdl library or equivalent.]) + LIBADD_DLOPEN=-lsvld libltdl_cv_func_dlopen=yes + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dlopen.la"])])]) +if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen" +then + lt_save_LIBS=$LIBS + LIBS="$LIBS $LIBADD_DLOPEN" + AC_CHECK_FUNCS([dlerror]) + LIBS=$lt_save_LIBS +fi +AC_SUBST([LIBADD_DLOPEN]) + +LIBADD_SHL_LOAD= +AC_CHECK_FUNC([shl_load], + [AC_DEFINE([HAVE_SHL_LOAD], [1], + [Define if you have the shl_load function.]) + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la"], + [AC_CHECK_LIB([dld], [shl_load], + [AC_DEFINE([HAVE_SHL_LOAD], [1], + [Define if you have the shl_load function.]) + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}shl_load.la" + LIBADD_SHL_LOAD=-ldld])]) +AC_SUBST([LIBADD_SHL_LOAD]) + +case $host_os in +darwin[[1567]].*) +# We only want this for pre-Mac OS X 10.4. + AC_CHECK_FUNC([_dyld_func_lookup], + [AC_DEFINE([HAVE_DYLD], [1], + [Define if you have the _dyld_func_lookup function.]) + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dyld.la"]) + ;; +beos*) + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}load_add_on.la" + ;; +cygwin* | mingw* | pw32*) + AC_CHECK_DECLS([cygwin_conv_path], [], [], [[#include <sys/cygwin.h>]]) + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}loadlibrary.la" + ;; +esac + +AC_CHECK_LIB([dld], [dld_link], + [AC_DEFINE([HAVE_DLD], [1], + [Define if you have the GNU dld library.]) + LT_DLLOADERS="$LT_DLLOADERS ${lt_dlopen_dir+$lt_dlopen_dir/}dld_link.la"]) +AC_SUBST([LIBADD_DLD_LINK]) + +m4_pattern_allow([^LT_DLPREOPEN$]) +LT_DLPREOPEN= +if test -n "$LT_DLLOADERS" +then + for lt_loader in $LT_DLLOADERS; do + LT_DLPREOPEN="$LT_DLPREOPEN-dlpreopen $lt_loader " + done + AC_DEFINE([HAVE_LIBDLLOADER], [1], + [Define if libdlloader will be built on this platform]) +fi +AC_SUBST([LT_DLPREOPEN]) + +dnl This isn't used anymore, but set it for backwards compatibility +LIBADD_DL="$LIBADD_DLOPEN $LIBADD_SHL_LOAD" +AC_SUBST([LIBADD_DL]) + +LIBS=$lt_dlload_save_LIBS +AC_LANG_POP +]) +m4trace:/usr/share/aclocal/ltdl.m4:748: -1- AU_DEFUN([AC_LTDL_DLLIB], [m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:748: -1- AC_DEFUN([AC_LTDL_DLLIB], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_DLLIB' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_LIB_DLLOAD], [LT_LIB_DLLOAD($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:756: -1- AC_DEFUN([LT_SYS_SYMBOL_USCORE], [m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl +AC_CACHE_CHECK([for _ prefix in compiled symbols], + [lt_cv_sys_symbol_underscore], + [lt_cv_sys_symbol_underscore=no + cat > conftest.$ac_ext <<_LT_EOF +void nm_test_func(){} +int main(){nm_test_func;return 0;} +_LT_EOF + if AC_TRY_EVAL(ac_compile); then + # Now try to grab the symbols. + ac_nlist=conftest.nm + if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $ac_nlist) && test -s "$ac_nlist"; then + # See whether the symbols have a leading underscore. + if grep '^. _nm_test_func' "$ac_nlist" >/dev/null; then + lt_cv_sys_symbol_underscore=yes + else + if grep '^. nm_test_func ' "$ac_nlist" >/dev/null; then + : + else + echo "configure: cannot find nm_test_func in $ac_nlist" >&AS_MESSAGE_LOG_FD + fi + fi + else + echo "configure: cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD + fi + else + echo "configure: failed program was:" >&AS_MESSAGE_LOG_FD + cat conftest.c >&AS_MESSAGE_LOG_FD + fi + rm -rf conftest* + ]) + sys_symbol_underscore=$lt_cv_sys_symbol_underscore + AC_SUBST([sys_symbol_underscore]) +]) +m4trace:/usr/share/aclocal/ltdl.m4:793: -1- AU_DEFUN([AC_LTDL_SYMBOL_USCORE], [m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:793: -1- AC_DEFUN([AC_LTDL_SYMBOL_USCORE], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_SYMBOL_USCORE' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_SYS_SYMBOL_USCORE], [LT_SYS_SYMBOL_USCORE($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:800: -1- AC_DEFUN([LT_FUNC_DLSYM_USCORE], [AC_REQUIRE([_LT_COMPILER_PIC])dnl for lt_prog_compiler_wl +AC_REQUIRE([LT_SYS_SYMBOL_USCORE])dnl for lt_cv_sys_symbol_underscore +AC_REQUIRE([LT_SYS_MODULE_EXT])dnl for libltdl_cv_shlibext +if test yes = "$lt_cv_sys_symbol_underscore"; then + if test yes = "$libltdl_cv_func_dlopen" || test yes = "$libltdl_cv_lib_dl_dlopen"; then + AC_CACHE_CHECK([whether we have to add an underscore for dlsym], + [libltdl_cv_need_uscore], + [libltdl_cv_need_uscore=unknown + dlsym_uscore_save_LIBS=$LIBS + LIBS="$LIBS $LIBADD_DLOPEN" + libname=conftmod # stay within 8.3 filename limits! + cat >$libname.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" +/* When -fvisibility=hidden is used, assume the code has been annotated + correspondingly for the symbols needed. */ +#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3)) +int fnord () __attribute__((visibility("default"))); +#endif +int fnord () { return 42; }] +_LT_EOF + + # ltfn_module_cmds module_cmds + # Execute tilde-delimited MODULE_CMDS with environment primed for + # $module_cmds or $archive_cmds type content. + ltfn_module_cmds () + {( # subshell avoids polluting parent global environment + module_cmds_save_ifs=$IFS; IFS='~' + for cmd in @S|@1; do + IFS=$module_cmds_save_ifs + libobjs=$libname.$ac_objext; lib=$libname$libltdl_cv_shlibext + rpath=/not-exists; soname=$libname$libltdl_cv_shlibext; output_objdir=. + major=; versuffix=; verstring=; deplibs= + ECHO=echo; wl=$lt_prog_compiler_wl; allow_undefined_flag= + eval $cmd + done + IFS=$module_cmds_save_ifs + )} + + # Compile a loadable module using libtool macro expansion results. + $CC $pic_flag -c $libname.$ac_ext + ltfn_module_cmds "${module_cmds:-$archive_cmds}" + + # Try to fetch fnord with dlsym(). + libltdl_dlunknown=0; libltdl_dlnouscore=1; libltdl_dluscore=2 + cat >conftest.$ac_ext <<_LT_EOF +[#line $LINENO "configure" +#include "confdefs.h" +#if HAVE_DLFCN_H +#include <dlfcn.h> +#endif +#include <stdio.h> +#ifndef RTLD_GLOBAL +# ifdef DL_GLOBAL +# define RTLD_GLOBAL DL_GLOBAL +# else +# define RTLD_GLOBAL 0 +# endif +#endif +#ifndef RTLD_NOW +# ifdef DL_NOW +# define RTLD_NOW DL_NOW +# else +# define RTLD_NOW 0 +# endif +#endif +int main () { + void *handle = dlopen ("`pwd`/$libname$libltdl_cv_shlibext", RTLD_GLOBAL|RTLD_NOW); + int status = $libltdl_dlunknown; + if (handle) { + if (dlsym (handle, "fnord")) + status = $libltdl_dlnouscore; + else { + if (dlsym (handle, "_fnord")) + status = $libltdl_dluscore; + else + puts (dlerror ()); + } + dlclose (handle); + } else + puts (dlerror ()); + return status; +}] +_LT_EOF + if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then + (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null + libltdl_status=$? + case x$libltdl_status in + x$libltdl_dlnouscore) libltdl_cv_need_uscore=no ;; + x$libltdl_dluscore) libltdl_cv_need_uscore=yes ;; + x*) libltdl_cv_need_uscore=unknown ;; + esac + fi + rm -rf conftest* $libname* + LIBS=$dlsym_uscore_save_LIBS + ]) + fi +fi + +if test yes = "$libltdl_cv_need_uscore"; then + AC_DEFINE([NEED_USCORE], [1], + [Define if dlsym() requires a leading underscore in symbol names.]) +fi +]) +m4trace:/usr/share/aclocal/ltdl.m4:907: -1- AU_DEFUN([AC_LTDL_DLSYM_USCORE], [m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])]) +m4trace:/usr/share/aclocal/ltdl.m4:907: -1- AC_DEFUN([AC_LTDL_DLSYM_USCORE], [AC_DIAGNOSE([obsolete], [The macro `AC_LTDL_DLSYM_USCORE' is obsolete. +You should run autoupdate.])dnl +m4_if($#, 0, [LT_FUNC_DLSYM_USCORE], [LT_FUNC_DLSYM_USCORE($@)])]) m4trace:/usr/share/aclocal/ltoptions.m4:14: -1- AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) m4trace:/usr/share/aclocal/ltoptions.m4:113: -1- AU_DEFUN([AC_LIBTOOL_DLOPEN], [_LT_SET_OPTION([LT_INIT], [dlopen]) AC_DIAGNOSE([obsolete], @@ -1108,6 +1806,28 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl ]) +m4trace:/usr/share/aclocal-1.15/cond.m4:12: -1- AC_DEFUN([AM_CONDITIONAL], [AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) +m4trace:/usr/share/aclocal-1.15/substnot.m4:12: -1- AC_DEFUN([_AM_SUBST_NOTMAKE]) +m4trace:/usr/share/aclocal-1.15/substnot.m4:17: -1- AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) m4trace:configure.ac:1: -1- AC_CONFIG_MACRO_DIR([m4]) m4trace:configure.ac:2: -1- m4_pattern_forbid([^_?A[CHUM]_]) m4trace:configure.ac:2: -1- m4_pattern_forbid([_AC_]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/movit-1.6.1/effect_chain.cpp new/movit-1.6.2/effect_chain.cpp --- old/movit-1.6.1/effect_chain.cpp 2018-01-31 23:01:23.000000000 +0100 +++ new/movit-1.6.2/effect_chain.cpp 2018-03-18 16:23:37.000000000 +0100 @@ -432,6 +432,7 @@ // strong one-to-one). frag_shader += "(tc) CS_OUTPUT_VAL\n"; } else { + assert(phase->effect_ids.count(make_pair(input, link_type))); frag_shader += string(" ") + phase->effect_ids[make_pair(input, link_type)] + "\n"; } } @@ -455,6 +456,7 @@ frag_shader += "\n"; } if (phase->is_compute_shader) { + assert(phase->effect_ids.count(make_pair(phase->compute_shader_node, IN_SAME_PHASE))); frag_shader += string("#define INPUT ") + phase->effect_ids[make_pair(phase->compute_shader_node, IN_SAME_PHASE)] + "\n"; if (phase->compute_shader_node == phase->effects.back()) { // No postprocessing. @@ -463,6 +465,7 @@ frag_shader += string("#define CS_POSTPROC ") + phase->effect_ids[make_pair(phase->effects.back(), IN_SAME_PHASE)] + "\n"; } } else { + assert(phase->effect_ids.count(make_pair(phase->effects.back(), IN_SAME_PHASE))); frag_shader += string("#define INPUT ") + phase->effect_ids[make_pair(phase->effects.back(), IN_SAME_PHASE)] + "\n"; } @@ -765,8 +768,8 @@ } else if (!node->strong_one_to_one_sampling) { // If all nodes so far are strong one-to-one, we can put them after // the compute shader (ie., process them on the output). - start_new_phase = !node->strong_one_to_one_sampling; - } else { + start_new_phase = true; + } else if (!start_new_phase) { phase->is_compute_shader = true; phase->compute_shader_node = deps[i]; } @@ -1916,6 +1919,22 @@ output_dot("step21-split-to-phases.dot"); + // There are some corner cases where we thought we needed to add a dummy + // effect, but then it turned out later we didn't (e.g. induces_compute_shader() + // didn't see a mipmap conflict coming, which would cause the compute shader + // to be split off from the inal phase); if so, remove the extra phase + // at the end, since it will give us some trouble during execution. + // + // TODO: Remove induces_compute_shader() and replace it with precise tracking. + if (has_dummy_effect && !phases[phases.size() - 2]->is_compute_shader) { + resource_pool->release_glsl_program(phases.back()->glsl_program_num); + delete phases.back(); + phases.pop_back(); + has_dummy_effect = false; + } + + output_dot("step22-dummy-phase-removal.dot"); + assert(phases[0]->inputs.empty()); finalized = true; @@ -2006,6 +2025,7 @@ assert(y == 0); assert(num_phases >= 2); assert(!phases.back()->is_compute_shader); + assert(phases[phases.size() - 2]->is_compute_shader); assert(phases.back()->effects.size() == 1); assert(phases.back()->effects[0]->effect->effect_type_id() == "ComputeShaderOutputDisplayEffect"); @@ -2029,9 +2049,10 @@ phase->timer_query_objects_running.push_back(timer_query_object); } bool last_phase = (phase_num == num_phases - 1); - if (phase_num == num_phases - 1) { + if (last_phase) { // Last phase goes to the output the user specified. if (!phase->is_compute_shader) { + assert(dest_fbo != (GLuint)-1); glBindFramebuffer(GL_FRAMEBUFFER, dest_fbo); check_error(); GLenum status = glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/movit-1.6.1/effect_chain_test.cpp new/movit-1.6.2/effect_chain_test.cpp --- old/movit-1.6.1/effect_chain_test.cpp 2018-01-31 23:01:23.000000000 +0100 +++ new/movit-1.6.2/effect_chain_test.cpp 2018-03-18 16:23:37.000000000 +0100 @@ -1885,4 +1885,44 @@ expect_equal(expected_data, out_data, 2, 1); } +// Requires mipmaps, but is otherwise like IdentityEffect. +class MipmapNeedingIdentityEffect : public IdentityEffect { +public: + MipmapNeedingIdentityEffect() {} + MipmapRequirements needs_mipmaps() const override { return NEEDS_MIPMAPS; } + string effect_type_id() const override { return "MipmapNeedingIdentityEffect"; } + bool strong_one_to_one_sampling() const override { return true; } +}; + +TEST(ComputeShaderTest, StrongOneToOneButStillNotChained) { + float data[] = { + 0.0f, 0.25f, 0.3f, 0.8f, + 0.75f, 1.0f, 1.0f, 0.2f, + }; + float out_data[8]; + + ImageFormat format; + format.color_space = COLORSPACE_sRGB; + format.gamma_curve = GAMMA_LINEAR; + + EffectChainTester tester(nullptr, 4, 2); + + FlatInput *input1 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2); + input1->set_pixel_data(data); + tester.get_chain()->add_input(input1); + Effect *compute_effect = tester.get_chain()->add_effect(new IdentityComputeEffect()); + + FlatInput *input2 = new FlatInput(format, FORMAT_GRAYSCALE, GL_FLOAT, 4, 2); + input2->set_pixel_data(data); + tester.get_chain()->add_input(input2); + + // Not chained with the compute shader because MipmapNeedingIdentityEffect comes in + // the same phase, and compute shaders cannot supply mipmaps. + tester.get_chain()->add_effect(new StrongOneToOneAddEffect(), compute_effect, input2); + tester.get_chain()->add_effect(new MipmapNeedingIdentityEffect()); + + tester.run(out_data, GL_RED, COLORSPACE_sRGB, GAMMA_LINEAR); + expect_equal(data, out_data, 4, 2); +} + } // namespace movit diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/movit-1.6.1/fp16_test.cpp new/movit-1.6.2/fp16_test.cpp --- old/movit-1.6.1/fp16_test.cpp 2018-01-31 23:01:23.000000000 +0100 +++ new/movit-1.6.2/fp16_test.cpp 2018-03-18 16:23:37.000000000 +0100 @@ -1,6 +1,6 @@ #include "fp16.h" -#include <math.h> +#include <cmath> #include <gtest/gtest.h> namespace movit { @@ -56,27 +56,27 @@ TEST(FP16Test, NaN) { // Ignore the sign bit. EXPECT_EQ(0x7e00, fp32_to_fp16(0.0 / 0.0).val & 0x7fff); - EXPECT_TRUE(isnan(fp16_to_fp32(make_fp16(0xfe00)))); + EXPECT_TRUE(std::isnan(fp16_to_fp32(make_fp16(0xfe00)))); fp32 borderline_inf; borderline_inf.u = 0x7f800000ull; fp32 borderline_nan; borderline_nan.u = 0x7f800001ull; - ASSERT_FALSE(isfinite(borderline_inf.f)); - ASSERT_FALSE(isnan(borderline_inf.f)); + ASSERT_FALSE(std::isfinite(borderline_inf.f)); + ASSERT_FALSE(std::isnan(borderline_inf.f)); - ASSERT_FALSE(isfinite(borderline_nan.f)); - ASSERT_TRUE(isnan(borderline_nan.f)); + ASSERT_FALSE(std::isfinite(borderline_nan.f)); + ASSERT_TRUE(std::isnan(borderline_nan.f)); double borderline_inf_roundtrip = fp16_to_fp32(fp32_to_fp16(borderline_inf.f)); double borderline_nan_roundtrip = fp16_to_fp32(fp32_to_fp16(borderline_nan.f)); - EXPECT_FALSE(isfinite(borderline_inf_roundtrip)); - EXPECT_FALSE(isnan(borderline_inf_roundtrip)); + EXPECT_FALSE(std::isfinite(borderline_inf_roundtrip)); + EXPECT_FALSE(std::isnan(borderline_inf_roundtrip)); - EXPECT_FALSE(isfinite(borderline_nan_roundtrip)); - EXPECT_TRUE(isnan(borderline_nan_roundtrip)); + EXPECT_FALSE(std::isfinite(borderline_nan_roundtrip)); + EXPECT_TRUE(std::isnan(borderline_nan_roundtrip)); } TEST(FP16Test, Denormals) {
