From 61b378e8a0ddf2e04d1e72d530cf5e524f8e28d7 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Mon, 13 Jan 2020 21:40:16 +0100 Subject: [PATCH] package/udftools: bump to version 2.2 Drop all patches (already in version) and so autoreconf Signed-off-by: Fabrice Fontaine Signed-off-by: Thomas Petazzoni --- ...figure-Use-AS_IF-macro-for-C99-check.patch | 27 ------- ...Allow-to-build-udftools-without-udev.patch | 49 ----------- ...ect-readline-via-pkg-config-when-pos.patch | 81 ------------------- package/udftools/udftools.hash | 2 +- package/udftools/udftools.mk | 3 +- 5 files changed, 2 insertions(+), 160 deletions(-) delete mode 100644 package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch delete mode 100644 package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch delete mode 100644 package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch diff --git a/package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch b/package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch deleted file mode 100644 index b4770f7df2..0000000000 --- a/package/udftools/0001-configure-Use-AS_IF-macro-for-C99-check.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 02a32d8827e884730d22ddee4c479577cd1e90ac Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= -Date: Wed, 26 Jun 2019 17:41:54 +0200 -Subject: [PATCH] configure: Use AS_IF macro for C99 check - -[Retrieved from: -https://github.com/pali/udftools/commit/02a32d8827e884730d22ddee4c479577cd1e90ac] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 2db31d0..315fb26 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -10,9 +10,7 @@ AC_PROG_CC_C99 - AC_DISABLE_SHARED - AM_PROG_LIBTOOL - --if test "$ac_cv_prog_cc_c99" = "no"; then -- AC_MSG_ERROR([Your C compiler does not support ISO C99.]) --fi -+AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([Your C compiler does not support ISO C99.])]) - - dnl Checks for libraries. - AC_CHECK_LIB(readline, readline, [ ]) diff --git a/package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch b/package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch deleted file mode 100644 index 3a3c4efe8e..0000000000 --- a/package/udftools/0002-all-Allow-to-build-udftools-without-udev.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2fbd6e8d0cb42507831847982ea3937e2c13ace0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Pali=20Roh=C3=A1r?= -Date: Tue, 13 Aug 2019 00:49:17 +0200 -Subject: [PATCH] all: Allow to build udftools without udev - -If udev is not found during configure phase then do not install pktsetup -udev rules file. udev itself is not used for anything else. - -Fixes: https://github.com/pali/udftools/issues/30 -[Retrieved from: -https://github.com/pali/udftools/commit/2fbd6e8d0cb42507831847982ea3937e2c13ace0] -Signed-off-by: Fabrice Fontaine ---- - configure.ac | 3 ++- - pktsetup/Makefile.am | 4 ++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 63bef62..d71fee8 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -25,7 +25,8 @@ AC_C_BIGENDIAN - AC_SYS_LARGEFILE - - PKG_PROG_PKG_CONFIG --PKG_CHECK_MODULES(UDEV, [udev], [ac_cv_udevdir=`$PKG_CONFIG --variable=udevdir udev`]) -+PKG_CHECK_MODULES(UDEV, [udev], [ac_cv_udevdir=`$PKG_CONFIG --variable=udevdir udev`], [ac_cv_udevdir=""]) -+AM_CONDITIONAL(UDEVDIR, [test "$ac_cv_udevdir" != ""]) - AC_SUBST(UDEVDIR, $ac_cv_udevdir) - - dnl Checks for library functions. -diff --git a/pktsetup/Makefile.am b/pktsetup/Makefile.am -index 0c5fd1c..33da370 100644 ---- a/pktsetup/Makefile.am -+++ b/pktsetup/Makefile.am -@@ -2,9 +2,13 @@ sbin_PROGRAMS = pktsetup - pktsetup_SOURCES = pktsetup.c - EXTRA_DIST = pktsetup.rules - -+if UDEVDIR -+ - install-data-local: - mkdir -p "$(DESTDIR)$(UDEVDIR)/rules.d" - $(INSTALL_DATA) "$(srcdir)/pktsetup.rules" "$(DESTDIR)$(UDEVDIR)/rules.d/80-pktsetup.rules" - - uninstall-local: - rm -f "$(DESTDIR)$(UDEVDIR)/rules.d/80-pktsetup.rules" -+ -+endif diff --git a/package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch b/package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch deleted file mode 100644 index 4f7e222697..0000000000 --- a/package/udftools/0003-configure.ac-detect-readline-via-pkg-config-when-pos.patch +++ /dev/null @@ -1,81 +0,0 @@ -From da044aa346fac63571d3d0cff8f8838263acab40 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Tue, 27 Aug 2019 18:19:05 +0200 -Subject: [PATCH] configure.ac: detect readline via pkg-config when possible - -pkg-config automatically handles static linking situations, where for -example readline is linked against ncurses, and therefore -lncurses -needs to be passed in addition to -lreadline. - -This proposal uses pkg-config when available. If pkg-config is not -found, or readline is not found via pkg-config, we fallback to the -existing AC_CHECK_LIB(). This AC_CHECK_LIB() test is modified to set -READLINE_LIBS, like PKG_CHECK_MODULES() does. The Makefile.am -consequently uses READLINE_LIBS instead of hardcoding -lreadline. - -Signed-off-by: Thomas Petazzoni -[Retrieved (and slightly updated) from: -https://git.buildroot.net/buildroot/tree/package/udftools/0002-configure.ac-detect-readline-via-pkg-config-when-pos.patch] -Signed-off-by: Fabrice Fontaine -[Retrieved from: -https://github.com/pali/udftools/commit/da044aa346fac63571d3d0cff8f8838263acab40] ---- - configure.ac | 18 ++++++++++++------ - wrudf/Makefile.am | 2 +- - 2 files changed, 13 insertions(+), 7 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 0404e50..9329d69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,18 +14,24 @@ AC_PROG_MKDIR_P - - AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([Your C compiler does not support ISO C99.])]) - --dnl Checks for libraries. --AC_CHECK_LIB(readline, readline, [ ]) -+dnl Checks for libraries, by using pkg-config when available -+PKG_PROG_PKG_CONFIG -+AS_IF([test -n "${PKG_CONFIG}"], [PKG_CHECK_MODULES([READLINE], [readline], [readline_found=yes], [readline_found=no])]) - --dnl Checks for header files. --AC_CHECK_HEADERS(readline/readline.h) -+AS_IF([test "${readline_found}" != "yes"], -+ [AC_CHECK_LIB(readline, readline, -+ [AC_CHECK_HEADERS(readline/readline.h, -+ [AC_SUBST([READLINE_LIBS], [-lreadline]) -+ readline_found=yes], -+ [readline_found=no])], -+ [readline_found=no]) -+ ]) - - dnl Checks for typedefs, structures, and compiler characteristics. - AC_C_INLINE - AC_C_BIGENDIAN - AC_SYS_LARGEFILE - --PKG_PROG_PKG_CONFIG - PKG_CHECK_MODULES(UDEV, [udev], [ac_cv_udevdir=`$PKG_CONFIG --variable=udevdir udev`], [ac_cv_udevdir=""]) - AM_CONDITIONAL(UDEVDIR, [test "$ac_cv_udevdir" != ""]) - AC_SUBST(UDEVDIR, $ac_cv_udevdir) -@@ -33,7 +39,7 @@ AC_SUBST(UDEVDIR, $ac_cv_udevdir) - dnl Checks for library functions. - AC_SUBST(LTLIBOBJS) - --AM_CONDITIONAL(USE_READLINE, test "$ac_cv_lib_readline_readline" = "yes" -a "$ac_cv_header_readline_readline_h" = "yes") -+AM_CONDITIONAL(USE_READLINE, test "$readline_found" = "yes") - - AC_CONFIG_FILES(Makefile libudffs/Makefile mkudffs/Makefile cdrwtool/Makefile pktsetup/Makefile udffsck/Makefile udfinfo/Makefile udflabel/Makefile wrudf/Makefile doc/Makefile) - -diff --git a/wrudf/Makefile.am b/wrudf/Makefile.am -index 4224b13..9f6b33d 100644 ---- a/wrudf/Makefile.am -+++ b/wrudf/Makefile.am -@@ -5,6 +5,6 @@ wrudf_SOURCES = wrudf.c wrudf-cmnd.c wrudf-desc.c wrudf-cdrw.c wrudf-cdr.c ide-p - AM_CPPFLAGS = -I$(top_srcdir)/include - - if USE_READLINE --wrudf_LDADD += -lreadline -+wrudf_LDADD += $(READLINE_LIBS) - AM_CPPFLAGS += -DUSE_READLINE - endif diff --git a/package/udftools/udftools.hash b/package/udftools/udftools.hash index 4b3a6288d1..630a3427eb 100644 --- a/package/udftools/udftools.hash +++ b/package/udftools/udftools.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 783221bcc2518ea480cee01ceeb8825db7a089f4e986b557f6460f89636142b6 udftools-2.1.tar.gz +sha256 d67ce203d71d828619d6d3791ab33eefab4bc506e0ee73355ab6c2f91d52448e udftools-2.2.tar.gz sha256 dcc100d4161cc0b7177545ab6e47216f84857cda3843847c792a25289852dcaa COPYING diff --git a/package/udftools/udftools.mk b/package/udftools/udftools.mk index ca2ec32065..db7c13cc77 100644 --- a/package/udftools/udftools.mk +++ b/package/udftools/udftools.mk @@ -4,11 +4,10 @@ # ################################################################################ -UDFTOOLS_VERSION = 2.1 +UDFTOOLS_VERSION = 2.2 UDFTOOLS_SITE = https://github.com/pali/udftools/releases/download/$(UDFTOOLS_VERSION) UDFTOOLS_LICENSE = GPL-2.0+ UDFTOOLS_LICENSE_FILES = COPYING -UDFTOOLS_AUTORECONF = YES UDFTOOLS_DEPENDENCIES = readline host-pkgconf $(eval $(autotools-package)) -- 2.30.2