summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Alfredsen <loki_val@gentoo.org>2008-10-14 12:47:21 +0000
committerPeter Alfredsen <loki_val@gentoo.org>2008-10-14 12:47:21 +0000
commit16ecd79870c4d98cad10576c3fe3635543f82f17 (patch)
tree166b33cd2b4d649347e3adae7b32cd0444984c25 /media-libs/gegl
parentAdd proper dependencies for xulrunner and firefox, fixing #239577 (diff)
downloadhistorical-16ecd79870c4d98cad10576c3fe3635543f82f17.tar.gz
historical-16ecd79870c4d98cad10576c3fe3635543f82f17.tar.bz2
historical-16ecd79870c4d98cad10576c3fe3635543f82f17.zip
Quick hack to make gegl compile with ffmpeg 20081014.
Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.27-rc8 x86_64
Diffstat (limited to 'media-libs/gegl')
-rw-r--r--media-libs/gegl/ChangeLog5
-rw-r--r--media-libs/gegl/Manifest14
-rw-r--r--media-libs/gegl/gegl-0.0.20.ebuild12
3 files changed, 17 insertions, 14 deletions
diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index b77c28c33bfc..edb09ccda352 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/gegl
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.8 2008/10/13 21:07:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.9 2008/10/14 12:47:21 loki_val Exp $
+
+ 14 Oct 2008; Peter Alfredsen <loki_val@gentoo.org> gegl-0.0.20.ebuild:
+ Quick hack to make gegl compile with ffmpeg 20081014.
13 Oct 2008; Hanno Boeck <hanno@gentoo.org> gegl-0.0.20.ebuild:
Depend on imagemagick with doc useflag.
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 312a890e2a5f..1f5b590b344e 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,17 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
AUX gegl-0.0.18-newffmpeg.diff 889 RMD160 506707235c92c0d8c0177b46af534352b246cb89 SHA1 74efdb5af757f94c271bd8fa39d27b8f6a7016c7 SHA256 4456bd53335a382860413b4332ffa8e5b0dc7d8ff2d6ee9aa3b80758998b52d3
AUX gegl-18-configure-ac.patch 12354 RMD160 ae12c9c7dab1c6251ac29d53ad141d9416a51579 SHA1 a5de6e8660bbeac0c52e6a002898f1bb5a64df02 SHA256 892f152ecc22a3d306137f498e9a5ef38fe24414573cdae7bb17f3d5d21d1581
AUX gegl-20-configure-ac.patch 13263 RMD160 df2f13719b23f45f04dcbce5a2e611f0b21636fb SHA1 67416e82775ac6cf30346128ba83af2420aa9280 SHA256 f27a68381a41f50125e1ec20efb5913feac0ea23dbeb565364a7feeeeb77d917
DIST gegl-0.0.20.tar.bz2 1224221 RMD160 b4bc7169eafa4fea512f1190f1ad835d688c4080 SHA1 37be399b58d50a87134f2dfad389a476e1155874 SHA256 708bb6afef9dc896caeaa618238bd67dd8548be5b774ce3c67664b716b550db7
-EBUILD gegl-0.0.20.ebuild 2557 RMD160 2bc6050899961d7a176eb096a1f7cedfb3f76e11 SHA1 2841051d5ea84aad1818c9cf941c8802372a70a6 SHA256 0441763c1214554c1fcad6d02d90da7b9213fb0ae5159bcf0caa9f4da0a34d22
-MISC ChangeLog 1233 RMD160 f7cf9a1c749158ccc718fbccbd8f0fd9b3cc9a84 SHA1 9cfbf848d7d565fce8643358bd0cc9ec92b14d6e SHA256 7bbb0cd728bbf26d6c262a5dd33ecef60f0bf083197f3ee6ab0eccb96ca936b0
+EBUILD gegl-0.0.20.ebuild 2811 RMD160 59c7851b5a78c95d706f7584a162ee372c8645b5 SHA1 5bf7360da8c588fdba58ded0c34f1b173a097796 SHA256 a0dcda2d20525ba830ad2c9ba5dd24f10ed0520221dca6683670a2f11bfd9875
+MISC ChangeLog 1366 RMD160 269bd58f5fa72161c12677940e0f365399ec3817 SHA1 0a1d4e0432bb8d48db2311f8b5b4b339ada47ba9 SHA256 8272d5fcee1c9a7e1206181c6cf03067f073d758bf8a43c4075bf914567e1894
MISC metadata.xml 220 RMD160 a49072631c03f8ac3685b12169abeef3b34ad3d6 SHA1 9614887db749b0a3c17016da5b3ec0e42b908ad3 SHA256 c893488c84e6da8039f2b473982f03e934ec12f8fe2c1ace770f9e34969db081
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkjzuJ0ACgkQr2QksT29OyD2/gCgnaMjJL2WHDtSHvO9+btmnaNR
-1OEAn1auykdMwFvGNZVuTTCkgeC+4PhL
-=ktVS
------END PGP SIGNATURE-----
diff --git a/media-libs/gegl/gegl-0.0.20.ebuild b/media-libs/gegl/gegl-0.0.20.ebuild
index 02f72ea3fc47..3c932485c3d0 100644
--- a/media-libs/gegl/gegl-0.0.20.ebuild
+++ b/media-libs/gegl/gegl-0.0.20.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.20.ebuild,v 1.8 2008/10/13 21:07:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.0.20.ebuild,v 1.9 2008/10/14 12:47:21 loki_val Exp $
WANT_AUTOCONF=latest
@@ -45,6 +45,16 @@ pkg_setup() {
src_unpack() {
unpack ${A}
cd "${S}"
+
+ #HACK!GACK!HACK!
+ #Interface name changed, we change with it.
+ if has_version '>=media-video/ffmpeg-0.4.9_p20081014'
+ then
+ sed -i \
+ -e 's:p->enc->error_resilience:p->enc->error_recognition:' \
+ operations/external/ff-load.c || die "404"
+ fi
+
epatch "${FILESDIR}/gegl-20-configure-ac.patch" || die
epatch "${FILESDIR}/gegl-0.0.18-newffmpeg.diff" || die