From da2a418ff980dd8deffd8e73050d2333ae4ecfd0 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Tue, 23 May 2023 21:54:11 +0200 Subject: [PATCH] package/eudev: bump version to 3.2.12 Release notes: https://github.com/eudev-project/eudev/releases/tag/v3.2.12 Removed patch 0001, a different fix was applied in 2015: https://github.com/eudev-project/eudev/commit/c7badd37d3ac5b06b1fb170b7dfc8ed7c00ce64b Removed patch 0002 which is included in this release. Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- .checkpackageignore | 1 - ...-pragma-for-ignoring-diagnostics-if-.patch | 39 ---------------- ...mpile-time-issue-on-very-old-kernels.patch | 44 ------------------- package/eudev/eudev.hash | 2 +- package/eudev/eudev.mk | 2 +- 5 files changed, 2 insertions(+), 86 deletions(-) delete mode 100644 package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch delete mode 100644 package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch diff --git a/.checkpackageignore b/.checkpackageignore index 23b0171792..b88ad4ce90 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -418,7 +418,6 @@ package/erlang/0002-erts-emulator-reorder-inclued-headers-paths.patch Upstream package/erlang/0003-crypto-Fixes-for-LibreSSL-3-5-0.patch Upstream package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch Upstream package/espeak/0002-tr_languages-cast-string_ordinal-init-values.patch Upstream -package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch Upstream package/eudev/S10udev ConsecutiveEmptyLines Indent Shellcheck Variables package/evemu/0001-Include-limits.h-for-PATH_MAX.patch Upstream package/evemu/0002-evemu-Update-struct-input_event.patch Upstream diff --git a/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch b/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch deleted file mode 100644 index 3046ba528b..0000000000 --- a/package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch +++ /dev/null @@ -1,39 +0,0 @@ -From dc8aa43b7b6d0cead7d8a0c1a151d289a5233a10 Mon Sep 17 00:00:00 2001 -From: Eric Le Bihan -Date: Wed, 2 Apr 2014 12:36:52 +0200 -Subject: [PATCH] libudev: Only use #pragma for ignoring diagnostics if GCC - version supports it. - -[Peter: update for 2.1.1, fix shared_assert issue] -Signed-off-by: Eric Le Bihan ---- - src/shared/macro.h | 8 +++++ - 1 file changed, 8 insertions(+) - -diff --git a/src/shared/macro.h b/src/shared/macro.h ---- a/src/shared/macro.h -+++ b/src/shared/macro.h -@@ -38,6 +38,7 @@ - #define _cleanup_(x) __attribute__((cleanup(x))) - - /* Temporarily disable some warnings */ -+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) - #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") -@@ -48,6 +49,13 @@ - - #define REENABLE_WARNING \ - _Pragma("GCC diagnostic pop") -+#else -+#define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT -+#define DISABLE_WARNING_FORMAT_NONLITERAL -+#define REENABLE_WARNING -+/* glibc unconditionally defines this, but it needs GCC 4.6+ */ -+#undef static_assert -+#endif - - #define XCONCATENATE(x, y) x ## y - #define CONCATENATE(x, y) XCONCATENATE(x, y) --- -1.7.9.5 diff --git a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch b/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch deleted file mode 100644 index 46961cc9d1..0000000000 --- a/package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001 -From: Stefan Ott -Date: Wed, 5 Apr 2023 18:20:37 +0200 -Subject: [PATCH] Fix compile-time issue on very old kernels - -Kernel versions prior to 3.4 did not have V4L2_CAP_DEVICE_CAPS and -compiling against such a kernel will fail. - -This patch introduces a version check and makes eudev fall back to -v2cap.capabilities on these kernels. - -Upstream: https://github.com/eudev-project/eudev/commit/09b536e0b9d0964674936901ab9d2954f935c8b4 -Signed-off-by: Stefan Ott ---- - src/v4l_id/v4l_id.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/v4l_id/v4l_id.c b/src/v4l_id/v4l_id.c -index 6bf45effe..702d5b687 100644 ---- a/src/v4l_id/v4l_id.c -+++ b/src/v4l_id/v4l_id.c -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - #include - - #include "util.h" -@@ -71,9 +72,11 @@ int main(int argc, char *argv[]) { - printf("ID_V4L_VERSION=2\n"); - printf("ID_V4L_PRODUCT=%s\n", v2cap.card); - printf("ID_V4L_CAPABILITIES=:"); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0) - if (v2cap.capabilities & V4L2_CAP_DEVICE_CAPS) - capabilities = v2cap.device_caps; - else -+#endif - capabilities = v2cap.capabilities; - if ((capabilities & V4L2_CAP_VIDEO_CAPTURE) > 0 || - (capabilities & V4L2_CAP_VIDEO_CAPTURE_MPLANE) > 0) --- -2.40.0 - diff --git a/package/eudev/eudev.hash b/package/eudev/eudev.hash index fe6c7ef008..d91bc761c9 100644 --- a/package/eudev/eudev.hash +++ b/package/eudev/eudev.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 19847cafec67897da855fde56f9dc7d92e21c50e450aa79068a7e704ed44558b eudev-3.2.11.tar.gz +sha256 ccdd64ec3c381d3c3ed0e99d2e70d1f62988c7763de89ca7bdffafa5eacb9ad8 eudev-3.2.12.tar.gz sha256 ab15fd526bd8dd18a9e77ebc139656bf4d33e97fc7238cd11bf60e2b9b8666c6 COPYING diff --git a/package/eudev/eudev.mk b/package/eudev/eudev.mk index feb5505289..235a71967e 100644 --- a/package/eudev/eudev.mk +++ b/package/eudev/eudev.mk @@ -4,7 +4,7 @@ # ################################################################################ -EUDEV_VERSION = 3.2.11 +EUDEV_VERSION = 3.2.12 EUDEV_SITE = https://github.com/eudev-project/eudev/releases/download/v$(EUDEV_VERSION) EUDEV_LICENSE = GPL-2.0+ (programs), LGPL-2.1+ (libraries) EUDEV_LICENSE_FILES = COPYING