From c4ee240313db87bc7b06ee51e5fb8a835d25c72c Mon Sep 17 00:00:00 2001
From: robxnano <89391914+robxnano@users.noreply.github.com>
Date: Sun, 19 Feb 2023 13:50:38 +0000
Subject: [PATCH] libebml: Use standard integer types (#7856)

Fixes compile issues on x86 with GCC 11
---
 dev-libs/libebml/libebml-1.4.4.recipe         |  3 +-
 .../libebml/patches/libebml-1.4.4.patchset    | 34 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 dev-libs/libebml/patches/libebml-1.4.4.patchset

diff --git a/dev-libs/libebml/libebml-1.4.4.recipe b/dev-libs/libebml/libebml-1.4.4.recipe
index 9fe0f36a5..01607156d 100644
--- a/dev-libs/libebml/libebml-1.4.4.recipe
+++ b/dev-libs/libebml/libebml-1.4.4.recipe
@@ -3,10 +3,11 @@ DESCRIPTION="libebml is a C++ library to parse EBML content (read/write)."
 HOMEPAGE="https://github.com/Matroska-Org/libebml/"
 COPYRIGHT="2005-2023 Matroska"
 LICENSE="GNU LGPL v2.1"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="$HOMEPAGE/archive/release-$portVersion.tar.gz"
 CHECKSUM_SHA256="3b30d89a5699fef4bdf5b4d7de7a1c94d9be47fababf9caca59250282f051283"
 SOURCE_DIR="libebml-release-$portVersion"
+PATCHES="libebml-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
 SECONDARY_ARCHITECTURES="x86"
diff --git a/dev-libs/libebml/patches/libebml-1.4.4.patchset b/dev-libs/libebml/patches/libebml-1.4.4.patchset
new file mode 100644
index 000000000..63d9812eb
--- /dev/null
+++ b/dev-libs/libebml/patches/libebml-1.4.4.patchset
@@ -0,0 +1,34 @@
+From 9f0839f6e9abdaf1533ae5f0e2752ce40f5be487 Mon Sep 17 00:00:00 2001
+From: robxnano <89391914+robxnano@users.noreply.github.com>
+Date: Sun, 12 Feb 2023 15:08:24 +0000
+Subject: [PATCH] Haiku: Only include SupportDefs.h on x86_gcc2
+
+---
+ ebml/c/libebml_t.h | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ebml/c/libebml_t.h b/ebml/c/libebml_t.h
+index b124369..a8853f9 100644
+--- a/ebml/c/libebml_t.h
++++ b/ebml/c/libebml_t.h
+@@ -72,7 +72,7 @@ extern "C" {
+     typedef uint16_t uint16;
+     typedef uint8_t uint8;
+ # endif // __GNUC__
+-#elif defined(__BEOS__) || defined(__HAIKU__)
++#elif defined(__BEOS__) || (defined(__HAIKU__) && __GNUC__ == 2)
+ #include <SupportDefs.h>
+ #elif defined(DJGPP)        /* SL : DJGPP doesn't support POSIX types ???? */
+     typedef signed long long int64;
+@@ -98,7 +98,7 @@ extern "C" {
+     typedef uint32_t uint32;
+     typedef uint16_t uint16;
+     typedef uint8_t uint8;
+-#elif defined(__BEOS__) || defined(__HAIKU__)
++#elif defined(__BEOS__) || (defined(__HAIKU__) && __GNUC__ == 2)
+ # include <support/SupportDefs.h>
+ #else // anything else (Linux, BSD, ...)
+ # include <inttypes.h>
+-- 
+2.39.1
+