Attachment #88906 for bug #129472

View | Details | Raw Unified | Return to bug 129472
Collapse All | Expand All




AM_CXXFLAGS = -D_REENTRANT @BILLS_CPPWARNINGS@

bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract
prog_libadd = libmpeg2_program.la \
	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
	$(top_builddir)/lib/mp4av/libmp4av.la \
	$(top_builddir)/lib/mp4v2/libmp4v2.la \
	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la

mpeg_ps_info_SOURCES = ps_info.cpp
mpeg_ps_info_LDADD = $(prog_libadd)


mpeg2ps_test_SOURCES = test.cpp
mpeg2ps_test_LDADD = libmpeg2_program.la \
	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
	$(top_builddir)/lib/mp4av/libmp4av.la \
	$(top_builddir)/lib/mp4v2/libmp4v2.la \
	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la

EXTRA_DIST=libmpeg2ps.dsp


Lines 49-53 Link Here

(-)lib/mp4av/Makefile.am.orig (+3 lines)
49	rfch264.cpp	49	rfch264.cpp
50		50
51		51
		52	libmp4av_la_LIBADD = \
		53	$(top_builddir)/lib/mp4v2/libmp4v2.la
		54
52	EXTRA_DIST = libmp4av.dsp	55	EXTRA_DIST = libmp4av.dsp
53		56

Lines 8-11 Link Here

(-)lib/Makefile.am.orig (-1 / +1 lines)
8	endif	8	endif
9	endif	9	endif
10		10
11	SUBDIRS = utils audio avi fposrec gnu ismacryp mp4av mp4 mp4v2 msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)	11	SUBDIRS = utils audio avi fposrec gnu ismacryp mp4 mp4v2 mp4av mp4v2/util msg_queue rtp sdp mpeg2t mpeg2ps srtp $(extradir)

Lines 1-4 Link Here

(-)lib/mp4v2/Makefile.am (-1 / +1 lines)
1	SUBDIRS = . test util	1	SUBDIRS = . test
2		2
3	INCLUDES = -I$(top_srcdir)/include	3	INCLUDES = -I$(top_srcdir)/include
4		4




[player=true])
AM_CONDITIONAL(PLAYER, [test x$player = xtrue])

dnl We need -lX11 as they are using XMoveWindow from it
if test $player=true ; then
    dnl Xorg or XFree86
    AC_PATH_XTRA
    
    if test "$no_x" = "yes" ; then
        AC_MSG_WARN([--enable-player was passed to configure, but we will not build it because the X11 headers/libraries were not found])
	player=false
    else
        XLIB_LIBS='$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)'
    fi
    
    AC_SUBST([XLIB_LIBS])
fi

#autoconf is slightly confusing here: 
#enableval will be 'no' if --disable-* is present and '' if it isn't
AC_ARG_ENABLE(srtp,[AC_HELP_STRING([--disable-srtp],[disable use of installed SRTP library])],

Lines 196-202 Link Here

(-)player/src/Makefile.am.orig (-2 / +2 lines)
196		196
197	mp4player_LDFLAGS = $(SDL_AUDIO_FLAGS)	197	mp4player_LDFLAGS = $(SDL_AUDIO_FLAGS)
198	mp4player_LDADD = \	198	mp4player_LDADD = \
199	-lm $(SDL_AUDIO_LIB) \
200	libmp4player.la \	199	libmp4player.la \
201	libmp4syncbase.la \	200	libmp4syncbase.la \
202	libmp4syncsdl.la \	201	libmp4syncsdl.la \
Lines 206-212 Link Here
206	$(top_builddir)/lib/audio/libaudio.la \	205	$(top_builddir)/lib/audio/libaudio.la \
207	$(top_builddir)/lib/ismacryp/libismacryp.la \	206	$(top_builddir)/lib/ismacryp/libismacryp.la \
208	$(top_builddir)/lib/srtp/libsrtpif.la \	207	$(top_builddir)/lib/srtp/libsrtpif.la \
209	@SDL_LIBS@ @SRTPLIB@	208	$(SDL_AUDIO_LIB) -lm \
		209	@SDL_LIBS@ @XLIB_LIBS@ @SRTPLIB@
210		210
211	gmp4player_LDFLAGS= $(SDL_AUDIO_FLAGS)	211	gmp4player_LDFLAGS= $(SDL_AUDIO_FLAGS)
212	gmp4player_LDADD = $(mp4player_LDADD) \	212	gmp4player_LDADD = $(mp4player_LDADD) \




	-D_REENTRANT -DNOCONTROLS -fexceptions @BILLS_CPPWARNINGS@ 

mp4live_LDADD = \
	@GTK_LIBS@ @GLIB_LIBS@ \
	@FAAC_LIB@ \
	@LAME_LIB@ \
	./h261/libmp4live_h261.la \
	$(GUIADD) \
	libmp4live.la \
	$(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
	$(top_builddir)/lib/msg_queue/libmsg_queue.la \
	$(top_builddir)/lib/mp4v2/libmp4v2.la \

	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
	$(top_builddir)/lib/utils/libutils.la \
	$(top_builddir)/lib/srtp/libsrtpif.la \
	./h261/libmp4live_h261.la \
	-lpthread \
	@SDL_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@ $(XVID_LIB) \
	@GTK_LIBS@ @GLIB_LIBS@ \
	@FAAC_LIB@ \
	@LAME_LIB@ \
	@SRTPLIB@ \
	@X264_LIB@ \
	-lpthread


EXTRA_DIST = $(ed2) video_v4l_source.cpp 

Return to bug 129472

Lines 351-356 Link Here

(-)configure.in.orig (+15 lines)
351	[player=true])	351	[player=true])
352	AM_CONDITIONAL(PLAYER, [test x$player = xtrue])	352	AM_CONDITIONAL(PLAYER, [test x$player = xtrue])
353		353
		354	dnl We need -lX11 as they are using XMoveWindow from it
		355	if test $player=true ; then
		356	dnl Xorg or XFree86
		357	AC_PATH_XTRA
		358
		359	if test "$no_x" = "yes" ; then
		360	AC_MSG_WARN([--enable-player was passed to configure, but we will not build it because the X11 headers/libraries were not found])
		361	player=false
		362	else
		363	XLIB_LIBS='$(X_LIBS) $(X_PRE_LIBS) -lX11 $(X_EXTRA_LIBS)'
		364	fi
		365
		366	AC_SUBST([XLIB_LIBS])
		367	fi
		368
