From cf9a74982c262643cb9c43500ed74e7ef4645feb Mon Sep 17 00:00:00 2001
From: Javier Viguera <javier.viguera@digi.com>
Date: Mon, 11 Nov 2024 11:34:33 +0100
Subject: [PATCH] Revert "orc: fix native build on ubuntu 18"

Poky updated orc to version 0.4.40. This patch is no longer needed.

This reverts commit bee97587cb634e86b9cae9141bbf0ba9b22bccd9.

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
---
 ...old-GCC-versions-pre-9.0-having-brok.patch | 62 -------------------
 .../recipes-devtools/orc/orc_0.4.39.bbappend  |  5 --
 2 files changed, 67 deletions(-)
 delete mode 100644 meta-digi-dey/recipes-devtools/orc/orc-0.4.39/0001-x86-work-around-old-GCC-versions-pre-9.0-having-brok.patch
 delete mode 100644 meta-digi-dey/recipes-devtools/orc/orc_0.4.39.bbappend

diff --git a/meta-digi-dey/recipes-devtools/orc/orc-0.4.39/0001-x86-work-around-old-GCC-versions-pre-9.0-having-brok.patch b/meta-digi-dey/recipes-devtools/orc/orc-0.4.39/0001-x86-work-around-old-GCC-versions-pre-9.0-having-brok.patch
deleted file mode 100644
index c1ede1531..000000000
--- a/meta-digi-dey/recipes-devtools/orc/orc-0.4.39/0001-x86-work-around-old-GCC-versions-pre-9.0-having-brok.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From e184d18fd6e4fa18178b30871903cdaa839093fe Mon Sep 17 00:00:00 2001
-From: "L. E. Segovia" <amy@centricular.com>
-Date: Fri, 19 Jul 2024 11:40:28 -0300
-Subject: [PATCH] x86: work around old GCC versions (pre 9.0) having broken
- xgetbv implementations
-
-See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71659
-
-Part-of: <https://gitlab.freedesktop.org/gstreamer/orc/-/merge_requests/194>
-Upstream-Status: Backport
----
- orc/orccpu-x86.c | 25 +++++++++++++++++++++----
- 1 file changed, 21 insertions(+), 4 deletions(-)
-
-diff --git a/orc/orccpu-x86.c b/orc/orccpu-x86.c
-index 742fa1f28d6c..315f04eed287 100644
---- a/orc/orccpu-x86.c
-+++ b/orc/orccpu-x86.c
-@@ -34,6 +34,19 @@
- 
- #ifdef _MSC_VER
- #  include <intrin.h>
-+#elif defined(__GNUC__)
-+#if __GNUC__ >= 8 && __GNUC__ < 9
-+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71659
-+#  include <xsaveintrin.h>
-+#elif __GNUC__ < 8
-+#  define ORC_NEEDS_ASM_XSAVE 1
-+#endif
-+#endif
-+
-+#if !defined(_MSC_VER) || defined(__clang__)
-+#define ORC_TARGET_XSAVE __attribute__((target("xsave")))
-+#else
-+#define ORC_TARGET_XSAVE
- #endif
- 
- #include <orc/orcdebug.h>
-@@ -304,15 +317,19 @@ orc_x86_cpuid_get_branding_string (void)
- // Checks if XMM and YMM state are enabled in XCR0.
- // See 14.3 DETECTION OF INTEL® AVX INSTRUCTIONS on the
- // Intel® 64 and IA-32 Architectures Software Developer’s Manual
--#if !defined(_MSC_VER) || defined(__clang__)
--#define ORC_TARGET_XSAVE __attribute__((target("xsave")))
-+#ifdef ORC_NEEDS_ASM_XSAVE
-+static orc_bool check_xcr0_ymm()
-+{
-+  uint32_t xcr0;
-+  __asm__ ("xgetbv" : "=a" (xcr0) : "c" (0) : "%edx" );
-+  return ((xcr0 & 6U) == 6U);
-+}
- #else
--#define ORC_TARGET_XSAVE
--#endif
- static orc_bool ORC_TARGET_XSAVE check_xcr0_ymm()
- {
-   return (_xgetbv(0) & 6U) != 0U;
- }
-+#endif
- 
- static void
- orc_x86_cpuid_handle_standard_flags (void)
diff --git a/meta-digi-dey/recipes-devtools/orc/orc_0.4.39.bbappend b/meta-digi-dey/recipes-devtools/orc/orc_0.4.39.bbappend
deleted file mode 100644
index 02741d972..000000000
--- a/meta-digi-dey/recipes-devtools/orc/orc_0.4.39.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright (C) 2024, Digi International Inc.
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/${BP}:"
-
-SRC_URI:append:class-native = " file://0001-x86-work-around-old-GCC-versions-pre-9.0-having-brok.patch"