aboutsummaryrefslogtreecommitdiff
path: root/subprojects
diff options
context:
space:
mode:
authorPřemysl Eric Janouch <p@janouch.name>2022-07-23 15:10:36 +0200
committerPřemysl Eric Janouch <p@janouch.name>2022-07-23 15:23:44 +0200
commitf94171fcf2875c1e475a822b09be6d27a7a7bb18 (patch)
tree4c3d698a330968cc342e2b406ca3e695f4cfa6a4 /subprojects
parent4131a926f2c82365fd2a3098b59523ec9c19c412 (diff)
downloadfiv-f94171fcf2875c1e475a822b09be6d27a7a7bb18.tar.gz
fiv-f94171fcf2875c1e475a822b09be6d27a7a7bb18.tar.xz
fiv-f94171fcf2875c1e475a822b09be6d27a7a7bb18.zip
Make the jpeg-quantsmooth wrap work on Debian
Sadly, it's not possible to delete files using patch_directory.
Diffstat (limited to 'subprojects')
-rw-r--r--subprojects/packagefiles/libjpegqs/include/libjpegqs.h4
-rw-r--r--subprojects/packagefiles/libjpegqs/meson.build20
2 files changed, 17 insertions, 7 deletions
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'),
)