haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-23 12:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

libsdl2: Add extra check on switching context, fix build

Browse Source
This commit is contained in:
Puck Meerburg
2015-01-17 19:35:12 +01:00
parent d7157c181d
commit 7d1303b6b6
2 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
media-libs/libsdl2/libsdl2-2.0.3.recipe
View File

@@ -8,7 +8,7 @@ emulators, and popular games.
HOMEPAGE="http://www.libsdl.org/"
SRC_URI="http://www.libsdl.org/release/SDL2-$portVersion.tar.gz"
CHECKSUM_SHA256="a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c"
REVISION="1"
REVISION="2"
LICENSE="Zlib"
COPYRIGHT="1997-2014 Sam Lantinga"
@@ -30,7 +30,7 @@ REQUIRES="
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libGL$secondaryArchSuffix
devel:libgl$secondaryArchSuffix
devel:libglu$secondaryArchSuffix
"

29
media-libs/libsdl2/patches/libsdl2-2.0.3.patchset
View File

@@ -1,4 +1,4 @@
From d6e2e7b054e8aff4979dc762b33236c4391587b0 Mon Sep 17 00:00:00 2001
From 3f0701d67fbbd5398c8c7cdbc41faa62d16aea85 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 29 Aug 2014 15:24:11 +0000
Subject: haiku patch
@@ -126,7 +126,7 @@ index 245cec1..52ee67a 100644
1.8.3.4
From 10d5f202f16294da23c5752d9a2d9d1ea238cde3 Mon Sep 17 00:00:00 2001
From 344472b0218ba8acbc535c0c456ede1c1008ad67 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Wed, 3 Sep 2014 19:22:12 +0200
Subject: Fix null pointer dereference.
@@ -149,3 +149,28 @@ index 52ee67a..2f0073d 100644
--
1.8.3.4
From 4c1fe53d13c6cada30bcb1606308487154003d9a Mon Sep 17 00:00:00 2001
From: Puck Meerburg <puck@puckipedia.nl>
Date: Sat, 17 Jan 2015 19:33:32 +0100
Subject: SDL_BApp: Make sure _current_context isn't NULL before trying to lock
it
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index 1e4a0f5..a13ea3b 100644
--- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h
@@ -193,7 +193,8 @@ public:
if(_current_context)
_current_context->UnlockGL();
_current_context = newContext;
- _current_context->LockGL();
+ if (_current_context)
+ _current_context->LockGL();
}
private:
/* Event management */
--
1.8.3.4