Take the Movit shader directory from pkg-config.

diff --git a/Makefile b/Makefile
index 04e658b8a30f2470652114989d00536687347f19..16bd2b532adb77057bda90150b97b2c90417afd3 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CXX=g++
-CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -fPIC $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions libusb-1.0 movit) -pthread
+CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -fPIC $(shell pkg-config --cflags Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions libusb-1.0 movit) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\"
 LDFLAGS=$(shell pkg-config --libs Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions libusb-1.0 movit) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil
 
 # Qt objects

diff --git a/mixer.cpp b/mixer.cpp
index 11553b4185092ccdfd1078a7936545d7f61a4712..d7726f3cc15c7a4136272086c386f0b53c82417a 100644 (file)
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -205,7 +205,7 @@ void mixer_thread_func(QSurface *surface, QSurface *surface2, QSurface *surface3
                exit(1);
        }
 
-       CHECK(init_movit("/usr/share/movit", MOVIT_DEBUG_ON));
+       CHECK(init_movit(MOVIT_SHADER_DIR, MOVIT_DEBUG_OFF));
        check_error();
 
        EffectChain chain(WIDTH, HEIGHT);