From f94171fcf2875c1e475a822b09be6d27a7a7bb18 Mon Sep 17 00:00:00 2001 From: Přemysl Eric Janouch Date: Sat, 23 Jul 2022 15:10:36 +0200 Subject: Make the jpeg-quantsmooth wrap work on Debian Sadly, it's not possible to delete files using patch_directory. --- .../packagefiles/libjpegqs/include/libjpegqs.h | 4 ++++ subprojects/packagefiles/libjpegqs/meson.build | 20 +++++++++++++------- 2 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 subprojects/packagefiles/libjpegqs/include/libjpegqs.h diff --git a/subprojects/packagefiles/libjpegqs/include/libjpegqs.h b/subprojects/packagefiles/libjpegqs/include/libjpegqs.h new file mode 100644 index 0000000..3705a25 --- /dev/null +++ b/subprojects/packagefiles/libjpegqs/include/libjpegqs.h @@ -0,0 +1,4 @@ +// This separate directory is necessary for Debian's multiarch with jpeg-turbo, +// because its jpeglib.h cannot perform local inclusion of jconfig.h, +// resulting in it being found within jpeg-quantsmooth and breaking the build. +#include "../libjpegqs.h" diff --git a/subprojects/packagefiles/libjpegqs/meson.build b/subprojects/packagefiles/libjpegqs/meson.build index 9755f59..03c219b 100644 --- a/subprojects/packagefiles/libjpegqs/meson.build +++ b/subprojects/packagefiles/libjpegqs/meson.build @@ -13,29 +13,35 @@ if host_machine.cpu_family() == 'x86_64' jpegqs_avx512 = static_library('jpegqs-avx512', 'libjpegqs.c', c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=avx512', '-mavx512f', '-mfma', '-DSIMD_AVX512'], - dependencies : deps) + dependencies : deps, + implicit_include_directories : false) jpegqs_avx2 = static_library('jpegqs-avx2', 'libjpegqs.c', c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=avx2', '-mavx2', '-mfma', '-DSIMD_AVX2'], - dependencies : deps) + dependencies : deps, + implicit_include_directories : false) jpegqs_sse2 = static_library('jpegqs-sse2', 'libjpegqs.c', c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=sse2', '-msse2', '-DSIMD_SSE2'], - dependencies : deps) + dependencies : deps, + implicit_include_directories : false) jpegqs_base = static_library('jpegqs-base', 'libjpegqs.c', c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=base', '-DSIMD_BASE'], - dependencies : deps) + dependencies : deps, + implicit_include_directories : false) jpegqs_lib = static_library('jpegqs', 'libjpegqs.c', c_args : ['-DSIMD_SELECT'], dependencies : deps, - link_with : [jpegqs_base, jpegqs_sse2, jpegqs_avx2, jpegqs_avx512]) + link_with : [jpegqs_base, jpegqs_sse2, jpegqs_avx2, jpegqs_avx512], + implicit_include_directories : false) else jpegqs_lib = static_library('jpegqs', 'libjpegqs.c', c_args : ['-DNO_SIMD'], - dependencies : deps) + dependencies : deps, + implicit_include_directories : false) endif jpegqs_dep = declare_dependency( link_with : jpegqs_lib, - include_directories : include_directories('.'), + include_directories : include_directories('include'), ) -- cgit v1.2.3-70-g09d2