NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/eudev: bump version to 3.2.12

Browse Source 
Release notes:
https://github.com/eudev-project/eudev/releases/tag/v3.2.12

Removed patch 0001, a different fix was applied in 2015:
c7badd37d3

Removed patch 0002 which is included in this release.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
Bernd Kuhls 2023-05-23 21:54:11 +02:00 committed by Thomas Petazzoni
parent 61bfe280d1
commit da2a418ff9
5 changed files with 2 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@ -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

39
package/eudev/0001-Only-use-pragma-for-ignoring-diagnostics-if-.patch
View File

@ -1,39 +0,0 @@
From dc8aa43b7b6d0cead7d8a0c1a151d289a5233a10 Mon Sep 17 00:00:00 2001
From: Eric Le Bihan <eric.le.bihan.dev@free.fr>
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 <eric.le.bihan.dev@free.fr>
---
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

44
package/eudev/0002-Fix-compile-time-issue-on-very-old-kernels.patch
View File

@ -1,44 +0,0 @@
From 09b536e0b9d0964674936901ab9d2954f935c8b4 Mon Sep 17 00:00:00 2001
From: Stefan Ott <stefan@ott.net>
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 <stefan@ott.net>
---
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 <sys/types.h>
#include <sys/time.h>
#include <sys/ioctl.h>
+#include <linux/version.h>
#include <linux/videodev2.h>
#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

2
package/eudev/eudev.hash
View File

@ -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

2
package/eudev/eudev.mk
View File

@ -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