Attachment #108551 for bug #164480

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

Lines 367-373 Link Here

(-)xine-lib-1.1.3/configure.ac~ (-1 / +1 lines)
367		367
368	if test "x$with_external_ffmpeg" = "xyes"; then	368	if test "x$with_external_ffmpeg" = "xyes"; then
369	PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.11.0])	369	PKG_CHECK_MODULES([FFMPEG], [libavcodec >= 51.11.0])
370	PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc >= 51.11.0])	370	PKG_CHECK_MODULES([FFMPEG_POSTPROC], [libpostproc >= 51.1.0])
371	AC_SUBST([FFMPEG_CFLAGS])	371	AC_SUBST([FFMPEG_CFLAGS])
372	AC_SUBST([FFMPEG_LIBS])	372	AC_SUBST([FFMPEG_LIBS])
373	AC_SUBST([FFMPEG_POSTPROC_CFLAGS])	373	AC_SUBST([FFMPEG_POSTPROC_CFLAGS])




        pkg_cv_FFMPEG_POSTPROC_CFLAGS="$FFMPEG_POSTPROC_CFLAGS"
    else
        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpostproc >= 51.1.0\"") >&5
  ($PKG_CONFIG --exists --print-errors "libpostproc >= 51.1.0") 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; then
  pkg_cv_FFMPEG_POSTPROC_CFLAGS=`$PKG_CONFIG --cflags "libpostproc >= 51.1.0" 2>/dev/null`
else
  pkg_failed=yes
fi

        pkg_cv_FFMPEG_POSTPROC_LIBS="$FFMPEG_POSTPROC_LIBS"
    else
        if test -n "$PKG_CONFIG" && \
    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpostproc >= 51.1.0\"") >&5
  ($PKG_CONFIG --exists --print-errors "libpostproc >= 51.1.0") 2>&5
  ac_status=$?
  echo "$as_me:$LINENO: \$? = $ac_status" >&5
  (exit $ac_status); }; then
  pkg_cv_FFMPEG_POSTPROC_LIBS=`$PKG_CONFIG --libs "libpostproc >= 51.1.0" 2>/dev/null`
else
  pkg_failed=yes
fi

        _pkg_short_errors_supported=no
