diff --git a/media-libs/libsdl2/libsdl2-2.0.8.recipe b/media-libs/libsdl2/libsdl2-2.0.8.recipe index 9d7bcd061..96b5eec69 100644 --- a/media-libs/libsdl2/libsdl2-2.0.8.recipe +++ b/media-libs/libsdl2/libsdl2-2.0.8.recipe @@ -6,7 +6,7 @@ software, emulators, and popular games." HOMEPAGE="https://www.libsdl.org/" COPYRIGHT="1997-2018 Sam Lantinga" LICENSE="Zlib" -REVISION="7" +REVISION="8" SOURCE_URI="https://www.libsdl.org/release/SDL2-$portVersion.tar.gz" CHECKSUM_SHA256="edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec" SOURCE_DIR="SDL2-$portVersion" diff --git a/media-libs/libsdl2/patches/libsdl2-2.0.8.patchset b/media-libs/libsdl2/patches/libsdl2-2.0.8.patchset index aa853edd3..be0e1ad47 100644 --- a/media-libs/libsdl2/patches/libsdl2-2.0.8.patchset +++ b/media-libs/libsdl2/patches/libsdl2-2.0.8.patchset @@ -1,4 +1,4 @@ -From 2c22cd24d27d1f46996212bc7b5888b34ecfd7e3 Mon Sep 17 00:00:00 2001 +From c486541ecee341dbb6264f884be5b0e410f7fe8d Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Fri, 29 Aug 2014 15:24:11 +0000 Subject: haiku patch @@ -30,7 +30,7 @@ index 3456932..d32eb94 100644 2.19.1 -From 222c8cba1d7d1f6bfcbe484ebeb6d0c6c3bec400 Mon Sep 17 00:00:00 2001 +From 72eedfc8fb26c9773597636dff9616f9f3326af5 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 25 Feb 2016 20:23:41 +0000 Subject: remove nacl, missing templates on Haiku @@ -78,7 +78,7 @@ index 1c7e793..8e3a74b 100644 2.19.1 -From d4887428e447f97a28a4893a5ea5af1c08eea9ad Mon Sep 17 00:00:00 2001 +From 52dc56adba2e1e67eb9518a8479e9afd029c2ef2 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Sat, 30 Sep 2017 13:36:12 +0200 Subject: fix AC_DEFINE @@ -101,7 +101,7 @@ index 8e3a74b..d4d38e4 100644 2.19.1 -From 9fcc81accf45b88b9364d662a135d169f4cd912f Mon Sep 17 00:00:00 2001 +From 3b5fe8597182deb812e4302d1734abff36f88859 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 2 Feb 2018 09:40:46 +0100 Subject: Fix secondary arch build. @@ -149,7 +149,7 @@ index d4d38e4..7c3a166 100644 2.19.1 -From c8f9cbf83934c4f43a317cffd08777057e5436a2 Mon Sep 17 00:00:00 2001 +From 0574b06e49831f79405e5c587ecdaa37e8ca1294 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Fri, 2 Feb 2018 10:40:00 +0100 Subject: Fix crash when opening window @@ -207,7 +207,7 @@ index 3e61888..bd4aae7 100644 2.19.1 -From 53e3f39cd7297ec2249b92489489295dda1e07ac Mon Sep 17 00:00:00 2001 +From 82d904bd7529bc8c3939fe56695def0cf0ae07fd Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 15 Sep 2018 23:16:25 +1000 Subject: Add simple relative mode for mouse @@ -243,7 +243,7 @@ index ba3f927..7d4f442 100644 2.19.1 -From 764848d8132f3b879206e564699c4891de344470 Mon Sep 17 00:00:00 2001 +From 9da93844df18c1a4c64a06fa6a45c873dd41da15 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Tue, 18 Sep 2018 20:47:07 +1000 Subject: Add support for relative mouse mode @@ -342,7 +342,7 @@ index bd4aae7..370bdce 100644 2.19.1 -From ce2158bbcc7741111bc2cbc1a1e4fecb2688abbe Mon Sep 17 00:00:00 2001 +From 5fa6df3d48437cb765391fae89995e4f2850dacd Mon Sep 17 00:00:00 2001 From: Peter Kosyh Date: Sat, 6 Oct 2018 12:48:15 +0300 Subject: haiku: mouse->ShowMouse method added @@ -419,7 +419,7 @@ index afe20e3..c0b1d30 100644 2.19.1 -From 4179419930220e9b5d3eadedb993d59c394a9dda Mon Sep 17 00:00:00 2001 +From 0ac7602b3cc4659e491c5e3abab19e0a32b64ccd Mon Sep 17 00:00:00 2001 From: Peter Kosyh Date: Sat, 6 Oct 2018 13:50:30 +0300 Subject: mouse_relative fix @@ -444,7 +444,7 @@ index 5ff8bf1..e0a4b9b 100644 2.19.1 -From ecc616c3ac0c93687d4869f7f6a08508538b7b25 Mon Sep 17 00:00:00 2001 +From 83745eedc8075c01da46abe7f6b4ab0d066eb7c4 Mon Sep 17 00:00:00 2001 From: Peter Kosyh Date: Sat, 6 Oct 2018 14:28:41 +0300 Subject: mouse wheel y invert @@ -467,7 +467,7 @@ index e0a4b9b..d59ac34 100644 2.19.1 -From 01563c1103a9c3e8b3e531ade0992539fd28fc15 Mon Sep 17 00:00:00 2001 +From dfb47d5e5882460d6958e20c9881368200ddbc3f Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Mon, 5 Nov 2018 23:25:54 +1000 Subject: Disable pointer history @@ -489,7 +489,7 @@ index 370bdce..7ff8ead 100644 2.19.1 -From a7351f522812d62944d9aeb793a7dcfa7e4a6256 Mon Sep 17 00:00:00 2001 +From dc3469a527fbdb507db7de957100f8aaa845d156 Mon Sep 17 00:00:00 2001 From: EXL Date: Wed, 5 Dec 2018 07:02:11 +0000 Subject: Implement message box for Haiku @@ -500,6 +500,7 @@ SDL_ShowSimpleMessageBox() SDL_ShowMessageBox() Add simple customization support also. +Fix build for x86_gcc2. diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h index 8aa4a39..a3f8de6 100644 @@ -584,10 +585,10 @@ index 8cf195d..76e6d4c 100644 SDL_SetError("No message system available"); diff --git a/src/video/haiku/SDL_bmessagebox.cc b/src/video/haiku/SDL_bmessagebox.cc new file mode 100644 -index 0000000..9ed834f +index 0000000..9b9fe14 --- /dev/null +++ b/src/video/haiku/SDL_bmessagebox.cc -@@ -0,0 +1,421 @@ +@@ -0,0 +1,425 @@ +/* + Simple DirectMedia Layer + Copyright (C) 1997-2018 Sam Lantinga @@ -658,9 +659,9 @@ index 0000000..9ed834f + rgb_color fTextColor; + + const char *fTitle; -+ const char *BE_SDL_DefTitle = "SDL MessageBox"; -+ const char *BE_SDL_DefMessage = "Some information has been lost."; -+ const char *BE_SDL_DefButton = "OK"; ++ const char *BE_SDL_DefTitle; ++ const char *BE_SDL_DefMessage; ++ const char *BE_SDL_DefButton; + + std::vector fButtons; + @@ -695,7 +696,8 @@ index 0000000..9ed834f + rgb_color + ConvertColorType(const SDL_MessageBoxColor *aColor) const + { -+ return { aColor->r, aColor->g, aColor->b, 255 }; ++ rgb_color color = { aColor->r, aColor->g, aColor->b, color.alpha = 255 }; ++ return color; + } + + int32 @@ -897,7 +899,10 @@ index 0000000..9ed834f + : BAlert(NULL, NULL, NULL, NULL, NULL, B_WIDTH_FROM_LABEL, B_WARNING_ALERT), + fComputedMessageBoxWidth(0.0f), + fCloseButton(G_CLOSE_BUTTON_ID), fDefaultButton(G_DEFAULT_BUTTON_ID), -+ fCustomColorScheme(false), fThereIsLongLine(false) ++ fCustomColorScheme(false), fThereIsLongLine(false), ++ BE_SDL_DefTitle("SDL2 MessageBox"), ++ BE_SDL_DefMessage("Some information has been lost."), ++ BE_SDL_DefButton("OK") + { + // MessageBox settings. + // We need a title to display it.