Fix some small whitespace errors in SingleResamplePassEffect.

[movit] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 3b5f6c3ab3a8c08f3119f8992d8e98c2358dfc95..21d1e7ce981d4c8acd7403199b232e168759eb0c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,8 +6,8 @@ GTEST_DIR ?= /usr/src/gtest
 # 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
+movit_ltversion = 7:1:0
+movit_version = 1.5.3
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
@@ -17,19 +17,19 @@ datarootdir = @datarootdir@
 datadir = @datadir@
 top_builddir = @top_builddir@
 with_demo_app = @with_demo_app@
-with_SDL2 = @with_SDL2@
+with_benchmark = @with_benchmark@
 with_coverage = @with_coverage@
 
 CC=@CC@
 CXX=@CXX@
-CXXFLAGS=-Wall @CXXFLAGS@ -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @SDL_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@
-ifeq ($(with_SDL2),yes)
-CXXFLAGS += -DHAVE_SDL2
+CXXFLAGS=-Wall @CXXFLAGS@ -fvisibility-inlines-hidden -I$(GTEST_DIR)/include @SDL2_CFLAGS@ @Eigen3_CFLAGS@ @epoxy_CFLAGS@ @FFTW3_CFLAGS@ @benchmark_CFLAGS@
+ifeq ($(with_benchmark),yes)
+CXXFLAGS += -DHAVE_BENCHMARK
 endif
 LDFLAGS=@LDFLAGS@
 LDLIBS=@epoxy_LIBS@ @FFTW3_LIBS@ -lpthread
-TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @SDL_LIBS@ -lpthread
-DEMO_LDLIBS=@SDL2_image_LIBS@ @SDL_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
+TEST_LDLIBS=@epoxy_LIBS@ @SDL2_LIBS@ @benchmark_LIBS@ -lpthread
+DEMO_LDLIBS=@SDL2_image_LIBS@ -lrt -lpthread @libpng_LIBS@ @FFTW3_LIBS@
 SHELL=@SHELL@
 LIBTOOL=@LIBTOOL@ --tag=CXX
 RANLIB=ranlib
@@ -42,11 +42,12 @@ LDFLAGS += -fprofile-arcs -ftest-coverage
 LDLIBS += -lgcov
 endif
 
-DEMO_OBJS=demo.o
+DEMO_OBJS=demo.o widgets.o
 
 # Inputs.
 TESTED_INPUTS = flat_input
 TESTED_INPUTS += ycbcr_input
+TESTED_INPUTS += ycbcr_422interleaved_input
 
 INPUTS = $(TESTED_INPUTS) $(UNTESTED_INPUTS)
 
@@ -75,6 +76,8 @@ TESTED_EFFECTS += slice_effect
 TESTED_EFFECTS += complex_modulate_effect
 TESTED_EFFECTS += luma_mix_effect
 TESTED_EFFECTS += fft_convolution_effect
+TESTED_EFFECTS += ycbcr_conversion_effect
+TESTED_EFFECTS += deinterlace_effect
 
 UNTESTED_EFFECTS = sandbox_effect
 UNTESTED_EFFECTS += mirror_effect
@@ -87,7 +90,7 @@ EFFECTS = $(TESTED_EFFECTS) $(UNTESTED_EFFECTS)
 # Unit tests.
 TESTS=effect_chain_test fp16_test $(TESTED_INPUTS:=_test) $(TESTED_EFFECTS:=_test)
 
-LIB_OBJS=effect_util.o util.o widgets.o effect.o effect_chain.o init.o resource_pool.o fp16.o $(INPUTS:=.o) $(EFFECTS:=.o)
+LIB_OBJS=effect_util.o util.o effect.o effect_chain.o init.o resource_pool.o ycbcr.o $(INPUTS:=.o) $(EFFECTS:=.o)
 
 # Default target:
 all: libmovit.la $(TESTS)
@@ -159,16 +162,16 @@ coverage:
        @exit 1
 endif
 
-HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h
+HDRS = effect_chain.h effect_util.h effect.h input.h image_format.h init.h util.h defs.h resource_pool.h fp16.h ycbcr.h version.h
 HDRS += $(INPUTS:=.h)
 HDRS += $(EFFECTS:=.h)
 
-SHADERS = vs.vert vs.130.vert vs.300es.vert
-SHADERS += header.frag header.130.frag header.300es.frag
-SHADERS += footer.frag footer.130.frag footer.300es.frag
-SHADERS += texture1d.frag texture1d.130.frag footer.300es.frag
+SHADERS = vs.vert vs.130.vert vs.150.vert vs.300es.vert
+SHADERS += header.130.frag header.150.frag header.300es.frag header.comp
+SHADERS += footer.frag identity.frag footer.comp
+SHADERS += texture1d.130.frag texture1d.150.frag texture1d.300es.frag
 SHADERS += $(INPUTS:=.frag)
-SHADERS += $(EFFECTS:=.frag)
+SHADERS += $(EFFECTS:=.frag) deinterlace_effect.comp
 SHADERS += highlight_cutoff_effect.frag
 SHADERS += overlay_matte_effect.frag