!24 Fix the x86 compilation failure of zbar caused by missing magic_types
From: @caodongxia Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
e1694e9328
@ -26,7 +26,7 @@
|
|||||||
Summary: An ImageMagick fork, offering faster image generation and better quality
|
Summary: An ImageMagick fork, offering faster image generation and better quality
|
||||||
Name: GraphicsMagick
|
Name: GraphicsMagick
|
||||||
Version: 1.3.38
|
Version: 1.3.38
|
||||||
Release: 1
|
Release: 2
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
|
Source0: http://downloads.sourceforge.net/sourceforge/graphicsmagick/GraphicsMagick-%{version}.tar.xz
|
||||||
@ -248,7 +248,20 @@ mv %{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h \
|
|||||||
%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types-%{__isa_bits}.h
|
%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types-%{__isa_bits}.h
|
||||||
|
|
||||||
cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h <<EOF
|
cat >%{buildroot}%{_includedir}/GraphicsMagick/magick/magick_types.h <<EOF
|
||||||
|
#ifndef MAGICK_TYPES_MULTILIB
|
||||||
|
#define MAGICK_TYPES_MULTILIB
|
||||||
|
|
||||||
|
#include <bits/wordsize.h>
|
||||||
|
|
||||||
|
#if __WORDSIZE == 32
|
||||||
|
# include "magick/magick_types-32.h"
|
||||||
|
#elif __WORDSIZE == 64
|
||||||
|
# include "magick/magick_types-64.h"
|
||||||
|
#else
|
||||||
|
# error "unexpected value for __WORDSIZE macro"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif
|
||||||
EOF
|
EOF
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -327,6 +340,9 @@ exit 1
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Jan 3 2023 caodongxia <caodongxia@h-partners.com> - 1.3.38-2
|
||||||
|
- Fix the x86 compilation failure of zbar caused by missing magic_types
|
||||||
|
|
||||||
* Tue Nov 1 2022 huyab<1229981468@qq.com> - 1.3.38-1
|
* Tue Nov 1 2022 huyab<1229981468@qq.com> - 1.3.38-1
|
||||||
- update version to 1.3.38-1
|
- update version to 1.3.38-1
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user