[MPlayer-dev-eng] QUESTION: pre7 at friday?
Joey Parrish
joey at yunamusic.com
Fri Aug 16 02:39:41 CEST 2002
Hi,
On Fri, Aug 16, 2002 at 01:44:39AM +0200, Arpi wrote:
> we should release pre7 ASAP, with:
> - compilation/other fatal fixes (mute sig11, wmv8 vs gcc 3.1 fix etc)
> - doc updates as usual :)
> - gui vs. commandline fix
> - gui vs. locale fix
> - new v4l capturing code
> - new directfb driver
> - live.com fixes
> - libmpdvdkit v2.x
> - realvideo a-v sync fixes (ye si know it isn't perfect yet but much better
> than pre6), rv40 support
>
> mayeb releasing it tomorrow isn't a good idea, but we shouldn't wait 2
> months again. pre6 has bugs, major bugs... so users should use cvs but they
> won't...
There are some patches I'd like to see in the next pre-release.
- inet_aton patch, to allow at least ipv4 streaming support on
platforms that are missing an inet_pton() function.
- vo2 patch, to remove references to the now abandoned libvo2.
i apologize if i misread the DOCS on this point.
I've re-attached them to this mail because they were never
committed and nobody ever said they were rejected either.
> note that gcc 3.2 is out, someone should check it on amd and intel systems
> if it works fine, and commit fixes if needed
Perhaps a bit off-topic, but is anyone interested in seeing mplayer
compile with icc? It's something I started hacking at yesterday,
but I haven't gotten that finished yet.
> A'rpi / Astral & ESP-team
--Joey
--
"All you need is love." --Darth Vader
-------------- next part --------------
--- configure Mon Aug 5 13:14:16 2002
+++ configure Mon Aug 5 13:48:20 2002
@@ -1518,6 +1518,7 @@
fi
+_use_aton=no
echocheck "inet_pton()"
cat > $TMPC << EOF
#include <sys/types.h>
@@ -1534,10 +1535,35 @@
_ld_sock="$_ld_sock -lresolv"
echores "yes (using $_ld_sock)"
else
- echores "no (=> streaming support disabled)"
- _streaming=no
+ echores "no (=> i'll try inet_aton next)"
+
+ echocheck "inet_aton()"
+ cat > $TMPC << EOF
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <arpa/inet.h>
+int main(void) { (void) inet_aton(0, 0); return 0; }
+EOF
+ _use_aton=yes
+ if cc_check $_ld_sock ; then
+ # NOTE: Linux has libresolv but does not need it
+ :
+ echores "yes (using $_ld_sock)"
+ elif cc_check $_ld_sock -lresolv ; then
+ # NOTE: needed for SunOS at least
+ _ld_sock="$_ld_sock -lresolv"
+ echores "yes (using $_ld_sock)"
+ else
+ _use_aton=no
+ _streaming=no
+ echores "no (=> streaming support disabled)"
+ fi
fi
+_def_use_aton='#undef USE_ATON'
+if test "$_use_aton" != no; then
+ _def_use_aton='#define USE_ATON 1'
+fi
echocheck "inttypes.h (required)"
cat > $TMPC << EOF
@@ -4523,6 +4549,9 @@
/* enable streaming */
$_def_streaming
+
+/* define this to use inet_aton instead of inet_pton */
+$_def_use_aton
/* enables / disables cdparanoia support */
$_def_cdparanoia
--- libmpdemux/network.h Thu Jul 4 21:35:19 2002
+++ libmpdemux/network.h Mon Aug 5 13:50:03 2002
@@ -52,4 +52,8 @@
int http_send_request(URL_t *url);
HTTP_header_t *http_read_response(int fd);
+#ifdef USE_ATON
+# define inet_pton(a, b, c) inet_aton(b, c)
+#endif
+
#endif
-------------- next part --------------
diff -Naur -x CVS -x libavcodec -x *~ ../main.cvs/Makefile ./Makefile
--- ../main.cvs/Makefile Wed Jul 24 23:43:22 2002
+++ ./Makefile Thu Jul 25 00:35:05 2002
@@ -38,13 +38,8 @@
OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
-ifeq ($(VO2),yes)
-VO_LIBS = -Llibvo2 -lvo2
-VO_INC = -Ilibvo2
-else
VO_LIBS = -Llibvo -lvo
VO_INC = -Ilibvo
-endif
V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
AO_LIBS = -Llibao2 -lao2
@@ -57,15 +52,10 @@
endif
CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC)# -Wall
-PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit
+PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit libvo
ifeq ($(VIDIX),yes)
PARTS += libdha vidix
endif
-ifeq ($(VO2),yes)
-PARTS += libvo2
-else
-PARTS += libvo
-endif
ifeq ($(GUI),yes)
PARTS += Gui
@@ -97,16 +87,11 @@
.c.o:
$(CC) -c $(CFLAGS) -o $@ $<
-COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a
+COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a
ifeq ($(VIDIX),yes)
COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
endif
-ifeq ($(VO2),yes)
-COMMON_DEPS += libvo2/libvo2.a
-else
-COMMON_DEPS += libvo/libvo.a
-endif
ifeq ($(FAME),yes)
COMMON_DEPS += libfame/libfame.a
endif
@@ -153,9 +138,6 @@
libvo/libvo.a:
$(MAKE) -C libvo
-
-libvo2/libvo2.a:
- $(MAKE) -C libvo2
libao2/libao2.a:
$(MAKE) -C libao2
diff -Naur -x CVS -x libavcodec -x *~ ../main.cvs/configure ./configure
--- ../main.cvs/configure Tue Jul 23 21:46:04 2002
+++ ./configure Thu Jul 25 00:35:05 2002
@@ -20,7 +20,7 @@
# GOTCHAS:
# - config files are currently:
# config.h config.mak libvo/config.mak libao2/config.mak
-# Gui/config.mak libvo2/config.mak
+# Gui/config.mak
#
#############################################################################
@@ -956,7 +956,6 @@
_directfb=auto
_zr=no
_largefiles=no
-_vo2=no
_language=en
_shm=auto
_linux_devfs=no
@@ -1113,8 +1112,6 @@
--disable-mtrr) _mtrr=no ;;
--enable-largefiles) _largefiles=yes ;;
--disable-largefiles) _largefiles=no ;;
- --enable-vo2) _vo2=yes ;;
- --disable-vo2) _vo2=no ;;
--enable-shm) _shm=yes ;;
--disable-shm) _shm=no ;;
--enable-select) _select=yes ;;
@@ -4119,8 +4116,6 @@
OPENDIVX = $_opendivx
-VO2 = $_vo2
-
PNG = $_mkf_png
JPEG = $_mkf_jpg
GIF = $_mkf_gif
@@ -4605,20 +4600,6 @@
OPTIONAL_SRCS = $_vosrc
OPTIONAL_OBJS = $_voobj
EOF
-
-#############################################################################
-
-if test -d "libvo2" ; then
-
-echo "Creating libvo2/config.mak"
-_vo2obj=`echo $_vo2src | sed -e 's/\.c/\.o/g'`
-cat > libvo2/config.mak << EOF
-include ../config.mak
-OPTIONAL_SRCS = $_vo2src
-OPTIONAL_OBJS = $_vo2obj
-EOF
-
-fi
#############################################################################
diff -Naur -x CVS -x libavcodec -x *~ ../main.cvs/dll_init.c ./dll_init.c
--- ../main.cvs/dll_init.c Mon Jun 24 13:21:13 2002
+++ ./dll_init.c Thu Jul 25 00:35:05 2002
@@ -24,11 +24,7 @@
#include "dll_init.h"
-#ifdef USE_LIBVO2
-#include "libvo2/img_format.h"
-#else
#include "libvo/img_format.h"
-#endif
#include "linux/shmem.h"
extern int divx_quality;
diff -Naur -x CVS -x libavcodec -x *~ ../main.cvs/find_sub.c ./find_sub.c
--- ../main.cvs/find_sub.c Mon Apr 15 14:17:12 2002
+++ ./find_sub.c Thu Jul 25 00:35:05 2002
@@ -8,13 +8,8 @@
#include <stdio.h>
-#ifdef USE_LIBVO2
-#include "libvo2/libvo2.h"
-#include "libvo2/sub.h"
-#else
#include "libvo/video_out.h"
#include "libvo/sub.h"
-#endif
#include "subreader.h"
static int current_sub=0;
diff -Naur -x CVS -x libavcodec -x *~ ../main.cvs/xacodec.c ./xacodec.c
--- ../main.cvs/xacodec.c Mon Jun 24 13:21:13 2002
+++ ./xacodec.c Thu Jul 25 00:35:05 2002
@@ -29,11 +29,7 @@
#include "codec-cfg.h"
#include "stheader.h"
-#ifdef USE_LIBVO2
-#include "libvo2/img_format.h"
-#else
#include "libvo/img_format.h"
-#endif
#include "linux/timer.h"
#include "xacodec.h"
More information about the MPlayer-dev-eng
mailing list