Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f8a7956a02c18e56c66207e23bc41d02b6c7bcf3)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f8a7956a02c18e56c66207e23bc41d02b6c7bcf3)
  • Date: Sat, 12 Nov 2016 16:25:20 +0000

GIT changes to stable-0.62 grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

graphics-libs/gegl/HISTORY | 3 +
graphics-libs/gegl/PRE_BUILD | 11 +++++++
graphics-libs/gegl/encoding.patch | 11 +++++++
graphics-libs/gegl/libav54.patch | 58
++++++++++++++++++++++++++++++++++++++
4 files changed, 83 insertions(+)

New commits:
commit f8a7956a02c18e56c66207e23bc41d02b6c7bcf3
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

gegl: fixed build with ffmpeg & asciidoc

diff --git a/graphics-libs/gegl/HISTORY b/graphics-libs/gegl/HISTORY
index f11071f..3bd8fb2 100644
--- a/graphics-libs/gegl/HISTORY
+++ b/graphics-libs/gegl/HISTORY
@@ -1,5 +1,8 @@
2016-11-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated source url
+ * PRE_BUILD: apply patches
+ * encoding.patch: added, to fix build with asciidoc
+ * libav54.patch: added, official patch to fix build with ffmpeg 2.x

2012-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libv4l -> v4l-utils
diff --git a/graphics-libs/gegl/PRE_BUILD b/graphics-libs/gegl/PRE_BUILD
index 24df05a..a690baa 100755
--- a/graphics-libs/gegl/PRE_BUILD
+++ b/graphics-libs/gegl/PRE_BUILD
@@ -1,3 +1,14 @@
default_pre_build &&
cd ${SOURCE_DIRECTORY} &&
+
+if is_depends_enabled ${SPELL} asciidoc; then
+ patch -p0 < "${SPELL_DIRECTORY}/encoding.patch"
+fi &&
+
+if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} LIBAVCODEC) &&
+ [[ $(get_spell_provider ${SPELL} LIBAVCODEC) == "ffmpeg" ]] &&
+ [[ $(installed_version ffmpeg | cut -d. -f1) -ge 2 ]]; then
+ patch -p1 < "${SPELL_DIRECTORY}/libav54.patch"
+fi &&
+
[ -f gegl/gegl-0.1.deps ] || echo 'Babl-0.1' > gegl/gegl-0.1.deps
diff --git a/graphics-libs/gegl/encoding.patch
b/graphics-libs/gegl/encoding.patch
new file mode 100644
index 0000000..b46028f
--- /dev/null
+++ b/graphics-libs/gegl/encoding.patch
@@ -0,0 +1,11 @@
+--- tools/create-reference.rb.orig 2012-03-24 10:51:30.000000000 -0400
++++ tools/create-reference.rb 2016-11-12 10:56:11.240118336 -0500
+@@ -5,6 +5,8 @@
+ # Use under a public domain license.
+ #
+
++Encoding.default_external = Encoding::UTF_8
++
+ class Argument
+ attr_accessor :name, :data_type, :doc
+ def initialize
diff --git a/graphics-libs/gegl/libav54.patch
b/graphics-libs/gegl/libav54.patch
new file mode 100644
index 0000000..a6089ef
--- /dev/null
+++ b/graphics-libs/gegl/libav54.patch
@@ -0,0 +1,58 @@
+From 97067622352e58f86a24851dacb1f5daa0762897 Mon Sep 17 00:00:00 2001
+From: nick black <nick.black AT sprezzatech.com>
+Date: Thu, 13 Dec 2012 23:11:16 -0500
+Subject: [PATCH] port gegl forward to libav 54
+
+---
+ operations/external/ff-load.c | 12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+diff --git a/operations/external/ff-load.c b/operations/external/ff-load.c
+index 442ec5f..75d26e9 100644
+--- a/operations/external/ff-load.c
++++ b/operations/external/ff-load.c
+@@ -137,7 +137,7 @@ ff_cleanup (GeglChantO *o)
+ if (p->enc)
+ avcodec_close (p->enc);
+ if (p->ic)
+- av_close_input_file (p->ic);
++ avformat_close_input(&p->ic);
+ if (p->lavc_frame)
+ av_free (p->lavc_frame);
+
+@@ -216,9 +216,9 @@ decode_frame (GeglOperation *operation,
+ {
+ do
+ {
+- if (av_read_packet (p->ic, &p->pkt) < 0)
++ if (av_read_frame (p->ic, &p->pkt) < 0)
+ {
+- fprintf (stderr, "av_read_packet failed for %s\n",
++ fprintf (stderr, "av_read_frame failed for %s\n",
+ o->path);
+ return -1;
+ }
+@@ -271,12 +271,12 @@ prepare (GeglOperation *operation)
+ gint err;
+
+ ff_cleanup (o);
+- err = av_open_input_file (&p->ic, o->path, NULL, 0, NULL);
++ err = avformat_open_input(&p->ic, o->path, NULL, 0);
+ if (err < 0)
+ {
+ print_error (o->path, err);
+ }
+- err = av_find_stream_info (p->ic);
++ err = avformat_find_stream_info (p->ic, NULL);
+ if (err < 0)
+ {
+ g_warning ("ff-load: error finding stream info for %s", o->path);
+@@ -312,7 +312,7 @@ prepare (GeglOperation *operation)
+ if (p->codec->capabilities & CODEC_CAP_TRUNCATED)
+ p->enc->flags |= CODEC_FLAG_TRUNCATED;
+
+- if (avcodec_open (p->enc, p->codec) < 0)
++ if (avcodec_open2 (p->enc, p->codec, NULL) < 0)
+ {
+ g_warning ("error opening codec %s", p->enc->codec->name);
+ return;



  • [SM-Commit] GIT changes to stable-0.62 grimoire by Vlad Glagolev (f8a7956a02c18e56c66207e23bc41d02b6c7bcf3), Vlad Glagolev, 11/12/2016

Archive powered by MHonArc 2.6.24.

Top of Page