summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArjan Bouter2008-10-01 15:17:03 +0200
committerArjan Bouter2008-10-01 15:17:03 +0200
commitd8fcac35b1278d3d5787de3700fe668130aa27c7 (patch)
tree86581f41073388ffe2e6c995bc5cc4eaeebd34fb
parent343333ea1e9c8fc34f927cb17ea0dc8ffc1d930b (diff)
parent79ed433b11710046b39c09c7e4b33367484736ff (diff)
Merge branch 'master' of git+ssh://abouter@scm.sourcemage.org/smgl/grimoire
-rw-r--r--graphics-libs/gegl/HISTORY3
-rwxr-xr-xgraphics-libs/gegl/PRE_BUILD4
2 files changed, 6 insertions, 1 deletions
diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index fada063e1c..9967053125 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,3 +1,6 @@
+2008-10-01 George Sherwood <gsherwood@sourcemage.org>
+ * PRE_BUILD: Only apply patch if ffmpeg-svn is LIBAVCODEC provider
+
2008-09-05 George Sherwood <gsherwood@sourcemage.org>
* DEPENDS: optional_depends librsvg2 vice librsvg
optional_depends LIBAVCODEC
diff --git a/graphics-libs/gegl/PRE_BUILD b/graphics-libs/gegl/PRE_BUILD
index 30bbaa34ae..b49325a8ae 100755
--- a/graphics-libs/gegl/PRE_BUILD
+++ b/graphics-libs/gegl/PRE_BUILD
@@ -1,3 +1,5 @@
default_pre_build &&
-cd $SOURCE_DIRECTORY
+if [[ "$(get_spell_provider $SPELL LIBAVCODEC)" == "ffmpeg-svn" ]]; then
+cd $SOURCE_DIRECTORY &&
patch -p0 < $SCRIPT_DIRECTORY/gegl-libavformat.patch
+fi