354	#autoconf is slightly confusing here:	369	#autoconf is slightly confusing here:
355	#enableval will be 'no' if --disable-* is present and '' if it isn't	370	#enableval will be 'no' if --disable-* is present and '' if it isn't
356	AC_ARG_ENABLE(srtp,[AC_HELP_STRING([--disable-srtp],[disable use of installed SRTP library])],	371	AC_ARG_ENABLE(srtp,[AC_HELP_STRING([--disable-srtp],[disable use of installed SRTP library])],

Lines 151-162 Link Here

(-)server/mp4live/Makefile.am.orig (-7 / +8 lines)
151	-D_REENTRANT -DNOCONTROLS -fexceptions @BILLS_CPPWARNINGS@	151	-D_REENTRANT -DNOCONTROLS -fexceptions @BILLS_CPPWARNINGS@
152		152
153	mp4live_LDADD = \	153	mp4live_LDADD = \
154	@GTK_LIBS@ @GLIB_LIBS@ \
155	@FAAC_LIB@ \
156	@LAME_LIB@ \
157	./h261/libmp4live_h261.la \
158	$(GUIADD) \	154	$(GUIADD) \
159	libmp4live.la \	155	libmp4live.la \
160	$(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \	156	$(top_builddir)/lib/mpeg2ps/libmpeg2_program.la \
161	$(top_builddir)/lib/msg_queue/libmsg_queue.la \	157	$(top_builddir)/lib/msg_queue/libmsg_queue.la \
162	$(top_builddir)/lib/mp4v2/libmp4v2.la \	158	$(top_builddir)/lib/mp4v2/libmp4v2.la \
Lines 166-174 Link Here
166	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \	160	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
167	$(top_builddir)/lib/utils/libutils.la \	161	$(top_builddir)/lib/utils/libutils.la \
168	$(top_builddir)/lib/srtp/libsrtpif.la \	162	$(top_builddir)/lib/srtp/libsrtpif.la \
169	@SRTPLIB@ \	163	./h261/libmp4live_h261.la \
170	-lpthread \
171	@SDL_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@ $(XVID_LIB) \	164	@SDL_LIBS@ $(GUILIBS) @FFMPEG_LIB@ @LIBVORBIS_LIB@ $(XVID_LIB) \
172	@X264_LIB@	165	@GTK_LIBS@ @GLIB_LIBS@ \
		166	@FAAC_LIB@ \
		167	@LAME_LIB@ \
		168	@SRTPLIB@ \
		169	@X264_LIB@ \
		170	-lpthread
		171
173		172
174	EXTRA_DIST = $(ed2) video_v4l_source.cpp	173	EXTRA_DIST = $(ed2) video_v4l_source.cpp

Lines 11-21 Link Here

(-)lib/mpeg2ps/Makefile.am.orig (-5 / +3 lines)
11	AM_CXXFLAGS = -D_REENTRANT @BILLS_CPPWARNINGS@	11	AM_CXXFLAGS = -D_REENTRANT @BILLS_CPPWARNINGS@
12		12
13	bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract	13	bin_PROGRAMS = mpeg_ps_info mpeg_ps_extract
14	prog_libadd = \	14	prog_libadd = libmpeg2_program.la \
15	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
16	$(top_builddir)/lib/mp4av/libmp4av.la \	15	$(top_builddir)/lib/mp4av/libmp4av.la \
17	$(top_builddir)/lib/mp4v2/libmp4v2.la \	16	$(top_builddir)/lib/mp4v2/libmp4v2.la \
18	libmpeg2_program.la	17	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la
19		18
20	mpeg_ps_info_SOURCES = ps_info.cpp	19	mpeg_ps_info_SOURCES = ps_info.cpp
21	mpeg_ps_info_LDADD = $(prog_libadd)	20	mpeg_ps_info_LDADD = $(prog_libadd)
Lines 25-34 Link Here
25		24
26	mpeg2ps_test_SOURCES = test.cpp	25	mpeg2ps_test_SOURCES = test.cpp
27	mpeg2ps_test_LDADD = libmpeg2_program.la \	26	mpeg2ps_test_LDADD = libmpeg2_program.la \
28	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la \
29	$(top_builddir)/lib/mp4av/libmp4av.la \	27	$(top_builddir)/lib/mp4av/libmp4av.la \
30	$(top_builddir)/lib/mp4v2/libmp4v2.la \	28	$(top_builddir)/lib/mp4v2/libmp4v2.la \
31	libmpeg2_program.la	29	$(top_builddir)/lib/gnu/libmpeg4ip_gnu.la
32		30
33	EXTRA_DIST=libmpeg2ps.dsp	31	EXTRA_DIST=libmpeg2ps.dsp
34		32