From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: From: Alexander Dahl Date: Wed, 24 Mar 2021 07:35:36 +0100 Message-Id: <20210324063540.22038-3-post@lespocky.de> In-Reply-To: <20210324063540.22038-1-post@lespocky.de> References: <20210324063540.22038-1-post@lespocky.de> MIME-Version: 1.0 Subject: [ptxdist] [PATCH 2/6] libgudev: version bump 230 -> 234 List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de Cc: Alexander Dahl From: Alexander Dahl Required by upcoming ModemManager version bump. Note: upstream changed build system from autotools to meson with version 235. This is the last autotools based release. Signed-off-by: Alexander Dahl --- ...1-Prepare-to-check-for-an-older-UDEV.patch | 131 ------------------ ...1-Prepare-to-check-for-an-older-UDEV.patch | 27 ++++ .../{libgudev-230 => libgudev-234}/autogen.sh | 0 patches/{libgudev-230 => libgudev-234}/series | 0 rules/libgudev.make | 8 +- 5 files changed, 32 insertions(+), 134 deletions(-) delete mode 100644 patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch create mode 100644 patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch rename patches/{libgudev-230 => libgudev-234}/autogen.sh (100%) rename patches/{libgudev-230 => libgudev-234}/series (100%) diff --git a/patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch b/patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch deleted file mode 100644 index 02834a648..000000000 --- a/patches/libgudev-230/0001-Prepare-to-check-for-an-older-UDEV.patch +++ /dev/null @@ -1,131 +0,0 @@ -From: Juergen Borleis -Date: Thu, 10 Dec 2015 16:28:37 +0100 -Subject: [PATCH] Prepare to check for an older UDEV - -In order to use libgudev with systemd's based udev and the standalone udev -we must libgudev check for an older udev release. Since v182 is the last -standalone udev, check for this specific release. The libudev API seems stable -enough in both releases. - -Signed-off-by: Juergen Borleis ---- - configure.ac | 2 +- - m4/introspection.m4 | 96 +++++++++++++++++++++++++++++++++++++++++++++++++++++ - 2 files changed, 97 insertions(+), 1 deletion(-) - create mode 100644 m4/introspection.m4 - -diff --git a/configure.ac b/configure.ac -index 2b5e96ef30a1..58a35631187f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -38,7 +38,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1]) - AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) - enable_introspection=no]) - --PKG_CHECK_MODULES([LIBUDEV], [libudev >= 199]) -+PKG_CHECK_MODULES([LIBUDEV], [libudev >= 182]) - PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.22.0 gobject-2.0 >= 2.22.0 gio-2.0]) - - AC_CONFIG_FILES([ -diff --git a/m4/introspection.m4 b/m4/introspection.m4 -new file mode 100644 -index 000000000000..aa7b3b408852 ---- /dev/null -+++ b/m4/introspection.m4 -@@ -0,0 +1,96 @@ -+dnl -*- mode: autoconf -*- -+dnl Copyright 2009 Johan Dahlin -+dnl -+dnl This file is free software; the author(s) gives unlimited -+dnl permission to copy and/or distribute it, with or without -+dnl modifications, as long as this notice is preserved. -+dnl -+ -+# serial 1 -+ -+m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([LT_INIT],[$0])dnl setup libtool first -+ -+ dnl enable/disable introspection -+ m4_if([$2], [require], -+ [dnl -+ enable_introspection=yes -+ ],[dnl -+ AC_ARG_ENABLE(introspection, -+ AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], -+ [Enable introspection for this build]),, -+ [enable_introspection=auto]) -+ ])dnl -+ -+ AC_MSG_CHECKING([for gobject-introspection]) -+ -+ dnl presence/version checking -+ AS_CASE([$enable_introspection], -+ [no], [dnl -+ found_introspection="no (disabled, use --enable-introspection to enable)" -+ ],dnl -+ [yes],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0],, -+ AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], -+ found_introspection=yes, -+ AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) -+ ],dnl -+ [auto],[dnl -+ PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) -+ dnl Canonicalize enable_introspection -+ enable_introspection=$found_introspection -+ ],dnl -+ [dnl -+ AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) -+ ])dnl -+ -+ AC_MSG_RESULT([$found_introspection]) -+ -+ INTROSPECTION_SCANNER= -+ INTROSPECTION_COMPILER= -+ INTROSPECTION_GENERATE= -+ INTROSPECTION_GIRDIR= -+ INTROSPECTION_TYPELIBDIR= -+ if test "x$found_introspection" = "xyes"; then -+ INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` -+ INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` -+ INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` -+ INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` -+ INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" -+ INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` -+ INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` -+ INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection -+ fi -+ AC_SUBST(INTROSPECTION_SCANNER) -+ AC_SUBST(INTROSPECTION_COMPILER) -+ AC_SUBST(INTROSPECTION_GENERATE) -+ AC_SUBST(INTROSPECTION_GIRDIR) -+ AC_SUBST(INTROSPECTION_TYPELIBDIR) -+ AC_SUBST(INTROSPECTION_CFLAGS) -+ AC_SUBST(INTROSPECTION_LIBS) -+ AC_SUBST(INTROSPECTION_MAKEFILE) -+ -+ AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") -+]) -+ -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) -+]) -+ -+dnl Usage: -+dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) -+ -+ -+AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], -+[ -+ _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) -+]) diff --git a/patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch b/patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch new file mode 100644 index 000000000..5edc09ee4 --- /dev/null +++ b/patches/libgudev-234/0001-Prepare-to-check-for-an-older-UDEV.patch @@ -0,0 +1,27 @@ +From: Juergen Borleis +Date: Thu, 10 Dec 2015 16:28:37 +0100 +Subject: [PATCH] Prepare to check for an older UDEV + +In order to use libgudev with systemd's based udev and the standalone udev +we must libgudev check for an older udev release. Since v182 is the last +standalone udev, check for this specific release. The libudev API seems stable +enough in both releases. + +Signed-off-by: Juergen Borleis +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 605de2ce8a46..570b21bc5592 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -38,7 +38,7 @@ GOBJECT_INTROSPECTION_CHECK([1.31.1]) + AM_CONDITIONAL([HAVE_INTROSPECTION], [false]) + enable_introspection=no]) + +-PKG_CHECK_MODULES([LIBUDEV], [libudev >= 199]) ++PKG_CHECK_MODULES([LIBUDEV], [libudev >= 182]) + PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.38 gobject-2.0 gio-2.0]) + + AC_ARG_ENABLE([umockdev], diff --git a/patches/libgudev-230/autogen.sh b/patches/libgudev-234/autogen.sh similarity index 100% rename from patches/libgudev-230/autogen.sh rename to patches/libgudev-234/autogen.sh diff --git a/patches/libgudev-230/series b/patches/libgudev-234/series similarity index 100% rename from patches/libgudev-230/series rename to patches/libgudev-234/series diff --git a/rules/libgudev.make b/rules/libgudev.make index 343d1dea6..cc7217715 100644 --- a/rules/libgudev.make +++ b/rules/libgudev.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBGUDEV) += libgudev # # Paths and names # -LIBGUDEV_VERSION := 230 -LIBGUDEV_MD5 := e4dee8f3f349e9372213d33887819a4d +LIBGUDEV_VERSION := 234 +LIBGUDEV_MD5 := 386889d460003a4242a64cb47244a39a LIBGUDEV := libgudev-$(LIBGUDEV_VERSION) LIBGUDEV_SUFFIX := tar.xz LIBGUDEV_URL := $(call ptx/mirror, GNOME, libgudev/$(LIBGUDEV_VERSION)/$(LIBGUDEV).$(LIBGUDEV_SUFFIX)) @@ -38,10 +38,12 @@ endif LIBGUDEV_CONF_TOOL := autoconf LIBGUDEV_CONF_OPT := \ $(CROSS_AUTOCONF_USR) \ + --$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-largefile \ --disable-gtk-doc \ --disable-gtk-doc-html \ --disable-gtk-doc-pdf \ - --$(call ptx/endis, PTXCONF_LIBGUDEV_INTROSPECTION)-introspection + --$(call ptx/endis, PTXCONF_LIBGUDEV_INTROSPECTION)-introspection \ + --disable-umockdev # ---------------------------------------------------------------------------- # Target-Install -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de