Commit a1629e28 authored by Diego Biurrun's avatar Diego Biurrun

Remove support for pre-Haiku, non-POSIX, non-C99 BeOS variants.

BeOS support has been broken for many years and the "maintainer" of the port
has not reacted to countless requests to get the port fixed.
approved by Mans

Originally committed as revision 23562 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent c1bdc930
...@@ -331,7 +331,6 @@ Alpha Mans Rullgard, Falk Hueffner ...@@ -331,7 +331,6 @@ Alpha Mans Rullgard, Falk Hueffner
ARM Mans Rullgard ARM Mans Rullgard
AVR32 Mans Rullgard AVR32 Mans Rullgard
MIPS Mans Rullgard MIPS Mans Rullgard
BeOS Francois Revol
Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier Mac OS X / PowerPC Romain Dolbeau, Guillaume Poirier
Amiga / PowerPC Colin Ward Amiga / PowerPC Colin Ward
Linux / PowerPC Luca Barbato Linux / PowerPC Luca Barbato
......
...@@ -115,7 +115,6 @@ Configuration options: ...@@ -115,7 +115,6 @@ Configuration options:
--enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary) --enable-runtime-cpudetect detect cpu capabilities at runtime (bigger binary)
--enable-hardcoded-tables use hardcoded tables instead of runtime generation --enable-hardcoded-tables use hardcoded tables instead of runtime generation
--enable-memalign-hack emulate memalign, interferes with memory debuggers --enable-memalign-hack emulate memalign, interferes with memory debuggers
--enable-beos-netserver enable BeOS netserver
--disable-everything disable all components listed below --disable-everything disable all components listed below
--disable-encoder=NAME disable encoder NAME --disable-encoder=NAME disable encoder NAME
--enable-encoder=NAME enable encoder NAME --enable-encoder=NAME enable encoder NAME
...@@ -894,7 +893,6 @@ CONFIG_LIST=" ...@@ -894,7 +893,6 @@ CONFIG_LIST="
avfilter_lavf avfilter_lavf
avformat avformat
avisynth avisynth
beos_netserver
bzlib bzlib
dct dct
doc doc
...@@ -2127,30 +2125,11 @@ enabled spic && enable pic ...@@ -2127,30 +2125,11 @@ enabled spic && enable pic
# OS specific # OS specific
case $target_os in case $target_os in
beos|haiku|zeta) haiku)
prefix_default="$HOME/config" prefix_default="$HOME/config"
# 3 gcc releases known for BeOS, each with ugly bugs
gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
case "$gcc_version" in
2.9-beos-991026*|2.9-beos-000224*) echo "R5/GG gcc"
disable mmx
;;
*20010315*) echo "BeBits gcc"
add_cflags -fno-expensive-optimizations
;;
esac
SHFLAGS=-nostart SHFLAGS=-nostart
# enable BeOS things
enable audio_beos enable audio_beos
# no need for libm, but the inet stuff ;;
# Check for BONE
# XXX: actually should check for NOT net_server
if echo $BEINCLUDES | grep -q 'headers/be/bone'; then
network_extralibs="-lbind -lsocket"
else
enable beos_netserver
network_extralibs="-lnet"
fi ;;
sunos) sunos)
FFSERVERLDFLAGS="" FFSERVERLDFLAGS=""
SHFLAGS='-shared -Wl,-h,$$(@F)' SHFLAGS='-shared -Wl,-h,$$(@F)'
......
...@@ -29,14 +29,6 @@ Michael's TODO list: (unordered) (if anyone wanna help with sth, just ask) ...@@ -29,14 +29,6 @@ Michael's TODO list: (unordered) (if anyone wanna help with sth, just ask)
- more optimizations - more optimizations
- simper rate control - simper rate control
Francois' TODO list: (unordered, without any timeframe)
-------------------
- test MACE decoder against the openquicktime one as suggested by A'rpi
- BeOS audio input grabbing backend
- BeOS video input grabbing backend
- publish my BeOS libposix on BeBits so I can officially support ffserver :)
- check the whole code for thread-safety (global and init stuff)
Philip'a TODO list: (alphabetically ordered) (please help) Philip'a TODO list: (alphabetically ordered) (please help)
------------------ ------------------
- Add a multi-ffm filetype so that feeds can be recorded into multiple files rather - Add a multi-ffm filetype so that feeds can be recorded into multiple files rather
......
...@@ -725,10 +725,6 @@ performance on systems without hardware floating point support). ...@@ -725,10 +725,6 @@ performance on systems without hardware floating point support).
@chapter Platform Specific information @chapter Platform Specific information
@section BeOS
BeOS support is broken in mysterious ways.
@section DOS @section DOS
Using a cross-compiler is preferred for various reasons. Using a cross-compiler is preferred for various reasons.
......
...@@ -540,10 +540,6 @@ static void term_init(void) ...@@ -540,10 +540,6 @@ static void term_init(void)
#ifdef SIGXCPU #ifdef SIGXCPU
signal(SIGXCPU, sigterm_handler); signal(SIGXCPU, sigterm_handler);
#endif #endif
#if CONFIG_BEOS_NETSERVER
fcntl(0, F_SETFL, fcntl(0, F_GETFL) | O_NONBLOCK);
#endif
} }
/* read a key without blocking */ /* read a key without blocking */
...@@ -552,7 +548,6 @@ static int read_key(void) ...@@ -552,7 +548,6 @@ static int read_key(void)
#if HAVE_TERMIOS_H #if HAVE_TERMIOS_H
int n = 1; int n = 1;
unsigned char ch; unsigned char ch;
#if !CONFIG_BEOS_NETSERVER
struct timeval tv; struct timeval tv;
fd_set rfds; fd_set rfds;
...@@ -561,7 +556,6 @@ static int read_key(void) ...@@ -561,7 +556,6 @@ static int read_key(void)
tv.tv_sec = 0; tv.tv_sec = 0;
tv.tv_usec = 0; tv.tv_usec = 0;
n = select(1, &rfds, NULL, NULL, &tv); n = select(1, &rfds, NULL, NULL, &tv);
#endif
if (n > 0) { if (n > 0) {
n = read(0, &ch, 1); n = read(0, &ch, 1);
if (n == 1) if (n == 1)
......
...@@ -45,23 +45,6 @@ static inline int is_dos_path(const char *path) ...@@ -45,23 +45,6 @@ static inline int is_dos_path(const char *path)
return 0; return 0;
} }
#ifdef __BEOS__
# include <sys/socket.h>
# include <netinet/in.h>
/* not net_server ? */
# include <BeBuild.h>
/* R5 didn't have usleep, fake it. Haiku and Zeta has it now. */
# if B_BEOS_VERSION <= B_BEOS_VERSION_5
# include <OS.h>
/* doesn't set errno but that's enough */
# define usleep(t) snooze((bigtime_t)(t))
# endif
# ifndef SA_RESTART
# warning SA_RESTART not implemented; ffserver might misbehave.
# define SA_RESTART 0
# endif
#endif
#if CONFIG_NETWORK #if CONFIG_NETWORK
#if !HAVE_SOCKLEN_T #if !HAVE_SOCKLEN_T
typedef int socklen_t; typedef int socklen_t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment