mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-15 16:44:44 +00:00
zbar: Remove support for 0.10 version
Remove support for the old ZBar project no longer maintained. Signed-off-by: Daniel Gomez <daniel@qtec.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
36b25ecd94
commit
4a1794ea9d
@ -1,36 +0,0 @@
|
||||
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])
|
||||
@ -1,31 +0,0 @@
|
||||
DESCRIPTION = "2D barcode scanner toolkit."
|
||||
SECTION = "graphics"
|
||||
LICENSE = "LGPL-2.1"
|
||||
|
||||
DEPENDS = "pkgconfig intltool-native libpng jpeg"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4015840237ca7f0175cd626f78714ca8"
|
||||
|
||||
PV = "0.10+git${SRCPV}"
|
||||
|
||||
# iPhoneSDK-1.3.1 tag
|
||||
SRCREV = "67003d2a985b5f9627bee2d8e3e0b26d0c474b57"
|
||||
SRC_URI = "git://github.com/ZBar/Zbar \
|
||||
file://0001-make-relies-GNU-extentions.patch \
|
||||
"
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
inherit autotools pkgconfig
|
||||
|
||||
PACKAGECONFIG = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}"
|
||||
|
||||
PACKAGECONFIG[x11] = "--with-x,-without-x,libxcb libx11 libsm libxau libxext libxv libice libxdmcp"
|
||||
|
||||
EXTRA_OECONF = "--without-imagemagick --without-qt --without-python --disable-video --without-gtk"
|
||||
|
||||
CPPFLAGS += "-Wno-error"
|
||||
|
||||
do_install_append() {
|
||||
#remove usr/bin if empty
|
||||
rmdir ${D}${bindir}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user