public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Alexis Ballier (aballier)" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-sound/sox: sox-14.4.1.ebuild ChangeLog
Date: Tue,  6 Aug 2013 21:41:06 +0000 (UTC)	[thread overview]
Message-ID: <20130806214106.1BD762171D@flycatcher.gentoo.org> (raw)

aballier    13/08/06 21:41:06

  Modified:             sox-14.4.1.ebuild ChangeLog
  Log:
  fix build with ffmpeg-2, bug #478080
  
  (Portage version: 2.2.0_alpha194/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.10                 media-sound/sox/sox-14.4.1.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild?r1=1.9&r2=1.10

Index: sox-14.4.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sox-14.4.1.ebuild	9 Mar 2013 13:35:55 -0000	1.9
+++ sox-14.4.1.ebuild	6 Aug 2013 21:41:05 -0000	1.10
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild,v 1.9 2013/03/09 13:35:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/sox-14.4.1.ebuild,v 1.10 2013/08/06 21:41:05 aballier Exp $
 
 EAPI=4
 inherit eutils flag-o-matic autotools
@@ -45,6 +45,13 @@
 		"${FILESDIR}"/${PN}-14.4.0-ffmpeg.patch \
 		"${FILESDIR}"/${PN}-14.4.0-avcodec54.patch \
 		"${FILESDIR}"/${PN}-14.4.0-libav-9.patch
+
+	if has_version '>=media-video/ffmpeg-2' ; then
+		epatch "${FILESDIR}"/${PN}-14.4.1-ffmpeg2.patch
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   src/ffmpeg.c || die
+	fi
 	eautoreconf
 }
 



1.154                media-sound/sox/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/ChangeLog?rev=1.154&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/ChangeLog?rev=1.154&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/sox/ChangeLog?r1=1.153&r2=1.154

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -r1.153 -r1.154
--- ChangeLog	10 Mar 2013 09:52:36 -0000	1.153
+++ ChangeLog	6 Aug 2013 21:41:05 -0000	1.154
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/sox
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.153 2013/03/10 09:52:36 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/sox/ChangeLog,v 1.154 2013/08/06 21:41:05 aballier Exp $
+
+  06 Aug 2013; Alexis Ballier <aballier@gentoo.org> sox-14.4.1.ebuild,
+  +files/sox-14.4.1-ffmpeg2.patch:
+  fix build with ffmpeg-2, bug #478080
 
   10 Mar 2013; Alexis Ballier <aballier@gentoo.org> -sox-14.3.2-r1.ebuild,
   -files/sox-14.3.2-ffmpeg.patch, -files/sox-14.3.2-uclibc.patch,





             reply	other threads:[~2013-08-06 21:41 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-06 21:41 Alexis Ballier (aballier) [this message]
  -- strict thread matches above, loose matches on Subject: below --
2015-03-03  9:13 [gentoo-commits] gentoo-x86 commit in media-sound/sox: sox-14.4.1.ebuild ChangeLog Yixun Lan (dlan)
2014-10-11 10:22 Alexis Ballier (aballier)
2014-02-03 16:06 Akinori Hattori (hattya)
2013-03-09 13:35 Agostino Sarubbo (ago)
2013-03-08 17:23 Agostino Sarubbo (ago)
2013-03-03 16:13 Agostino Sarubbo (ago)
2013-03-03 16:11 Agostino Sarubbo (ago)
2013-03-03 15:28 Agostino Sarubbo (ago)
2013-03-03 12:14 Agostino Sarubbo (ago)
2013-03-03 12:08 Agostino Sarubbo (ago)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130806214106.1BD762171D@flycatcher.gentoo.org \
    --to=aballier@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox