haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-05-05 14:38:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

libsdl2: bump version.

Browse Source
This commit is contained in:
Jerome Duval
2019-10-29 19:18:40 +01:00
parent 702293455c
commit 3c351ac290
2 changed files with 191 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
media-libs/libsdl2/libsdl2-2.0.9.recipe → media-libs/libsdl2/libsdl2-2.0.10.recipe
View File

@@ -6,9 +6,9 @@ software, emulators, and popular games."
HOMEPAGE="https://www.libsdl.org/" HOMEPAGE="https://www.libsdl.org/"
COPYRIGHT="1997-2018 Sam Lantinga" COPYRIGHT="1997-2018 Sam Lantinga"
LICENSE="Zlib" LICENSE="Zlib"
REVISION="2" REVISION="1"
SOURCE_URI="https://www.libsdl.org/release/SDL2-$portVersion.tar.gz" SOURCE_URI="https://www.libsdl.org/release/SDL2-$portVersion.tar.gz"
CHECKSUM_SHA256="255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1" CHECKSUM_SHA256="b4656c13a1f0d0023ae2f4a9cf08ec92fffb464e0f24238337784159b8b91d57"
SOURCE_DIR="SDL2-$portVersion" SOURCE_DIR="SDL2-$portVersion"
PATCHES="libsdl2-$portVersion.patchset" PATCHES="libsdl2-$portVersion.patchset"
@@ -17,7 +17,7 @@ SECONDARY_ARCHITECTURES="x86_gcc2 x86"
PROVIDES=" PROVIDES="
libsdl2$secondaryArchSuffix = $portVersion compat >= 2.0 libsdl2$secondaryArchSuffix = $portVersion compat >= 2.0
lib:libSDL2_2.0$secondaryArchSuffix = 0.9.0 compat >= 0 lib:libSDL2_2.0$secondaryArchSuffix = 0.10.0 compat >= 0
" "
REQUIRES=" REQUIRES="
haiku$secondaryArchSuffix haiku$secondaryArchSuffix
@@ -29,10 +29,8 @@ REQUIRES="
PROVIDES_devel=" PROVIDES_devel="
libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0 libsdl2${secondaryArchSuffix}_devel = $portVersion compat >= 2.0
cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0 cmd:sdl2_config$secondaryArchSuffix = $portVersion compat >= 2.0
devel:libSDL2$secondaryArchSuffix = 0.9.0 compat >= 0 devel:libSDL2$secondaryArchSuffix = 0.10.0 compat >= 0
devel:libSDL2_2.0$secondaryArchSuffix = 0.9.0 compat >= 0 devel:libSDL2_2.0$secondaryArchSuffix = 0.10.0 compat >= 0
devel:libSDL2_test$secondaryArchSuffix = 0.9.0 compat >= 0
devel:libSDL2main$secondaryArchSuffix = 0.9.0 compat >= 0
" "
REQUIRES_devel=" REQUIRES_devel="
libsdl2$secondaryArchSuffix == $portVersion base libsdl2$secondaryArchSuffix == $portVersion base
@@ -57,6 +55,7 @@ BUILD_PREREQUIRES="
BUILD() BUILD()
{ {
autoreconf -fi
runConfigure ./configure runConfigure ./configure
make $jobArgs make $jobArgs
} }
@@ -65,13 +64,11 @@ INSTALL()
{ {
make install make install
rm $libDir/libSDL*.la rm $libDir/libSDL*.la $libDir/libSDL*.a
# devel package # devel package
prepareInstalledDevelLibs \ prepareInstalledDevelLibs \
libSDL2 \ libSDL2 \
libSDL2main \
libSDL2_test \
libSDL2-2.0 libSDL2-2.0
fixPkgconfig fixPkgconfig

248
media-libs/libsdl2/patches/libsdl2-2.0.9.patchset → media-libs/libsdl2/patches/libsdl2-2.0.10.patchset
View File

@@ -1,11 +1,11 @@
From 547d126802b8059e16bf73c7b6c9f5b78000109f Mon Sep 17 00:00:00 2001 From d476ddfe0ff3183c3cc2393eca2924065bd6e3bf Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Fri, 29 Aug 2014 15:24:11 +0000 Date: Fri, 29 Aug 2014 15:24:11 +0000
Subject: haiku patch Subject: haiku patch
diff --git a/src/video/haiku/SDL_bopengl.cc b/src/video/haiku/SDL_bopengl.cc diff --git a/src/video/haiku/SDL_bopengl.cc b/src/video/haiku/SDL_bopengl.cc
index e599062..3b145a3 100644 index 5065e9f..44b21fe 100644
--- a/src/video/haiku/SDL_bopengl.cc --- a/src/video/haiku/SDL_bopengl.cc
+++ b/src/video/haiku/SDL_bopengl.cc +++ b/src/video/haiku/SDL_bopengl.cc
@@ -54,7 +54,7 @@ int HAIKU_GL_LoadLibrary(_THIS, const char *path) @@ -54,7 +54,7 @@ int HAIKU_GL_LoadLibrary(_THIS, const char *path)
@@ -27,23 +27,23 @@ index e599062..3b145a3 100644
&location)) == B_OK) { &location)) == B_OK) {
return location; return location;
-- --
2.21.0 2.23.0
From 7f29b18a1153196ca53a081ccdecbaa60de5f20c Mon Sep 17 00:00:00 2001 From fde3e77a378cf1941530b661420eb2dfa34c46d6 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Thu, 25 Feb 2016 20:23:41 +0000 Date: Thu, 25 Feb 2016 20:23:41 +0000
Subject: remove nacl, missing templates on Haiku Subject: remove nacl, missing templates on Haiku
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
index ae866ff..57afa1f 100644 index 9e782c6..c0527a2 100644
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -1551,33 +1551,6 @@ AC_HELP_STRING([--enable-mir-shared], [dynamically load Mir support [[default=ma @@ -1520,33 +1520,6 @@ AS_HELP_STRING([--enable-wayland-shared], [dynamically load Wayland support [[de
fi
} }
-dnl Check for Native Client stuff -dnl Check for Native Client stuff
-CheckNativeClient() -CheckNativeClient()
-{ -{
@@ -75,20 +75,20 @@ index ae866ff..57afa1f 100644
{ {
AC_ARG_ENABLE(video-rpi, AC_ARG_ENABLE(video-rpi,
-- --
2.21.0 2.23.0
From 3169c62e87c3a6912716332298259cedfd5e2140 Mon Sep 17 00:00:00 2001 From 589c40f315003962c5e404ad647ce386edcbae90 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com> From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 30 Sep 2017 13:36:12 +0200 Date: Sat, 30 Sep 2017 13:36:12 +0200
Subject: fix AC_DEFINE Subject: fix AC_DEFINE
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
index 57afa1f..4c87ce0 100644 index c0527a2..166d06b 100644
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -1854,7 +1854,7 @@ int event_type = XI_TouchBegin; @@ -1823,7 +1823,7 @@ int event_type = XI_TouchBegin;
XITouchClassInfo *t; XITouchClassInfo *t;
],[ ],[
have_xinput2_multitouch=yes have_xinput2_multitouch=yes
@@ -98,10 +98,10 @@ index 57afa1f..4c87ce0 100644
]) ])
AC_MSG_RESULT($have_xinput2_multitouch) AC_MSG_RESULT($have_xinput2_multitouch)
-- --
2.21.0 2.23.0
From b15e0202c2761049337002dc044bbbd151fa7e3d Mon Sep 17 00:00:00 2001 From 02e0c626e48881378cf191a353312340d5b71bcf Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 09:40:46 +0100 Date: Fri, 2 Feb 2018 09:40:46 +0100
Subject: Fix secondary arch build. Subject: Fix secondary arch build.
@@ -111,10 +111,10 @@ mode so it figures this out by itself. The previous way of detecting
libstdc++ would not allow for building a secondary architecture package. libstdc++ would not allow for building a secondary architecture package.
diff --git a/Makefile.in b/Makefile.in diff --git a/Makefile.in b/Makefile.in
index 4eb6e63..85162c6 100644 index 567624e..1c5622f 100644
--- a/Makefile.in --- a/Makefile.in
+++ b/Makefile.in +++ b/Makefile.in
@@ -144,13 +144,13 @@ update-revision: @@ -147,13 +147,13 @@ update-revision:
.PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d) .PHONY: all update-revision install install-bin install-hdrs install-lib install-data uninstall uninstall-bin uninstall-hdrs uninstall-lib uninstall-data clean distclean dist $(OBJECTS:.lo=.d)
$(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS) $(objects)/$(TARGET): $(GEN_HEADERS) $(GEN_OBJECTS) $(OBJECTS) $(VERSION_OBJECTS)
@@ -131,11 +131,11 @@ index 4eb6e63..85162c6 100644
install: all install-bin install-hdrs install-lib install-data install: all install-bin install-hdrs install-lib install-data
install-bin: install-bin:
diff --git a/configure.in b/configure.in diff --git a/configure.ac b/configure.ac
index 4c87ce0..7dd7cd8 100644 index 166d06b..8d8da32 100644
--- a/configure.in --- a/configure.ac
+++ b/configure.in +++ b/configure.ac
@@ -3733,9 +3733,6 @@ AC_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau @@ -3692,9 +3692,6 @@ AS_HELP_STRING([--enable-render-d3d], [enable the Direct3D render driver [[defau
# The Haiku platform requires special setup. # The Haiku platform requires special setup.
SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES" SOURCES="$srcdir/src/main/haiku/*.cc $SOURCES"
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding" EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lroot -lbe -lmedia -lgame -ldevice -ltextencoding"
@@ -146,10 +146,10 @@ index 4c87ce0..7dd7cd8 100644
arm*-apple-darwin*|*-ios-*) arm*-apple-darwin*|*-ios-*)
ARCH=ios ARCH=ios
-- --
2.21.0 2.23.0
From b0f10f9c4c4622e2da9cdcb8767e7ff13be6f44b Mon Sep 17 00:00:00 2001 From 16e2d5728c785f8f95ccded8c007430bca1981a3 Mon Sep 17 00:00:00 2001
From: Adrien Destugues <pulkomandy@pulkomandy.tk> From: Adrien Destugues <pulkomandy@pulkomandy.tk>
Date: Fri, 2 Feb 2018 10:40:00 +0100 Date: Fri, 2 Feb 2018 10:40:00 +0100
Subject: Fix crash when opening window Subject: Fix crash when opening window
@@ -161,7 +161,7 @@ Subject: Fix crash when opening window
grow. grow.
diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h
index b22f74b..7cb2de9 100644 index da84dd5..1534059 100644
--- a/src/video/haiku/SDL_BWin.h --- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h +++ b/src/video/haiku/SDL_BWin.h
@@ -86,6 +86,7 @@ class SDL_BWin:public BDirectWindow @@ -86,6 +86,7 @@ class SDL_BWin:public BDirectWindow
@@ -204,17 +204,17 @@ index b22f74b..7cb2de9 100644
thread_id _draw_thread_id; thread_id _draw_thread_id;
-- --
2.21.0 2.23.0
From 3dfd7cf9d4cce998ac749f71de0f98567041de7c Mon Sep 17 00:00:00 2001 From 3c9f7b22940e2cffbd2d29105c9715849d6b6844 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Sat, 15 Sep 2018 23:16:25 +1000 Date: Sat, 15 Sep 2018 23:16:25 +1000
Subject: Add simple relative mode for mouse Subject: Add simple relative mode for mouse
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index 7adbd00..786a57e 100644 index ae51ebc..764c8fc 100644
--- a/src/main/haiku/SDL_BApp.h --- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h +++ b/src/main/haiku/SDL_BApp.h
@@ -230,6 +230,21 @@ private: @@ -230,6 +230,21 @@ private:
@@ -240,17 +240,17 @@ index 7adbd00..786a57e 100644
HAIKU_UpdateWindowFramebuffer(NULL,win,NULL,-1); HAIKU_UpdateWindowFramebuffer(NULL,win,NULL,-1);
} }
-- --
2.21.0 2.23.0
From 89ef2180606cdc3ff27765c7f24529df8ca0c4b8 Mon Sep 17 00:00:00 2001 From 27ce813719170553130e8defceb7216c74ee4832 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Tue, 18 Sep 2018 20:47:07 +1000 Date: Tue, 18 Sep 2018 20:47:07 +1000
Subject: Add support for relative mouse mode Subject: Add support for relative mouse mode
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index 786a57e..07f33f6 100644 index 764c8fc..3e7b472 100644
--- a/src/main/haiku/SDL_BApp.h --- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h +++ b/src/main/haiku/SDL_BApp.h
@@ -228,7 +228,6 @@ private: @@ -228,7 +228,6 @@ private:
@@ -277,7 +277,7 @@ index 786a57e..07f33f6 100644
be_app->ShowCursor(); be_app->ShowCursor();
} }
diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h
index 7cb2de9..fa945a5 100644 index 1534059..9f79927 100644
--- a/src/video/haiku/SDL_BWin.h --- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h +++ b/src/video/haiku/SDL_BWin.h
@@ -319,22 +319,17 @@ class SDL_BWin:public BDirectWindow @@ -319,22 +319,17 @@ class SDL_BWin:public BDirectWindow
@@ -339,17 +339,17 @@ index 7cb2de9..fa945a5 100644
_last_buttons = buttons; _last_buttons = buttons;
-- --
2.21.0 2.23.0
From 16f828785ee64e617ac3f03bcc1962d894bc81ee Mon Sep 17 00:00:00 2001 From 3de9cf0943043bb730fa92e380df5026044a4241 Mon Sep 17 00:00:00 2001
From: Peter Kosyh <p.kosyh@gmail.com> From: Peter Kosyh <p.kosyh@gmail.com>
Date: Sat, 6 Oct 2018 12:48:15 +0300 Date: Sat, 6 Oct 2018 12:48:15 +0300
Subject: haiku: mouse->ShowMouse method added Subject: haiku: mouse->ShowMouse method added
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index 07f33f6..f86ba9a 100644 index 3e7b472..01fcba7 100644
--- a/src/main/haiku/SDL_BApp.h --- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h +++ b/src/main/haiku/SDL_BApp.h
@@ -244,7 +244,7 @@ private: @@ -244,7 +244,7 @@ private:
@@ -362,7 +362,7 @@ index 07f33f6..f86ba9a 100644
} }
diff --git a/src/video/haiku/SDL_bvideo.cc b/src/video/haiku/SDL_bvideo.cc diff --git a/src/video/haiku/SDL_bvideo.cc b/src/video/haiku/SDL_bvideo.cc
index e7b4b6e..747f7d4 100644 index 52e0f1d..68300a9 100644
--- a/src/video/haiku/SDL_bvideo.cc --- a/src/video/haiku/SDL_bvideo.cc
+++ b/src/video/haiku/SDL_bvideo.cc +++ b/src/video/haiku/SDL_bvideo.cc
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@@ -417,17 +417,17 @@ index e7b4b6e..747f7d4 100644
/* testgl application doesn't load library, just tries to load symbols */ /* testgl application doesn't load library, just tries to load symbols */
/* is it correct? if so we have to load library here */ /* is it correct? if so we have to load library here */
-- --
2.21.0 2.23.0
From e96e33627597f3a1ea89025dcbe129eb86787dd9 Mon Sep 17 00:00:00 2001 From 9b6b67cb04c1c9090bad39f1cabca3a32064abf7 Mon Sep 17 00:00:00 2001
From: Peter Kosyh <p.kosyh@gmail.com> From: Peter Kosyh <p.kosyh@gmail.com>
Date: Sat, 6 Oct 2018 13:50:30 +0300 Date: Sat, 6 Oct 2018 13:50:30 +0300
Subject: mouse_relative fix Subject: mouse_relative fix
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index f86ba9a..1e7a8b5 100644 index 01fcba7..a4367f6 100644
--- a/src/main/haiku/SDL_BApp.h --- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h +++ b/src/main/haiku/SDL_BApp.h
@@ -230,9 +230,7 @@ private: @@ -230,9 +230,7 @@ private:
@@ -442,17 +442,17 @@ index f86ba9a..1e7a8b5 100644
SDL_GetWindowSize(win, &winWidth, &winHeight); SDL_GetWindowSize(win, &winWidth, &winHeight);
SDL_GetWindowPosition(win, &winPosX, &winPosY); SDL_GetWindowPosition(win, &winPosX, &winPosY);
-- --
2.21.0 2.23.0
From 47a0f9a87eaa8ec30b3e69e77f11692fcd49aee4 Mon Sep 17 00:00:00 2001 From 5425a5446f6c790e503682e493489b5053d30a33 Mon Sep 17 00:00:00 2001
From: Peter Kosyh <p.kosyh@gmail.com> From: Peter Kosyh <p.kosyh@gmail.com>
Date: Sat, 6 Oct 2018 14:28:41 +0300 Date: Sat, 6 Oct 2018 14:28:41 +0300
Subject: mouse wheel y invert Subject: mouse wheel y invert
diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h diff --git a/src/main/haiku/SDL_BApp.h b/src/main/haiku/SDL_BApp.h
index 1e7a8b5..3fe4bb0 100644 index a4367f6..6bdf6db 100644
--- a/src/main/haiku/SDL_BApp.h --- a/src/main/haiku/SDL_BApp.h
+++ b/src/main/haiku/SDL_BApp.h +++ b/src/main/haiku/SDL_BApp.h
@@ -277,7 +277,7 @@ private: @@ -277,7 +277,7 @@ private:
@@ -465,17 +465,17 @@ index 1e7a8b5..3fe4bb0 100644
void _HandleKey(BMessage *msg) { void _HandleKey(BMessage *msg) {
-- --
2.21.0 2.23.0
From 32e7fb1e506b5d6554935fbb807893c21fe8012b Mon Sep 17 00:00:00 2001 From cccac2a60f7774d50d94fd8d34a956d030310cee Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Mon, 5 Nov 2018 23:25:54 +1000 Date: Mon, 5 Nov 2018 23:25:54 +1000
Subject: Disable pointer history Subject: Disable pointer history
diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h
index fa945a5..9bcfa66 100644 index 9f79927..be2fafd 100644
--- a/src/video/haiku/SDL_BWin.h --- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h +++ b/src/video/haiku/SDL_BWin.h
@@ -140,6 +140,7 @@ class SDL_BWin:public BDirectWindow @@ -140,6 +140,7 @@ class SDL_BWin:public BDirectWindow
@@ -487,10 +487,10 @@ index fa945a5..9bcfa66 100644
_SDL_GLView->LockGL(); /* "New" GLViews are created */ _SDL_GLView->LockGL(); /* "New" GLViews are created */
Unlock(); Unlock();
-- --
2.21.0 2.23.0
From 8a0fa60cab85f7334af1cbb7872046a0c0598c93 Mon Sep 17 00:00:00 2001 From f9196a6a5eb94cc1a6c71e1e8a03923c1a05c881 Mon Sep 17 00:00:00 2001
From: EXL <exlmotodev@gmail.com> From: EXL <exlmotodev@gmail.com>
Date: Wed, 5 Dec 2018 07:02:11 +0000 Date: Wed, 5 Dec 2018 07:02:11 +0000
Subject: Implement message box for Haiku Subject: Implement message box for Haiku
@@ -504,10 +504,10 @@ Add simple customization support also.
Fix build for x86_gcc2. Fix build for x86_gcc2.
diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h diff --git a/include/SDL_syswm.h b/include/SDL_syswm.h
index f1c4021..384753c 100644 index 7aa8c68..162fd5d 100644
--- a/include/SDL_syswm.h --- a/include/SDL_syswm.h
+++ b/include/SDL_syswm.h +++ b/include/SDL_syswm.h
@@ -126,7 +126,8 @@ typedef enum @@ -129,7 +129,8 @@ typedef enum
SDL_SYSWM_WINRT, SDL_SYSWM_WINRT,
SDL_SYSWM_ANDROID, SDL_SYSWM_ANDROID,
SDL_SYSWM_VIVANTE, SDL_SYSWM_VIVANTE,
@@ -518,7 +518,7 @@ index f1c4021..384753c 100644
/** /**
diff --git a/src/main/haiku/SDL_BeApp.cc b/src/main/haiku/SDL_BeApp.cc diff --git a/src/main/haiku/SDL_BeApp.cc b/src/main/haiku/SDL_BeApp.cc
index cbd2129..5c06744 100644 index 2d78059..4eb215c 100644
--- a/src/main/haiku/SDL_BeApp.cc --- a/src/main/haiku/SDL_BeApp.cc
+++ b/src/main/haiku/SDL_BeApp.cc +++ b/src/main/haiku/SDL_BeApp.cc
@@ -48,13 +48,14 @@ extern "C" { @@ -48,13 +48,14 @@ extern "C" {
@@ -539,7 +539,7 @@ index cbd2129..5c06744 100644
image_info info; image_info info;
int32 cookie = 0; int32 cookie = 0;
diff --git a/src/main/haiku/SDL_BeApp.h b/src/main/haiku/SDL_BeApp.h diff --git a/src/main/haiku/SDL_BeApp.h b/src/main/haiku/SDL_BeApp.h
index 83a2beb..7d5e569 100644 index d14e14f..5fcfa54 100644
--- a/src/main/haiku/SDL_BeApp.h --- a/src/main/haiku/SDL_BeApp.h
+++ b/src/main/haiku/SDL_BeApp.h +++ b/src/main/haiku/SDL_BeApp.h
@@ -31,6 +31,9 @@ extern int SDL_InitBeApp(void); @@ -31,6 +31,9 @@ extern int SDL_InitBeApp(void);
@@ -553,10 +553,10 @@ index 83a2beb..7d5e569 100644
#ifdef __cplusplus #ifdef __cplusplus
diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
index 336fdaa..290cfef 100644 index c63f746..655175b 100644
--- a/src/video/SDL_video.c --- a/src/video/SDL_video.c
+++ b/src/video/SDL_video.c +++ b/src/video/SDL_video.c
@@ -3818,9 +3818,12 @@ SDL_IsScreenKeyboardShown(SDL_Window *window) @@ -3843,9 +3843,12 @@ SDL_IsScreenKeyboardShown(SDL_Window *window)
#if SDL_VIDEO_DRIVER_X11 #if SDL_VIDEO_DRIVER_X11
#include "x11/SDL_x11messagebox.h" #include "x11/SDL_x11messagebox.h"
#endif #endif
@@ -570,7 +570,7 @@ index 336fdaa..290cfef 100644
static SDL_bool SDL_MessageboxValidForDriver(const SDL_MessageBoxData *messageboxdata, SDL_SYSWM_TYPE drivertype) static SDL_bool SDL_MessageboxValidForDriver(const SDL_MessageBoxData *messageboxdata, SDL_SYSWM_TYPE drivertype)
{ {
SDL_SysWMinfo info; SDL_SysWMinfo info;
@@ -3912,6 +3915,13 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid) @@ -3937,6 +3940,13 @@ SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid)
X11_ShowMessageBox(messageboxdata, buttonid) == 0) { X11_ShowMessageBox(messageboxdata, buttonid) == 0) {
retval = 0; retval = 0;
} }
@@ -1067,7 +1067,7 @@ index 0000000..4f35cda
+ +
+/* vi: set ts=4 sw=4 expandtab: */ +/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/haiku/SDL_bwindow.cc b/src/video/haiku/SDL_bwindow.cc diff --git a/src/video/haiku/SDL_bwindow.cc b/src/video/haiku/SDL_bwindow.cc
index 142a3fa..462608b 100644 index 6c68802..e818532 100644
--- a/src/video/haiku/SDL_bwindow.cc --- a/src/video/haiku/SDL_bwindow.cc
+++ b/src/video/haiku/SDL_bwindow.cc +++ b/src/video/haiku/SDL_bwindow.cc
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
@@ -1097,17 +1097,17 @@ index 142a3fa..462608b 100644
-- --
2.21.0 2.23.0
From 62dfd165b406bb3d983615ab1c114acbcba864c3 Mon Sep 17 00:00:00 2001 From b0294f6967ec08ad13de8c9850633bdacfa501a1 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com> From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Thu, 20 Jun 2019 23:29:44 +1000 Date: Thu, 20 Jun 2019 23:29:44 +1000
Subject: Move SetEventMask to SetRelativeMouseMode handler Subject: Move SetEventMask to SetRelativeMouseMode handler
diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h diff --git a/src/video/haiku/SDL_BWin.h b/src/video/haiku/SDL_BWin.h
index 9bcfa66..fa945a5 100644 index be2fafd..9f79927 100644
--- a/src/video/haiku/SDL_BWin.h --- a/src/video/haiku/SDL_BWin.h
+++ b/src/video/haiku/SDL_BWin.h +++ b/src/video/haiku/SDL_BWin.h
@@ -140,7 +140,6 @@ class SDL_BWin:public BDirectWindow @@ -140,7 +140,6 @@ class SDL_BWin:public BDirectWindow
@@ -1119,7 +1119,7 @@ index 9bcfa66..fa945a5 100644
_SDL_GLView->LockGL(); /* "New" GLViews are created */ _SDL_GLView->LockGL(); /* "New" GLViews are created */
Unlock(); Unlock();
diff --git a/src/video/haiku/SDL_bvideo.cc b/src/video/haiku/SDL_bvideo.cc diff --git a/src/video/haiku/SDL_bvideo.cc b/src/video/haiku/SDL_bvideo.cc
index 747f7d4..14c7060 100644 index 68300a9..5e564c9 100644
--- a/src/video/haiku/SDL_bvideo.cc --- a/src/video/haiku/SDL_bvideo.cc
+++ b/src/video/haiku/SDL_bvideo.cc +++ b/src/video/haiku/SDL_bvideo.cc
@@ -36,6 +36,11 @@ extern "C" { @@ -36,6 +36,11 @@ extern "C" {
@@ -1170,5 +1170,125 @@ index 747f7d4..14c7060 100644
mouse->def_cursor = (SDL_Cursor*)0x2; mouse->def_cursor = (SDL_Cursor*)0x2;
} }
-- --
2.21.0 2.23.0
From c0da8c7a9243ecf6d24f0ee7f33c6b5467d2cb0d Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Tue, 29 Oct 2019 19:13:09 +0100
Subject: remove unused stuff
diff --git a/configure.ac b/configure.ac
index 8d8da32..d8950c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -887,45 +887,6 @@ AS_HELP_STRING([--enable-oss], [support the OSS audio API [[default=maybe]]]),
fi
}
-dnl See if the ALSA audio interface is supported
-CheckALSA()
-{
- AC_ARG_ENABLE(alsa,
-AS_HELP_STRING([--enable-alsa], [support the ALSA audio API [[default=yes]]]),
- , enable_alsa=yes)
- if test x$enable_audio = xyes -a x$enable_alsa = xyes; then
- AM_PATH_ALSA(1.0.11, have_alsa=yes, have_alsa=no)
- # Restore all flags from before the ALSA detection runs
- CFLAGS="$alsa_save_CFLAGS"
- LDFLAGS="$alsa_save_LDFLAGS"
- LIBS="$alsa_save_LIBS"
- if test x$have_alsa = xyes; then
- AC_ARG_ENABLE(alsa-shared,
-AS_HELP_STRING([--enable-alsa-shared], [dynamically load ALSA audio support [[default=yes]]]),
- , enable_alsa_shared=yes)
- alsa_lib=[`find_lib "libasound.so.*" "$ALSA_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
-
- AC_DEFINE(SDL_AUDIO_DRIVER_ALSA, 1, [ ])
- SOURCES="$SOURCES $srcdir/src/audio/alsa/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $ALSA_CFLAGS"
- if test x$have_loadso != xyes && \
- test x$enable_alsa_shared = xyes; then
- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ALSA loading])
- fi
- if test x$have_loadso = xyes && \
- test x$enable_alsa_shared = xyes && test x$alsa_lib != x; then
- echo "-- dynamic libasound -> $alsa_lib"
- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ALSA_DYNAMIC, "$alsa_lib", [ ])
- SUMMARY_audio="${SUMMARY_audio} alsa(dynamic)"
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ALSA_LIBS"
- SUMMARY_audio="${SUMMARY_audio} alsa"
- fi
- have_audio=yes
- fi
- fi
-}
-
dnl Find JACK Audio
CheckJACK()
{
@@ -970,41 +931,6 @@ AS_HELP_STRING([--enable-jack-shared], [dynamically load JACK audio support [[de
fi
}
-dnl Find the ESD includes and libraries
-CheckESD()
-{
- AC_ARG_ENABLE(esd,
-AS_HELP_STRING([--enable-esd], [support the Enlightened Sound Daemon [[default=yes]]]),
- , enable_esd=yes)
- if test x$enable_audio = xyes -a x$enable_esd = xyes; then
- AM_PATH_ESD(0.2.8, have_esd=yes, have_esd=no)
- if test x$have_esd = xyes; then
- AC_ARG_ENABLE(esd-shared,
-AS_HELP_STRING([--enable-esd-shared], [dynamically load ESD audio support [[default=yes]]]),
- , enable_esd_shared=yes)
- esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`]
-
- AC_DEFINE(SDL_AUDIO_DRIVER_ESD, 1, [ ])
- SOURCES="$SOURCES $srcdir/src/audio/esd/*.c"
- EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS"
- if test x$have_loadso != xyes && \
- test x$enable_esd_shared = xyes; then
- AC_MSG_WARN([You must have SDL_LoadObject() support for dynamic ESD loading])
- fi
- if test x$have_loadso = xyes && \
- test x$enable_esd_shared = xyes && test x$esd_lib != x; then
- echo "-- dynamic libesd -> $esd_lib"
- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", [ ])
- SUMMARY_audio="${SUMMARY_audio} esd(dynamic)"
- else
- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS"
- SUMMARY_audio="${SUMMARY_audio} esd"
- fi
- have_audio=yes
- fi
- fi
-}
-
dnl Find PulseAudio
CheckPulseAudio()
{
@@ -2978,17 +2904,6 @@ XINPUT_STATE_EX s1;
esac
fi
- AC_CHECK_HEADER(mmdeviceapi.h, have_wasapi=yes)
- if test x$have_wasapi = xyes; then
- AC_DEFINE(HAVE_MMDEVICEAPI_H,1,[])
- fi
- AC_CHECK_HEADER(audioclient.h,,have_wasapi=no)
- if test x$have_wasapi = xyes; then
- AC_DEFINE(HAVE_AUDIOCLIENT_H,1,[])
- fi
-
- AC_CHECK_HEADER(endpointvolume.h,AC_DEFINE(HAVE_ENDPOINTVOLUME_H,1,[]))
-
AC_ARG_ENABLE(wasapi,
AS_HELP_STRING([--enable-wasapi], [use the Windows WASAPI audio driver [[default=yes]]]),
, enable_wasapi=yes)
--
2.23.0