[FFmpeg-devel] [PATCH] buildsys: Fix shared lib build of ffserver.

[Michael Niedermayer]

On Mon, Jan 23, 2012 at 09:32:34AM +0100, Clément Bœsch wrote:
> On Mon, Jan 23, 2012 at 01:48:09AM +0100, Michael Niedermayer wrote:
> > Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> > ---
> >  configure                 |    2 +-
> >  libavformat/libavformat.v |    3 +++
> >  2 files changed, 4 insertions(+), 1 deletions(-)
> > 
> > diff --git a/configure b/configure
> > index 2a3eaa1..645010b 100755
> > --- a/configure
> > +++ b/configure
> > @@ -1673,7 +1673,7 @@ avconv_deps="avcodec avformat swscale"
> >  ffplay_deps="avcodec avformat swscale sdl"
> >  ffplay_select="buffersink_filter rdft"
> >  ffprobe_deps="avcodec avformat"
> > -ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer !shared"
> > +ffserver_deps="avformat ffm_muxer fork rtp_protocol rtsp_demuxer"
> >  ffserver_extralibs='$ldl'
> >  ffmpeg_deps="avcodec avformat swscale swresample"
> >  ffmpeg_select="buffersink_filter"
> > diff --git a/libavformat/libavformat.v b/libavformat/libavformat.v
> > index 718524e..6949884 100644
> > --- a/libavformat/libavformat.v
> > +++ b/libavformat/libavformat.v
> > @@ -10,6 +10,9 @@ LIBAVFORMAT_$MAJOR {
> >                  ff_rtp_get_local_rtp_port;
> >                  ff_rtp_get_local_rtcp_port;
> >                  ffio_open_dyn_packet_buf;
> > +                ffurl_close;
> > +                ffurl_open;
> > +                ffurl_write;
> >                  url_open;
> >                  url_close;
> >                  url_write;
> 
> Don't you want to merge Anton fix for avserver? IIRC it was using the
> deprecated API instead. Using it over symbol export might remind us there
> is something to fix there.

which "anton fix" ?

First anton fix:
    commit 8e1340abc316e038bb89e5a3b46e92ff58c98a88
    Author: Anton Khirnov <anton at khirnov.net>
    Date:   Thu Jan 12 09:51:23 2012 +0100

        avserver: fix build after the next bump.

This broke the build


Second anton fix:
    commit 97e3f94b61abb4148bbd33eda1b2540ea4e7cbdf
    Author: Anton Khirnov <anton at khirnov.net>
    Date:   Sat Jan 21 08:40:47 2012 +0100

        Revert "avserver: fix build after the next bump."

        This temporarily (until 0.8 is released) reverts commit
        8e1340abc316e038bb89e5a3b46e92ff58c98a88. That commit breaks shared
        builds because of symbol hiding. Reverting it will enable shared builds
        for 0.8

This reverted the first


Third anton fix:
    commit b263bf66b7dff93b98932065fc379686f83ef751
    Author: Anton Khirnov <anton at khirnov.net>
    Date:   Thu Jan 12 09:51:23 2012 +0100

        avserver: fix build after the next bump.

        Now that 0.8 is out we can reapply this commit. It breaks shared
        avserver builds due to avserver using internal libavformat symbols,
        which are now hidden, so this commit also disables avserver with
        --enable-shared.

This recommited the cosmetic change that breaks the build but it
disables *server so it doesnt "break"

?


[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

No snowflake in an avalanche ever feels responsible. -- Voltaire
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-devel/attachments/20120123/59f441ca/attachment.asc>