added my Recipes
This commit is contained in:
@@ -0,0 +1,36 @@
|
||||
From 224507bc4b6e58f7a6e445bfebfb59d6b8d78bd6 Mon Sep 17 00:00:00 2001
|
||||
From: Khem Raj <raj.khem@gmail.com>
|
||||
Date: Fri, 2 Dec 2016 17:38:51 -0800
|
||||
Subject: [PATCH] make relies GNU extentions
|
||||
|
||||
We get errors like
|
||||
`%'-style pattern rules are a GNU make extension
|
||||
|
||||
Disable this warning, since we use gmake with OE
|
||||
anyway
|
||||
|
||||
Signed-off-by: Khem Raj <raj.khem@gmail.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3,7 +3,7 @@ AC_PREREQ([2.61])
|
||||
AC_INIT([zbar], [0.10], [spadix@users.sourceforge.net])
|
||||
AC_CONFIG_AUX_DIR(config)
|
||||
AC_CONFIG_MACRO_DIR(config)
|
||||
-AM_INIT_AUTOMAKE([1.10 -Wall -Werror foreign subdir-objects std-options dist-bzip2])
|
||||
+AM_INIT_AUTOMAKE([1.10 -Wall -Wno-error foreign subdir-objects std-options dist-bzip2])
|
||||
AC_CONFIG_HEADERS([include/config.h])
|
||||
AC_CONFIG_SRCDIR(zbar/scanner.c)
|
||||
LT_PREREQ([2.2])
|
||||
@@ -47,7 +47,7 @@ AC_DEFINE_UNQUOTED([LIB_VERSION_REVISION
|
||||
[Library revision])
|
||||
|
||||
AM_CPPFLAGS="-I$srcdir/include"
|
||||
-AM_CFLAGS="-Wall -Wno-parentheses -Werror"
|
||||
+AM_CFLAGS="-Wall -Wno-parentheses"
|
||||
AM_CXXFLAGS="$AM_CFLAGS"
|
||||
AC_SUBST([AM_CPPFLAGS])
|
||||
AC_SUBST([AM_CFLAGS])
|
||||
@@ -0,0 +1,45 @@
|
||||
From 3d4fd19334b1d4c35ba64dff63a31e9eec01c422 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Priouzeau <christophe.priouzeau@st.com>
|
||||
Date: Fri, 9 Oct 2020 11:21:38 +0200
|
||||
Subject: [PATCH] support of ImageMagick 7
|
||||
|
||||
Signed-off-by: Christophe Priouzeau <christophe.priouzeau@st.com>
|
||||
---
|
||||
configure.ac | 2 +-
|
||||
zbarimg/zbarimg.c | 6 +-----
|
||||
2 files changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 256aedb..5d4ed23 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -324,7 +324,7 @@ dnl but the latter doesn't exist in older verisons (bug #2848437)
|
||||
dnl double check ImageMagick install (bug #2582232)
|
||||
CPPFLAGS_save="$CPPFLAGS"
|
||||
CPPFLAGS="$CPPFLAGS $MAGICK_CFLAGS"
|
||||
- AC_CHECK_HEADER([wand/MagickWand.h],
|
||||
+ AC_CHECK_HEADER([MagickWand/MagickWand.h],
|
||||
[have_IM="yes"],
|
||||
[have_IM="broken"])
|
||||
CPPFLAGS="$CPPFLAGS_save"])])
|
||||
diff --git a/zbarimg/zbarimg.c b/zbarimg/zbarimg.c
|
||||
index d3cf5e8..fc7abba 100644
|
||||
--- a/zbarimg/zbarimg.c
|
||||
+++ b/zbarimg/zbarimg.c
|
||||
@@ -39,12 +39,8 @@
|
||||
|
||||
#include <zbar.h>
|
||||
|
||||
-#ifdef HAVE_GRAPHICSMAGICK
|
||||
-# include <wand/wand_api.h>
|
||||
-#endif
|
||||
-
|
||||
#ifdef HAVE_IMAGEMAGICK
|
||||
-# include <wand/MagickWand.h>
|
||||
+#include <MagickWand/MagickWand.h>
|
||||
|
||||
/* ImageMagick frequently changes API names - just use the original
|
||||
* (more stable?) names to match GraphicsMagick
|
||||
--
|
||||
2.17.1
|
||||
|
||||
Reference in New Issue
Block a user