p
/
fiv
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make the jpeg-quantsmooth wrap work on Debian 

Sadly, it's not possible to delete files using patch_directory.
This commit is contained in:
Přemysl Eric Janouch 2022-07-23 15:10:36 +02:00
parent 4131a926f2
commit f94171fcf2
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subprojects/packagefiles/libjpegqs/include/libjpegqs.h Normal file
View File

@ -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"

20
subprojects/packagefiles/libjpegqs/meson.build
View File

@ -13,29 +13,35 @@ if host_machine.cpu_family() == 'x86_64'
jpegqs_avx512 = static_library('jpegqs-avx512', 'libjpegqs.c', jpegqs_avx512 = static_library('jpegqs-avx512', 'libjpegqs.c',
c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=avx512', c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=avx512',
'-mavx512f', '-mfma', '-DSIMD_AVX512'], '-mavx512f', '-mfma', '-DSIMD_AVX512'],
dependencies : deps) dependencies : deps,
implicit_include_directories : false)
jpegqs_avx2 = static_library('jpegqs-avx2', 'libjpegqs.c', jpegqs_avx2 = static_library('jpegqs-avx2', 'libjpegqs.c',
c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=avx2', c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=avx2',
'-mavx2', '-mfma', '-DSIMD_AVX2'], '-mavx2', '-mfma', '-DSIMD_AVX2'],
dependencies : deps) dependencies : deps,
implicit_include_directories : false)
jpegqs_sse2 = static_library('jpegqs-sse2', 'libjpegqs.c', jpegqs_sse2 = static_library('jpegqs-sse2', 'libjpegqs.c',
c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=sse2', '-msse2', '-DSIMD_SSE2'], 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', jpegqs_base = static_library('jpegqs-base', 'libjpegqs.c',
c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=base', '-DSIMD_BASE'], c_args : ['-DSIMD_SELECT', '-DSIMD_NAME=base', '-DSIMD_BASE'],
dependencies : deps) dependencies : deps,
implicit_include_directories : false)
jpegqs_lib = static_library('jpegqs', 'libjpegqs.c', jpegqs_lib = static_library('jpegqs', 'libjpegqs.c',
c_args : ['-DSIMD_SELECT'], c_args : ['-DSIMD_SELECT'],
dependencies : deps, 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 else
jpegqs_lib = static_library('jpegqs', 'libjpegqs.c', jpegqs_lib = static_library('jpegqs', 'libjpegqs.c',
c_args : ['-DNO_SIMD'], c_args : ['-DNO_SIMD'],
dependencies : deps) dependencies : deps,
implicit_include_directories : false)
endif endif
jpegqs_dep = declare_dependency( jpegqs_dep = declare_dependency(
link_with : jpegqs_lib, link_with : jpegqs_lib,
include_directories : include_directories('.'), include_directories : include_directories('include'),
) )