[gentoo-commits] gentoo-x86 commit in dev-php/ffmpeg-php: ffmpeg-php-0.6.0-r3.ebuild ffmpeg-php-0.6.0-r4.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in dev-php/ffmpeg-php: ffmpeg-php-0.6.0-r3.ebuild ffmpeg-php-0.6.0-r4.ebuild ChangeLog

[Brian Evans (grknight)]

grknight    15/06/24 01:02:47

  Modified:             ffmpeg-php-0.6.0-r3.ebuild ChangeLog
  Added:                ffmpeg-php-0.6.0-r4.ebuild
  Log:
  Fix build failures wrt bug 545700 ; Revbump to include the libav IUSE so we can rebuilt against libav/ffmpeg subslots
  
  (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0xD1F781EFF9F4A3B6)

Revision  Changes    Path
1.7                  dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild?r1=1.6&r2=1.7

Index: ffmpeg-php-0.6.0-r3.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ffmpeg-php-0.6.0-r3.ebuild	14 Apr 2015 18:05:58 -0000	1.6
+++ ffmpeg-php-0.6.0-r3.ebuild	24 Jun 2015 01:02:47 -0000	1.7
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild,v 1.6 2015/04/14 18:05:58 grknight Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r3.ebuild,v 1.7 2015/06/24 01:02:47 grknight Exp $
 
 EAPI="5"
 
@@ -42,6 +42,7 @@
 		epatch "${FILESDIR}/${P}-ffincludes.patch"
 		epatch "${FILESDIR}/${P}-ffmpeg1.patch"
 		epatch "${FILESDIR}/${P}-api.patch"
+		epatch "${FILESDIR}/${P}-libav10.patch"
 	done
 	php-ext-source-r2_src_prepare
 }



1.19                 dev-php/ffmpeg-php/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ChangeLog?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ChangeLog?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ChangeLog?r1=1.18&r2=1.19

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ChangeLog	9 Jun 2015 15:00:39 -0000	1.18
+++ ChangeLog	24 Jun 2015 01:02:47 -0000	1.19
@@ -1,6 +1,13 @@
 # ChangeLog for dev-php/ffmpeg-php
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.18 2015/06/09 15:00:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ChangeLog,v 1.19 2015/06/24 01:02:47 grknight Exp $
+
+*ffmpeg-php-0.6.0-r4 (24 Jun 2015)
+
+  24 Jun 2015; Brian Evans <grknight@gentoo.org> +ffmpeg-php-0.6.0-r4.ebuild,
+  +files/ffmpeg-php-0.6.0-libav10.patch, ffmpeg-php-0.6.0-r3.ebuild:
+  Fix build failures wrt bug 545700 ; Revbump to include the libav IUSE so we
+  can rebuilt against libav/ffmpeg subslots
 
   09 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Updating remote-id in metadata.xml



1.1                  dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild?rev=1.1&content-type=text/plain

Index: ffmpeg-php-0.6.0-r4.ebuild
===================================================================
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-php/ffmpeg-php/ffmpeg-php-0.6.0-r4.ebuild,v 1.1 2015/06/24 01:02:47 grknight Exp $

EAPI="5"

PHP_EXT_NAME="ffmpeg"
PHP_EXT_INI="yes"
PHP_EXT_ZENDEXT="no"

USE_PHP="php5-6 php5-5 php5-4"

inherit php-ext-source-r2 eutils

KEYWORDS="~amd64 ~x86"

DESCRIPTION="PHP extension that provides access to movie info"
HOMEPAGE="http://sourceforge.net/projects/ffmpeg-php/"
SRC_URI="mirror://sourceforge/ffmpeg-php/${P}.tbz2"
LICENSE="GPL-2"
SLOT="0"
IUSE="libav"

DEPEND="libav? ( media-video/libav:0= )
	!libav? ( media-video/ffmpeg:0= )
	dev-lang/php:*[gd]"
RDEPEND="${DEPEND}"

# The test breaks with the test movie, but it the same code works fine with
# other movies

RESTRICT="test"

DOCS="CREDITS ChangeLog EXPERIMENTAL TODO"

src_prepare() {
	for slot in $(php_get_slots) ; do
		cd "${WORKDIR}/${slot}"
		epatch "${FILESDIR}/${P}-avutil50.patch"
		epatch "${FILESDIR}/${P}-ffmpeg.patch"
		epatch "${FILESDIR}/${P}-log.patch"
		epatch "${FILESDIR}/${P}-php5-4.patch"
		epatch "${FILESDIR}/${P}-ffincludes.patch"
		epatch "${FILESDIR}/${P}-ffmpeg1.patch"
		epatch "${FILESDIR}/${P}-api.patch"
		epatch "${FILESDIR}/${P}-libav10.patch"
	done
	php-ext-source-r2_src_prepare
}