From 1eea4ca69c218f09a6032bbf413de388e040f934 Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Tue, 26 Dec 2023 16:15:39 +0100 Subject: [PATCH 1/2] Remove stray BOM in dav1d patch --- subprojects/packagefiles/dav1d/0001.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/subprojects/packagefiles/dav1d/0001.patch b/subprojects/packagefiles/dav1d/0001.patch index 5356fa5e29..324e07335f 100644 --- a/subprojects/packagefiles/dav1d/0001.patch +++ b/subprojects/packagefiles/dav1d/0001.patch @@ -1,4 +1,4 @@ -diff --git a/include/dav1d/dav1d.h b/include/dav1d/dav1d.h +diff --git a/include/dav1d/dav1d.h b/include/dav1d/dav1d.h index e8f0705..ff48ea0 100644 --- a/include/dav1d/dav1d.h +++ b/include/dav1d/dav1d.h From 8e60a46c0136d36c17090bda33d36a490be9cb1c Mon Sep 17 00:00:00 2001 From: arch1t3cht Date: Tue, 26 Dec 2023 16:16:12 +0100 Subject: [PATCH 2/2] Work around double buffering issue in wx master See https://github.com/wxWidgets/wxWidgets/issues/23585 . This patch reverts commit fb4f0b590c42a66263debf926617c00b157c9a in wxWidgets. --- .../packagefiles/wxWidgets-master/0001.patch | 21 +++++++++++++++++++ subprojects/wxWidgets-master.wrap | 1 + 2 files changed, 22 insertions(+) create mode 100644 subprojects/packagefiles/wxWidgets-master/0001.patch diff --git a/subprojects/packagefiles/wxWidgets-master/0001.patch b/subprojects/packagefiles/wxWidgets-master/0001.patch new file mode 100644 index 0000000000..45ceeef142 --- /dev/null +++ b/subprojects/packagefiles/wxWidgets-master/0001.patch @@ -0,0 +1,21 @@ +diff --git a/include/wx/dcbuffer.h b/include/wx/dcbuffer.h +index b47045bca1..435a501546 100644 +--- a/include/wx/dcbuffer.h ++++ b/include/wx/dcbuffer.h +@@ -15,8 +15,13 @@ + #include "wx/dcclient.h" + #include "wx/window.h" + +-// All current ports use double buffering. +-#define wxALWAYS_NATIVE_DOUBLE_BUFFER 1 ++// Split platforms into two groups - those which have well-working ++// double-buffering by default, and those which do not. ++#if defined(__WXMAC__) || defined(__WXGTK20__) || defined(__WXDFB__) || defined(__WXQT__) ++ #define wxALWAYS_NATIVE_DOUBLE_BUFFER 1 ++#else ++ #define wxALWAYS_NATIVE_DOUBLE_BUFFER 0 ++#endif + + + // ---------------------------------------------------------------------------- + \ No newline at end of file diff --git a/subprojects/wxWidgets-master.wrap b/subprojects/wxWidgets-master.wrap index bbde46e78a..a8bd19b39c 100644 --- a/subprojects/wxWidgets-master.wrap +++ b/subprojects/wxWidgets-master.wrap @@ -4,3 +4,4 @@ url = https://github.com/wxWidgets/wxWidgets.git revision = master clone-recursive = true depth = 1 +diff_files = wxWidgets-master/0001.patch