Merge branch 'master' into epoxy

Conflicts:
	Makefile.in
	movit.pc.in

diff --git a/Makefile.in b/Makefile.in
index ee3626b53eeb12d303e1c0021a2590d5dfd286d2..cd56fa6f643228e7f5d1e84ea13a9bccead28cd9 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,14 @@
 GTEST_DIR ?= /usr/src/gtest
 
+# This will be upgraded for each release, although not necessarily for every git commit.
+# See http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+# for the rules as of how this is changed. This does not really mean that Movit will
+# 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 = 1:3:0
+movit_version = 1.0.3
+
 prefix = @prefix@
 exec_prefix = @exec_prefix@
 includedir = @includedir@
@@ -17,8 +26,10 @@ CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eig
 ifeq ($(with_SDL2),yes)
 CXXFLAGS += -DHAVE_SDL2
 endif
-LDFLAGS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ @FFTW3_LIBS@ -lpthread
-DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
+LDFLAGS=@LDFLAGS@
+LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
+TEST_LDLIBS=@epoxy_LIBS@ @SDL_LIBS@ -lpthread
+DEMO_LDLIBS=@SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 SHELL=@SHELL@
 LIBTOOL=@LIBTOOL@ --tag=CXX
 RANLIB=ranlib
@@ -86,7 +97,8 @@ all: demo
 endif
 
 # Google Test and other test library functions.
-TEST_OBJS = gtest-all.o gtest_sdl_main.o test_util.o
+OWN_TEST_OBJS = gtest_sdl_main.o test_util.o
+TEST_OBJS = gtest-all.o $(OWN_TEST_OBJS)
 
 gtest-all.o: $(GTEST_DIR)/src/gtest-all.cc
        $(CXX) -MMD $(CPPFLAGS) -I$(GTEST_DIR) $(CXXFLAGS) -c $< -o $@
@@ -95,8 +107,9 @@ gtest_sdl_main.o: gtest_sdl_main.cpp
 
 # Unit tests.
 $(TESTS): %: %.o $(TEST_OBJS) libmovit.la
-       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(LDLIBS)
+       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -o $@ $^ $(TEST_LDLIBS)
 
+OWN_OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(OWN_TEST_OBJS) $(TESTS:=.o)
 OBJS=$(DEMO_OBJS) $(LIB_OBJS) $(TEST_OBJS) $(TESTS:=.o)
 
 # A small demo program.
@@ -105,7 +118,7 @@ demo: libmovit.la $(DEMO_OBJS)
 
 # The library itself.
 libmovit.la: $(LIB_OBJS:.o=.lo)
-       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(libdir) -o $@ $^ $(LDLIBS)
+       $(LIBTOOL) --mode=link $(CXX) $(LDFLAGS) -rpath $(libdir) -version-info $(movit_ltversion) -o $@ $^ $(LDLIBS)
 
 %.lo: %.cpp
        $(LIBTOOL) --mode=compile $(CXX) -MMD -MP $(CPPFLAGS) $(CXXFLAGS) -o $@ -c $<
@@ -159,15 +172,30 @@ SHADERS += texture1d.frag
 
 # These purposefully do not exist.
 MISSING_SHADERS = diffusion_effect.frag glow_effect.frag unsharp_mask_effect.frag resize_effect.frag
+MISSING_SHADERS += fft_convolution_effect.frag fft_input.frag
 SHADERS := $(filter-out $(MISSING_SHADERS),$(SHADERS))
 
 install: libmovit.la
-       $(LIBTOOL) --mode=install $(INSTALL) -m 0644 libmovit.la $(libdir)/
-       $(MKDIR) -p $(includedir)/movit/
-       $(INSTALL) -m 0644 $(HDRS) $(includedir)/movit/
-       $(MKDIR) -p $(datadir)/movit/
-       $(INSTALL) -m 0644 $(SHADERS) $(datadir)/movit/
-       $(MKDIR) -p $(libdir)/pkgconfig/
-       $(INSTALL) -m 644 movit.pc $(libdir)/pkgconfig/
-
-.PHONY: coverage clean distclean check all install
+       $(MKDIR) -p $(DESTDIR)$(libdir)/
+       $(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)$(libdir)/pkgconfig/
+       $(INSTALL) -m 644 movit.pc $(DESTDIR)$(libdir)/pkgconfig/
+
+DISTDIR=movit-$(movit_version)
+OTHER_DIST_FILES=add.frag autogen.sh blue.frag configure.ac d65.h identity.frag invert_effect.frag Makefile.in mipmap_needing_effect.frag movit.pc.in README NEWS test_util.h widgets.h
+
+dist:
+       $(MKDIR) $(DISTDIR)
+       cp $(OWN_OBJS:.o=.cpp) $(DISTDIR)/
+       cp $(HDRS) $(DISTDIR)/
+       cp $(SHADERS) $(DISTDIR)/
+       cp $(OTHER_DIST_FILES) $(DISTDIR)/
+       ( cd $(DISTDIR) && aclocal && libtoolize --install --copy && autoconf && $(RM) -r autom4te.cache/ )
+       tar zcvvf ../$(DISTDIR).tar.gz $(DISTDIR)
+       $(RM) -r $(DISTDIR)
+
+.PHONY: coverage clean distclean check all install dist

