commit f51adfc3317eb5258d4d0041d6fcdb12a5179e24
parent 2c800f9519f363b5ffd556305f185bfdd212238d
Author: Jonathan Bennett <JBennett@incomsystems.biz>
Date: Mon, 25 May 2015 23:25:36 -0500
libqrencode: fix typo in makefile
Fix compile error due to autoconf
Signed-off-by: Jonathan Bennett <jbennett@incomsystems.biz>
Diffstat:
2 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/libs/qrencode/Makefile b/libs/qrencode/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=qrencode
PKG_VERSION:=3.4.4
-PKG_RELEASE:=1
+PKG_RELEASE:=2
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://fukuchi.org/works/qrencode/
@@ -17,7 +17,7 @@ PKG_MD5SUM:=be545f3ce36ea8fbb58612d72c4222de
PKG_MAINTAINER:=Jonathan Bennett <JBennett@incomsystems.biz>
PKG_LICENSE:=LGPL-2.1+
PKG_INSTALL:=1
-PKG:FIXUP:=autoreconf
+PKG_FIXUP:=autoreconf
include $(INCLUDE_DIR)/package.mk
diff --git a/libs/qrencode/patches/001-disable-png.patch b/libs/qrencode/patches/001-disable-png.patch
@@ -1,15 +1,3 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -58,9 +58,6 @@
- [build_tools=$withval], [build_tools=yes])
-
- AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
--if test x$build_tools = xyes ; then
-- PKG_CHECK_MODULES(png, "libpng")
--fi
-
- dnl --with-tests
- AC_ARG_WITH([tests], [AS_HELP_STRING([--with-tests], [build tests [default=no]])],
--- a/qrenc.c
+++ b/qrenc.c
@@ -25,7 +25,6 @@
@@ -291,3 +279,28 @@
if(optind < argc) {
intext = (unsigned char *)argv[optind];
length = strlen((char *)intext);
+--- a/configure.ac
++++ b/configure.ac
+@@ -58,9 +58,6 @@
+ [build_tools=$withval], [build_tools=yes])
+
+ AM_CONDITIONAL(BUILD_TOOLS, [test "x$build_tools" = "xyes" ])
+-if test x$build_tools = xyes ; then
+- PKG_CHECK_MODULES(png, "libpng")
+-fi
+
+ dnl --with-tests
+ AC_ARG_WITH([tests], [AS_HELP_STRING([--with-tests], [build tests [default=no]])],
+@@ -80,12 +77,6 @@
+ echo "/* #undef WITH_TESTS */" >>confdefs.h
+ fi
+
+-if test x$build_tests = xyes ; then
+- SDL_REQUIRED_VERSION=1.2.0
+- AM_PATH_SDL($SDL_REQUIRED_VERSION,,AC_MSG_WARN([*** SDL $SDL_REQUIRED_VERSION or better is required.]))
+- AC_MSG_NOTICE([SDL check done.])
+- AM_ICONV_LINK
+-fi
+ AM_CONDITIONAL(HAVE_SDL, [test "x$SDL_CFLAGS" != "x" ])
+
+
