mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-03-28 12:32:17 +02:00
Remove Plan 9 support
Supporting the system was a nice joke for the 9 release, but it has run its course. Nowadays Plan 9 receives no testing and has no practical usefulness.
This commit is contained in:
parent
4a1ef54398
commit
3794062ab1
4
Makefile
4
Makefile
@ -116,7 +116,7 @@ FF_STATIC_DEP_LIBS := $(STATIC_DEP_LIBS)
|
|||||||
|
|
||||||
all: $(AVPROGS)
|
all: $(AVPROGS)
|
||||||
|
|
||||||
$(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
|
$(TOOLS): %$(EXESUF): %.o
|
||||||
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
|
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $^ $(ELIBS)
|
||||||
|
|
||||||
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
|
tools/cws2fws$(EXESUF): ELIBS = $(ZLIB)
|
||||||
@ -157,7 +157,7 @@ $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D))))
|
|||||||
include $(SRC_PATH)/doc/Makefile
|
include $(SRC_PATH)/doc/Makefile
|
||||||
|
|
||||||
define DOPROG
|
define DOPROG
|
||||||
OBJS-$(1) += $(1).o $(EXEOBJS) $(OBJS-$(1)-yes)
|
OBJS-$(1) += $(1).o $(OBJS-$(1)-yes)
|
||||||
$(1)$(EXESUF): $$(OBJS-$(1))
|
$(1)$(EXESUF): $$(OBJS-$(1))
|
||||||
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
|
$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1))
|
||||||
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
|
$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1))
|
||||||
|
@ -1,10 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
n=10
|
|
||||||
|
|
||||||
case "$1" in
|
|
||||||
-n) n=$2; shift 2 ;;
|
|
||||||
-n*) n=${1#-n}; shift ;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
exec sed ${n}q "$@"
|
|
@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* This file is part of Libav.
|
|
||||||
*
|
|
||||||
* Libav is free software; you can redistribute it and/or
|
|
||||||
* modify it under the terms of the GNU Lesser General Public
|
|
||||||
* License as published by the Free Software Foundation; either
|
|
||||||
* version 2.1 of the License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* Libav is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* Lesser General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Lesser General Public
|
|
||||||
* License along with Libav; if not, write to the Free Software
|
|
||||||
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
||||||
*/
|
|
||||||
|
|
||||||
int plan9_main(int argc, char **argv);
|
|
||||||
|
|
||||||
#undef main
|
|
||||||
int main(int argc, char **argv)
|
|
||||||
{
|
|
||||||
/* The setfcr() function in lib9 is broken, must use asm. */
|
|
||||||
#ifdef __i386
|
|
||||||
short fcr;
|
|
||||||
__asm__ volatile ("fstcw %0 \n"
|
|
||||||
"or $63, %0 \n"
|
|
||||||
"fldcw %0 \n"
|
|
||||||
: "=m"(fcr));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return plan9_main(argc, argv);
|
|
||||||
}
|
|
@ -1,2 +0,0 @@
|
|||||||
#!/bin/sh
|
|
||||||
exec awk "BEGIN { for (i = 2; i < ARGC; i++) printf \"$1\", ARGV[i] }" "$@"
|
|
18
configure
vendored
18
configure
vendored
@ -1173,7 +1173,7 @@ apply(){
|
|||||||
cp_if_changed(){
|
cp_if_changed(){
|
||||||
cmp -s "$1" "$2" && { test "$quiet" != "yes" && echo "$2 is unchanged"; } && return
|
cmp -s "$1" "$2" && { test "$quiet" != "yes" && echo "$2 is unchanged"; } && return
|
||||||
mkdir -p "$(dirname $2)"
|
mkdir -p "$(dirname $2)"
|
||||||
$cp_f "$1" "$2"
|
cp -f "$1" "$2"
|
||||||
}
|
}
|
||||||
|
|
||||||
# CONFIG_LIST contains configurable options, while HAVE_LIST is for
|
# CONFIG_LIST contains configurable options, while HAVE_LIST is for
|
||||||
@ -2491,7 +2491,6 @@ shlibdir_default="$libdir_default"
|
|||||||
ar_default="ar"
|
ar_default="ar"
|
||||||
cc_default="gcc"
|
cc_default="gcc"
|
||||||
host_cc_default="gcc"
|
host_cc_default="gcc"
|
||||||
cp_f="cp -f"
|
|
||||||
ln_s="ln -s -f"
|
ln_s="ln -s -f"
|
||||||
nm_default="nm -g"
|
nm_default="nm -g"
|
||||||
objformat="elf"
|
objformat="elf"
|
||||||
@ -3985,17 +3984,6 @@ case $target_os in
|
|||||||
;;
|
;;
|
||||||
minix)
|
minix)
|
||||||
;;
|
;;
|
||||||
plan9)
|
|
||||||
add_cppflags -D_C99_SNPRINTF_EXTENSION \
|
|
||||||
-D_REENTRANT_SOURCE \
|
|
||||||
-D_RESEARCH_SOURCE \
|
|
||||||
-DFD_SETSIZE=96 \
|
|
||||||
-DHAVE_SOCK_OPTS
|
|
||||||
add_compat strtod.o strtod=avpriv_strtod
|
|
||||||
network_extralibs='-lbsd'
|
|
||||||
exeobjs=compat/plan9/main.o
|
|
||||||
cp_f='cp'
|
|
||||||
;;
|
|
||||||
none)
|
none)
|
||||||
;;
|
;;
|
||||||
*)
|
*)
|
||||||
@ -5056,9 +5044,6 @@ case $target_os in
|
|||||||
osf1)
|
osf1)
|
||||||
enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
|
enabled ccc && add_ldflags '-Wl,-expect_unresolved,*'
|
||||||
;;
|
;;
|
||||||
plan9)
|
|
||||||
add_cppflags -Dmain=plan9_main
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
|
enabled asm || { arch=c; disable $ARCH_LIST $ARCH_EXT_LIST; }
|
||||||
@ -5318,7 +5303,6 @@ ZLIB=$($ldflags_filter -lz)
|
|||||||
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
|
LIB_INSTALL_EXTRA_CMD=$LIB_INSTALL_EXTRA_CMD
|
||||||
EXTRALIBS=$extralibs
|
EXTRALIBS=$extralibs
|
||||||
COMPAT_OBJS=$compat_objs
|
COMPAT_OBJS=$compat_objs
|
||||||
EXEOBJS=$exeobjs
|
|
||||||
INSTALL=install
|
INSTALL=install
|
||||||
LIBTARGET=${LIBTARGET}
|
LIBTARGET=${LIBTARGET}
|
||||||
SLIBNAME=${SLIBNAME}
|
SLIBNAME=${SLIBNAME}
|
||||||
|
@ -336,67 +336,4 @@ and for a build with shared libraries
|
|||||||
./configure --target-os=mingw32 --enable-shared --disable-static --extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin
|
./configure --target-os=mingw32 --enable-shared --disable-static --extra-cflags=-mno-cygwin --extra-libs=-mno-cygwin
|
||||||
@end example
|
@end example
|
||||||
|
|
||||||
@chapter Plan 9
|
|
||||||
|
|
||||||
The native @uref{http://plan9.bell-labs.com/plan9/, Plan 9} compiler
|
|
||||||
does not implement all the C99 features needed by Libav so the gcc
|
|
||||||
port must be used. Furthermore, a few items missing from the C
|
|
||||||
library and shell environment need to be fixed.
|
|
||||||
|
|
||||||
@itemize
|
|
||||||
|
|
||||||
@item GNU awk, grep, make, and sed
|
|
||||||
|
|
||||||
Working packages of these tools can be found at
|
|
||||||
@uref{http://code.google.com/p/ports2plan9/downloads/list, ports2plan9}.
|
|
||||||
They can be installed with @uref{http://9front.org/, 9front's} @code{pkg}
|
|
||||||
utility by setting @code{pkgpath} to
|
|
||||||
@code{http://ports2plan9.googlecode.com/files/}.
|
|
||||||
|
|
||||||
@item Missing/broken @code{head} and @code{printf} commands
|
|
||||||
|
|
||||||
Replacements adequate for building Libav can be found in the
|
|
||||||
@code{compat/plan9} directory. Place these somewhere they will be
|
|
||||||
found by the shell. These are not full implementations of the
|
|
||||||
commands and are @emph{not} suitable for general use.
|
|
||||||
|
|
||||||
@item Missing C99 @code{stdint.h} and @code{inttypes.h}
|
|
||||||
|
|
||||||
Replacement headers are available from
|
|
||||||
@url{http://code.google.com/p/plan9front/issues/detail?id=152}.
|
|
||||||
|
|
||||||
@item Missing or non-standard library functions
|
|
||||||
|
|
||||||
Some functions in the C library are missing or incomplete. The
|
|
||||||
@code{@uref{http://ports2plan9.googlecode.com/files/gcc-apelibs-1207.tbz,
|
|
||||||
gcc-apelibs-1207}} package from
|
|
||||||
@uref{http://code.google.com/p/ports2plan9/downloads/list, ports2plan9}
|
|
||||||
includes an updated C library, but installing the full package gives
|
|
||||||
unusable executables. Instead, keep the files from @code{gccbin.tgz}
|
|
||||||
under @code{/386/lib/gnu}. From the @code{libc.a} archive in the
|
|
||||||
@code{gcc-apelibs-1207} package, extract the following object files and
|
|
||||||
turn them into a library:
|
|
||||||
|
|
||||||
@itemize
|
|
||||||
@item @code{strerror.o}
|
|
||||||
@item @code{strtoll.o}
|
|
||||||
@item @code{snprintf.o}
|
|
||||||
@item @code{vsnprintf.o}
|
|
||||||
@item @code{vfprintf.o}
|
|
||||||
@item @code{_IO_getc.o}
|
|
||||||
@item @code{_IO_putc.o}
|
|
||||||
@end itemize
|
|
||||||
|
|
||||||
Use the @code{--extra-libs} option of @code{configure} to inform the
|
|
||||||
build system of this library.
|
|
||||||
|
|
||||||
@item FPU exceptions enabled by default
|
|
||||||
|
|
||||||
Unlike most other systems, Plan 9 enables FPU exceptions by default.
|
|
||||||
These must be disabled before calling any Libav functions. While the
|
|
||||||
included tools will do this automatically, other users of the
|
|
||||||
libraries must do it themselves.
|
|
||||||
|
|
||||||
@end itemize
|
|
||||||
|
|
||||||
@bye
|
@bye
|
||||||
|
@ -59,7 +59,7 @@ static inline int is_dos_path(const char *path)
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#if defined(__OS2__) || defined(__Plan9__)
|
#if defined(__OS2__)
|
||||||
#define SHUT_RD 0
|
#define SHUT_RD 0
|
||||||
#define SHUT_WR 1
|
#define SHUT_WR 1
|
||||||
#define SHUT_RDWR 2
|
#define SHUT_RDWR 2
|
||||||
|
@ -27,7 +27,7 @@ define RULES
|
|||||||
$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
|
$(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB))
|
||||||
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
|
$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME)
|
||||||
|
|
||||||
$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o $(EXEOBJS)
|
$(TESTPROGS) $(TOOLS): %$(EXESUF): %.o
|
||||||
$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
|
$$(LD) $(LDFLAGS) $(LDEXEFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS)
|
||||||
|
|
||||||
$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)
|
$(SUBDIR)lib$(NAME).ver: $(SUBDIR)lib$(NAME).v $(OBJS)
|
||||||
|
@ -34,7 +34,7 @@ OBJDIRS += $(CHECKASMDIRS)
|
|||||||
|
|
||||||
CHECKASM := tests/checkasm/checkasm$(EXESUF)
|
CHECKASM := tests/checkasm/checkasm$(EXESUF)
|
||||||
|
|
||||||
$(CHECKASM): $(EXEOBJS) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
|
$(CHECKASM): $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS)
|
||||||
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS)
|
$(LD) $(LDFLAGS) $(LDEXEFLAGS) $(LD_O) $(CHECKASMOBJS) $(FF_STATIC_DEP_LIBS) $(EXTRALIBS)
|
||||||
|
|
||||||
checkasm: $(CHECKASM)
|
checkasm: $(CHECKASM)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user