Archives
Archives
| From: | "Alexis Ballier (aballier)" <aballier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in media-video/motion/files: motion-3.2.10.1-ffmpegheaders.patch motion-3.2.10.1-asneeded.patch |
| Date: | Fri, 20 Jun 2008 21:47:14 |
| Message-Id: | E1K9oRp-0007Fi-8x@stork.gentoo.org |
| 1 | aballier 08/06/20 21:47:09 |
| 2 | |
| 3 | Added: motion-3.2.10.1-ffmpegheaders.patch |
| 4 | motion-3.2.10.1-asneeded.patch |
| 5 | Log: |
| 6 | version bump for bug #227053 and add compatibility with older ffmpegs |
| 7 | (Portage version: 2.2_rc1/cvs/Linux 2.6.25.4 x86_64) |
| 8 | |
| 9 | Revision Changes Path |
| 10 | 1.1 media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch |
| 11 | |
| 12 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch?rev=1.1&view=markup |
| 13 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/motion/files/motion-3.2.10.1-ffmpegheaders.patch?rev=1.1&content-type=text/plain |
| 14 | |
| 15 | Index: motion-3.2.10.1-ffmpegheaders.patch |
| 16 | =================================================================== |
| 17 | Index: motion-3.2.10.1/configure.in |
| 18 | =================================================================== |
| 19 | --- motion-3.2.10.1.orig/configure.in |
| 20 | +++ motion-3.2.10.1/configure.in |
| 21 | @@ -415,12 +415,18 @@ if test "${FFMPEG_OK}" = "found"; then |
| 22 | elif test -f ${FFMPEG}/avformat.h; then |
| 23 | AC_MSG_RESULT(found ${FFMPEG}/avformat.h) |
| 24 | FFMPEG_CFLAGS="-I${FFMPEG}" |
| 25 | + elif test -f ${FFMPEG}/libavformat/avformat.h; then |
| 26 | + AC_MSG_RESULT(found ${FFMPEG}/libavformat/avformat.h) |
| 27 | + FFMPEG_CFLAGS="-I${FFMPEG}/libavformat -I${FFMPEG}/libavutil" |
| 28 | elif test -f `AS_DIRNAME([${FFMPEG}])`/include/avformat.h; then |
| 29 | AC_MSG_RESULT(found ${FFMPEG}/include/avformat.h) |
| 30 | FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include" |
| 31 | elif test -f `AS_DIRNAME([${FFMPEG}])`/include/ffmpeg/avformat.h; then |
| 32 | AC_MSG_RESULT(found ${FFMPEG}/include/ffmpeg/avformat.h) |
| 33 | FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/ffmpeg" |
| 34 | + elif test -f `AS_DIRNAME([${FFMPEG}])`/include/libavformat/avformat.h; then |
| 35 | + AC_MSG_RESULT(found ${FFMPEG}/include/libavformat/avformat.h) |
| 36 | + FFMPEG_CFLAGS="-I`AS_DIRNAME([${FFMPEG}])`/include/libavformat -I`AS_DIRNAME([${FFMPEG}])`/include/libavutil" |
| 37 | else |
| 38 | AC_MSG_RESULT(not found) |
| 39 | FFMPEG_OK="no_found" |
| 40 | |
| 41 | |
| 42 | |
| 43 | 1.1 media-video/motion/files/motion-3.2.10.1-asneeded.patch |
| 44 | |
| 45 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/motion/files/motion-3.2.10.1-asneeded.patch?rev=1.1&view=markup |
| 46 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-video/motion/files/motion-3.2.10.1-asneeded.patch?rev=1.1&content-type=text/plain |
| 47 | |
| 48 | Index: motion-3.2.10.1-asneeded.patch |
| 49 | =================================================================== |
| 50 | Index: motion-3.2.10.1/configure.in |
| 51 | =================================================================== |
| 52 | --- motion-3.2.10.1.orig/configure.in |
| 53 | +++ motion-3.2.10.1/configure.in |
| 54 | @@ -303,7 +303,7 @@ if test x$MJPEG_HEADER1_SUPPORT != xyes |
| 55 | LDFLAGS=$TEMP_LDFLAGS |
| 56 | |
| 57 | AC_CHECK_LIB(lavjpeg, decode_jpeg_raw,[ |
| 58 | - TEMP_LDFLAGS="$TEMP_LDFLAGS -lmjpegutils -llavjpeg" |
| 59 | + TEMP_LIBS="$TEMP_LIBS -lmjpegutils -llavjpeg" |
| 60 | MJPEG_SUPPORT="yes" |
| 61 | TEMP_CFLAGS="$TEMP_CFLAGS -DMJPEGT" |
| 62 | ], , -lmjpegutils) |
| 63 | |
| 64 | |
| 65 | |
| 66 | -- |
| 67 | gentoo-commits@l.g.o mailing list |