# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1569857134 -7200
# Node ID a449793b9af31720e5c956dbd82f05dba6a7d726
# Parent  47014aa052fd6ce1957f0c6834cf1840e90fa16a
merkaartor: fix build

diff -r 47014aa052fd -r a449793b9af3 ffmpeg/receipt
--- a/ffmpeg/receipt	Mon Sep 30 12:31:11 2019 +0200
+++ b/ffmpeg/receipt	Mon Sep 30 17:25:34 2019 +0200
@@ -57,6 +57,7 @@
 		--enable-libvpx		\
 		--enable-libx264	\
 		--enable-libx265	\
+		--enable-avresample	\
 		--enable-gnutls		\
 		${ARCH_ARGS} &&
 	make &&
diff -r 47014aa052fd -r a449793b9af3 merkaartor/receipt
--- a/merkaartor/receipt	Mon Sep 30 12:31:11 2019 +0200
+++ b/merkaartor/receipt	Mon Sep 30 17:25:34 2019 +0200
@@ -18,6 +18,7 @@
 # Rules to configure and make the package.
 compile_rules()
 {
+	export CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"
 	qmake PREFIX="/usr/" &&
 	make $MAKEFLAGS -j 1 &&
 	make INSTALL_ROOT=$DESTDIR install