diff options
| author | Arwed von Merkatz | 2006-02-17 23:00:06 +0000 |
|---|---|---|
| committer | Arwed von Merkatz | 2006-02-17 23:00:06 +0000 |
| commit | 861a0991ecd41e2b6039e41a1ad4701d9d5c3b4f (patch) | |
| tree | 9a5671b3dacafbeac00971173cf29b414f8bf092 | |
| parent | efa0b9fef924c70eb79580ac2c7b7c37a3b6ecd4 (diff) | |
fix current cvs, and autoupdate query to stable-rc/stable0.2
| -rwxr-xr-x | video/ffmpeg-cvs/BUILD | 3 | ||||
| -rwxr-xr-x | video/ffmpeg-cvs/DETAILS | 4 | ||||
| -rw-r--r-- | video/ffmpeg-cvs/HISTORY | 7 | ||||
| -rwxr-xr-x | video/ffmpeg-cvs/INSTALL | 24 | ||||
| -rwxr-xr-x | video/ffmpeg-cvs/PREPARE | 1 |
5 files changed, 22 insertions, 17 deletions
diff --git a/video/ffmpeg-cvs/BUILD b/video/ffmpeg-cvs/BUILD index 1c3cf317ce..fc1d1ecf11 100755 --- a/video/ffmpeg-cvs/BUILD +++ b/video/ffmpeg-cvs/BUILD @@ -11,7 +11,4 @@ sedit 's:-Werror::' libavformat/Makefile && --enable-pp \ --enable-gpl \ $OPTS && -cd libavcodec/libpostproc && -make && -cd $SOURCE_DIRECTORY && make diff --git a/video/ffmpeg-cvs/DETAILS b/video/ffmpeg-cvs/DETAILS index 3f6e6171aa..d62c328334 100755 --- a/video/ffmpeg-cvs/DETAILS +++ b/video/ffmpeg-cvs/DETAILS @@ -1,5 +1,9 @@ SPELL=ffmpeg-cvs +if test "$FFMPEG_CVS_AUTOUPDATE" = "y"; then VERSION=$(date +%Y%m%d) +else + VERSION=cvs +fi SOURCE=$SPELL.tar.bz2 SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL SOURCE_URL[0]=cvs://:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg:ffmpeg diff --git a/video/ffmpeg-cvs/HISTORY b/video/ffmpeg-cvs/HISTORY index ae65211815..5247467b90 100644 --- a/video/ffmpeg-cvs/HISTORY +++ b/video/ffmpeg-cvs/HISTORY @@ -1,3 +1,10 @@ +2006-02-17 Arwed v. Merkatz <v.merkatz@gmx.net> + * BUILD, INSTALL: removed old hacks for libpostproc build/install, + create /usr/include/postproc before installing + +2006-02-11 Arwed v. Merkatz <v.merkatz@gmx.net> + * PREPARE, DETAILS: added autoupdate query + 2006-01-17 Arwed v. Merkatz <v.merkatz@gmx.net> * BUILD: removed --enable-shared-pp, not used anymore and breaks the compile diff --git a/video/ffmpeg-cvs/INSTALL b/video/ffmpeg-cvs/INSTALL index d85df05b6e..94e106110d 100755 --- a/video/ffmpeg-cvs/INSTALL +++ b/video/ffmpeg-cvs/INSTALL @@ -1,18 +1,14 @@ +# make install fails to create that first (2006-02-17) +install -d /usr/include/postproc && make install && -( - cd libavcodec/libpostproc && - make install && - install -m 644 postprocess_internal.h \ - ${INSTALL_ROOT}/usr/include/postproc -) && -( - install -m 644 libavutil/bswap.h \ - ${INSTALL_ROOT}/usr/include/ffmpeg && - install -m 644 libavcodec/dsputil.h \ - ${INSTALL_ROOT}/usr/include/ffmpeg && - install -m 644 libavformat/os_support.h \ - ${INSTALL_ROOT}/usr/include/ffmpeg -) && +install -m 644 libavcodec/libpostproc/postprocess_internal.h \ + ${INSTALL_ROOT}/usr/include/postproc && +install -m 644 libavutil/bswap.h \ + ${INSTALL_ROOT}/usr/include/ffmpeg && +install -m 644 libavcodec/dsputil.h \ + ${INSTALL_ROOT}/usr/include/ffmpeg && +install -m 644 libavformat/os_support.h \ + ${INSTALL_ROOT}/usr/include/ffmpeg && if [ ! -f ${INSTALL_ROOT}/etc/ffserver.conf ] then cp doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf diff --git a/video/ffmpeg-cvs/PREPARE b/video/ffmpeg-cvs/PREPARE new file mode 100755 index 0000000000..11200ef858 --- /dev/null +++ b/video/ffmpeg-cvs/PREPARE @@ -0,0 +1 @@ +config_query FFMPEG_CVS_AUTOUPDATE "Update to the latest CVS on every cast?" n |