Version bumps, bug 504978

(Portage version: 2.2.8-r1/cvs/Linux x86_64, unsigned Manifest commit)

4 files changed, 92 insertions, 1 deletions

diff --git a/media-video/ccextractor/ChangeLog b/media-video/ccextractor/ChangeLog
index 913488331a3e..39de0ea4d9d4 100644
--- a/media-video/ccextractor/ChangeLog
+++ b/media-video/ccextractor/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ccextractor
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ccextractor/ChangeLog,v 1.8 2014/04/05 11:11:33 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ccextractor/ChangeLog,v 1.9 2014/04/25 18:28:18 beandog Exp $
+
+*ccextractor-0.69 (25 Apr 2014)
+*ccextractor-0.68 (25 Apr 2014)
+
+  25 Apr 2014; Steve Dibb <beandog@gentoo.org> +ccextractor-0.68.ebuild,
+  +ccextractor-0.69.ebuild, +files/ccextractor-0.68-libpng.patch:
+  Version bumps, bug 504978
 
   05 Apr 2014; Agostino Sarubbo <ago@gentoo.org> ccextractor-0.59.ebuild:
   Stable for x86, wrt bug #505094
diff --git a/media-video/ccextractor/ccextractor-0.68.ebuild b/media-video/ccextractor/ccextractor-0.68.ebuild
new file mode 100644
index 000000000000..52a76f2c1bc8
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.68.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ccextractor/ccextractor-0.68.ebuild,v 1.1 2014/04/25 18:28:18 beandog Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${PN}.src.${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	media-libs/libpng
+	sys-libs/zlib"
+
+S="${WORKDIR}/${PN}.${PV}"
+
+src_prepare() {
+	epatch "${FILESDIR}/${P}-libpng.patch" || die
+	rm -r src/libpng src/zlib || die
+}
+
+src_compile() {
+	cd src
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -DHAVE_LIBPNG -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -Igpacmp4/ -o ccextractor $(find . -name '*.cpp') $(find . -name '*.c') -lpng || die
+}
+
+src_install() {
+	dobin src/ccextractor
+	dodoc docs/*.TXT
+}
diff --git a/media-video/ccextractor/ccextractor-0.69.ebuild b/media-video/ccextractor/ccextractor-0.69.ebuild
new file mode 100644
index 000000000000..4f9f020b04da
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.69.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/ccextractor/ccextractor-0.69.ebuild,v 1.1 2014/04/25 18:28:18 beandog Exp $
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${PN}.src.${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="app-arch/unzip
+	media-libs/libpng
+	sys-libs/zlib"
+
+S="${WORKDIR}/${PN}"
+
+src_prepare() {
+	rm -r src/libpng src/zlib || die
+}
+
+src_compile() {
+	cd src
+	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -DHAVE_LIBPNG -DGPAC_CONFIG_LINUX -D_FILE_OFFSET_BITS=64 -Igpacmp4/ -o ccextractor $(find . -name '*.cpp') $(find . -name '*.c') -lpng || die
+}
+
+src_install() {
+	dobin src/ccextractor
+	dodoc docs/*.TXT
+}
diff --git a/media-video/ccextractor/files/ccextractor-0.68-libpng.patch b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
new file mode 100644
index 000000000000..518d434df369
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
@@ -0,0 +1,11 @@
+--- src/608_spupng.cpp.orig     2014-03-19 10:32:47.578960867 -0600

++++ src/608_spupng.cpp  2014-03-19 10:33:00.692179157 -0600

+@@ -490,7 +490,7 @@

+ {

+     unsigned int i;

+ 

+-    if (setjmp (png_ptr->jmpbuf))

++    if (setjmp(png_jmpbuf(png_ptr)))

+             return 0;

+ 

+     png_init_io (png_ptr, fppng);
\ No newline at end of file