Hello community, here is the log from the commit of package movit for openSUSE:Factory checked in at 2017-08-12 20:28:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/movit (Old) and /work/SRC/openSUSE:Factory/.movit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "movit" Sat Aug 12 20:28:03 2017 rev:8 rq:516107 version:1.5.3 Changes: -------- --- /work/SRC/openSUSE:Factory/movit/movit.changes 2017-07-12 19:36:09.691030346 +0200 +++ /work/SRC/openSUSE:Factory/.movit.new/movit.changes 2017-08-12 20:28:13.655409023 +0200 @@ -1,0 +2,8 @@ +Fri Aug 11 11:32:18 UTC 2017 - [email protected] + +- Update to 1.5.3: + * Various bugfixes. +- Don't use gcc6-c++ for Leap anymore: It builds fine with default + compiler again. + +------------------------------------------------------------------- Old: ---- movit-1.5.2.tar.gz New: ---- movit-1.5.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ movit.spec ++++++ --- /var/tmp/diff_new_pack.NKCR7s/_old 2017-08-12 20:28:15.235187572 +0200 +++ /var/tmp/diff_new_pack.NKCR7s/_new 2017-08-12 20:28:15.243186451 +0200 @@ -17,7 +17,7 @@ Name: movit -Version: 1.5.2 +Version: 1.5.3 Release: 0 %define _sonum 7 Summary: GPU video filter library @@ -26,12 +26,7 @@ Url: https://movit.sesse.net Source0: https://movit.sesse.net/movit-%{version}.tar.gz Source1: COPYING -%if 0%{?suse_version} == 1315 -# Leap 42.2+ / SLE12SP2Backports, C++14 needed -BuildRequires: gcc6-c++ -%else BuildRequires: gcc-c++ -%endif BuildRequires: make BuildRequires: pkg-config BuildRequires: pkgconfig(egl) @@ -89,8 +84,6 @@ cp -av %{SOURCE1} . %build -test -x "$(type -p gcc-6)" && export CC=gcc-6 -test -x "$(type -p g++-6)" && export CXX=g++-6 %configure --disable-static --datarootdir=%{_datadir}/libmovit%{_sonum} make %{?_smp_mflags} TESTS= ++++++ movit-1.5.2.tar.gz -> movit-1.5.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/Makefile.in new/movit-1.5.3/Makefile.in --- old/movit-1.5.2/Makefile.in 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/Makefile.in 2017-08-10 17:59:58.000000000 +0200 @@ -6,8 +6,8 @@ # strive towards having a rock-stable ABI, but at least the soversion will increase # whenever it breaks, so that you will not have silent failures, and distribution package # management can run its course. -movit_ltversion = 7:0:0 -movit_version = 1.5.2 +movit_ltversion = 7:1:0 +movit_version = 1.5.3 prefix = @prefix@ exec_prefix = @exec_prefix@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/NEWS new/movit-1.5.3/NEWS --- old/movit-1.5.2/NEWS 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/NEWS 2017-08-10 17:59:58.000000000 +0200 @@ -1,3 +1,8 @@ +Movit 1.5.3, August 10th, 2017 + + - Various bugfixes. + + Movit 1.5.2, July 5th, 2017 - The texture generation for ResampleEffect (when the size is changed) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/autom4te.cache/requests new/movit-1.5.3/autom4te.cache/requests --- old/movit-1.5.2/autom4te.cache/requests 2017-07-05 09:43:18.000000000 +0200 +++ new/movit-1.5.3/autom4te.cache/requests 2017-08-10 18:00:46.000000000 +0200 @@ -26,167 +26,167 @@ 'configure.ac' ], { - 'AC_LIBTOOL_OBJDIR' => 1, - 'AC_LIBTOOL_SETUP' => 1, - 'AC_LIBTOOL_DLOPEN_SELF' => 1, - '_LT_PREPARE_SED_QUOTE_VARS' => 1, - '_LTDL_SETUP' => 1, - 'LTDL_CONVENIENCE' => 1, + 'AM_PROG_LD' => 1, + '_LT_LIBOBJ' => 1, + 'LT_FUNC_ARGZ' => 1, + 'AM_SUBST_NOTMAKE' => 1, + 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, '_LT_AC_LANG_C_CONFIG' => 1, - 'm4_pattern_allow' => 1, - 'AC_LTDL_SHLIBPATH' => 1, - '_LT_LINKER_BOILERPLATE' => 1, - 'PKG_NOARCH_INSTALLDIR' => 1, - 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, - 'include' => 1, - 'AC_PROG_LD_RELOAD_FLAG' => 1, - 'AC_ENABLE_FAST_INSTALL' => 1, - 'AC_PATH_MAGIC' => 1, + 'AC_LIBTOOL_PROG_CC_C_O' => 1, '_LT_COMPILER_OPTION' => 1, - 'PKG_INSTALLDIR' => 1, - 'LTOPTIONS_VERSION' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - 'LT_CMD_MAX_LEN' => 1, - 'AC_LIBTOOL_WIN32_DLL' => 1, - 'AM_DISABLE_SHARED' => 1, - 'LT_LIB_M' => 1, - 'LT_INIT' => 1, - 'LT_PROG_RC' => 1, - 'AC_LTDL_SYSSEARCHPATH' => 1, - 'LTDL_INSTALLABLE' => 1, - '_LT_AC_LANG_CXX' => 1, - 'LT_FUNC_ARGZ' => 1, - 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, - 'LT_SYS_DLOPEN_SELF' => 1, - 'AC_LTDL_PREOPEN' => 1, - 'AC_LIBTOOL_COMPILER_OPTION' => 1, - '_LT_PROG_CXX' => 1, - 'm4_pattern_forbid' => 1, - 'AC_LTDL_DLSYM_USCORE' => 1, - '_LT_AC_LOCK' => 1, - '_LT_PROG_ECHO_BACKSLASH' => 1, - 'AC_LIB_LTDL' => 1, - '_LT_AC_CHECK_DLFCN' => 1, - 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, - 'AC_LTDL_SHLIBEXT' => 1, 'LT_PROG_GO' => 1, - 'AC_LIBTOOL_CONFIG' => 1, - 'LT_AC_PROG_GCJ' => 1, - 'LTDL_INIT' => 1, - 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, - 'AC_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_LANG_C_CONFIG' => 1, - 'AC_DEFUN' => 1, - 'AC_LIBLTDL_CONVENIENCE' => 1, - 'AC_ENABLE_STATIC' => 1, - 'AC_LTDL_DLLIB' => 1, - '_LT_CC_BASENAME' => 1, - '_LT_PROG_F77' => 1, - '_AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, - 'AC_CONFIG_MACRO_DIR' => 1, - '_LT_AC_PROG_ECHO_BACKSLASH' => 1, - 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, - 'AC_DEFUN_ONCE' => 1, - '_LT_PROG_LTMAIN' => 1, + 'PKG_CHECK_VAR' => 1, + 'm4_include' => 1, + 'AC_LTDL_DLSYM_USCORE' => 1, + 'AC_PROG_LIBTOOL' => 1, + '_AM_CONFIG_MACRO_DIRS' => 1, + 'AC_DISABLE_FAST_INSTALL' => 1, + 'LT_FUNC_DLSYM_USCORE' => 1, + 'PKG_CHECK_MODULES' => 1, + 'LT_LIB_DLLOAD' => 1, + 'AC_PROG_LD' => 1, + 'AM_PROG_NM' => 1, 'LT_SYS_DLSEARCH_PATH' => 1, + 'PKG_PROG_PKG_CONFIG' => 1, + 'AC_LIBTOOL_COMPILER_OPTION' => 1, + '_LT_AC_LANG_GCJ' => 1, + 'AC_DEFUN_ONCE' => 1, + 'AC_PATH_MAGIC' => 1, + 'PKG_CHECK_MODULES_STATIC' => 1, + 'PKG_CHECK_EXISTS' => 1, + 'AC_LIBTOOL_WIN32_DLL' => 1, + 'LTOPTIONS_VERSION' => 1, 'AC_PATH_TOOL_PREFIX' => 1, + '_LT_AC_TAGVAR' => 1, + 'AC_LIBTOOL_FC' => 1, + 'AC_ENABLE_SHARED' => 1, + '_m4_warn' => 1, + '_LT_AC_LANG_RC_CONFIG' => 1, + '_LT_AC_FILE_LTDLL_C' => 1, + '_AM_AUTOCONF_VERSION' => 1, + 'AC_LIBTOOL_GCJ' => 1, + 'LT_AC_PROG_EGREP' => 1, + 'AC_ENABLE_STATIC' => 1, + 'LT_OUTPUT' => 1, + 'AC_PROG_LD_GNU' => 1, 'AC_WITH_LTDL' => 1, - 'PKG_CHECK_EXISTS' => 1, 'AU_DEFUN' => 1, - '_LT_AC_SYS_LIBPATH_AIX' => 1, + '_LT_AC_TRY_DLOPEN_SELF' => 1, + 'AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH' => 1, 'AM_CONDITIONAL' => 1, - 'AC_LIBTOOL_PROG_CC_C_O' => 1, - 'AM_DISABLE_STATIC' => 1, + 'LT_SUPPORTED_TAG' => 1, + '_LT_LINKER_OPTION' => 1, + 'LT_SYS_MODULE_PATH' => 1, + '_LT_PROG_CXX' => 1, + '_LT_COMPILER_BOILERPLATE' => 1, '_LT_PATH_TOOL_PREFIX' => 1, - '_LT_AC_FILE_LTDLL_C' => 1, + 'AC_LIBTOOL_CXX' => 1, + 'LT_INIT' => 1, + 'AC_DEPLIBS_CHECK_METHOD' => 1, 'LT_LANG' => 1, - '_LT_AC_TAGVAR' => 1, + 'AC_LIBTOOL_LANG_F77_CONFIG' => 1, + 'AC_LTDL_SYS_DLOPEN_DEPLIBS' => 1, + 'AC_LIBTOOL_F77' => 1, + 'AC_LIBTOOL_SYS_DYNAMIC_LINKER' => 1, + 'LT_SYS_DLOPEN_DEPLIBS' => 1, + 'LT_PROG_RC' => 1, + 'LTDL_INIT' => 1, + '_LT_AC_LANG_CXX' => 1, + 'AC_LTDL_ENABLE_INSTALL' => 1, 'AC_LIBTOOL_DLOPEN' => 1, + '_LT_REQUIRED_DARWIN_CHECKS' => 1, + 'LT_PROG_GCJ' => 1, + 'AC_LTDL_SYSSEARCHPATH' => 1, + '_LTDL_SETUP' => 1, '_LT_AC_PROG_CXXCPP' => 1, + 'LTVERSION_VERSION' => 1, + 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + '_LT_AC_SYS_COMPILER' => 1, + 'AC_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, + 'm4_pattern_forbid' => 1, + 'AC_LIB_LTDL' => 1, + 'AC_LIBTOOL_PROG_COMPILER_NO_RTTI' => 1, + '_LT_PROG_F77' => 1, 'AM_ENABLE_STATIC' => 1, - '_LT_AC_LANG_F77_CONFIG' => 1, - '_LT_LIBOBJ' => 1, - 'AC_LIBLTDL_INSTALLABLE' => 1, - 'LT_LIB_DLLOAD' => 1, - 'm4_include' => 1, - '_LT_COMPILER_BOILERPLATE' => 1, - 'PKG_CHECK_MODULES_STATIC' => 1, + '_LT_WITH_SYSROOT' => 1, + 'LT_LIB_M' => 1, + 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, 'AC_CONFIG_MACRO_DIR_TRACE' => 1, - 'AC_DISABLE_FAST_INSTALL' => 1, - 'LT_SYS_MODULE_EXT' => 1, - 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, - 'AC_PROG_NM' => 1, - 'LT_PROG_GCJ' => 1, - 'AC_LIBTOOL_SYS_OLD_ARCHIVE' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_PROG_NM' => 1, - 'AM_PROG_LIBTOOL' => 1, - 'AC_PROG_LD' => 1, - '_m4_warn' => 1, - '_LT_LINKER_OPTION' => 1, - '_LT_AC_LANG_RC_CONFIG' => 1, - 'AC_LIBTOOL_F77' => 1, + 'AC_LIBTOOL_DLOPEN_SELF' => 1, + '_LT_AC_LOCK' => 1, + 'LTOBSOLETE_VERSION' => 1, + 'AC_LIBTOOL_LINKER_OPTION' => 1, + '_LT_PROG_LTMAIN' => 1, 'AC_LIBTOOL_PROG_LD_SHLIBS' => 1, - '_LT_DLL_DEF_P' => 1, - '_LT_REQUIRED_DARWIN_CHECKS' => 1, - 'LT_SYS_SYMBOL_USCORE' => 1, - '_LT_WITH_SYSROOT' => 1, - 'LT_FUNC_DLSYM_USCORE' => 1, - 'AC_DISABLE_STATIC' => 1, - '_LT_AC_LANG_CXX_CONFIG' => 1, - 'LT_PATH_LD' => 1, - '_LT_AC_LANG_GCJ_CONFIG' => 1, - 'AM_PROG_LD' => 1, - '_LT_AC_TRY_DLOPEN_SELF' => 1, - 'PKG_CHECK_VAR' => 1, - 'LT_SYS_DLOPEN_DEPLIBS' => 1, - '_LT_AC_LANG_GCJ' => 1, - 'AC_LIBTOOL_SYS_MAX_CMD_LEN' => 1, + 'AC_LIBTOOL_SYS_LIB_STRIP' => 1, + 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, '_LT_AC_SHELL_INIT' => 1, - '_PKG_SHORT_ERRORS_SUPPORTED' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_LIBTOOL_LANG_CXX_CONFIG' => 1, - 'AC_LIBTOOL_LINKER_OPTION' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'LTVERSION_VERSION' => 1, - '_AM_CONFIG_MACRO_DIRS' => 1, - 'LTOBSOLETE_VERSION' => 1, - 'LT_AC_PROG_SED' => 1, - 'LT_AC_PROG_RC' => 1, - '_LT_PROG_FC' => 1, - '_AM_AUTOCONF_VERSION' => 1, - 'LT_SYS_MODULE_PATH' => 1, 'AM_ENABLE_SHARED' => 1, - 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, + '_LT_AC_LANG_F77_CONFIG' => 1, + 'LT_SYS_MODULE_EXT' => 1, + '_LT_PROG_ECHO_BACKSLASH' => 1, + 'AC_DISABLE_STATIC' => 1, + '_LT_AC_PROG_ECHO_BACKSLASH' => 1, + '_LT_AC_LANG_GCJ_CONFIG' => 1, + 'LT_AC_PROG_GCJ' => 1, 'AC_LTDL_SYMBOL_USCORE' => 1, + '_LT_DLL_DEF_P' => 1, + 'AC_LTDL_SHLIBEXT' => 1, + 'LT_AC_PROG_SED' => 1, 'AC_CHECK_LIBM' => 1, - 'PKG_CHECK_MODULES' => 1, - 'AC_LIBTOOL_CXX' => 1, - 'AC_LIBTOOL_PICMODE' => 1, + 'AC_DEFUN' => 1, + 'AC_LIBLTDL_CONVENIENCE' => 1, + 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, + 'LT_WITH_LTDL' => 1, + '_AC_PROG_LIBTOOL' => 1, + 'AC_LTDL_PREOPEN' => 1, + 'PKG_NOARCH_INSTALLDIR' => 1, + 'AC_LTDL_SHLIBPATH' => 1, + '_LT_AC_CHECK_DLFCN' => 1, + 'AC_PROG_NM' => 1, + 'LT_CMD_MAX_LEN' => 1, 'AC_LIBTOOL_RC' => 1, - 'LT_OUTPUT' => 1, + '_LT_LINKER_BOILERPLATE' => 1, + 'LT_SYS_DLOPEN_SELF' => 1, + '_LT_PROG_FC' => 1, + '_LT_PREPARE_SED_QUOTE_VARS' => 1, + 'm4_pattern_allow' => 1, + 'AC_LIBTOOL_LANG_C_CONFIG' => 1, + 'AC_CONFIG_MACRO_DIR' => 1, + '_LT_AC_LANG_F77' => 1, + 'AC_LIBTOOL_LANG_RC_CONFIG' => 1, 'AC_PROG_EGREP' => 1, 'AC_LIBTOOL_PROG_COMPILER_PIC' => 1, - 'PKG_PROG_PKG_CONFIG' => 1, - 'AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE' => 1, - 'LT_AC_PROG_EGREP' => 1, - 'AC_LIBTOOL_FC' => 1, - 'LT_WITH_LTDL' => 1, + 'AM_DISABLE_SHARED' => 1, + 'AC_LIBTOOL_OBJDIR' => 1, + 'AC_LIBTOOL_SETUP' => 1, + 'AC_LTDL_DLLIB' => 1, 'LT_PATH_NM' => 1, - 'AC_LTDL_ENABLE_INSTALL' => 1, 'AC_LTDL_OBJDIR' => 1, - '_LT_AC_LANG_F77' => 1, - 'AC_PROG_LIBTOOL' => 1, - 'AC_LIBTOOL_GCJ' => 1, - 'AC_PROG_LD_GNU' => 1, - 'AC_DEPLIBS_CHECK_METHOD' => 1, + '_LT_AC_SYS_LIBPATH_AIX' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'include' => 1, + 'PKG_INSTALLDIR' => 1, + 'LT_AC_PROG_RC' => 1, + 'AC_LIBTOOL_SYS_HARD_LINK_LOCKS' => 1, + '_LT_CC_BASENAME' => 1, + 'AM_DISABLE_STATIC' => 1, + 'AC_LIBTOOL_CONFIG' => 1, + 'LT_PATH_LD' => 1, + 'LTDL_CONVENIENCE' => 1, + 'AC_ENABLE_FAST_INSTALL' => 1, + 'AC_PROG_LD_RELOAD_FLAG' => 1, + 'LTDL_INSTALLABLE' => 1, 'LTSUGAR_VERSION' => 1, - 'AC_LIBTOOL_POSTDEP_PREDEP' => 1, - 'AM_SUBST_NOTMAKE' => 1, - '_LT_AC_SYS_COMPILER' => 1, - 'AC_LIBTOOL_LANG_GCJ_CONFIG' => 1, - 'AC_DISABLE_SHARED' => 1 + '_PKG_SHORT_ERRORS_SUPPORTED' => 1, + '_LT_AC_LANG_CXX_CONFIG' => 1, + 'AC_LIBLTDL_INSTALLABLE' => 1, + 'AC_LIBTOOL_PICMODE' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'LT_SYS_SYMBOL_USCORE' => 1, + '_LT_AC_TAGCONFIG' => 1 } ], 'Autom4te::Request' ), bless( [ @@ -201,64 +201,64 @@ 'configure.ac' ], { - 'AM_MAKEFILE_INCLUDE' => 1, - 'LT_SUPPORTED_TAG' => 1, - 'AM_MAINTAINER_MODE' => 1, - 'AM_PROG_LIBTOOL' => 1, + 'AM_PROG_AR' => 1, + '_m4_warn' => 1, + 'AC_CONFIG_LINKS' => 1, + 'AM_SILENT_RULES' => 1, '_AM_COND_ELSE' => 1, - '_AM_COND_ENDIF' => 1, - 'AM_ENABLE_MULTILIB' => 1, + 'AC_FC_FREEFORM' => 1, 'AM_PROG_MOC' => 1, - 'AC_CONFIG_LIBOBJ_DIR' => 1, - 'AC_CONFIG_LINKS' => 1, - 'AH_OUTPUT' => 1, - 'include' => 1, - 'AM_NLS' => 1, - 'LT_CONFIG_LTDL_DIR' => 1, - '_m4_warn' => 1, - 'AM_POT_TOOLS' => 1, + 'm4_pattern_forbid' => 1, + 'AC_CANONICAL_TARGET' => 1, + 'm4_pattern_allow' => 1, + '_AM_MAKEFILE_INCLUDE' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_SUBST' => 1, + 'LT_SUPPORTED_TAG' => 1, + 'AM_PROG_F77_C_O' => 1, 'AC_CONFIG_FILES' => 1, - 'AM_INIT_AUTOMAKE' => 1, + 'AH_OUTPUT' => 1, 'm4_include' => 1, - 'AM_PATH_GUILE' => 1, - 'AM_XGETTEXT_OPTION' => 1, - 'AC_SUBST' => 1, - 'm4_pattern_allow' => 1, - 'AC_FC_PP_DEFINE' => 1, - 'AC_CANONICAL_HOST' => 1, - 'm4_sinclude' => 1, - 'AC_CONFIG_SUBDIRS' => 1, - 'AC_LIBSOURCE' => 1, - 'AC_FC_FREEFORM' => 1, 'AC_PROG_LIBTOOL' => 1, - 'AC_CANONICAL_BUILD' => 1, - 'AC_REQUIRE_AUX_FILE' => 1, - 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, - 'AM_CONDITIONAL' => 1, - 'AC_CANONICAL_TARGET' => 1, - 'AM_PROG_AR' => 1, - 'AC_SUBST_TRACE' => 1, - '_LT_AC_TAGCONFIG' => 1, - 'm4_pattern_forbid' => 1, - 'AC_FC_SRCEXT' => 1, - '_AM_SUBST_NOTMAKE' => 1, - 'AC_CANONICAL_SYSTEM' => 1, - 'AC_CONFIG_AUX_DIR' => 1, - '_AM_MAKEFILE_INCLUDE' => 1, + 'AM_ENABLE_MULTILIB' => 1, 'LT_INIT' => 1, + 'AM_MAKEFILE_INCLUDE' => 1, + 'AC_FC_PP_SRCEXT' => 1, + 'AC_INIT' => 1, + 'AC_SUBST_TRACE' => 1, 'AC_CONFIG_HEADERS' => 1, - 'sinclude' => 1, + 'AC_CANONICAL_HOST' => 1, + 'AM_XGETTEXT_OPTION' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AM_POT_TOOLS' => 1, + 'AM_GNU_GETTEXT_INTL_SUBDIR' => 1, + 'AC_LIBSOURCE' => 1, + 'include' => 1, + 'AC_REQUIRE_AUX_FILE' => 1, + 'AM_PROG_CC_C_O' => 1, + 'AM_MAINTAINER_MODE' => 1, + '_AM_COND_ENDIF' => 1, + 'AM_PROG_FC_C_O' => 1, + '_AM_COND_IF' => 1, 'AC_DEFINE_TRACE_LITERAL' => 1, - 'AC_INIT' => 1, - 'AC_FC_PP_SRCEXT' => 1, + 'AC_CONFIG_AUX_DIR' => 1, + 'AC_FC_SRCEXT' => 1, + 'm4_sinclude' => 1, + 'AM_INIT_AUTOMAKE' => 1, + 'AM_PATH_GUILE' => 1, + 'LT_CONFIG_LTDL_DIR' => 1, 'AM_PROG_CXX_C_O' => 1, - 'AM_SILENT_RULES' => 1, 'AM_AUTOMAKE_VERSION' => 1, + 'AC_CONFIG_LIBOBJ_DIR' => 1, + 'AC_FC_PP_DEFINE' => 1, 'AM_GNU_GETTEXT' => 1, - '_AM_COND_IF' => 1, - 'AM_PROG_FC_C_O' => 1, - 'AM_PROG_F77_C_O' => 1, - 'AM_PROG_CC_C_O' => 1 + 'AC_CANONICAL_BUILD' => 1, + 'sinclude' => 1, + 'AM_NLS' => 1, + '_AM_SUBST_NOTMAKE' => 1, + 'AC_CANONICAL_SYSTEM' => 1, + 'AC_CONFIG_SUBDIRS' => 1, + '_LT_AC_TAGCONFIG' => 1 } ], 'Autom4te::Request' ) ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/effect_chain.h new/movit-1.5.3/effect_chain.h --- old/movit-1.5.2/effect_chain.h 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/effect_chain.h 2017-08-10 17:59:58.000000000 +0200 @@ -364,6 +364,9 @@ void reset_phase_timing(); void print_phase_timing(); + // Note: If you already know the width and height of the viewport, + // calling render_to_fbo() directly will be slightly more efficient, + // as it saves it from getting it from OpenGL. void render_to_screen() { render_to_fbo(0, 0, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/fp16_test.cpp new/movit-1.5.3/fp16_test.cpp --- old/movit-1.5.2/fp16_test.cpp 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/fp16_test.cpp 2017-08-10 17:59:58.000000000 +0200 @@ -46,6 +46,13 @@ unsigned long long ll; }; +#ifdef __F16C__ +union fp32 { + float f; + unsigned int u; +}; +#endif + TEST(FP16Test, NaN) { // Ignore the sign bit. EXPECT_EQ(0x7e00, fp32_to_fp16(0.0 / 0.0).val & 0x7fff); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/resample_effect.cpp new/movit-1.5.3/resample_effect.cpp --- old/movit-1.5.2/resample_effect.cpp 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/resample_effect.cpp 2017-08-10 17:59:58.000000000 +0200 @@ -206,7 +206,7 @@ // // The greedy strategy for combining samples is optimal. template<class DestFloat> -unsigned combine_many_samples(const Tap<float> *weights, unsigned src_size, unsigned src_samples, unsigned dst_samples, unique_ptr<Tap<DestFloat>[]> *bilinear_weights) +unsigned combine_many_samples(const Tap<float> *weights, unsigned src_size, unsigned src_samples, unsigned dst_samples, Tap<DestFloat> **bilinear_weights) { float num_subtexels = src_size / movit_texel_subpixel_precision; float inv_num_subtexels = movit_texel_subpixel_precision / src_size; @@ -221,9 +221,10 @@ // Now that we know the right width, actually combine the samples. unsigned src_bilinear_samples = src_samples - max_samples_saved; - bilinear_weights->reset(new Tap<DestFloat>[dst_samples * src_bilinear_samples]); + if (*bilinear_weights != NULL) delete[] *bilinear_weights; + *bilinear_weights = new Tap<DestFloat>[dst_samples * src_bilinear_samples]; for (unsigned y = 0; y < dst_samples; ++y) { - Tap<DestFloat> *bilinear_weights_ptr = bilinear_weights->get() + y * src_bilinear_samples; + Tap<DestFloat> *bilinear_weights_ptr = *bilinear_weights + y * src_bilinear_samples; unsigned num_samples_saved = combine_samples( weights + y * src_samples, bilinear_weights_ptr, @@ -300,7 +301,8 @@ } // namespace ResampleEffect::ResampleEffect() - : input_width(1280), + : owns_effects(true), + input_width(1280), input_height(720), offset_x(0.0f), offset_y(0.0f), zoom_x(1.0f), zoom_y(1.0f), @@ -318,6 +320,14 @@ update_size(); } +ResampleEffect::~ResampleEffect() +{ + if (owns_effects) { + delete hpass; + delete vpass; + } +} + void ResampleEffect::rewrite_graph(EffectChain *graph, Node *self) { Node *hpass_node = graph->add_node(hpass); @@ -326,6 +336,7 @@ graph->replace_receiver(self, hpass_node); graph->replace_sender(self, vpass_node); self->disabled = true; + owns_effects = false; } // We get this information forwarded from the first blur pass, @@ -526,15 +537,15 @@ GLenum type, internal_format; void *pixels; - assert((weights.bilinear_weights_fp16 == nullptr) != (weights.bilinear_weights_fp32 == nullptr)); - if (weights.bilinear_weights_fp32 != nullptr) { + assert((weights.bilinear_weights_fp16 == NULL) != (weights.bilinear_weights_fp32 == NULL)); + if (weights.bilinear_weights_fp32 != NULL) { type = GL_FLOAT; internal_format = GL_RG32F; - pixels = weights.bilinear_weights_fp32.get(); + pixels = weights.bilinear_weights_fp32; } else { type = GL_HALF_FLOAT; internal_format = GL_RG16F; - pixels = weights.bilinear_weights_fp16.get(); + pixels = weights.bilinear_weights_fp16; } if (int(weights.src_bilinear_samples) == last_texture_width && @@ -550,6 +561,9 @@ last_texture_internal_format = internal_format; } check_error(); + + delete[] weights.bilinear_weights_fp16; + delete[] weights.bilinear_weights_fp32; } ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset) @@ -632,7 +646,7 @@ float radius_scaling_factor = min(scaling_factor, 1.0f); int int_radius = lrintf(LANCZOS_RADIUS / radius_scaling_factor); int src_samples = int_radius * 2 + 1; - unique_ptr<Tap<float>[]> weights(new Tap<float>[dst_samples * src_samples]); + Tap<float> *weights = new Tap<float>[dst_samples * src_samples]; float subpixel_offset = offset - lrintf(offset); // The part not covered by whole_pixel_offset. assert(subpixel_offset >= -0.5f && subpixel_offset <= 0.5f); for (unsigned y = 0; y < dst_samples; ++y) { @@ -656,14 +670,14 @@ // Our tolerance level for total error is a bit higher than the one for invididual // samples, since one would assume overall errors in the shape don't matter as much. const float max_error = 2.0f / (255.0f * 255.0f); - unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16; - int src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp16); - unique_ptr<Tap<float>[]> bilinear_weights_fp32 = NULL; + Tap<fp16_int_t> *bilinear_weights_fp16 = NULL; + int src_bilinear_samples = combine_many_samples(weights, src_size, src_samples, dst_samples, &bilinear_weights_fp16); + Tap<float> *bilinear_weights_fp32 = NULL; double max_sum_sq_error_fp16 = 0.0; for (unsigned y = 0; y < dst_samples; ++y) { double sum_sq_error_fp16 = compute_sum_sq_error( - weights.get() + y * src_samples, src_samples, - bilinear_weights_fp16.get() + y * src_bilinear_samples, src_bilinear_samples, + weights + y * src_samples, src_samples, + bilinear_weights_fp16 + y * src_bilinear_samples, src_bilinear_samples, src_size); max_sum_sq_error_fp16 = std::max(max_sum_sq_error_fp16, sum_sq_error_fp16); if (max_sum_sq_error_fp16 > max_error) { @@ -672,16 +686,19 @@ } if (max_sum_sq_error_fp16 > max_error) { - bilinear_weights_fp16.reset(); - src_bilinear_samples = combine_many_samples(weights.get(), src_size, src_samples, dst_samples, &bilinear_weights_fp32); + delete[] bilinear_weights_fp16; + bilinear_weights_fp16 = NULL; + src_bilinear_samples = combine_many_samples(weights, src_size, src_samples, dst_samples, &bilinear_weights_fp32); } + delete[] weights; + ScalingWeights ret; ret.src_bilinear_samples = src_bilinear_samples; ret.dst_samples = dst_samples; ret.num_loops = num_loops; - ret.bilinear_weights_fp16 = move(bilinear_weights_fp16); - ret.bilinear_weights_fp32 = move(bilinear_weights_fp32); + ret.bilinear_weights_fp16 = bilinear_weights_fp16; + ret.bilinear_weights_fp32 = bilinear_weights_fp32; return ret; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/resample_effect.h new/movit-1.5.3/resample_effect.h --- old/movit-1.5.2/resample_effect.h 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/resample_effect.h 2017-08-10 17:59:58.000000000 +0200 @@ -18,7 +18,6 @@ #include <epoxy/gl.h> #include <assert.h> #include <stddef.h> -#include <memory> #include <string> #include "effect.h" @@ -41,14 +40,15 @@ unsigned dst_samples, num_loops; // Exactly one of these is set. - std::unique_ptr<Tap<fp16_int_t>[]> bilinear_weights_fp16; - std::unique_ptr<Tap<float>[]> bilinear_weights_fp32; + Tap<fp16_int_t> *bilinear_weights_fp16; + Tap<float> *bilinear_weights_fp32; }; ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, float zoom, float offset); class ResampleEffect : public Effect { public: ResampleEffect(); + ~ResampleEffect(); virtual std::string effect_type_id() const { return "ResampleEffect"; } @@ -73,6 +73,9 @@ void update_size(); void update_offset_and_zoom(); + // Both of these are owned by us if owns_effects is true (before finalize()), + // and otherwise owned by the EffectChain. + bool owns_effects; SingleResamplePassEffect *hpass, *vpass; int input_width, input_height, output_width, output_height; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/movit-1.5.2/resource_pool.cpp new/movit-1.5.3/resource_pool.cpp --- old/movit-1.5.2/resource_pool.cpp 2017-07-05 09:40:40.000000000 +0200 +++ new/movit-1.5.3/resource_pool.cpp 2017-08-10 17:59:58.000000000 +0200 @@ -548,7 +548,6 @@ } } } - pthread_mutex_unlock(&lock); // Create a new one. VAO vao_format;
