[71636] trunk/dports/multimedia/avidemux

[raimue at macports.org]

Revision: 71636
          http://trac.macports.org/changeset/71636
Author:   raimue at macports.org
Date:     2010-09-18 09:34:16 -0700 (Sat, 18 Sep 2010)
Log Message:
-----------
multimedia/avidemux:
Disable docs generation for bundled ffmpeg to avoid #25803 and texi2html
dependency.

Modified Paths:
--------------
    trunk/dports/multimedia/avidemux/Portfile

Added Paths:
-----------
    trunk/dports/multimedia/avidemux/files/patch-ffmpeg-configure.diff

Removed Paths:
-------------
    trunk/dports/multimedia/avidemux/files/patch-ffmpeg-compiler.diff

Modified: trunk/dports/multimedia/avidemux/Portfile
===================================================================
--- trunk/dports/multimedia/avidemux/Portfile	2010-09-18 15:47:00 UTC (rev 71635)
+++ trunk/dports/multimedia/avidemux/Portfile	2010-09-18 16:34:16 UTC (rev 71636)
@@ -5,7 +5,7 @@
 
 name                avidemux
 version             2.5.3
-revision            1
+revision            2
 categories          multimedia
 platforms           darwin
 maintainers         nomaintainer
@@ -40,7 +40,7 @@
                     patch-cmake-use-sdl.diff \
                     patch-build-plugins.diff \
                     patch-ffmpeg-libs-naming.diff \
-                    patch-ffmpeg-compiler.diff \
+                    patch-ffmpeg-configure.diff \
                     patch-no-bundles.diff
 
 # do a out of place build

Deleted: trunk/dports/multimedia/avidemux/files/patch-ffmpeg-compiler.diff
===================================================================
--- trunk/dports/multimedia/avidemux/files/patch-ffmpeg-compiler.diff	2010-09-18 15:47:00 UTC (rev 71635)
+++ trunk/dports/multimedia/avidemux/files/patch-ffmpeg-compiler.diff	2010-09-18 16:34:16 UTC (rev 71636)
@@ -1,13 +0,0 @@
---- cmake/admFFmpegBuild.cmake.orig	2010-09-18 00:13:02.000000000 +0200
-+++ cmake/admFFmpegBuild.cmake	2010-09-18 00:13:17.000000000 +0200
-@@ -88,6 +88,10 @@
- 	set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --extra-ldflags=${CMAKE_SHARED_LINKER_FLAGS})
- endif (CMAKE_SHARED_LINKER_FLAGS)
- 
-+if (CMAKE_C_COMPILER)
-+        set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --cc=${CMAKE_C_COMPILER})
-+endif (CMAKE_C_COMPILER)
-+
- if (CROSS_ARCH OR CROSS_OS)
- 	set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --enable-cross-compile)
- endif (CROSS_ARCH OR CROSS_OS)

Added: trunk/dports/multimedia/avidemux/files/patch-ffmpeg-configure.diff
===================================================================
--- trunk/dports/multimedia/avidemux/files/patch-ffmpeg-configure.diff	                        (rev 0)
+++ trunk/dports/multimedia/avidemux/files/patch-ffmpeg-configure.diff	2010-09-18 16:34:16 UTC (rev 71636)
@@ -0,0 +1,15 @@
+--- cmake/admFFmpegBuild.cmake.orig	2010-09-18 18:03:11.000000000 +0200
++++ cmake/admFFmpegBuild.cmake	2010-09-18 18:05:00.000000000 +0200
+@@ -88,6 +88,12 @@
+ 	set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --extra-ldflags=${CMAKE_SHARED_LINKER_FLAGS})
+ endif (CMAKE_SHARED_LINKER_FLAGS)
+ 
++if (CMAKE_C_COMPILER)
++        set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --cc=${CMAKE_C_COMPILER})
++endif (CMAKE_C_COMPILER)
++
++set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --disable-doc)
++
+ if (CROSS_ARCH OR CROSS_OS)
+ 	set(FFMPEG_FLAGS ${FFMPEG_FLAGS} --enable-cross-compile)
+ endif (CROSS_ARCH OR CROSS_OS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100918/1263e6b8/attachment.html>