wok-6.x rev 21884
merkaartor: fix build
| author | Pascal Bellard <pascal.bellard@slitaz.org> |
|---|---|
| date | Mon Sep 30 17:25:34 2019 +0200 (2019-09-30) |
| parents | 47014aa052fd |
| children | 432dd31a79d5 |
| files | ffmpeg/receipt merkaartor/receipt |
line diff
1.1 --- a/ffmpeg/receipt Mon Sep 30 12:31:11 2019 +0200 1.2 +++ b/ffmpeg/receipt Mon Sep 30 17:25:34 2019 +0200 1.3 @@ -57,6 +57,7 @@ 1.4 --enable-libvpx \ 1.5 --enable-libx264 \ 1.6 --enable-libx265 \ 1.7 + --enable-avresample \ 1.8 --enable-gnutls \ 1.9 ${ARCH_ARGS} && 1.10 make &&
2.1 --- a/merkaartor/receipt Mon Sep 30 12:31:11 2019 +0200 2.2 +++ b/merkaartor/receipt Mon Sep 30 17:25:34 2019 +0200 2.3 @@ -18,6 +18,7 @@ 2.4 # Rules to configure and make the package. 2.5 compile_rules() 2.6 { 2.7 + export CXXFLAGS="$CXXFLAGS -DACCEPT_USE_OF_DEPRECATED_PROJ_API_H" 2.8 qmake PREFIX="/usr/" && 2.9 make $MAKEFLAGS -j 1 && 2.10 make INSTALL_ROOT=$DESTDIR install