Update of /cvsroot/mplayer/main In directory mplayer:/var/tmp.root/cvs-serv27324 Modified Files: Makefile configure divx4_vbr.c Log Message: small fixes (=> HAVE_STDINT_H is now defined) added STREAMING_LIB in config.mak/Makefile Note: compile via a configure && make without glitches on SunOS Index: Makefile =================================================================== RCS file: /cvsroot/mplayer/main/Makefile,v retrieving revision 1.132 retrieving revision 1.133 diff -u -r1.132 -r1.133 --- Makefile 31 Dec 2001 10:03:10 -0000 1.132 +++ Makefile 31 Dec 2001 15:29:46 -0000 1.133 @@ -163,14 +163,14 @@ endif $(PRG): $(MPLAYER_DEP) - $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) -lm + $(CC) $(CFLAGS) -o $(PRG) $(OBJS_MPLAYER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(VO_LIBS) $(AO_LIBS) $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(V_LIBS) $(LIRC_LIB) $(CSS_LIB) $(ARCH_LIB) $(DECORE_LIB) $(TERMCAP_LIB) $(STATIC_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(STREAMING_LIB) -lm $(PRG_FIBMAP): fibmap_mplayer.o $(CC) -o $(PRG_FIBMAP) fibmap_mplayer.o ifeq ($(MENCODER),yes) $(PRG_MENCODER): $(MENCODER_DEP) - $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(CSS_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) -lm + $(CC) $(CFLAGS) -o $(PRG_MENCODER) $(OBJS_MENCODER) $(CODEC_LIBS) -Llibmpdemux -lmpdemux $(LIB_LOADER) $(GUI_LIBS) $(COMMON_LIBS) $(EXTRA_LIB) $(A_LIBS) $(CSS_LIB) $(GTK_LIBS) $(PNG_LIB) $(Z_LIB) $(ARCH_LIB) $(DECORE_LIB) $(ENCORE_LIB) $(TERMCAP_LIB) $(STREAMING_LIB) -lm endif # Every mplayer dependancy depends on version.h, to force building version.h Index: configure =================================================================== RCS file: /cvsroot/mplayer/main/configure,v retrieving revision 1.354 retrieving revision 1.355 diff -u -r1.354 -r1.355 --- configure 30 Dec 2001 19:38:28 -0000 1.354 +++ configure 31 Dec 2001 15:29:46 -0000 1.355 @@ -1114,6 +1114,21 @@ fi +echocheck "stdint.h" +cat > $TMPC << EOF +#include <stdint.h> +int main(void) { return 0; } +EOF +_stdint=no +cc_check && _stdint=yes +if test "$_stdint" = yes ; then + _def_stdint='#define HAVE_STDINT_H 1' +else + _def_stdint='#undef HAVE_STDINT_H' +fi +echores "$_stdint" + + echocheck "malloc.h" cat > $TMPC << EOF #include <malloc.h> @@ -2544,6 +2559,7 @@ # FIXME streaming check if test "$_streaming" != no ; then _def_streaming='#define STREAMING 1' + _ld_streaming="$_ld_sock" _inputmodules="network $_inputmodules" else _def_streaming='#undef STREAMING' @@ -2730,6 +2746,7 @@ WIN32_PATH = -DWIN32_PATH=\\"$_win32libdir\\" STREAMING = $_streaming +STREAMING_LIB = $_ld_streaming VO2 = $_vo2 @@ -2872,6 +2889,9 @@ /* Define this if your system has the header file for the OSS sound interface */ $_def_sys_soundcard + +/* Define this if your system has the "stdint.h" header file */ +$_def_stdint /* Define this if your system has the "malloc.h" header file */ $_def_malloc Index: divx4_vbr.c =================================================================== RCS file: /cvsroot/mplayer/main/divx4_vbr.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- divx4_vbr.c 31 Dec 2001 10:13:11 -0000 1.3 +++ divx4_vbr.c 31 Dec 2001 15:29:46 -0000 1.4 @@ -43,11 +43,12 @@ #include <dlfcn.h> #include <math.h> -#ifndef __FreeBSD__ +#include "config.h" + +#ifdef HAVE_STDINT_H #include <stdint.h> #endif -#include "config.h" #include "divx4_vbr.h"