[gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/, media-video/ccextractor/files/

2020-10-31 Thread Sam James 
commit: 8cc02afe349792cc39e886d9ee01f8bf501548cc
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  1 05:23:55 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  1 05:23:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8cc02afe

media-video/ccextractor: fix build with gcc 10

Thanks-to: Matt Whitlock  mattwhitlock.name>
Closes: https://bugs.gentoo.org/706934
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 media-video/ccextractor/ccextractor-0.85-r2.ebuild | 26 +++---
 .../files/ccextractor-0.85-fno-common.patch| 13 +++
 2 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/media-video/ccextractor/ccextractor-0.85-r2.ebuild 
b/media-video/ccextractor/ccextractor-0.85-r2.ebuild
index b7f0cdfe882..982bba8df30 100644
--- a/media-video/ccextractor/ccextractor-0.85-r2.ebuild
+++ b/media-video/ccextractor/ccextractor-0.85-r2.ebuild
@@ -1,32 +1,32 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit cmake-utils toolchain-funcs
+inherit cmake
 
 DESCRIPTION="Extract closed captioning subtitles from video to SRT"
 HOMEPAGE="https://www.ccextractor.org/;
 SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
+S="${WORKDIR}/${PN}/src"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
 
+BDEPEND="app-arch/unzip
+   virtual/pkgconfig"
 RDEPEND="
media-libs/libpng:0=
-   sys-libs/zlib:=
-"
-DEPEND="${RDEPEND}
-   app-arch/unzip
-   virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}/src"
+   sys-libs/zlib:="
+DEPEND="${RDEPEND}"
 
-PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+PATCHES=(
+   "${FILESDIR}/${P}-cmake.patch"
+   "${FILESDIR}/${PN}-0.85-fno-common.patch"
+)
 
 src_install() {
-   cmake-utils_src_install
+   cmake_src_install
dodoc ../docs/*.TXT
 }

diff --git a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch 
b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch
new file mode 100644
index 000..6e543f74910
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/706934
+--- a/lib_ccx/ccx_decoders_708.h
 b/lib_ccx/ccx_decoders_708.h
+@@ -368,7 +368,7 @@
+
unsigned char *data,
+int 
data_length);
+ 
+-ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color;
+-ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs;
++extern ccx_dtvcc_pen_color ccx_dtvcc_default_pen_color;
++extern ccx_dtvcc_pen_attribs ccx_dtvcc_default_pen_attribs;
+ 
+ #endif

[gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/, media-video/ccextractor/files/

2017-07-25 Thread Steve Dibb 
commit: 45faa89268bc5fe45996dc034a497d2d0fac98aa
Author: Steve Dibb  gentoo  org>
AuthorDate: Tue Jul 25 18:58:49 2017 +
Commit: Steve Dibb  gentoo  org>
CommitDate: Tue Jul 25 18:59:25 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45faa892

media-video/ccextractor: remove file collision headers

Fix file collision header install; update makefile patch, bug 617420

Package-Manager: Portage-2.3.0, Repoman-2.3.1

 ...ctor-0.85.ebuild => ccextractor-0.85-r1.ebuild} |  4 +-
 .../files/ccextractor-0.85-makefile.patch  | 76 ++
 2 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/media-video/ccextractor/ccextractor-0.85.ebuild 
b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
similarity index 87%
rename from media-video/ccextractor/ccextractor-0.85.ebuild
rename to media-video/ccextractor/ccextractor-0.85-r1.ebuild
index ea26c55c5ef..35c0f63e14f 100644
--- a/media-video/ccextractor/ccextractor-0.85.ebuild
+++ b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
@@ -25,11 +25,9 @@ DEPEND="${RDEPEND}
 S="${WORKDIR}/${PN}/src"
 
 PATCHES=(
-   "${FILESDIR}/zlib.patch"
-   "${FILESDIR}/cflags.patch"
+   "${FILESDIR}/${P}-makefile.patch"
 )
 
 src_prepare() {
-   rm -rf libpng zlib || die
cmake-utils_src_prepare
 }

diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch 
b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
new file mode 100644
index 000..6937869180d
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
@@ -0,0 +1,76 @@
+--- ccextractor/src/CMakeLists.txt.orig2017-07-25 12:22:29.294144514 
-0600
 ccextractor/src/CMakeLists.txt 2017-07-25 12:23:33.979149436 -0600
+@@ -25,14 +25,13 @@
+ 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
+ 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} -std=gnu99 -D_FILE_OFFSET_BITS=64")
+ add_subdirectory (lib_ccx)
+ 
+ aux_source_directory (${PROJECT_SOURCE_DIR} SOURCEFILE)
+@@ -43,24 +42,8 @@
+ set (EXTRA_LIBS ${EXTRA_LIBS} iconv)
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ 
+-
+-find_package (PkgConfig)
+-if(PKG_CONFIG_FOUND)
+-  pkg_check_modules(PNG libpng )
+-  if(PNG_FOUND)
+-set (EXTRA_LIBS ${EXTRA_LIBS} png)
+-  else (PNG_FOUND)
+-include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+-include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-  endif(PNG_FOUND)
+-else(PKG_CONFIG_FOUND)
+-include_directories ("${PROJECT_SOURCE_DIR}/libpng/")
+-include_directories ("${PROJEXT_SOURCE_DIR}/zlib/")
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/libpng/" SOURCEFILE)
+-aux_source_directory ("${PROJECT_SOURCE_DIR}/zlib/" SOURCEFILE)
+-endif (PKG_CONFIG_FOUND)
++set (EXTRA_LIBS ${EXTRA_LIBS} png)
++set (EXTRA_LIBS ${EXTRA_LIBS} z)
+ 
+ 
+ # Build using FFmpeg libraries
+--- ccextractor/src/lib_ccx/CMakeLists.txt.orig2017-07-25 
12:32:32.803190443 -0600
 ccextractor/src/lib_ccx/CMakeLists.txt 2017-07-25 12:25:40.819159089 
-0600
+@@ -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} -std=gnu99")
+ 
+ if (WITH_FFMPEG)
+   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_FFMPEG")
+@@ -37,20 +37,3 @@
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+ set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DGPAC_CONFIG_DARWIN")
+ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+-
+-
+-file (GLOB HeaderFiles *.h)
+-file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
+-  "includedir=\${prefix}/include\n"
+-  "libdir=\${prefix}/lib\n\n"
+-  "Name: ccx\n"
+-  "Description: Closed Caption Extraction library\n"
+-  "Version: 0.75\n"
+-  "Cflags: -I\${includedir}/\n"
+-  "Libs: -L\${libdir} -lccx -lpng\n"
+-  "Libs.private: -lpng\n"
+-  )
+-
+-install (TARGETS ccx DESTINATION lib)
+-install (FILES ${HeaderFiles} DESTINATION include)
+-install (FILES ccx.pc DESTINATION lib/pkgconfig)

[gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/, media-video/ccextractor/files/

2017-04-23 Thread Alexis Ballier 
commit: a9d7b175844cd43afeeb4618f296bbcd9ce3f2c5
Author: Alexis Ballier  gentoo  org>
AuthorDate: Sun Apr 23 10:48:54 2017 +
Commit: Alexis Ballier  gentoo  org>
CommitDate: Sun Apr 23 11:10:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a9d7b175

media-video/ccextractor: Bump to 0.85

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 media-video/ccextractor/Manifest|  1 +
 media-video/ccextractor/ccextractor-0.85.ebuild | 35 
 media-video/ccextractor/files/cflags.patch  | 25 +
 media-video/ccextractor/files/zlib.patch| 36 +
 4 files changed, 97 insertions(+)

diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index ccb67fabeb9..b9549f951c7 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 
14b05f4f9bc5c52d3943d0aa0f55ce144b0a221c67feec55779687576e1e7abe8da617002d4d6ca09258d859692861f71db6410fbebcfde35998ea6b9d12
 DIST ccextractor.src.0.68.zip 927590 SHA256 
b4d711b88995bbf4e22b70076b802b162fcaca3eff95263e01ed502edc7dbd00 SHA512 
c73eb007db7058cf17a818cd5bdf20dfb6f6f3585f55d9f7f1b894aaedcc6b74ac0c2b34b517b44491cdefe2fe7b1fc0035802326b61f7f6330acdb854b8c2ad
 WHIRLPOOL 
4d6b245212f37d79076fc6afe6bdd4bc754c6ffb5c94559aea1f1428270de395daf7720e8cf7d346681975cb68d8357ef2aaed326a59d9a37eea7d7ddc157f3b
 DIST ccextractor.src.0.69.zip 940531 SHA256 
bfb6d1174e7a440a624f39ade3c9b9ccbdebb9111ec308578d68aba89a8ec50a SHA512 
51c3218a9a8e88aa86acfdd0cbd51bc52a734bde77dbea32c7e2a0f63835b25e0e86ea4b228564e5e996a5a19c74d5513d057bf510c324280f0c155a96b5
 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 000..ea26c55c5ef
--- /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 000..e482bdbe5fc
--- /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 000..d2dfd2a3adb
--- /dev/null
+++ b/media-video/ccextractor/files/zlib.patch
@@ -0,0 +1,36 @@
+Index: src/CMakeLists.txt