Fix Lua compilation issues under Arch Linux. Patch from Martin Sandsmark.

diff --git a/Makefile b/Makefile
index 27d075041cf7b33fcd2d4bf6258c3098e18fc29a..9222684f4388acb356d40067413818e4c255b4b1 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 CXX=g++
-PKG_MODULES = Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua5.2 libmicrohttpd
+PKG_MODULES = Qt5Core Qt5Gui Qt5Widgets Qt5OpenGLExtensions Qt5OpenGL libusb-1.0 movit lua52 libmicrohttpd
 CXXFLAGS := -O2 -march=native -g -std=gnu++11 -Wall -Wno-deprecated-declarations -Werror -fPIC $(shell pkg-config --cflags $(PKG_MODULES)) -pthread -DMOVIT_SHADER_DIR=\"$(shell pkg-config --variable=shaderdir movit)\"
 LDFLAGS=$(shell pkg-config --libs $(PKG_MODULES)) -lEGL -lGL -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lswscale -lzita-resampler -lasound
 

diff --git a/theme.cpp b/theme.cpp
index 0c74a8b88c76b1acdb0b779440371c7f51eef0c8..7e69f91e5d5feccca50a88bf32a7ea44080b7830 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -2,8 +2,7 @@
 
 #include <assert.h>
 #include <lauxlib.h>
-#include <lua.h>
-#include <lualib.h>
+#include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>

diff --git a/theme.h b/theme.h
index 660a2cd7962024a767230bfb9c49735ed8bb94fd..20d736738a89d94718c9344e624bdc253e4b3db6 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -2,8 +2,7 @@
 #define _THEME_H 1
 
 #include <epoxy/gl.h>
-#include <lauxlib.h>
-#include <lua.h>
+#include <lua.hpp>
 #include <movit/effect_chain.h>
 #include <movit/deinterlace_effect.h>
 #include <movit/ycbcr_input.h>