media-video/ccextractor: Bump to 0.85

Package-Manager: Portage-2.3.5, Repoman-2.3.2

4 files changed, 97 insertions, 0 deletions

diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index ccb67fabeb9c..b9549f951c79 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,3 +1,4 @@
 DIST ccextractor-0.59-src.zip 168198 SHA256 13ca427527661e99f156c72ebd09b5bb4eb735904a83c2b3eb3f8aec66425ecb SHA512 13c9ffacdcbea781bac067e850700dbe46ba5fad00f2fde1fb563980c06b77be4c2216b1075d3dad873e3604f408f4cb739fca66bc0764bbaf15a987eb9cc9a3 WHIRLPOOL ff599cb5b07ff275fca34ce325d867e2f7d3c85d996de081335a4ef22f3104ce5e5bb9455c9718139a27b1946283f1b324e585fad8108424201eb77e938f73e8
+DIST ccextractor-src-nowin.0.85.zip 1843154 SHA256 2ac21c6483e206a796d26d6adb7e969eb038a97ead9e2b2a7ee91b8b08c6882e SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec WHIRLPOOL 14b05f4f9bc5c52d3943d0aa0f55ce144b0a221c67feec55779687576e1e7abe8da617002d4d6ca09258d859692861f71db6410fbebcfdcccce35998ea6b9d12
 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
diff --git a/media-video/ccextractor/ccextractor-0.85.ebuild b/media-video/ccextractor/ccextractor-0.85.ebuild
new file mode 100644
index 000000000000..ea26c55c5efa
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.85.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs cmake-utils
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="http://ccextractor.sourceforge.net/"
+SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+	media-libs/libpng:0=
+	sys-libs/zlib:=
+"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${PN}/src"
+
+PATCHES=(
+	"${FILESDIR}/zlib.patch"
+	"${FILESDIR}/cflags.patch"
+)
+
+src_prepare() {
+	rm -rf libpng zlib || die
+	cmake-utils_src_prepare
+}
diff --git a/media-video/ccextractor/files/cflags.patch b/media-video/ccextractor/files/cflags.patch
new file mode 100644
index 000000000000..e482bdbe5fc2
--- /dev/null
+++ b/media-video/ccextractor/files/cflags.patch
@@ -0,0 +1,25 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src.orig/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -31,7 +31,7 @@ aux_source_directory ("${PROJECT_SOURCE_
+ link_directories (/opt/local/lib)
+ link_directories (/usr/local/lib)
+ 
+-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O0 -Wall -g -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64")
+ add_subdirectory (lib_ccx)
+ 
+ aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
+Index: src/lib_ccx/CMakeLists.txt
+===================================================================
+--- src.orig/lib_ccx/CMakeLists.txt
++++ src/lib_ccx/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_policy (SET CMP0037 NEW)
+ 
+-set (CMAKE_C_FLAGS "-O0 -Wall -g -std=gnu99")
++set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -std=gnu99")
+ 
+ if (WITH_FFMPEG)
+   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
diff --git a/media-video/ccextractor/files/zlib.patch b/media-video/ccextractor/files/zlib.patch
new file mode 100644
index 000000000000..d2dfd2a3adb9
--- /dev/null
+++ b/media-video/ccextractor/files/zlib.patch
@@ -0,0 +1,36 @@
+Index: src/CMakeLists.txt
+===================================================================
+--- src.orig/CMakeLists.txt
++++ src/CMakeLists.txt
+@@ -25,7 +25,6 @@ include_directories ("${PROJECT_SOURCE_D
+ include_directories ("${PROJECT_SOURCE_DIR}/protobuf-c/")
+ include_directories ("${PROJECT_SOURCE_DIR}/zvbi")
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/zvbi" SOURCEFILE)
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib" SOURCEFILE)
+ aux_source_directory ("${PROJECT_SOURCE_DIR}/lib_hash" SOURCEFILE)
+ 
+ # Adding some platform specific library path
+@@ -48,7 +47,7 @@ find_package (PkgConfig)
+ if(PKG_CONFIG_FOUND)
+   pkg_check_modules(PNG libpng )
+   if(PNG_FOUND)
+-    set (EXTRA_LIBS ${EXTRA_LIBS} png)
++    set (EXTRA_LIBS ${EXTRA_LIBS} png z)
+   else (PNG_FOUND)
+     include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+     include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+Index: src/lib_ccx/CMakeLists.txt
+===================================================================
+--- src.orig/lib_ccx/CMakeLists.txt
++++ src/lib_ccx/CMakeLists.txt
+@@ -47,8 +47,8 @@ file (WRITE ccx.pc "prefix=${CMAKE_INSTA
+                   "Description: Closed Caption Extraction library\n"
+                   "Version: 0.75\n"
+                   "Cflags: -I\${includedir}/\n"
+-                  "Libs: -L\${libdir} -lccx -lpng\n"
+-                  "Libs.private: -lpng\n"
++                  "Libs: -L\${libdir} -lccx -lpng -lz\n"
++                  "Libs.private: -lpng -lz\n"
+                   )
+ 
+ install (TARGETS ccx DESTINATION lib)