[SM-Commit] GIT changes to master grimoire by Arwed von Merkatz (c5441d9b8bd20e2cb0703359e88142b034e09a55)

Arwed von Merkatz scm at sourcemage.org
Tue Apr 1 13:37:15 EDT 2008


GIT changes to master grimoire by Arwed von Merkatz <v.merkatz at gmx.net>:

 video/ffmpeg-svn/BUILD     |    3 ---
 video/ffmpeg-svn/DETAILS   |    2 +-
 video/ffmpeg-svn/HISTORY   |    7 +++++++
 video/ffmpeg-svn/INSTALL   |    5 +----
 video/ffmpeg-svn/PRE_BUILD |    2 --
 5 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit c5441d9b8bd20e2cb0703359e88142b034e09a55
Author: Arwed von Merkatz <v.merkatz at gmx.net>
Commit: Arwed von Merkatz <v.merkatz at gmx.net>

    ffmpeg-svn: header install location cleanup

diff --git a/video/ffmpeg-svn/BUILD b/video/ffmpeg-svn/BUILD
index 2417772..edf217c 100755
--- a/video/ffmpeg-svn/BUILD
+++ b/video/ffmpeg-svn/BUILD
@@ -1,4 +1,3 @@
-CFLAGS="${CFLAGS/-funroll-loops/} -O3"
 disable_pic  &&
 
 #if [ $FFAMR != none ];then
@@ -9,7 +8,6 @@ OPTS="$FFMPEG_SWSCALE $OPTS"  &&
 
 ./configure  --prefix=${INSTALL_ROOT}/usr            \
              --mandir=${INSTALL_ROOT}/usr/share/man  \
-             --incdir=${INSTALL_ROOT}/usr/include/ffmpeg \
              --enable-shared                         \
              --enable-pthreads                       \
              --disable-static                        \
@@ -17,5 +15,4 @@ OPTS="$FFMPEG_SWSCALE $OPTS"  &&
              --enable-postproc                       \
              --enable-gpl                            \
              $OPTS                         &&
-#sedit  's:SDL_LIBS=.*:\0 -L/usr/X11R6/lib -lX11:'  config.mak  &&
 make
diff --git a/video/ffmpeg-svn/DETAILS b/video/ffmpeg-svn/DETAILS
index b8fcd6a..3b3ce98 100755
--- a/video/ffmpeg-svn/DETAILS
+++ b/video/ffmpeg-svn/DETAILS
@@ -27,7 +27,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL
         WEB_SITE=http://ffmpeg.sourceforge.net
          ENTERED=20030514
       LICENSE[0]=GPL
-      PATCHLEVEL=1
+      PATCHLEVEL=2
   STAGED_INSTALL=off
         KEYWORDS="video"
            SHORT="ffmpeg is complete video and audio broadcasting solution"
diff --git a/video/ffmpeg-svn/HISTORY b/video/ffmpeg-svn/HISTORY
index 698a054..97dc656 100644
--- a/video/ffmpeg-svn/HISTORY
+++ b/video/ffmpeg-svn/HISTORY
@@ -1,3 +1,10 @@
+2008-04-01 Arwed v. Merkatz <v.merkatz at gmx.net>
+	* BUILD: removed incdir switch, install to normal locations now,
+	  removed old -O3 hack
+	* INSTALL: removed installation of unnecessary headers
+	* PRE_BUILD: removed some unnecessary sedits
+	* DETAILS: PATCHLEVEL++
+
 2008-03-13 Arwed v. Merkatz <v.merkatz at gmx.net>
 	* BUILD: --enable-pp --> --enable-postproc
 	* CONFIGURE: --{en,dis}able-swscaler --> --{en,dis}able-swscale,
diff --git a/video/ffmpeg-svn/INSTALL b/video/ffmpeg-svn/INSTALL
index f0c9ac4..d3f6c19 100755
--- a/video/ffmpeg-svn/INSTALL
+++ b/video/ffmpeg-svn/INSTALL
@@ -1,6 +1,3 @@
 make_single &&
 install_config_file doc/ffserver.conf ${INSTALL_ROOT}/etc/ffserver.conf  &&
-make    install  &&
-cp libavutil/intreadwrite.h $INSTALL_ROOT/usr/include/ffmpeg  &&
-cp libavutil/bswap.h        $INSTALL_ROOT/usr/include/ffmpeg  &&
-cp libavformat/riff.h       $INSTALL_ROOT/usr/include/ffmpeg
+make    install
diff --git a/video/ffmpeg-svn/PRE_BUILD b/video/ffmpeg-svn/PRE_BUILD
index 7ebefb2..0dbf5dc 100755
--- a/video/ffmpeg-svn/PRE_BUILD
+++ b/video/ffmpeg-svn/PRE_BUILD
@@ -1,7 +1,5 @@
 default_pre_build          &&
 cd $SOURCE_DIRECTORY 	   &&
-sedit  's:-lpostproc:-Llibpostproc -lpostproc:'  libavcodec/Makefile  &&
-sedit  's:-Werror::'  libavformat/Makefile  &&
 sedit  '/#define LIBAVCODEC_VERSION_INT/i#if !defined INT64_C\n#if defined __WORDSIZE && __WORDSIZE == 64\n#define INT64_C(c) c ## L\n#else\n#define INT64_C(c) c ## LL\n#endif\n#endif'  libavcodec/avcodec.h
 
 #cd libavcodec       &&



More information about the SM-Commit mailing list