MIRRORS/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2025-12-18 08:15:56 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

protobuf-c: 1.5.0 -> 1.5.1

Browse Source 
According to [1], protobuf-c 1.5.1 has commits [2] to fix broke with
protobuf 26.0 (4.26.0)

Also port a patch from archlinux [3] to support protobuf 30 (4.30.0)

License-Update: update copyright years to 2025

[1] https://github.com/protobuf-c/protobuf-c/issues/730
[2] https://github.com/protobuf-c/protobuf-c/pull/711/
[3] https://gitlab.archlinux.org/archlinux/packaging/packages/protobuf-c/-/blob/main/protobuf-30.patch

Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Hongxu Jia 2025-03-12 15:54:59 +08:00 committed by Khem Raj
parent 2ec4ded4fa
commit ed1319272c
No known key found for this signature in database
GPG Key ID: BB053355919D3314
3 changed files with 1467 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
meta-oe/recipes-devtools/protobuf/protobuf-c/0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch
View File

@ -1,6 +1,6 @@
From 62b2fd0a150133b6439f6537cb1762d35f5790ee Mon Sep 17 00:00:00 2001 From ad4d22cd6b0b1237a4d50699736d38cd3c902ace Mon Sep 17 00:00:00 2001
From: Xiangyu Chen <xiangyu.chen@windriver.com> From: Xiangyu Chen <xiangyu.chen@windriver.com>
Date: Fri, 31 Mar 2023 16:02:50 +0800 Date: Wed, 12 Mar 2025 00:16:24 -0700
Subject: [PATCH] Makefile.am: do not compile the code which was generated from Subject: [PATCH] Makefile.am: do not compile the code which was generated from
test-full.proto in protobuf-c-native test-full.proto in protobuf-c-native
@ -11,15 +11,18 @@ the test-full.proto with latest version protobuf.
Upstream-Status: Inappropriate [oe specific] Upstream-Status: Inappropriate [oe specific]
Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com> Signed-off-by: Xiangyu Chen <xiangyu.chen@windriver.com>
Rebase to 1.5.1
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
--- ---
Makefile.am | 75 ----------------------------------------------------- Makefile.am | 75 -----------------------------------------------------
1 file changed, 75 deletions(-) 1 file changed, 75 deletions(-)
diff --git a/Makefile.am b/Makefile.am diff --git a/Makefile.am b/Makefile.am
index ff12664..7412aef 100644 index 77aa9d9..5cdd81a 100644
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -136,81 +136,6 @@ else @@ -138,81 +138,6 @@ else
LOG_COMPILER = $(VALGRIND) LOG_COMPILER = $(VALGRIND)
@ -72,20 +75,20 @@ index ff12664..7412aef 100644
-t_generated_code2_cxx_generate_packed_data_LDADD = \ -t_generated_code2_cxx_generate_packed_data_LDADD = \
- $(protobuf_LIBS) - $(protobuf_LIBS)
- -
-t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto -t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto
- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto
- -
-t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto -t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto
- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto
- -
-t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto -t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto
- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
- -
-t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto -t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto
- $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto - $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto
- -
-t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto -t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto
- $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto - $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-gen-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto
- -
-t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT) -t/generated-code2/test-full-cxx-output.inc: t/generated-code2/cxx-generate-packed-data$(EXEEXT)
- $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc - $(AM_V_GEN)$(top_builddir)/t/generated-code2/cxx-generate-packed-data$(EXEEXT) > $(top_builddir)/t/generated-code2/test-full-cxx-output.inc
@ -102,5 +105,5 @@ index ff12664..7412aef 100644
t/version/version.c t/version/version.c
t_version_version_LDADD = \ t_version_version_LDADD = \
-- --
2.34.1 2.25.1

1446
meta-oe/recipes-devtools/protobuf/protobuf-c/protobuf-30.patch Normal file
View File

File diff suppressed because it is too large Load Diff

8
meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.0.bb → meta-oe/recipes-devtools/protobuf/protobuf-c_1.5.1.bb
View File

@ -8,14 +8,16 @@ has been split out into the protobuf-c-rpc project."
HOMEPAGE = "https://github.com/protobuf-c/protobuf-c" HOMEPAGE = "https://github.com/protobuf-c/protobuf-c"
SECTION = "console/tools" SECTION = "console/tools"
LICENSE = "BSD-2-Clause" LICENSE = "BSD-2-Clause"
LIC_FILES_CHKSUM = "file://LICENSE;md5=d11077c6a2b5d2e64b9f32b61a9b78ba" LIC_FILES_CHKSUM = "file://LICENSE;md5=bd8de4f63e06b1ccc06e9f8dc5b1aa97"
DEPENDS = "protobuf-native protobuf" DEPENDS = "protobuf-native protobuf"
SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https" SRC_URI = "git://github.com/protobuf-c/protobuf-c.git;branch=master;protocol=https \
file://protobuf-30.patch \
"
SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch" SRC_URI:append:class-native = " file://0001-Makefile.am-do-not-compile-the-code-which-was-genera.patch"
SRCREV = "8c201f6e47a53feaab773922a743091eb6c8972a" SRCREV = "185beed28e65494be7505b30c1afeaf199e19b23"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"