fi
        if test $_pkg_short_errors_supported = yes; then
	        FFMPEG_POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpostproc >= 51.1.0"`
        else
	        FFMPEG_POSTPROC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpostproc >= 51.1.0"`
        fi
	# Put the nasty error message in config.log where it belongs
	echo "$FFMPEG_POSTPROC_PKG_ERRORS" >&5

	{ { echo "$as_me:$LINENO: error: Package requirements (libpostproc >= 51.1.0) were not met:

$FFMPEG_POSTPROC_PKG_ERRORS


and FFMPEG_POSTPROC_LIBS to avoid the need to call pkg-config.
See the pkg-config man page for more details.
" >&5
echo "$as_me: error: Package requirements (libpostproc >= 51.1.0) were not met:

$FFMPEG_POSTPROC_PKG_ERRORS


Return to bug 164480

Lines 26115-26126 Link Here

(-)xine-lib-1.1.3/configure~ (-10 / +10 lines)
26115	pkg_cv_FFMPEG_POSTPROC_CFLAGS="$FFMPEG_POSTPROC_CFLAGS"	26115	pkg_cv_FFMPEG_POSTPROC_CFLAGS="$FFMPEG_POSTPROC_CFLAGS"
26116	else	26116	else
26117	if test -n "$PKG_CONFIG" && \	26117	if test -n "$PKG_CONFIG" && \
26118	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpostproc >= 51.11.0\"") >&5	26118	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpostproc >= 51.1.0\"") >&5
26119	($PKG_CONFIG --exists --print-errors "libpostproc >= 51.11.0") 2>&5	26119	($PKG_CONFIG --exists --print-errors "libpostproc >= 51.1.0") 2>&5
26120	ac_status=$?	26120	ac_status=$?
26121	echo "$as_me:$LINENO: \$? = $ac_status" >&5	26121	echo "$as_me:$LINENO: \$? = $ac_status" >&5
26122	(exit $ac_status); }; then	26122	(exit $ac_status); }; then
26123	pkg_cv_FFMPEG_POSTPROC_CFLAGS=`$PKG_CONFIG --cflags "libpostproc >= 51.11.0" 2>/dev/null`	26123	pkg_cv_FFMPEG_POSTPROC_CFLAGS=`$PKG_CONFIG --cflags "libpostproc >= 51.1.0" 2>/dev/null`
26124	else	26124	else
26125	pkg_failed=yes	26125	pkg_failed=yes
26126	fi	26126	fi
Lines 26133-26144 Link Here
26133	pkg_cv_FFMPEG_POSTPROC_LIBS="$FFMPEG_POSTPROC_LIBS"	26133	pkg_cv_FFMPEG_POSTPROC_LIBS="$FFMPEG_POSTPROC_LIBS"
26134	else	26134	else
26135	if test -n "$PKG_CONFIG" && \	26135	if test -n "$PKG_CONFIG" && \
26136	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpostproc >= 51.11.0\"") >&5	26136	{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libpostproc >= 51.1.0\"") >&5
26137	($PKG_CONFIG --exists --print-errors "libpostproc >= 51.11.0") 2>&5	26137	($PKG_CONFIG --exists --print-errors "libpostproc >= 51.1.0") 2>&5
26138	ac_status=$?	26138	ac_status=$?
26139	echo "$as_me:$LINENO: \$? = $ac_status" >&5	26139	echo "$as_me:$LINENO: \$? = $ac_status" >&5
26140	(exit $ac_status); }; then	26140	(exit $ac_status); }; then
26141	pkg_cv_FFMPEG_POSTPROC_LIBS=`$PKG_CONFIG --libs "libpostproc >= 51.11.0" 2>/dev/null`	26141	pkg_cv_FFMPEG_POSTPROC_LIBS=`$PKG_CONFIG --libs "libpostproc >= 51.1.0" 2>/dev/null`
26142	else	26142	else
26143	pkg_failed=yes	26143	pkg_failed=yes
26144	fi	26144	fi
Lines 26157-26170 Link Here
26157	_pkg_short_errors_supported=no	26157	_pkg_short_errors_supported=no
26158	fi	26158	fi
26159	if test $_pkg_short_errors_supported = yes; then	26159	if test $_pkg_short_errors_supported = yes; then
26160	FFMPEG_POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpostproc >= 51.11.0"`	26160	FFMPEG_POSTPROC_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libpostproc >= 51.1.0"`
26161	else	26161	else
26162	FFMPEG_POSTPROC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpostproc >= 51.11.0"`	26162	FFMPEG_POSTPROC_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libpostproc >= 51.1.0"`
26163	fi	26163	fi
26164	# Put the nasty error message in config.log where it belongs	26164	# Put the nasty error message in config.log where it belongs
26165	echo "$FFMPEG_POSTPROC_PKG_ERRORS" >&5	26165	echo "$FFMPEG_POSTPROC_PKG_ERRORS" >&5
26166		26166
26167	{ { echo "$as_me:$LINENO: error: Package requirements (libpostproc >= 51.11.0) were not met:	26167	{ { echo "$as_me:$LINENO: error: Package requirements (libpostproc >= 51.1.0) were not met:
26168		26168
26169	$FFMPEG_POSTPROC_PKG_ERRORS	26169	$FFMPEG_POSTPROC_PKG_ERRORS
26170		26170
Lines 26175-26181 Link Here
26175	and FFMPEG_POSTPROC_LIBS to avoid the need to call pkg-config.	26175	and FFMPEG_POSTPROC_LIBS to avoid the need to call pkg-config.
26176	See the pkg-config man page for more details.	26176	See the pkg-config man page for more details.
26177	" >&5	26177	" >&5
26178	echo "$as_me: error: Package requirements (libpostproc >= 51.11.0) were not met:	26178	echo "$as_me: error: Package requirements (libpostproc >= 51.1.0) were not met:
26179		26179
26180	$FFMPEG_POSTPROC_PKG_ERRORS	26180	$FFMPEG_POSTPROC_PKG_ERRORS
26181		26181