diff options
| author |   Alexis Ballier <aballier@gentoo.org> | 2008-06-20 21:47:08 +0000 |
|---|---|---|
| committer | Alexis Ballier <aballier@gentoo.org> | 2008-06-20 21:47:08 +0000 |
| commit | e6cd7e42099a763f9c145d1ac0bfde0fd4529f1b (patch) | |
| tree | 377f6ec3949c66b19f181d6dc61cc1595520549e /media-video/motion/files | |
| parent | revert, the file is only on ftp.berlios.de and not on mirrors. (diff) | |
| download | gentoo-2-e6cd7e42099a763f9c145d1ac0bfde0fd4529f1b.tar.gz gentoo-2-e6cd7e42099a763f9c145d1ac0bfde0fd4529f1b.tar.bz2 gentoo-2-e6cd7e42099a763f9c145d1ac0bfde0fd4529f1b.zip | |
version bump for bug #227053 and add compatibility with older ffmpegs
(Portage version: 2.2_rc1/cvs/Linux 2.6.25.4 x86_64)
Diffstat (limited to 'media-video/motion/files')
| -rw-r--r-- | media-video/motion/files/motion-3.2.10.1-asneeded.patch | 13 | ||||
| -rw-r--r-- | media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch | 23 |
2 files changed, 36 insertions, 0 deletions
diff --git a/media-video/motion/files/motion-3.2.10.1-asneeded.patch b/media-video/motion/files/motion-3.2.10.1-asneeded.patch new file mode 100644 index 000000000000..2c0bbf23ad80 --- /dev/null +++ b/media-video/motion/files/motion-3.2.10.1-asneeded.patch @@ -0,0 +1,13 @@ +Index: motion-3.2.10.1/configure.in +=================================================================== +--- motion-3.2.10.1.orig/configure.in ++++ motion-3.2.10.1/configure.in +@@ -303,7 +303,7 @@ if test x$MJPEG_HEADER1_SUPPORT != xyes + LDFLAGS=$TEMP_LDFLAGS + + AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[ +- TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg" ++ TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg" + MJPEG_SUPPORT="yes" + TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT" + ], , -lmjpegutils) diff --git a/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch b/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch new file mode 100644 index 000000000000..717749e57695 --- /dev/null +++ b/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch @@ -0,0 +1,23 @@ +Index: motion-3.2.10.1/configure.in +=================================================================== +--- motion-3.2.10.1.orig/configure.in ++++ motion-3.2.10.1/configure.in +@@ -415,12 +415,18 @@ if test "${FFMPEG_OK}" = "found"; then + elif test -f ${FFMPEG}/avformat.h; then + AC_MSG_RESULT(found ${FFMPEG}/avformat.h) + FFMPEG_CFLAGS="-I${FFMPEG}" ++ elif test -f ${FFMPEG}/libavformat/avformat.h; then ++ AC_MSG_RESULT(found ${FFMPEG}/libavformat/avformat.h) ++ FFMPEG_CFLAGS="-I${FFMPEG}/libavformat -I${FFMPEG}/libavutil" + elif test -f `AS_DIRNAME([${FFMPEG}])`/include/avformat.h; then + AC_MSG_RESULT(found ${FFMPEG}/include/avformat.h) + FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include" + elif test -f `AS_DIRNAME([${FFMPEG}])`/include/ffmpeg/avformat.h; then + AC_MSG_RESULT(found ${FFMPEG}/include/ffmpeg/avformat.h) + FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg" ++ elif test -f `AS_DIRNAME([${FFMPEG}])`/include/libavformat/avformat.h; then ++ AC_MSG_RESULT(found ${FFMPEG}/include/libavformat/avformat.h) ++ FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/libavformat -I`AS_DIRNAME([${FFMPEG}])`/include/libavutil" + else + AC_MSG_RESULT(not found) + FFMPEG_OK="no_found" |