diff --git a/NEWS b/NEWS
new file mode 100644 (file)
index 0000000..8688e99
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,18 @@
+Movit 1.0.3, March 16th, 2014
+
+ - Yet more build system tweaks mainly related to distribution packaging.
+
+
+Movit 1.0.2, March 16th, 2014
+
+ - Make a few tweaks to “make install”, to make distributions' lives easier.
+
+
+Movit 1.0.1, March 16th, 2014
+
+ - Fix so that shared libraries are built.
+
+
+Movit 1.0, March 16th, 2014
+
+ - Initial release.

diff --git a/README b/README
index 0537f687e9b0b07fb340ae554970849ef44fe0eb..b6b2b9d9a946561639d33079a6f54187026aff13 100644 (file)
--- a/README
+++ b/README
@@ -9,7 +9,7 @@ Movit is the Modern Video Toolkit, notwithstanding that anything that's
 called “modern” usually isn't, and it's really not a toolkit.
 
 Movit aims to be a _high-quality_, _high-performance_, _open-source_
-library for video filters. It is currently in alpha stage.
+library for video filters.
 
 
 TL;DR, please give me download link and system demands

diff --git a/complex_modulate_effect.cpp b/complex_modulate_effect.cpp
index 656de3a3728ef0fb6006f5ba31811fac677f0fa5..9483f6b1f0f09202b54d6c8d8e54cf48f67e274c 100644 (file)
--- a/complex_modulate_effect.cpp
+++ b/complex_modulate_effect.cpp
@@ -25,7 +25,7 @@ void ComplexModulateEffect::set_gl_state(GLuint glsl_program_num, const string &
 {
        Effect::set_gl_state(glsl_program_num, prefix, sampler_num);
 
-       float num_repeats[] = { num_repeats_x, num_repeats_y };
+       float num_repeats[] = { float(num_repeats_x), float(num_repeats_y) };
        set_uniform_vec2(glsl_program_num, prefix, "num_repeats", num_repeats);
 
        // Set the secondary input to repeat (and nearest while we're at it).

diff --git a/configure.ac b/configure.ac
index 1007ce28668de7bf4f969e8892a5e9b8f9def7a7..823740b9e610c39b69a898f68fe248d012ae9d6c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,8 +1,10 @@
 AC_CONFIG_MACRO_DIR([m4])
 AC_INIT(movit, git)
 LT_INIT
+PKG_PROG_PKG_CONFIG
 
 AC_CONFIG_SRCDIR(effect.cpp)
+AC_CONFIG_AUX_DIR(.)
 
 AC_PROG_CC
 AC_PROG_CXX

diff --git a/effectlist.txt b/effectlist.txt
deleted file mode 100644 (file)
index 21fc509..0000000
--- a/effectlist.txt
+++ /dev/null
@@ -1,43 +0,0 @@
-                                  linear light?
-
-geometrical (5)
- 
- * crop                                0
- * rotate                             +1
- * lens correction                    +1
- * mirror/flip                         0
- * aspect ratio change                 0
- 
-time (2)
- 
- * slowmo/speedup                     ??
- * stabilize                          ??
- 
-spatial (6)
- 
- * blur                               +2
- * sharpen                            +2
- * denoise                            +2
- * glow                               +2 
- * vignette                           +1
- * diffuse                            +2
- 
-color and exposure (5)
- 
- * brightness/contrast                +2
- * hue/saturation/value               +2
- * levels/curves                      -1
- * lift/gamma/gain                    +2
- * white balance                      +2
- 
-misc (1)
- 
- * chroma key                         ??
-
-
-linear light key:
-
- * -1: actively harmful
- *  0: don't care
- *  1: would be nice 
- *  2: important

diff --git a/movit.pc.in b/movit.pc.in
index 6069a06e4d72f0b468f97ef979b1f629b4cd8e60..20427c6acd4ee123a5832c17546ab4e8900732c6 100644 (file)
--- a/movit.pc.in
+++ b/movit.pc.in
@@ -13,5 +13,6 @@ Description: Movit is a library for high-quality, high-performance video filters
 Version: git
 Requires:
 Conflicts:
-Libs: -lmovit @epoxy_LIBS@
-Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @epoxy_CFLAGS@
+Libs: -lmovit
+Libs.private: @epoxy_LIBS@ @FFTW3_LIBS@
+Cflags: -I${includedir}/movit @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@