From b1b7f14eb13c7dcfdc7ea57cd0be4528baadca0c Mon Sep 17 00:00:00 2001
From: Martin Valgur <martin.valgur@gmail.com>
Date: Sat, 20 Apr 2024 17:10:08 +0300
Subject: [PATCH] flac: ignore DLL_EXPORT define in export.h

---
 recipes/flac/all/conandata.yml                |  8 +++++++
 .../1.4.2-002-ignore-dll_export-define.patch  | 22 +++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 recipes/flac/all/patches/1.4.2-002-ignore-dll_export-define.patch

diff --git a/recipes/flac/all/conandata.yml b/recipes/flac/all/conandata.yml
index e2b6d7651827c..da984a86264a9 100644
--- a/recipes/flac/all/conandata.yml
+++ b/recipes/flac/all/conandata.yml
@@ -9,6 +9,14 @@ sources:
     url: "https://github.com/xiph/flac/archive/1.3.3.tar.gz"
     sha256: "668cdeab898a7dd43cf84739f7e1f3ed6b35ece2ef9968a5c7079fe9adfe1689"
 patches:
+  "1.4.3":
+    - patch_file: "patches/1.4.2-002-ignore-dll_export-define.patch"
+      patch_description: "Ignore autotools-specific DLL_EXPORT define in export.h"
+      patch_type: "conan"
+  "1.4.2":
+    - patch_file: "patches/1.4.2-002-ignore-dll_export-define.patch"
+      patch_description: "Ignore autotools-specific DLL_EXPORT define in export.h"
+      patch_type: "conan"
   "1.3.3":
     - patch_file: "patches/fix-cmake-1.3.3.patch"
       patch_description: "Various adaptations in CMakeLists.txt files to improve compatibility with Conan."
diff --git a/recipes/flac/all/patches/1.4.2-002-ignore-dll_export-define.patch b/recipes/flac/all/patches/1.4.2-002-ignore-dll_export-define.patch
new file mode 100644
index 0000000000000..0ce0853b69c7e
--- /dev/null
+++ b/recipes/flac/all/patches/1.4.2-002-ignore-dll_export-define.patch
@@ -0,0 +1,22 @@
+--- include/FLAC/export.h
++++ include/FLAC/export.h
+@@ -74,7 +74,7 @@
+  */
+ #if defined(_WIN32)
+ 
+-#if defined(FLAC__NO_DLL) && !(defined(DLL_EXPORT))
++#if defined(FLAC__NO_DLL)
+ #define FLAC_API
+ #else
+ #ifdef FLAC_API_EXPORTS
+--- include/FLAC++/export.h
++++ include/FLAC++/export.h
+@@ -73,7 +73,7 @@
+  * by libtool, must override FLAC__NO_DLL on building shared components
+  */
+ #if defined(_WIN32)
+-#if defined(FLAC__NO_DLL) && !(defined(DLL_EXPORT))
++#if defined(FLAC__NO_DLL)
+ #define FLACPP_API
+ #else
+ #ifdef FLACPP_API_EXPORTS