package/kmsxx: fix gcc-10.x compile
PATCH 1/1 package/kmsxx: fix gcc-10.x compile
Backport upstream commit ([1]) adding missing string include.
Fixes:
- http://autobuild.buildroot.net/results/53a5f023ae40db18f45ebe7578962914c2d22a44
In file included from .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/omap/omapcard.h:3,
from .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/src/omap/omapcard.cpp:2:
.../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/card.h:17:18: error: 'string' in namespace 'std' does not name a type
17 | Card(const std::string& device);
| ^~~~~~[1] https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch
--- ...ring-to-card.h-to-follow-gcc10-porti.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +27 -0
@@ -0,0 +1,27 @@ +From f7ee1e8c96ffbfc645487e483b928d250a7e79ec Mon Sep 17 00:00:00 2001 +From: Tobias Off <[email protected]> +Date: Thu, 8 Oct 2020 22:37:55 +0200 +Subject: [PATCH] added #include <string> to card.h to follow gcc10 porting + guide + +[Upstream: https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch] +Signed-off-by: Peter Seiderer <[email protected]> +--- + kms++/inc/kms++/card.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/kms++/inc/kms++/card.h b/kms++/inc/kms++/card.h +index 90ad1f6..f055e27 100644 +--- a/kms++/inc/kms++/card.h ++++ b/kms++/inc/kms++/card.h +@@ -3,6 +3,7 @@ + #include <cstdint> + #include <vector> + #include <map> ++#include <string> + + #include "decls.h" + #include "pipeline.h" +-- +2.29.2 +
Signature · 1 line
2.29.2
PATCH 1/1 package/kmsxx: fix gcc-10.x compile
Quoted 26 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Backport upstream commit ([1]) adding missing string include.
Fixes:
- http://autobuild.buildroot.net/results/53a5f023ae40db18f45ebe7578962914c2d22a44In file included from
.../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/omap/omapcard.h:3,from .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/src/omap/omapcard.cpp:2: .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/card.h:17:18: error: 'string' in namespace 'std' does not name a type 17 | Card(const std::string& device); | ^~~~~~[1] https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch
Signed-off-by Peter Seiderer <[email protected]>--- ...ring-to-card.h-to-follow-gcc10-porti.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patchpackage/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +0
-0
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch line 8
Quoted 8 lines
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +8
-0@@ -0,0 +1,27 @@ +From f7ee1e8c96ffbfc645487e483b928d250a7e79ec Mon Sep 17 00:00:00 2001 +From: Tobias Off <[email protected]> +Date: Thu, 8 Oct 2020 22:37:55 +0200 +Subject: [PATCH] added #include <string> to card.h to follow gcc10 porting + guide + +[Upstream: https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch] +Signed-off-by: Peter Seiderer <[email protected]>
NIT: Why do you end with a different commit hash than the upstream one (E.G. The From line)?
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard
PATCH 1/1 package/kmsxx: fix gcc-10.x compile
Hello Peter,
Quoted 29 lines · Peter Korsgaard
Quoted 29 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Backport upstream commit ([1]) adding missing string include.
Fixes:
- http://autobuild.buildroot.net/results/53a5f023ae40db18f45ebe7578962914c2d22a44In file included from
.../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/omap/omapcard.h:3,from .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/src/omap/omapcard.cpp:2: .../build/kmsxx-cb0786049f960f2bd383617151b01318e02e9ff9/kms++/inc/kms++/card.h:17:18: error: 'string' in namespace 'std' does not name a type 17 | Card(const std::string& device); | ^~~~~~[1] https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch
Signed-off-by Peter Seiderer <[email protected]>--- ...ring-to-card.h-to-follow-gcc10-porti.patch | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patchpackage/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +3
-0@@ -0,0 +1,27 @@ +From f7ee1e8c96ffbfc645487e483b928d250a7e79ec Mon Sep 17 00:00:00 2001 +From: Tobias Off <[email protected]> +Date: Thu, 8 Oct 2020 22:37:55 +0200
Quoted 8 lines
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch line 8
Quoted 5 lines
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +5
-0+Subject: [PATCH] added #include <string> to card.h to follow gcc10 porting + guide + +[Upstream: https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch] +Signed-off-by: Peter Seiderer <[email protected]>NIT: Why do you end with a different commit hash than the upstream one (E.G. The From line)?
Is a change of the hash not normal while re-basing and adding something to the commit message?
Produced the patch with the following workflow:
$ wget https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch $ git am b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch $ vi kms++/inc/kms++/card.h # fixing re-base conflicts $ git add kms++/inc/kms++/card.h $ git am --continue $ git commit --amend --signoff $ git format-patch -1
Regards,
Peter
Quoted 3 lines
Committed, thanks.
PATCH 1/1 package/kmsxx: fix gcc-10.x compile
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Seiderer <[email protected]> writes:
Hi,
Quoted 14 lines
Quoted 5 lines
Quoted 5 lines
+++
b/package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patchpackage/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +3
-0@@ -0,0 +1,27 @@ +From f7ee1e8c96ffbfc645487e483b928d250a7e79ec Mon Sep 17 00:00:00 2001 +From: Tobias Off <[email protected]> +Date: Thu, 8 Oct 2020 22:37:55 +0200Quoted 8 lines
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch line 8
Quoted 5 lines
package/kmsxx/0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch new file +5
-0+Subject: [PATCH] added #include <string> to card.h to follow gcc10 porting + guide + +[Upstream: https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch] +Signed-off-by: Peter Seiderer <[email protected]>NIT: Why do you end with a different commit hash than the upstream one (E.G. The From line)?
Quoted 2 lines
Is a change of the hash not normal while re-basing and adding something to the commit message?
If you need to rebase, yes.
Quoted 9 lines
Produced the patch with the following workflow:
$ wget https://github.com/tomba/kmsxx/commit/b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch $ git am b53f9d383c9189a897c44cd88a8fc1b871fdc8a2.patch $ vi kms++/inc/kms++/card.h # fixing re-base conflicts $ git add kms++/inc/kms++/card.h $ git am --continue $ git commit --amend --signoff $ git format-patch -1
Given that the patch was just adding a single include, I thought it would apply cleanly to our version. For such cases, you can simply do:
git clone https://github.com/tomba/kmsxx/
git format-patch -s --start-number=2 \
b53f9d383c9189a897c44cd88a8fc1b871fdc8a2^..b53f9d383c9189a897c44cd88a8fc1b871fdc8a2
0002-added-include-string-to-card.h-to-follow-gcc10-porti.patch
But looking closer, the memory/cstdint includes close to this line would indeed give issues.
Signature · 1 line
Bye, Peter Korsgaard