package/libcrossguid: bump version
PATCH 1/1 package/libcrossguid: bump version
Needed for kodi 22.x.
Added build fix for >= gcc-13.
Switched build system to cmake following upstream:
https://github.com/graeme-hill/crossguid/commit/13683c56e559f93d75f8640488aa3335f43443ed
--- .../0001-pr67-include-missing-cstdint.patch | 31 +++++++++++++++++++ package/libcrossguid/libcrossguid.hash | 2 +- package/libcrossguid/libcrossguid.mk | 19 ++---------- 3 files changed, 35 insertions(+), 17 deletions(-) create mode 100644 package/libcrossguid/0001-pr67-include-missing-cstdint.patch
package/libcrossguid/0001-pr67-include-missing-cstdint.patch new file +31 -0
@@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj <[email protected]> + +Upstream: https://github.com/graeme-hill/crossguid/pull/67 + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <jni.h> + #endif + ++#include <cstdint> + #include <functional> + #include <iostream> + #include <array>
package/libcrossguid/libcrossguid.hash +1 -1
@@ -1,3 +1,3 @@ # Locally calculated -sha256 022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 libcrossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz +sha256 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4 libcrossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz sha256 779e58787f966a1552f68d5ec041513cef68785dae4a519dbda7bc0b86eda20e LICENSE
package/libcrossguid/libcrossguid.mk +3 -16
@@ -4,25 +4,12 @@ # ################################################################################ -LIBCROSSGUID_VERSION = 8f399e8bd4252be9952f3dfa8199924cc8487ca4 +LIBCROSSGUID_VERSION = ca1bf4b810e2d188d04cb6286f957008ee1b7681 LIBCROSSGUID_SITE = $(call github,graeme-hill,crossguid,$(LIBCROSSGUID_VERSION)) LIBCROSSGUID_LICENSE = MIT LIBCROSSGUID_LICENSE_FILES = LICENSE LIBCROSSGUID_INSTALL_STAGING = YES -# only a static library -LIBCROSSGUID_INSTALL_TARGET = NO LIBCROSSGUID_DEPENDENCIES = util-linux +LIBCROSSGUID_CONF_OPTS = -DCROSSGUID_TESTS=OFF -define LIBCROSSGUID_BUILD_CMDS - (cd $(@D); $(TARGET_CXX) $(TARGET_CXXFLAGS) -std=c++11 -DGUID_LIBUUID \ - -c guid.cpp -o guid.o) - (cd $(@D); $(TARGET_AR) rvs libcrossguid.a guid.o) -endef - -define LIBCROSSGUID_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/libcrossguid.a \ - $(STAGING_DIR)/usr/lib/libcrossguid.a - $(INSTALL) -D -m 644 $(@D)/guid.h $(STAGING_DIR)/usr/include/guid.h -endef - -$(eval $(generic-package)) +$(eval $(cmake-package))
Signature · 6 lines
2.39.5 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Julien Olivain via buildroot
AppliedQuoted 8 lines · Bernd Kuhls
Needed for kodi 22.x.
Added build fix for >= gcc-13.
Switched build system to cmake following upstream:
https://github.com/graeme-hill/crossguid/commit/13683c56e559f93d75f8640488aa3335f43443edSigned-off-by Bernd Kuhls <[email protected]>
Applied to master, thanks.
For info, I switched _VERSION to use the
"git describe --tags --abbrev=40" format, since upstream has an old tag. See:
https://gitlab.com/buildroot.org/buildroot/-/commit/c61d7d61b1e3fe143569938f7c63b01a24169830
Best regards,
Julien.
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
Quoted 8 lines · Bernd Kuhls
Needed for kodi 22.x.
Added build fix for >= gcc-13.
Switched build system to cmake following upstream:
https://github.com/graeme-hill/crossguid/commit/13683c56e559f93d75f8640488aa3335f43443edSigned-off-by Bernd Kuhls <[email protected]>
Applied to 2025.02.x and 2025.05.x, thanks.
Regards,
Arnout
Quoted 76 lines
--- .../0001-pr67-include-missing-cstdint.patch | 31 +++++++++++++++++++ package/libcrossguid/libcrossguid.hash | 2 +- package/libcrossguid/libcrossguid.mk | 19 ++---------- 3 files changed, 35 insertions(+), 17 deletions(-)create mode 100644
package/libcrossguid/0001-pr67-include-missing-cstdint.patchpackage/libcrossguid/0001-pr67-include-missing-cstdint.patch new file +31
-0@@ -0,0 +1,31 @@ +From 1eb9bea38c320b2b588635cffceaaa2a8d434780 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 25 Jan 2023 22:09:26 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively +included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Signed-off-by: Khem Raj <[email protected]> + +Upstream: https://github.com/graeme-hill/crossguid/pull/67 + +Signed-off-by: Bernd Kuhls <[email protected]> +--- + include/crossguid/guid.hpp | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/crossguid/guid.hpp b/include/crossguid/guid.hpp +index 61e0f17..70966f2 100644 +--- a/include/crossguid/guid.hpp ++++ b/include/crossguid/guid.hpp +@@ -29,6 +29,7 @@ THE SOFTWARE. + #include <jni.h> + #endif + ++#include <cstdint> + #include <functional> + #include <iostream> + #include <array>package/libcrossguid/libcrossguid.hash +1
-1@@ -1,3 +1,3 @@ # Locally calculated -sha256 022c9f02cc36e865cd8fd0111a597ff2bd91988deeb348dbe2aba64aed1abd99 libcrossguid-8f399e8bd4252be9952f3dfa8199924cc8487ca4.tar.gz +sha256 6be27e0b3a4907f0cd3cfadec255ee1b925569e1bd06e67a4d2f4267299b69c4 libcrossguid-ca1bf4b810e2d188d04cb6286f957008ee1b7681.tar.gz sha256 779e58787f966a1552f68d5ec041513cef68785dae4a519dbda7bc0b86eda20e LICENSEpackage/libcrossguid/libcrossguid.mk +2
-7@@ -4,25 +4,12 @@ # ################################################################################ -LIBCROSSGUID_VERSION = 8f399e8bd4252be9952f3dfa8199924cc8487ca4 +LIBCROSSGUID_VERSION = ca1bf4b810e2d188d04cb6286f957008ee1b7681 LIBCROSSGUID_SITE = $(call github,graeme-hill,crossguid,$(LIBCROSSGUID_VERSION)) LIBCROSSGUID_LICENSE = MIT LIBCROSSGUID_LICENSE_FILES = LICENSE LIBCROSSGUID_INSTALL_STAGING = YES -# only a static library -LIBCROSSGUID_INSTALL_TARGET = NO LIBCROSSGUID_DEPENDENCIES = util-linux +LIBCROSSGUID_CONF_OPTS = -DCROSSGUID_TESTS=OFF -define LIBCROSSGUID_BUILD_CMDS - (cd $(@D); $(TARGET_CXX) $(TARGET_CXXFLAGS) -std=c++11 -DGUID_LIBUUID \ - -c guid.cpp -o guid.o) - (cd $(@D); $(TARGET_AR) rvs libcrossguid.a guid.o)
package/libcrossguid/libcrossguid.mk line 15
Quoted 10 lines
package/libcrossguid/libcrossguid.mk +1
-9-endef - -define LIBCROSSGUID_INSTALL_STAGING_CMDS - $(INSTALL) -D -m 644 $(@D)/libcrossguid.a \ - $(STAGING_DIR)/usr/lib/libcrossguid.a - $(INSTALL) -D -m 644 $(@D)/guid.h $(STAGING_DIR)/usr/include/guid.h -endef - -$(eval $(generic-package)) +$(eval $(cmake-package))
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot