[MPlayer-dev-eng] [PATCH] libnemesi support in mplayer

[Diego Biurrun]

On Wed, Sep 19, 2007 at 01:42:00AM +0200, Luca Barbato wrote:
> Diego Biurrun wrote:
> > On Mon, Sep 17, 2007 at 05:51:59PM +0200, Luca Barbato wrote:
> >> Luca Barbato wrote:
> >> [issues about configure and makefile]
> >>
> >> Those patches should address the problems pointed.
> > 
> > Should be OK, although it's easier to read when you don't post patches
> > for patches :)
> 
> Patch updated again, now it correctly support the slider and works as
> should. Libnemesi had been updated to fix some bugs discovered in the
> process.
> 
> If it's fine as initial support I'll commit it, if you think would be
> better to support all the rtsp subsystems at the same time I'll add an
> additional namespace even if I'm not so convinced about it.
> 
> --- stream/Makefile	(revision 24576)
> +++ stream/Makefile	(working copy)
> @@ -27,21 +27,27 @@
>                                      rtp.c                  \
>                                      udp.c                  \
>                                      tcp.c                  \
> +                                    stream_udp.c           \
>                                      stream_rtp.c           \
> -                                    stream_udp.c           \

cosmetics

Also, this was in alphabetical order before, now it is no longer.

> +                                    realrtsp/asmrp.c       \
> +                                    realrtsp/real.c        \
> +                                    realrtsp/rmff.c        \
> +                                    realrtsp/sdpplin.c     \
> +                                    realrtsp/xbuffer.c     \
> +
> +ifeq ($(LIBNEMESI),no)
> +SRCS_COMMON-$(MPLAYER_NETWORK)   += stream_rtsp.c          \
>                                      freesdp/common.c       \
>                                      freesdp/errorlist.c    \
>                                      freesdp/parser.c       \
>                                      librtsp/rtsp.c         \
>                                      librtsp/rtsp_rtp.c     \
>                                      librtsp/rtsp_session.c \
> -                                    realrtsp/asmrp.c       \
> -                                    realrtsp/real.c        \
> -                                    realrtsp/rmff.c        \
> -                                    realrtsp/sdpplin.c     \
> -                                    realrtsp/xbuffer.c     \
>  
> +else
> +SRCS_COMMON-$(MPLAYER_NETWORK)   += stream_nemesi.c
> +endif

This is not the way to go.  Add a new variable in config.mak, then make
sure that configure only activates either nemesi or that variable.  Then
you can remove all those conditionals from the Makefile.

> --- configure	(revision 24576)
> +++ configure	(working copy)
> @@ -6222,7 +6226,25 @@
>  
> +if test "$_nemesi" = yes; then
> +    _def_nemesi='#define LIBNEMESI 1'
> +    _inputmodules="nemesi $_inputmodules"
> +    _live=no

Do not disable live555 from the nemesi check, rather have the live555
check make sure that nemesi is disabled.

Diego