Attachment #185344 for bug #259461

Lines 25073-25079 Link Here

(-)mjpegtools-1.9.0_orig/configure (-2 / +2 lines)
25073	# Martyn Johnson says this is needed for Ultrix, if the X	25073	# Martyn Johnson says this is needed for Ultrix, if the X
25074	# libraries were built with DECnet support. And Karl Berry says	25074	# libraries were built with DECnet support. And Karl Berry says
25075	# the Alpha needs dnet_stub (dnet does not exist).	25075	# the Alpha needs dnet_stub (dnet does not exist).
25076	ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"	25076	ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS"
25077	cat >conftest.$ac_ext <<_ACEOF	25077	cat >conftest.$ac_ext <<_ACEOF
25078	/* confdefs.h. */	25078	/* confdefs.h. */
25079	_ACEOF	25079	_ACEOF
Lines 26154-26160 Link Here
26154	echo $ECHO_N "(cached) $ECHO_C" >&6	26154	echo $ECHO_N "(cached) $ECHO_C" >&6
26155	else	26155	else
26156	ac_check_lib_save_LIBS=$LIBS	26156	ac_check_lib_save_LIBS=$LIBS
26157	LIBS="-lXxf86dga $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS $LIBS"	26157	LIBS="-lXxf86dga $X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS $LIBS"
26158	cat >conftest.$ac_ext <<_ACEOF	26158	cat >conftest.$ac_ext <<_ACEOF
26159	/* confdefs.h. */	26159	/* confdefs.h. */
26160	_ACEOF	26160	_ACEOF

Lines 261-267 Link Here

(-)mjpegtools-1.9.0_orig/configure.ac (-1 / +1 lines)
261	AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,	261	AC_CHECK_LIB(Xxf86dga, XF86DGAQueryExtension,
262	V4LCONF_LIBS="$X_LIBS -lXxf86dga"	262	V4LCONF_LIBS="$X_LIBS -lXxf86dga"
263	AC_DEFINE(HAVE_LIBXXF86DGA,1, [libxf86dga is present]),,	263	AC_DEFINE(HAVE_LIBXXF86DGA,1, [libxf86dga is present]),,
264	$X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS)	264	$X_LIBS $X_PRE_LIBS $X_EXTRA_LIBS)
265		265
266	dnl ********************************************************************	266	dnl ********************************************************************
267	dnl Check for Gtk+/glib (for glav). 2.4.0 or greater required (should	267	dnl Check for Gtk+/glib (for glav). 2.4.0 or greater required (should

Lines 60-66 Link Here

(-)mjpegtools-1.9.0_orig/lavtools/Makefile.am (-1 / +1 lines)
60	liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)	60	liblavplay_la_LDFLAGS = $(LAV_ALL_LIB_OPTS)
61	liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la	61	liblavplay_la_LIBADD = liblavfile.la $(SDL_LIBS) liblavjpeg.la
62	if HAVE_V4L	62	if HAVE_V4L
63	liblavplay_la_LIBADD += ${X_LIBS} -lX11	63	liblavplay_la_LIBADD += ${X_LIBS}
64	endif	64	endif
65	liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la	65	liblavplay_la_DEPENDENCIES = liblavfile.la liblavjpeg.la
66		66

Lines 44-50 Link Here

(-)mjpegtools-1.9.0_orig/lavtools/Makefile.in (-1 / +1 lines)
44	@HAVE_ALTIVEC_TRUE@am__append_1 = $(top_builddir)/mpeg2enc/libmpeg2encpp.la	44	@HAVE_ALTIVEC_TRUE@am__append_1 = $(top_builddir)/mpeg2enc/libmpeg2encpp.la
45	@HAVE_V4L_TRUE@am__append_2 = liblavrec.la	45	@HAVE_V4L_TRUE@am__append_2 = liblavrec.la
46	@HAVE_V4L_OR_SDL_TRUE@am__append_3 = liblavplay.la	46	@HAVE_V4L_OR_SDL_TRUE@am__append_3 = liblavplay.la
47	@HAVE_V4L_TRUE@am__append_4 = ${X_LIBS} -lX11	47	@HAVE_V4L_TRUE@am__append_4 = ${X_LIBS}
48	bin_PROGRAMS = mjpeg_simd_helper$(EXEEXT) lav2wav$(EXEEXT) \	48	bin_PROGRAMS = mjpeg_simd_helper$(EXEEXT) lav2wav$(EXEEXT) \
49	lav2yuv$(EXEEXT) lavaddwav$(EXEEXT) lavtrans$(EXEEXT) \	49	lav2yuv$(EXEEXT) lavaddwav$(EXEEXT) lavtrans$(EXEEXT) \
50	ypipe$(EXEEXT) yuv2lav$(EXEEXT) transist.flt$(EXEEXT) \	50	ypipe$(EXEEXT) yuv2lav$(EXEEXT) transist.flt$(EXEEXT) \

Return to bug 259461