mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-15 08:10:07 +02:00
166 lines
3.7 KiB
Diff
166 lines
3.7 KiB
Diff
From 7a9d0881e262b2b7d33eab5cf88a5f13a23b5b5b Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
|
Date: Mon, 20 Oct 2014 00:59:52 +0200
|
|
Subject: [PATCH 1/3] Add Haiku support
|
|
|
|
---
|
|
Makefile | 3 +++
|
|
librtmp/Makefile | 6 ++++++
|
|
2 files changed, 9 insertions(+)
|
|
|
|
diff --git a/Makefile b/Makefile
|
|
index a1595a8..857080d 100644
|
|
--- a/Makefile
|
|
+++ b/Makefile
|
|
@@ -35,12 +35,14 @@ MANDIR=$(DESTDIR)$(mandir)
|
|
LIBS_posix=
|
|
LIBS_darwin=
|
|
LIBS_mingw=-lws2_32 -lwinmm -lgdi32
|
|
+LIBS_haiku=-lnetwork
|
|
LIB_RTMP=-Llibrtmp -lrtmp
|
|
LIBS=$(LIB_RTMP) $(CRYPTO_LIB) $(LIBS_$(SYS)) $(XLIBS)
|
|
|
|
THREADLIB_posix=-lpthread
|
|
THREADLIB_darwin=-lpthread
|
|
THREADLIB_mingw=
|
|
+THREADLIB_haiku=
|
|
THREADLIB=$(THREADLIB_$(SYS))
|
|
SLIBS=$(THREADLIB) $(LIBS)
|
|
|
|
@@ -50,6 +52,7 @@ INCRTMP=librtmp/rtmp_sys.h librtmp/rtmp.h librtmp/log.h librtmp/amf.h
|
|
EXT_posix=
|
|
EXT_darwin=
|
|
EXT_mingw=.exe
|
|
+EXT_haiku=
|
|
EXT=$(EXT_$(SYS))
|
|
|
|
PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck
|
|
diff --git a/librtmp/Makefile b/librtmp/Makefile
|
|
index 2c1c790..f81851d 100644
|
|
--- a/librtmp/Makefile
|
|
+++ b/librtmp/Makefile
|
|
@@ -29,6 +29,7 @@ LIBZ=-lz
|
|
LIBS_posix=
|
|
LIBS_darwin=
|
|
LIBS_mingw=-lws2_32 -lwinmm -lgdi32
|
|
+LIBS_haiku=
|
|
LIB_GNUTLS=-lgnutls -lhogweed -lnettle -lgmp $(LIBZ)
|
|
LIB_OPENSSL=-lssl -lcrypto $(LIBZ)
|
|
LIB_POLARSSL=-lpolarssl $(LIBZ)
|
|
@@ -42,26 +43,31 @@ SO_VERSION=1
|
|
SOX_posix=so
|
|
SOX_darwin=dylib
|
|
SOX_mingw=dll
|
|
+SOX_haiku=so
|
|
SOX=$(SOX_$(SYS))
|
|
SO_posix=.$(SOX).$(SO_VERSION)
|
|
SO_darwin=.$(SO_VERSION).$(SOX)
|
|
SO_mingw=-$(SO_VERSION).$(SOX)
|
|
+SO_haiku=.$(SO_VERSION).$(SOX)
|
|
SO_EXT=$(SO_$(SYS))
|
|
|
|
SODIR_posix=$(LIBDIR)
|
|
SODIR_darwin=$(LIBDIR)
|
|
SODIR_mingw=$(BINDIR)
|
|
+SODIR_haiku=$(LIBDIR)
|
|
SODIR=$(SODIR_$(SYS))
|
|
|
|
SO_LDFLAGS_posix=-shared -Wl,-soname,$@
|
|
SO_LDFLAGS_darwin=-dynamiclib -twolevel_namespace -undefined dynamic_lookup \
|
|
-fno-common -headerpad_max_install_names -install_name $(libdir)/$@
|
|
SO_LDFLAGS_mingw=-shared -Wl,--out-implib,librtmp.dll.a
|
|
+SO_LDFLAGS_haiku=-shared -Wl,-soname,$@
|
|
SO_LDFLAGS=$(SO_LDFLAGS_$(SYS))
|
|
|
|
INSTALL_IMPLIB_posix=
|
|
INSTALL_IMPLIB_darwin=
|
|
INSTALL_IMPLIB_mingw=cp librtmp.dll.a $(LIBDIR)
|
|
+INSTALL_IMPLIB_haiku=
|
|
INSTALL_IMPLIB=$(INSTALL_IMPLIB_$(SYS))
|
|
|
|
SHARED=yes
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From 2454b0545ca1dad168fe1aec2e03611302c9724d Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
|
Date: Mon, 20 Oct 2014 01:12:47 +0200
|
|
Subject: [PATCH 2/3] POSIX says fd_set is in sys/select.h
|
|
|
|
---
|
|
rtmpgw.c | 1 +
|
|
rtmpsrv.c | 1 +
|
|
rtmpsuck.c | 1 +
|
|
3 files changed, 3 insertions(+)
|
|
|
|
diff --git a/rtmpgw.c b/rtmpgw.c
|
|
index 3e47602..2745723 100644
|
|
--- a/rtmpgw.c
|
|
+++ b/rtmpgw.c
|
|
@@ -26,6 +26,7 @@
|
|
|
|
#include <signal.h>
|
|
#include <getopt.h>
|
|
+#include <sys/select.h>
|
|
|
|
#include <assert.h>
|
|
|
|
diff --git a/rtmpsrv.c b/rtmpsrv.c
|
|
index 5df4d3a..2e78dcc 100644
|
|
--- a/rtmpsrv.c
|
|
+++ b/rtmpsrv.c
|
|
@@ -31,6 +31,7 @@
|
|
|
|
#include <signal.h>
|
|
#include <getopt.h>
|
|
+#include <sys/select.h>
|
|
|
|
#include <assert.h>
|
|
|
|
diff --git a/rtmpsuck.c b/rtmpsuck.c
|
|
index e886179..990b477 100644
|
|
--- a/rtmpsuck.c
|
|
+++ b/rtmpsuck.c
|
|
@@ -31,6 +31,7 @@
|
|
|
|
#include <signal.h>
|
|
#include <getopt.h>
|
|
+#include <sys/select.h>
|
|
|
|
#include <assert.h>
|
|
|
|
--
|
|
2.7.0
|
|
|
|
|
|
From 32e5291ed67a71a2965379893327ca39937645d6 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
|
|
Date: Mon, 11 Jan 2016 13:33:22 +0100
|
|
Subject: [PATCH 3/3] Update README to mention building on Haiku
|
|
|
|
---
|
|
README | 6 +++++-
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/README b/README
|
|
index dcf5f52..306bc80 100644
|
|
--- a/README
|
|
+++ b/README
|
|
@@ -19,7 +19,11 @@ for MacOSX or
|
|
|
|
$ make SYS=mingw
|
|
|
|
-for Windows.
|
|
+for Windows or
|
|
+
|
|
+ $ make SYS=haiku
|
|
+
|
|
+for Haiku.
|
|
|
|
You can cross-compile for other platforms using the CROSS_COMPILE variable:
|
|
|
|
--
|
|
2.7.0
|
|
|