5 files changed, 98 insertions, 22 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/Manifest b/media-video/ccextractor/Manifest
index a145d62d4214..14bebed0374d 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,24 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
+AUX ccextractor-0.68-libpng.patch 316 SHA256 a28597bd5c76aaa0c74d402e7c9b16dea63d817dcedab4e4c882749610f04329 SHA512 1952c3a9a8804cb2adafb026994c94fad3e621fcdd601ead9ccb53d022efd131c8325ea93b1dbf5d37afd272ae69db120087452fad640b990f15e6e1b198d676 WHIRLPOOL a8d1d6f8340e5218eaa75c5c4adc4dbd70c880157acb87014c51b4242a226511aa0b781acb95c9cb85828f41f2d61f96a927bad633d9ec53cc61d98672bed24d
 DIST ccextractor-0.59-src.zip 168198 SHA256 13ca427527661e99f156c72ebd09b5bb4eb735904a83c2b3eb3f8aec66425ecb
+DIST ccextractor.src.0.68.zip 927590 SHA256 b4d711b88995bbf4e22b70076b802b162fcaca3eff95263e01ed502edc7dbd00 SHA512 c73eb007db7058cf17a818cd5bdf20dfb6f6f3585f55d9f7f1b894aaedcc6b74ac0c2b34b517b44491cdefe2fe7b1fc0035802326b61f7f6330acdb854b8c2ad WHIRLPOOL 4d6b245212f37d79076fc6afe6bdd4bc754c6ffb5c94559aea1f1428270de395daf7720e8cf7d346681975cb68d8357ef2aaed326a59d9a37eea7d7ddc157f3b
+DIST ccextractor.src.0.69.zip 940531 SHA256 bfb6d1174e7a440a624f39ade3c9b9ccbdebb9111ec308578d68aba89a8ec50a SHA512 51c3218a9a8e88aa86acfdd0cbd51bc52a734bde77dbea32c7e2a0f63835b25e0e86ea4b228564e5e996a5a19c74d5513d057bf510c324280f0c155a96b77775 WHIRLPOOL f27c377ab7f535900f858f138867cc8d12b76b05bc2eabbd0309c4ffcd7cd19865f419d4f0fe2b8bd1b480a6594f4a8a0104212fba6923da126b56ed31425c96
 EBUILD ccextractor-0.59.ebuild 708 SHA256 3cf10747e2101799806b87d3bf962c700a2cc69cea49360a7c148df2c64bcb3b SHA512 ba7ce1c9c6ba31087195f05b10eb0dddb9b5746ed2dae3424ae97a81a0fc78bf4b586e3660b83f772557776e90b80b2407115cfc2fc9bfc1496854a012885088 WHIRLPOOL 1e05f3f004a48e12f7f757797c5c2b464a91a9fb324f6c638b387a23c7b6f17e761ae4b04fa1165d196a4f33eaa7f045e3e967e8d50d4d07d243c27de2eadb53
