mirror of
https://github.com/yann64/haikuports.git
synced 2026-05-05 06:28:55 +02:00
152 lines
5.2 KiB
Diff
152 lines
5.2 KiB
Diff
Index: src/video/bwindow/SDL_sysyuv.cc
|
|
===================================================================
|
|
--- src/video/bwindow/SDL_sysyuv.cc (revision 4456)
|
|
+++ src/video/bwindow/SDL_sysyuv.cc (working copy)
|
|
@@ -94,7 +94,7 @@
|
|
|
|
// See <GraphicsDefs.h> [btw: Cb=U, Cr=V]
|
|
// See also http://www.fourcc.org/indexyuv.htm
|
|
-enum color_space convert_color_space(Uint32 format) {
|
|
+color_space convert_color_space(Uint32 format) {
|
|
switch (format) {
|
|
case SDL_YV12_OVERLAY:
|
|
return B_YUV9;
|
|
Index: src/video/bwindow/SDL_sysyuv.h
|
|
===================================================================
|
|
--- src/video/bwindow/SDL_sysyuv.h (revision 4456)
|
|
+++ src/video/bwindow/SDL_sysyuv.h (working copy)
|
|
@@ -62,7 +62,7 @@
|
|
};
|
|
|
|
extern BBitmap * BE_GetOverlayBitmap(BRect bounds, color_space cs);
|
|
-extern SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display);
|
|
+SDL_Overlay* BE_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, SDL_Surface* display);
|
|
extern int BE_LockYUVOverlay(_THIS, SDL_Overlay* overlay);
|
|
extern void BE_UnlockYUVOverlay(_THIS, SDL_Overlay* overlay);
|
|
extern int BE_DisplayYUVOverlay(_THIS, SDL_Overlay* overlay, SDL_Rect* src, SDL_Rect* dst);
|
|
Index: src/video/bwindow/SDL_sysvideo.cc
|
|
===================================================================
|
|
--- src/video/bwindow/SDL_sysvideo.cc (revision 4456)
|
|
+++ src/video/bwindow/SDL_sysvideo.cc (working copy)
|
|
@@ -637,8 +637,12 @@
|
|
int32 cookie = 0;
|
|
while (get_next_image_info(0,&cookie,&info) == B_OK) {
|
|
void *location = NULL;
|
|
- if (get_image_symbol((image_id)cookie,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) {
|
|
- _this->gl_config.dll_handle = (void*)cookie;
|
|
+#ifdef __HAIKU__
|
|
+ if (get_image_symbol(info.id,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) { // This is how it actually works in Haiku
|
|
+#else
|
|
+ if (get_image_symbol((image_id)cookie,"glBegin",B_SYMBOL_TYPE_ANY,&location) == B_OK) { // I don't know if that *did* work in BeOS
|
|
+#endif
|
|
+ _this->gl_config.dll_handle = (void*)info.id;
|
|
_this->gl_config.driver_loaded = 1;
|
|
SDL_strlcpy(_this->gl_config.driver_path, "libGL.so", SDL_arraysize(_this->gl_config.driver_path));
|
|
}
|
|
Index: test/configure.in
|
|
===================================================================
|
|
--- test/configure.in (revision 4456)
|
|
+++ test/configure.in (working copy)
|
|
@@ -20,7 +20,7 @@
|
|
MATHLIB=""
|
|
SYS_GL_LIBS="-lopengl32"
|
|
;;
|
|
- *-*-beos*)
|
|
+ *-*-beos* | *-*-haiku*)
|
|
EXE=""
|
|
MATHLIB=""
|
|
SYS_GL_LIBS="-lGL"
|
|
Index: test/testplatform.c
|
|
===================================================================
|
|
--- test/testplatform.c (revision 4456)
|
|
+++ test/testplatform.c (working copy)
|
|
@@ -162,6 +162,8 @@
|
|
"Dreamcast"
|
|
#elif __FREEBSD__
|
|
"FreeBSD"
|
|
+#elif __HAIKU__
|
|
+ "Haiku"
|
|
#elif __HPUX__
|
|
"HP-UX"
|
|
#elif __IRIX__
|
|
Index: include/begin_code.h
|
|
===================================================================
|
|
--- include/begin_code.h (revision 4456)
|
|
+++ include/begin_code.h (working copy)
|
|
@@ -33,7 +33,7 @@
|
|
|
|
/* Some compilers use a special export keyword */
|
|
#ifndef DECLSPEC
|
|
-# if defined(__BEOS__)
|
|
+# if defined(__BEOS__) || defined(__HAIKU__)
|
|
# if defined(__GNUC__)
|
|
# define DECLSPEC __declspec(dllexport)
|
|
# else
|
|
Index: include/SDL_platform.h
|
|
===================================================================
|
|
--- include/SDL_platform.h (revision 4456)
|
|
+++ include/SDL_platform.h (working copy)
|
|
@@ -33,6 +33,10 @@
|
|
#undef __BEOS__
|
|
#define __BEOS__ 1
|
|
#endif
|
|
+#if defined(__HAIKU__)
|
|
+#undef __HAIKU__
|
|
+#define __HAIKU__ 1
|
|
+#endif
|
|
#if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
|
|
#undef __BSDI__
|
|
#define __BSDI__ 1
|
|
@@ -45,6 +49,10 @@
|
|
#undef __FREEBSD__
|
|
#define __FREEBSD__ 1
|
|
#endif
|
|
+#if defined(__HAIKU__)
|
|
+#undef __HAIKU__
|
|
+#define __HAIKU__ 1
|
|
+#endif
|
|
#if defined(hpux) || defined(__hpux) || defined(__hpux__)
|
|
#undef __HPUX__
|
|
#define __HPUX__ 1
|
|
Index: configure.in
|
|
===================================================================
|
|
--- configure.in (revision 4456)
|
|
+++ configure.in (working copy)
|
|
@@ -40,7 +40,7 @@
|
|
AC_SUBST(LT_AGE)
|
|
|
|
dnl Detect the canonical build and host environments
|
|
-AC_CONFIG_AUX_DIRS($srcdir/build-scripts)
|
|
+AC_CONFIG_AUX_DIR([build-scripts])
|
|
AC_CANONICAL_HOST
|
|
AC_C_BIGENDIAN
|
|
if test x$ac_cv_c_bigendian = xyes; then
|
|
@@ -2493,7 +2493,7 @@
|
|
SDL_CFLAGS="$SDL_CFLAGS -Dmain=SDL_main -D_WIN32_WCE=0x420"
|
|
SDL_LIBS="-lSDLmain $SDL_LIBS"
|
|
;;
|
|
- *-*-beos*)
|
|
+ *-*-beos* | *-*-haiku*)
|
|
ARCH=beos
|
|
ac_default_prefix=/boot/develop/tools/gnupro
|
|
CheckDummyVideo
|
|
@@ -2536,8 +2536,16 @@
|
|
fi
|
|
# Set up files for the shared object loading library
|
|
if test x$enable_loadso = xyes; then
|
|
- AC_DEFINE(SDL_LOADSO_BEOS)
|
|
- SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
|
|
+ case "$host" in
|
|
+ *-*-beos*)
|
|
+ AC_DEFINE(SDL_LOADSO_BEOS)
|
|
+ SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c"
|
|
+ ;;
|
|
+ *-*-haiku*)
|
|
+ AC_DEFINE(SDL_LOADSO_DLOPEN)
|
|
+ SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c"
|
|
+ ;;
|
|
+ esac
|
|
have_loadso=yes
|
|
fi
|
|
# The BeOS platform requires special setup.
|