mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-23 12:10:06 +02:00
libsdl: fix black box in top-left corner (#3193)
This commit is contained in:
Peter Kosyh
committed by
Sergei Reznikov
Sergei Reznikov
parent
e046b094bf
commit
f8c79af243
@@ -5,7 +5,7 @@ joystick, and graphics via OpenGL."
|
||||
HOMEPAGE="http://www.libsdl.org/"
|
||||
COPYRIGHT="1997-2012 Sam Lantinga"
|
||||
LICENSE="GNU LGPL v2.1"
|
||||
REVISION="13"
|
||||
REVISION="14"
|
||||
SOURCE_URI="http://www.libsdl.org/release/SDL-1.2.15.tar.gz"
|
||||
CHECKSUM_SHA256="d6d316a793e5e348155f0dd93b979798933fb98aa1edebcc108829d6474aad00"
|
||||
SOURCE_DIR="SDL-$portVersion"
|
||||
|
||||
@@ -1,12 +1,9 @@
|
||||
From 5a1a0f841aaffdd2d50dd61b9b77f79038293977 Mon Sep 17 00:00:00 2001
|
||||
From 6e348a6871b1cd882b2310b6f6cdc92b348cef44 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 22 Nov 2013 23:38:56 +0100
|
||||
Subject: [PATCH 01/10] Remove Alsa and ESD detection
|
||||
Subject: Remove Alsa and ESD detection
|
||||
|
||||
These will fail on Haiku, and we don't need them anyway.
|
||||
---
|
||||
configure.in | 5 +++--
|
||||
1 file changed, 3 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/configure.in b/configure.in
|
||||
index 08c8e1e..84d9a55 100644
|
||||
@@ -36,20 +33,17 @@ index 08c8e1e..84d9a55 100644
|
||||
])
|
||||
+AC_CONFIG_MACRO_DIR([acinclude])
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From cd6e938bfdbe60b75fb483ae185437e7dabeb440 Mon Sep 17 00:00:00 2001
|
||||
From 8f11ab4149c6a4e4be28d1c907955ff30c936552 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 22 Nov 2013 23:39:26 +0100
|
||||
Subject: [PATCH 02/10] Fix samples vs bytes issues
|
||||
Subject: Fix samples vs bytes issues
|
||||
|
||||
This was particularly noticeable in Milkytracker (SDL version) and
|
||||
Hivelytracker, where all the audio timing relies on the buffer being
|
||||
played during the right time.
|
||||
---
|
||||
src/audio/baudio/SDL_beaudio.cc | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
|
||||
index de635f8..7faf571 100644
|
||||
@@ -70,20 +64,17 @@ index de635f8..7faf571 100644
|
||||
{ sigset_t omask;
|
||||
SDL_MaskSignals(&omask);
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 9f21694189fca33ec9c63dd647275100bbe77a4b Mon Sep 17 00:00:00 2001
|
||||
From 05cbb8360ef0edd25c76ce0c52bdc5d4b878989d Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Fri, 22 Nov 2013 23:40:12 +0100
|
||||
Subject: [PATCH 03/10] Various fixes to the video code
|
||||
Subject: Various fixes to the video code
|
||||
|
||||
* Do not center the window each time it is resized
|
||||
* Do not reset video mode if we didn't enter fullscreen
|
||||
* remove annoying debug print
|
||||
---
|
||||
src/video/bwindow/SDL_sysvideo.cc | 26 +++++++++++++++-----------
|
||||
1 file changed, 15 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
|
||||
index c32b661..a26f18b 100644
|
||||
@@ -153,18 +144,14 @@ index c32b661..a26f18b 100644
|
||||
SDL_Win->SetXYOffset(cx, cy);
|
||||
}
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 16b05a5bb44c626afabe4802637e74eb046968d0 Mon Sep 17 00:00:00 2001
|
||||
From 8e4ce42357ea8573f8fb8bfc1ab7bde4aa00c5c3 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sat, 23 Nov 2013 11:59:00 +0100
|
||||
Subject: [PATCH 04/10] Actually fix the sample vs bytes problem in audio
|
||||
driver.
|
||||
Subject: Actually fix the sample vs bytes problem in audio driver.
|
||||
|
||||
---
|
||||
src/audio/baudio/SDL_beaudio.cc | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/audio/baudio/SDL_beaudio.cc b/src/audio/baudio/SDL_beaudio.cc
|
||||
index 7faf571..300bf03 100644
|
||||
@@ -211,17 +198,14 @@ index 7faf571..300bf03 100644
|
||||
/* Subscribe to the audio stream (creates a new thread) */
|
||||
{ sigset_t omask;
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 7707d4eb70a7caf8b6ca6114ea2a0b191c04fd60 Mon Sep 17 00:00:00 2001
|
||||
From e80a2b0cbdc71878dad069ff5fa00e7808774670 Mon Sep 17 00:00:00 2001
|
||||
From: Chris Roberts <cpr420@gmail.com>
|
||||
Date: Sun, 22 Dec 2013 18:37:30 -0700
|
||||
Subject: [PATCH 05/10] Remove Haiku from specialized DECLSPEC definition
|
||||
Subject: Remove Haiku from specialized DECLSPEC definition
|
||||
|
||||
---
|
||||
include/begin_code.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/include/begin_code.h b/include/begin_code.h
|
||||
index 27e2f7b..d5e2f1f 100644
|
||||
@@ -237,18 +221,15 @@ index 27e2f7b..d5e2f1f 100644
|
||||
# define DECLSPEC
|
||||
# else
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From d1f9c6c01ef5bea92c15e4255deede177aba0508 Mon Sep 17 00:00:00 2001
|
||||
From d4881867266f9b5416eeec5ac9ed57a099a70120 Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
|
||||
Date: Sun, 5 Jan 2014 17:22:10 +0100
|
||||
Subject: [PATCH 06/10] Change prefix from "be" to "os" for OpenGL includes
|
||||
Subject: Change prefix from "be" to "os" for OpenGL includes
|
||||
|
||||
Accomodate the new OpenGL kit that doesn't have the "be" symlink.
|
||||
---
|
||||
src/video/bwindow/SDL_BWin.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/video/bwindow/SDL_BWin.h b/src/video/bwindow/SDL_BWin.h
|
||||
index f2b19a2..2cb94ee 100644
|
||||
@@ -264,21 +245,15 @@ index f2b19a2..2cb94ee 100644
|
||||
#include <support/UTF8.h>
|
||||
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 0023dd96fedd8f29f83578cc6916f1ba31bbb062 Mon Sep 17 00:00:00 2001
|
||||
From fe36b04a86bb540767c5a96b48c40526b51a1d12 Mon Sep 17 00:00:00 2001
|
||||
From: Jonathan Schleifer <js@webkeks.org>
|
||||
Date: Fri, 28 Mar 2014 18:04:12 +0100
|
||||
Subject: [PATCH 07/10] Fix compilation on x86_64
|
||||
Subject: Fix compilation on x86_64
|
||||
|
||||
Also cleans up and fixes warnings.
|
||||
---
|
||||
src/video/SDL_sysvideo.h | 8 ++++++++
|
||||
src/video/SDL_video.c | 2 +-
|
||||
src/video/bwindow/SDL_sysvideo.cc | 22 +++++++++-------------
|
||||
src/video/bwindow/SDL_sysyuv.cc | 3 ++-
|
||||
4 files changed, 20 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
|
||||
index 436450e..b45a8a9 100644
|
||||
@@ -405,22 +380,19 @@ index 7c71b00..f2fef10 100644
|
||||
return 0;
|
||||
}
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 67fa278e22614bc0e74c0b94af802272a0604c6f Mon Sep 17 00:00:00 2001
|
||||
From b4d5b080305fff28b87d542f4e6a336a02af2c4e Mon Sep 17 00:00:00 2001
|
||||
From: Adrien Destugues <pulkomandy@gmail.com>
|
||||
Date: Mon, 20 Oct 2014 13:33:55 +0200
|
||||
Subject: [PATCH 08/10] Fix problem with GL viewport
|
||||
Subject: Fix problem with GL viewport
|
||||
|
||||
Make sure the window has the correct size before the GL view is created.
|
||||
Otherwise the view doesn't use the resized window size and things render
|
||||
in an awfully small area in the corner of the window.
|
||||
|
||||
Fixes Dragon Memory, for example (also seen in other games using SDL+GL).
|
||||
---
|
||||
src/video/bwindow/SDL_sysvideo.cc | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
|
||||
index 5d4077f..7e1bd38 100644
|
||||
@@ -436,20 +408,16 @@ index 5d4077f..7e1bd38 100644
|
||||
gl_flags = BGL_RGB;
|
||||
if (_this->gl_config.double_buffer)
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 87943f6278adeb8c2a76995c03ea84d1269b7257 Mon Sep 17 00:00:00 2001
|
||||
From 75e7832f924f90dd4f5539c0ac118a46c20fe2bb Mon Sep 17 00:00:00 2001
|
||||
From: Michael Lotz <mmlr@mlotz.ch>
|
||||
Date: Tue, 27 Oct 2015 21:39:24 +0000
|
||||
Subject: [PATCH 09/10] Avoid crashing on quit when SDL_Win was never
|
||||
initialized.
|
||||
Subject: Avoid crashing on quit when SDL_Win was never initialized.
|
||||
|
||||
This can happen when an unknown screen mode is detected and video init
|
||||
fails because of it.
|
||||
---
|
||||
src/video/bwindow/SDL_sysvideo.cc | 6 ++++--
|
||||
1 file changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
|
||||
index 7e1bd38..818d1a0 100644
|
||||
@@ -469,19 +437,16 @@ index 7e1bd38..818d1a0 100644
|
||||
if ( SDL_BlankCursor != NULL ) {
|
||||
BE_FreeWMCursor(_this, SDL_BlankCursor);
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From 612dcf5da6b7bb799edc7a3f66255791bca465ff Mon Sep 17 00:00:00 2001
|
||||
From 332d8be37c9b9c8c9d228812e22184cef7020458 Mon Sep 17 00:00:00 2001
|
||||
From: Michael Lotz <mmlr@mlotz.ch>
|
||||
Date: Tue, 27 Oct 2015 21:40:36 +0000
|
||||
Subject: [PATCH 10/10] Add 24 bit color spaces to ColorSpaceToBitsPerPixel().
|
||||
Subject: Add 24 bit color spaces to ColorSpaceToBitsPerPixel().
|
||||
|
||||
This allows initializing the native video mode when running with a 24
|
||||
bit screen color depth.
|
||||
---
|
||||
src/video/bwindow/SDL_sysvideo.cc | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
diff --git a/src/video/bwindow/SDL_sysvideo.cc b/src/video/bwindow/SDL_sysvideo.cc
|
||||
index 818d1a0..0100f3b 100644
|
||||
@@ -499,10 +464,10 @@ index 818d1a0..0100f3b 100644
|
||||
case B_RGBA32:
|
||||
case B_RGB32_BIG:
|
||||
--
|
||||
2.2.2
|
||||
2.19.0
|
||||
|
||||
|
||||
From d7ef3da5dc491445e50eb4f915d00d7d4b722fe4 Mon Sep 17 00:00:00 2001
|
||||
From 65f80fb80f326eda6eb75f276eb4f96b983995d0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
||||
Date: Mon, 11 Jul 2016 15:08:06 +0200
|
||||
Subject: Try to find correct application signature from app resources
|
||||
@@ -551,5 +516,39 @@ index 8b79377..65a6dbf 100644
|
||||
App->Run();
|
||||
delete App;
|
||||
--
|
||||
2.8.0
|
||||
2.19.0
|
||||
|
||||
|
||||
From 82e9317f9fba83878a8d28d11c163fb22a7ecd9d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Kosyh <p.kosyh@gmail.com>
|
||||
Date: Fri, 5 Oct 2018 17:39:06 +0300
|
||||
Subject: fix black box in top-left corner while win lost mouse focus
|
||||
|
||||
|
||||
diff --git a/src/video/bwindow/SDL_sysevents.cc b/src/video/bwindow/SDL_sysevents.cc
|
||||
index 9e12750..63afded 100644
|
||||
--- a/src/video/bwindow/SDL_sysevents.cc
|
||||
+++ b/src/video/bwindow/SDL_sysevents.cc
|
||||
@@ -208,7 +208,8 @@ void SDL_BWin::DispatchMessage(BMessage *msg, BHandler *target)
|
||||
// for some reason, SDL_EraseCursor fails for OpenGL
|
||||
if (this->the_view != this->SDL_GLView)
|
||||
#endif
|
||||
- SDL_EraseCursor(SDL_VideoSurface);
|
||||
+ { if (SHOULD_DRAWCURSOR(SDL_cursorstate))
|
||||
+ SDL_EraseCursor(SDL_VideoSurface); }
|
||||
be_app->SetCursor(B_HAND_CURSOR);
|
||||
}
|
||||
} else {
|
||||
@@ -218,7 +219,8 @@ void SDL_BWin::DispatchMessage(BMessage *msg, BHandler *target)
|
||||
// for some reason, SDL_EraseCursor fails for OpenGL
|
||||
if (this->the_view != this->SDL_GLView)
|
||||
#endif
|
||||
- SDL_EraseCursor(SDL_VideoSurface);
|
||||
+ { if (SHOULD_DRAWCURSOR(SDL_cursorstate))
|
||||
+ SDL_EraseCursor(SDL_VideoSurface); }
|
||||
SDL_SetCursor(NULL);
|
||||
}
|
||||
|
||||
--
|
||||
2.19.0
|
||||
|
||||
|
||||
Reference in New Issue
Block a user