mirror/motion
1
0
Fork 0
mirror of https://github.com/Motion-Project/motion.git synced 2026-01-17 11:18:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

Get rid of ffmpeg-config in debian , it's deprecated.

Browse Source
This commit is contained in:
AngelCarpintero
2008-09-17 05:51:53 +00:00
parent 0d627cd693
commit c1941e68cd
4 changed files with 21 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@@ -4,6 +4,8 @@ Features
* Added support for ffmpeg-2008-04-09 port version of FreeBSD.
* Remove mjpegtools dependencies and integrate only needed functions from library. (Angel Carpintero)
* Allow change/setup framerate in FreeBSD using pwcbsd. (Angel Carpintero)
* Get rid of ffmpeg-config in configure.in for debian. (Angel Carpintero)
Bugfixes
* Fix Problem Encoding 1280x1024 resolution videos

2
CREDITS
View File

@@ -403,6 +403,8 @@ Angel Carpintero
* Allow change/setup framerate in FreeBSD using pwcbsd.
* Add a new parameter netcam_tolerant_check, to be less strict with some buggy network cameras firmwares.
http://www.lavrsen.dk/twiki/bin/view/Motion/BugReport2008x06x19x123218
* Get rid of ffmpeg-config in configure.in for debian.
Jared D
* Change bayer2rgb24() to fix a problem with sn9c102 driver

42
configure vendored
View File

@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for motion 3.2.11.branch-r409.
# Generated by GNU Autoconf 2.61 for motion 3.2.11.branch-r410.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -572,8 +572,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='motion'
PACKAGE_TARNAME='motion'
PACKAGE_VERSION='3.2.11.branch-r409'
PACKAGE_STRING='motion 3.2.11.branch-r409'
PACKAGE_VERSION='3.2.11.branch-r410'
PACKAGE_STRING='motion 3.2.11.branch-r410'
PACKAGE_BUGREPORT=''
ac_unique_file="motion.c"
@@ -1178,7 +1178,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures motion 3.2.11.branch-r409 to adapt to many kinds of systems.
\`configure' configures motion 3.2.11.branch-r410 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1239,7 +1239,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of motion 3.2.11.branch-r409:";;
short | recursive ) echo "Configuration of motion 3.2.11.branch-r410:";;
esac
cat <<\_ACEOF
@@ -1375,7 +1375,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
motion configure 3.2.11.branch-r409
motion configure 3.2.11.branch-r410
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1389,7 +1389,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by motion $as_me 3.2.11.branch-r409, which was
It was created by motion $as_me 3.2.11.branch-r410, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -3174,14 +3174,7 @@ else if test "${FFMPEG_DIR}" = "yes"; then
{ echo "$as_me:$LINENO: checking for ffmpeg autodetecting" >&5
echo $ECHO_N "checking for ffmpeg autodetecting... $ECHO_C" >&6; }
# weird hack to fix debian problem TO BE REMOVED
if test -f /usr/bin/ffmpeg-config; then
FFMPEG_LIBS_DEB="`ffmpeg-config --libs avformat`"
FFMPEG_CFLAGS_DEB="`ffmpeg-config --cflags`"
FFMPEG_OK="found"
{ echo "$as_me:$LINENO: result: found for debian" >&5
echo "${ECHO_T}found for debian" >&6; }
elif test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
{ echo "$as_me:$LINENO: result: found in /usr/lib64" >&5
echo "${ECHO_T}found in /usr/lib64" >&6; }
FFMPEG_OK="found"
@@ -3252,11 +3245,7 @@ if test "${FFMPEG_OK}" = "found"; then
{ echo "$as_me:$LINENO: checking for ffmpeg headers in ${FFMPEG_DIR}" >&5
echo $ECHO_N "checking for ffmpeg headers in ${FFMPEG_DIR}... $ECHO_C" >&6; }
if test "${FFMPEG_CFLAGS_DEB}" != "" ; then
FFMPEG_CFLAGS="${FFMPEG_CFLAGS_DEB}"
{ echo "$as_me:$LINENO: result: found for debian" >&5
echo "${ECHO_T}found for debian" >&6; }
elif test -f ${FFMPEG_DIR}/include/avformat.h; then
if test -f ${FFMPEG_DIR}/include/avformat.h; then
{ echo "$as_me:$LINENO: result: found ${FFMPEG_DIR}/include/avformat.h" >&5
echo "${ECHO_T}found ${FFMPEG_DIR}/include/avformat.h" >&6; }
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
@@ -3291,13 +3280,8 @@ echo "${ECHO_T}not found" >&6; }
#
if test "${FFMPEG_OK}" = "found"; then
if test "${FFMPEG_LIBS_DEB}" != ""; then
TEMP_LIBS="$TEMP_LIBS ${FFMPEG_LIBS_DEB}"
else
TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
fi
TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
FFMPEG_OBJ="ffmpeg.o"
@@ -8140,7 +8124,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by motion $as_me 3.2.11.branch-r409, which was
This file was extended by motion $as_me 3.2.11.branch-r410, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -8189,7 +8173,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
motion config.status 3.2.11.branch-r409
motion config.status 3.2.11.branch-r410
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

22
configure.in
View File

@@ -315,13 +315,7 @@ else if test "${FFMPEG_DIR}" = "yes"; then
# AUTODETECT STATIC/SHARED LIB
AC_MSG_CHECKING(for ffmpeg autodetecting)
# weird hack to fix debian problem TO BE REMOVED
if test -f /usr/bin/ffmpeg-config; then
FFMPEG_LIBS_DEB="`ffmpeg-config --libs avformat`"
FFMPEG_CFLAGS_DEB="`ffmpeg-config --cflags`"
FFMPEG_OK="found"
AC_MSG_RESULT(found for debian)
elif test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
AC_MSG_RESULT(found in /usr/lib64)
FFMPEG_OK="found"
FFMPEG_LIB="/usr/lib64"
@@ -383,10 +377,7 @@ fi
if test "${FFMPEG_OK}" = "found"; then
AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
if test "${FFMPEG_CFLAGS_DEB}" != "" ; then
FFMPEG_CFLAGS="${FFMPEG_CFLAGS_DEB}"
AC_MSG_RESULT(found for debian)
elif test -f ${FFMPEG_DIR}/include/avformat.h; then
if test -f ${FFMPEG_DIR}/include/avformat.h; then
AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
elif test -f ${FFMPEG_DIR}/avformat.h; then
@@ -416,13 +407,8 @@ if test "${FFMPEG_OK}" = "found"; then
#
if test "${FFMPEG_OK}" = "found"; then
if test "${FFMPEG_LIBS_DEB}" != ""; then
TEMP_LIBS="$TEMP_LIBS ${FFMPEG_LIBS_DEB}"
else
TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
fi
TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
FFMPEG_OBJ="ffmpeg.o"