From d465081d2f36a88508bc4afb83285abaca89d4ec Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Sun, 30 Jun 2013 10:56:03 +0200 Subject: [PATCH] ffmpeg: fix ffserver.conf path, include docs * Patch the hard-coded /etc/ffserver.conf path and declare it as global writable file. * Build the documentation. * Also include ffserver.conf as a documentation file. It requires editing, so we can't include it as a default settings file. --- media-video/ffmpeg/ffmpeg-0.10.2.recipe | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/media-video/ffmpeg/ffmpeg-0.10.2.recipe b/media-video/ffmpeg/ffmpeg-0.10.2.recipe index d94ad6254..3a2c1414d 100644 --- a/media-video/ffmpeg/ffmpeg-0.10.2.recipe +++ b/media-video/ffmpeg/ffmpeg-0.10.2.recipe @@ -11,7 +11,7 @@ COPYRIGHT=" " SRC_URI="http://www.ffmpeg.org/releases/ffmpeg-0.10.2.tar.bz2" CHECKSUM_MD5="de1bd5fc4bbf3ef730a5361ee596fedd" -REVISION="1" +REVISION="2" ARCHITECTURES="x86_gcc2 ?x86" PATCHES="ffmpeg-0.10.2-gcc2.patch" @@ -44,7 +44,9 @@ BUILD_REQUIRES=" cmd:gcc cmd:ld cmd:make + cmd:perl cmd:pkg_config + cmd:texi2html cmd:yasm devel:libogg devel:libspeex @@ -57,8 +59,25 @@ BUILD_PREREQUIRES=" haiku_devel >= $haikuVersion " +GLOBAL_WRITABLE_FILES=" + settings/ffserver.conf +" + SOURCE_DIR="$portVersionedName" +PATCH() +{ + # patch hard-coded config file path + sed -i "s,/etc/ffserver.conf,$sysconfDir/ffserver.conf," \ + ffserver.c \ + doc/ffserver.texi + + # patch hard-coded paths to perl + sed -i "s,/usr/bin/perl,$portPackageLinksDir/cmd:perl/bin/perl," \ + Doxyfile \ + doc/texi2pod.pl +} + BUILD() { # not an auto tools configure @@ -96,6 +115,10 @@ INSTALL() libswscale fixPkgconfig + # include the documented ffserver.conf + mkdir -p $docDir + cp doc/ffserver.conf $docDir + # devel package packageEntries devel \ $developDir