Message ID | 1446041856-22453-1-git-send-email-sv99@inbox.ru |
---|---|
State | Superseded |
Headers | show |
On Wed, Oct 28, 2015 at 3:17 PM, Viacheslav Volkov <sv99@inbox.ru> wrote: > Signed-off-by: Viacheslav Volkov <sv99@inbox.ru> > --- > Changes v2 -> v3: > - intendation in the Config.in (suggested by Yegor Yefremov) > - add license info > > Changes v1 -> v2: > - many changes > --- > package/Config.in | 1 + > package/zbar/0001-zbar-autoconf.patch | 16 ++++++++++++++++ > package/zbar/0002-zbar-jpeg.patch | 13 +++++++++++++ > package/zbar/Config.in | 16 ++++++++++++++++ > package/zbar/zbar.mk | 22 ++++++++++++++++++++++ > 5 files changed, 68 insertions(+) > create mode 100644 package/zbar/0001-zbar-autoconf.patch > create mode 100644 package/zbar/0002-zbar-jpeg.patch > create mode 100644 package/zbar/Config.in > create mode 100644 package/zbar/zbar.mk > > diff --git a/package/Config.in b/package/Config.in > index 10ff94e..778b1e1 100644 > --- a/package/Config.in > +++ b/package/Config.in > @@ -854,6 +854,7 @@ menu "Graphics" > source "package/webkit/Config.in" > source "package/webkitgtk24/Config.in" > source "package/webp/Config.in" > + source "package/zbar/Config.in" > source "package/zxing-cpp/Config.in" > endmenu > > diff --git a/package/zbar/0001-zbar-autoconf.patch b/package/zbar/0001-zbar-autoconf.patch > new file mode 100644 > index 0000000..159f75e > --- /dev/null > +++ b/package/zbar/0001-zbar-autoconf.patch > @@ -0,0 +1,16 @@ > +diff --git a/configure.ac b/configure.ac > +index 256aedb..5aa5689 100644 > +--- a/configure.ac > ++++ b/configure.ac > +@@ -3,10 +3,11 @@ 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 -Werror -Wno-portability foreign subdir-objects std-options dist-bzip2]) > + AC_CONFIG_HEADERS([include/config.h]) > + AC_CONFIG_SRCDIR(zbar/scanner.c) > + LT_PREREQ([2.2]) > ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) > + LT_INIT([dlopen win32-dll]) > + LT_LANG([Windows Resource]) > diff --git a/package/zbar/0002-zbar-jpeg.patch b/package/zbar/0002-zbar-jpeg.patch > new file mode 100644 > index 0000000..1d93a94 > --- /dev/null > +++ b/package/zbar/0002-zbar-jpeg.patch > @@ -0,0 +1,13 @@ > +diff --git a/zbar/jpeg.c b/zbar/jpeg.c > +index 972bfea..fdd1619 100644 > +--- a/zbar/jpeg.c > ++++ b/zbar/jpeg.c > +@@ -68,7 +68,7 @@ void init_source (j_decompress_ptr cinfo) > + cinfo->src->bytes_in_buffer = img->datalen; > + } > + > +-int fill_input_buffer (j_decompress_ptr cinfo) > ++boolean fill_input_buffer (j_decompress_ptr cinfo) > + { > + /* buffer underrun error case */ > + cinfo->src->next_input_byte = fake_eoi; > diff --git a/package/zbar/Config.in b/package/zbar/Config.in > new file mode 100644 > index 0000000..ced6c95 > --- /dev/null > +++ b/package/zbar/Config.in > @@ -0,0 +1,16 @@ > +config BR2_PACKAGE_ZBAR > + bool "zbar" > + # dependencies from lib4l > + depends on BR2_TOOLCHAIN_HAS_THREADS > + depends on BR2_USE_MMU # fork() > + depends on !BR2_STATIC_LIBS # dlopen() > + depends on BR2_INSTALL_LIBSTDCPP > + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers > + # wait for libv4l 1.7+ for musl compatibility > + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC > + select BR2_PACKAGE_JPEG > + select BR2_PACKAGE_LIBV4L > + help > + QR and barcode scanner > + > + http://zbar.sourceforge.net/ > diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk > new file mode 100644 > index 0000000..e25a952 > --- /dev/null > +++ b/package/zbar/zbar.mk > @@ -0,0 +1,22 @@ > +################################################################################ > +# > +# zbar > +# > +################################################################################ > + > +ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f > +ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION)) > +ZBAR_LICENSE = GPLv2.1 > +ZBAR_LICENSE_FILES = LICENSE > +ZBAR_INSTALL_STAGING = YES > +ZBAR_AUTORECONF = YES > +ZBAR_DEPENDENCIES = libv4l libjpeg > +ZBAR_CONF_OPTS = --without-imagemagick --without-qt --without-gtk --without-python --without-x --enable-shared=yes line too long You can add my Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> > + > +define ZBAR_INSTALL_FIXUP > + touch $(@D)/doc/man/zbarcam.1 > +endef > + > +ZBAR_POST_BUILD_HOOKS += ZBAR_INSTALL_FIXUP > + > +$(eval $(autotools-package)) > -- > 2.6.1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
diff --git a/package/Config.in b/package/Config.in index 10ff94e..778b1e1 100644 --- a/package/Config.in +++ b/package/Config.in @@ -854,6 +854,7 @@ menu "Graphics" source "package/webkit/Config.in" source "package/webkitgtk24/Config.in" source "package/webp/Config.in" + source "package/zbar/Config.in" source "package/zxing-cpp/Config.in" endmenu diff --git a/package/zbar/0001-zbar-autoconf.patch b/package/zbar/0001-zbar-autoconf.patch new file mode 100644 index 0000000..159f75e --- /dev/null +++ b/package/zbar/0001-zbar-autoconf.patch @@ -0,0 +1,16 @@ +diff --git a/configure.ac b/configure.ac +index 256aedb..5aa5689 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -3,10 +3,11 @@ 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 -Werror -Wno-portability foreign subdir-objects std-options dist-bzip2]) + AC_CONFIG_HEADERS([include/config.h]) + AC_CONFIG_SRCDIR(zbar/scanner.c) + LT_PREREQ([2.2]) ++m4_ifdef([AM_PROG_AR], [AM_PROG_AR]) + LT_INIT([dlopen win32-dll]) + LT_LANG([Windows Resource]) diff --git a/package/zbar/0002-zbar-jpeg.patch b/package/zbar/0002-zbar-jpeg.patch new file mode 100644 index 0000000..1d93a94 --- /dev/null +++ b/package/zbar/0002-zbar-jpeg.patch @@ -0,0 +1,13 @@ +diff --git a/zbar/jpeg.c b/zbar/jpeg.c +index 972bfea..fdd1619 100644 +--- a/zbar/jpeg.c ++++ b/zbar/jpeg.c +@@ -68,7 +68,7 @@ void init_source (j_decompress_ptr cinfo) + cinfo->src->bytes_in_buffer = img->datalen; + } + +-int fill_input_buffer (j_decompress_ptr cinfo) ++boolean fill_input_buffer (j_decompress_ptr cinfo) + { + /* buffer underrun error case */ + cinfo->src->next_input_byte = fake_eoi; diff --git a/package/zbar/Config.in b/package/zbar/Config.in new file mode 100644 index 0000000..ced6c95 --- /dev/null +++ b/package/zbar/Config.in @@ -0,0 +1,16 @@ +config BR2_PACKAGE_ZBAR + bool "zbar" + # dependencies from lib4l + depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() + depends on !BR2_STATIC_LIBS # dlopen() + depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_0 # media headers + # wait for libv4l 1.7+ for musl compatibility + depends on BR2_TOOLCHAIN_USES_GLIBC || BR2_TOOLCHAIN_USES_UCLIBC + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBV4L + help + QR and barcode scanner + + http://zbar.sourceforge.net/ diff --git a/package/zbar/zbar.mk b/package/zbar/zbar.mk new file mode 100644 index 0000000..e25a952 --- /dev/null +++ b/package/zbar/zbar.mk @@ -0,0 +1,22 @@ +################################################################################ +# +# zbar +# +################################################################################ + +ZBAR_VERSION = 854a5d97059e395807091ac4d80c53f7968abb8f +ZBAR_SITE = $(call github,ZBar,Zbar,$(ZBAR_VERSION)) +ZBAR_LICENSE = GPLv2.1 +ZBAR_LICENSE_FILES = LICENSE +ZBAR_INSTALL_STAGING = YES +ZBAR_AUTORECONF = YES +ZBAR_DEPENDENCIES = libv4l libjpeg +ZBAR_CONF_OPTS = --without-imagemagick --without-qt --without-gtk --without-python --without-x --enable-shared=yes + +define ZBAR_INSTALL_FIXUP + touch $(@D)/doc/man/zbarcam.1 +endef + +ZBAR_POST_BUILD_HOOKS += ZBAR_INSTALL_FIXUP + +$(eval $(autotools-package))
Signed-off-by: Viacheslav Volkov <sv99@inbox.ru> --- Changes v2 -> v3: - intendation in the Config.in (suggested by Yegor Yefremov) - add license info Changes v1 -> v2: - many changes --- package/Config.in | 1 + package/zbar/0001-zbar-autoconf.patch | 16 ++++++++++++++++ package/zbar/0002-zbar-jpeg.patch | 13 +++++++++++++ package/zbar/Config.in | 16 ++++++++++++++++ package/zbar/zbar.mk | 22 ++++++++++++++++++++++ 5 files changed, 68 insertions(+) create mode 100644 package/zbar/0001-zbar-autoconf.patch create mode 100644 package/zbar/0002-zbar-jpeg.patch create mode 100644 package/zbar/Config.in create mode 100644 package/zbar/zbar.mk