Hello community, here is the log from the commit of package movit for openSUSE:Factory checked in at 2018-01-29 14:58:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/movit (Old) and /work/SRC/openSUSE:Factory/.movit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "movit" Mon Jan 29 14:58:24 2018 rev:9 rq:570363 version:1.6.0 Changes: -------- --- /work/SRC/openSUSE:Factory/movit/movit.changes 2017-08-12 20:28:13.655409023 +0200 +++ /work/SRC/openSUSE:Factory/.movit.new/movit.changes 2018-01-29 15:00:03.959210105 +0100 @@ -1,0 +2,46 @@ +Sat Jan 27 20:56:11 UTC 2018 - [email protected] + +- Fix build for Leap 42.3: Force use of GCC7. + +------------------------------------------------------------------- +Thu Jan 25 07:09:49 UTC 2018 - [email protected] + +- Update to version 1.6.0: + * Support for effects that work as compute shaders. Compute + shaders are generally slower than fragment shaders for the same + algorithm, but allow some forms of communication between shader + invocations and have more flexible output, which can enable + more efficient algorithms. See effect.h for more details. Note + that the fastest rendering API on EffectChain is now to a + texture if possible, not to an FBO. This will only matter if + the last effect is a compute shader. + * Movit now includes a compute shader implementation of + DeinterlaceEffect, which is automatically used instead of the + fragment shader implementation if your GPU and OpenGL driver + supports it (in practice, this means on all platforms except on + macOS). The compute shader version is typically 20–80% faster + than the fragment shader version, depending on your GPU and + other factors. + A compute shader implementation of ResampleEffect was written but + ultimately failed to be faster, and so is not included. + * Support for microbenchmarks of effects through the Google + microbenchmarking framework (optional). Currently, + DeinterlaceEffect and ResampleEffect has benchmarks; enable + them by running the unit test with --benchmark (also try + --benchmark --help). + * Effects can now explicitly request _not_ to have mipmaps, which + means they can do so without needing to request bounce and + fiddling with the sampler state. Note that this is an API + change for effects. + * Movit now requires C++11, both to build and to #include the + header files. Support for SDL1 has been dropped; unit tests and + the demo program now need SDL2. + * Various smaller bugfixes and optimizations. +- Drop COPYING (now included in upstream tarball). +- Now build requires SDL2 instead of SDL1. +- (Experiment) Make data subpackage versioned, as the library is + versioned and requires the data files: + * Add movit-1.6.0-versioned-shaderdir.patch. +- Ran spec-cleaner. + +------------------------------------------------------------------- Old: ---- COPYING movit-1.5.3.tar.gz New: ---- movit-1.6.0-versioned-shaderdir.patch movit-1.6.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ movit.spec ++++++ --- /var/tmp/diff_new_pack.knJ3Zi/_old 2018-01-29 15:00:04.815170114 +0100 +++ /var/tmp/diff_new_pack.knJ3Zi/_new 2018-01-29 15:00:04.819169927 +0100 @@ -1,7 +1,8 @@ # # spec file for package movit # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 The openSUSE Project. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,25 +17,36 @@ # +%define _sonum 8 +# Benchmark support disabled for now, looks like its .pc file can't be found +%bcond_with benchmark Name: movit -Version: 1.5.3 +Version: 1.6.0 Release: 0 -%define _sonum 7 Summary: GPU video filter library License: GPL-2.0+ Group: Development/Libraries/C and C++ Url: https://movit.sesse.net Source0: https://movit.sesse.net/movit-%{version}.tar.gz -Source1: COPYING +# 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: pkg-config +BuildRequires: pkgconfig BuildRequires: pkgconfig(egl) BuildRequires: pkgconfig(eigen3) BuildRequires: pkgconfig(epoxy) BuildRequires: pkgconfig(fftw3) -BuildRequires: pkgconfig(sdl) -BuildRoot: %{_tmppath}/%{name}-%{version}-build +BuildRequires: pkgconfig(sdl2) +%if %{with benchmark} +BuildRequires: pkgconfig(benchmark) +%endif %description Movit is a library for video filters. It uses the GPU present in many @@ -44,9 +56,9 @@ %package -n libmovit%{_sonum} Summary: GPU video filter library Group: Development/Libraries/C and C++ +Requires: %{name}%{_sonum}-data Provides: %{name} = %{version} Obsoletes: %{name} < %{version} -Requires: %{name}-data %description -n libmovit%{_sonum} Movit is a library for video filters. It uses the GPU present in many @@ -67,29 +79,42 @@ This package contains the development files (library and header files). -%package data +%package -n movit%{_sonum}-data Summary: Data files for the Movit GPU video filter library Group: Development/Libraries/C and C++ +Provides: %{name}-data = %{version} +Obsoletes: %{name}-data < %{version} BuildArch: noarch -%description data +%description -n movit%{_sonum}-data Movit is a library for video filters. It uses the GPU present in many computers to accelerate computation of common filters and transitions, facilitating real-time HD video editing. -This package contains the architecture-independent data files. +This package contains the architecture-independent data files (GLSL +fragment shaders). %prep %setup -q -cp -av %{SOURCE1} . +%patch0 -p1 %build -%configure --disable-static --datarootdir=%{_datadir}/libmovit%{_sonum} +# For Leap 42.3, force use of GCC 7 +test -x "$(type -p gcc-7)" && export CC=gcc-7 +test -x "$(type -p g++-7)" && export CXX=g++-7 + +autoreconf +%configure \ + --disable-static \ + --with-shaderdir="%{_datadir}/%{name}%{_sonum}" +%if %{with benchmark} + --with-benchmark \ +%endif + make %{?_smp_mflags} TESTS= %install %make_install - rm %{buildroot}%{_libdir}/libmovit.la %post -n libmovit%{_sonum} -p /sbin/ldconfig @@ -100,10 +125,10 @@ %doc README NEWS COPYING %{_libdir}/libmovit.so.* -%files data +%files -n movit%{_sonum}-data %defattr(-,root,root) %doc COPYING -%{_datadir}/%{name}/ +%{_datadir}/movit%{_sonum}/ %files devel %defattr(-,root,root) ++++++ movit-1.6.0-versioned-shaderdir.patch ++++++ diff -up movit-1.6.0/configure.ac.orig movit-1.6.0/configure.ac --- movit-1.6.0/configure.ac.orig 2018-01-27 21:17:07.451757844 +0100 +++ movit-1.6.0/configure.ac 2018-01-27 21:17:33.419757413 +0100 @@ -6,6 +6,14 @@ PKG_PROG_PKG_CONFIG AC_CONFIG_SRCDIR(effect.cpp) AC_CONFIG_AUX_DIR(.) +AC_ARG_WITH(shaderdir, + [AS_HELP_STRING([--with-shaderdir=DIR], + [shaders location [DATADIR/movit]])], + [], + [with_shaderdir='${datadir}/movit']) +SHADERDIR=$with_shaderdir +AC_SUBST(SHADERDIR) + AC_PROG_CC AC_PROG_CXX PKG_CHECK_MODULES([Eigen3], [eigen3]) diff -up movit-1.6.0/Makefile.in.orig movit-1.6.0/Makefile.in --- movit-1.6.0/Makefile.in.orig 2018-01-27 21:17:12.839757755 +0100 +++ movit-1.6.0/Makefile.in 2018-01-27 21:18:28.939756490 +0100 @@ -15,6 +15,7 @@ includedir = @includedir@ libdir = @libdir@ datarootdir = @datarootdir@ datadir = @datadir@ +shaderdir = @SHADERDIR@ top_builddir = @top_builddir@ with_demo_app = @with_demo_app@ with_benchmark = @with_benchmark@ @@ -185,8 +186,8 @@ install: libmovit.la $(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(DESTDIR)$(libdir)/ $(MKDIR) -p $(DESTDIR)$(includedir)/movit/ $(INSTALL) -m 0644 $(HDRS) $(DESTDIR)$(includedir)/movit/ - $(MKDIR) -p $(DESTDIR)$(datadir)/movit/ - $(INSTALL) -m 0644 $(SHADERS) $(DESTDIR)$(datadir)/movit/ + $(MKDIR) -p $(DESTDIR)$(shaderdir) + $(INSTALL) -m 0644 $(SHADERS) $(DESTDIR)$(shaderdir) $(MKDIR) -p $(DESTDIR)$(libdir)/pkgconfig/ $(INSTALL) -m 644 movit.pc $(DESTDIR)$(libdir)/pkgconfig/ diff -up movit-1.6.0/movit.pc.in.orig movit-1.6.0/movit.pc.in --- movit-1.6.0/movit.pc.in.orig 2018-01-27 21:17:18.895757654 +0100 +++ movit-1.6.0/movit.pc.in 2018-01-27 21:18:50.555756130 +0100 @@ -6,7 +6,7 @@ libdir=@libdir@ includedir=@includedir@ datarootdir=@datarootdir@ datadir=@datadir@ -shaderdir=@datadir@/movit +shaderdir=@SHADERDIR@ Name: movit Description: Movit is a library for high-quality, high-performance video filters. ++++++ movit-1.5.3.tar.gz -> movit-1.6.0.tar.gz ++++++ ++++ 51927 lines of diff (skipped)