-MISC ChangeLog 1223 SHA256 981319c197e962e7dadc9e31e8f89f5a467ee93e060ccafefa04f9abf9189e89 SHA512 271701c29544e4377adbc5e4a946d0a73e6837ecaccde9f63a1011a0224a17b096ded764d1eec3af6119d3867d87d1cc0edada765ca03049d048ce6ceedf55d1 WHIRLPOOL 41108f6e2e965d53cef176c1d9033c10d04aa9017f832d7c27edeb5e759b09a27b55ece69ad66a5dee863958fa5f2232eee67ad9594020e49ee5dd0a5c161c37
+EBUILD ccextractor-0.68.ebuild 959 SHA256 633f98dbb8e8d69ff2a1758845086a91d30c54540175859e6347371805d8daaf SHA512 315afb2752d10c4b6c4f52b6d895aba854aa186ba3213e2e1b12c813c859bb3caa1bb61bd435b0e43ad16fd81a1ad1599cf50a2cedd6ec91d4a81488a58cd768 WHIRLPOOL 4390ed6954f8312ff21b4a83ec15c5fd25a4ca13888315943bcf0c590778ff2a57097cf1b31399e94be0b7d89a75048b397576b7fb4882268d1cdbc4ff3e9738
+EBUILD ccextractor-0.69.ebuild 906 SHA256 32c392ca58e561045df887c9c6e55751e2ce5147aaf3db78614e1a390d69d80f SHA512 98f9e74608147b26ca1182293eeaad27a5f7c05c0d2ef487ecaf0a209bf3473f844b079b04e178b60c9f4838da6de128df80c5f5e9d4bc09fcb1ff3019cb2138 WHIRLPOOL 8c715adbf5d8e17e39cbebbde5aaf138dc867921a9d6fd540ebb569e6192692830c1623a8073cfff5cd99f9d17754cf587671e254d07e3a2aedeecf2529278f5
+MISC ChangeLog 1460 SHA256 b346ca0c7f58f07b6bef3a44aebeac48953ad7118342c47f7800d36629e89d1d SHA512 fc30210346718e56c5a8f290860e8050ae93f8311221fbc738422d148db95b9d860b6a6e96df33d7f76c8a2a0bf429e109707e8cf44bee29520cecf03484c502 WHIRLPOOL e2e5aa657f7b3b7aacd773615380cd7c916afc24f5f8d956bf185eb3664f894c199399dc56c15cf3ef7940bbc3bcb97a727aed5a6713ea64f9e5dd316e6b7a3d
 MISC metadata.xml 343 SHA256 41cc9d0f8cb0c7c017a21d39891eba9192f0dd1020bbf4ea9c1e0c41ac9cc1ba SHA512 f12f4de0b8180ec1337b955e9cbb9c032f8a6324da3e54ea49d12dc0fcb44cc8cad8dfda3957125fc03dd102240ec605289ed3fb90ec4c1d5a5c00a3065083ce WHIRLPOOL 3ef39f3edf0571aa60b704d06d64dbade674ed6cfe461d27912c06d72b6318d286b38e3df467703bfda006f449f0127ff6f5273b90204b1bc0e0969fc1397ee8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
-
-iQIcBAEBCAAGBQJTP+TnAAoJELp701BxlEWf9FcQALqZZjxOeoe5fvWl5PQu+MD+
-skOXZPwZS0K0g7nUO0orHE1yLIf0oKBIACG2D9s9cuCDOK0FTHXR/b0Dft4zR4+r
-uXAeUp/eVT2CbRjcSRRTGroctIsYbIWsygf+x8VlH9pW1Yh0usueltvvjdrrzteP
-62NogRb91exrQPxxsVlHPIIEEbT+ppKnPLA4YPLXLZG2CPwJgpi7Z4Pu+50TL5Q9
-EJVuFnlst1RgyCBMB5acHUNRbzvmuyjDL042CM1JiKSFFdjDf6OrW06DFVZgSkOd
-SrcI2o/7FaI7BYrsZwd+ExEIbuPRZM/O1Oj69cbyEM68nkJtU547zRoxvU7nbI0H
-zVB3GMtSVwmAh+8s457fZIGnGio0bpaFt/qNQXvNoQlNS8FwN8o+4RMcpUCRkSNC
-zY8aBnb5hi4HGM66lMRg8QLVV7vrEcYpDh5UkFTE5bFjaasI8IlkNWjqML5tjT/8
-ntJCBxm+l8pYtmoRVU8r/KFkJSro+mdvGVBTlH9ZUaXm3rgaeIIXqvCZvN5x3HY1
-kYSycuYjf4Krxmo7e/w65pP17CCwtu2L/Fl+g8pcTGggrZ1QIO5zX7Ue3Tx4yZv9
-bhFmRtuchcSvdL68g0Y6AV2Ji2hSGzcac7saJHAoXznOfla1k8ooK7PCAyyDs+2P
-WbY0cEMPT2beaiJn805o
-=1cW9
------END PGP SIGNATURE-----
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