public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/files/, media-video/ccextractor/
@ 2018-08-26  8:51 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2018-08-26  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     2bd95e189e829f2282bea13b6d7b67c2b256ed6a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 26 07:26:51 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Aug 26 08:51:25 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2bd95e18

media-video/ccextractor: EAPI-6 bump, HOMEPAGE, cleanup

Package-Manager: Portage-2.3.48, Repoman-2.3.10

 media-video/ccextractor/ccextractor-0.85-r1.ebuild       | 16 +++++-----------
 ...-0.85-makefile.patch => ccextractor-0.85-cmake.patch} |  8 ++++----
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/media-video/ccextractor/ccextractor-0.85-r1.ebuild b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
index 35c0f63e14f..aad1f505d1f 100644
--- a/media-video/ccextractor/ccextractor-0.85-r1.ebuild
+++ b/media-video/ccextractor/ccextractor-0.85-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs cmake-utils
+inherit cmake-utils toolchain-funcs
 
 DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
+HOMEPAGE="https://www.ccextractor.org/"
 SRC_URI="mirror://sourceforge/ccextractor/${PN}-src-nowin.${PV}.zip"
 
 LICENSE="GPL-2"
@@ -24,10 +24,4 @@ DEPEND="${RDEPEND}
 
 S="${WORKDIR}/${PN}/src"
 
-PATCHES=(
-	"${FILESDIR}/${P}-makefile.patch"
-)
-
-src_prepare() {
-	cmake-utils_src_prepare
-}
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )

diff --git a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
similarity index 89%
rename from media-video/ccextractor/files/ccextractor-0.85-makefile.patch
rename to media-video/ccextractor/files/ccextractor-0.85-cmake.patch
index 6937869180d..2fcf6cfee4b 100644
--- a/media-video/ccextractor/files/ccextractor-0.85-makefile.patch
+++ b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
@@ -1,5 +1,5 @@
---- ccextractor/src/CMakeLists.txt.orig	2017-07-25 12:22:29.294144514 -0600
-+++ ccextractor/src/CMakeLists.txt	2017-07-25 12:23:33.979149436 -0600
+--- a/CMakeLists.txt	2017-07-25 12:22:29.294144514 -0600
++++ b/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")
@@ -43,8 +43,8 @@
  
  ########################################################
  # Build using FFmpeg libraries
---- ccextractor/src/lib_ccx/CMakeLists.txt.orig	2017-07-25 12:32:32.803190443 -0600
-+++ ccextractor/src/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
+--- a/lib_ccx/CMakeLists.txt	2017-07-25 12:32:32.803190443 -0600
++++ b/lib_ccx/CMakeLists.txt	2017-07-25 12:25:40.819159089 -0600
 @@ -1,6 +1,6 @@
  cmake_policy (SET CMP0037 NEW)
  


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/files/, media-video/ccextractor/
@ 2019-06-12 10:37 Andreas Sturmlechner
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 10:37 UTC (permalink / raw
  To: gentoo-commits

commit:     45d174ced629a1ccd53643a00d264f8692b33c4b
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 10:27:05 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 10:37:04 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45d174ce

media-video/ccextractor: Drop old

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/ccextractor/Manifest                   |  3 --
 media-video/ccextractor/ccextractor-0.59.ebuild    | 29 -----------------
 media-video/ccextractor/ccextractor-0.68.ebuild    | 36 ----------------------
 media-video/ccextractor/ccextractor-0.69.ebuild    | 35 ---------------------
 .../files/ccextractor-0.68-libpng.patch            | 11 -------
 5 files changed, 114 deletions(-)

diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index d430732c575..58c7c84ab38 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,4 +1 @@
-DIST ccextractor-0.59-src.zip 168198 BLAKE2B b0398e897b2f5e1aa7974b92aefd1d7a8c2c7fcaa9761b672de8f0b6c636fc373a5b66a0421e163c6b03253817475eb07cb0ec1a4561d9e930d332f1a31cb1dd SHA512 13c9ffacdcbea781bac067e850700dbe46ba5fad00f2fde1fb563980c06b77be4c2216b1075d3dad873e3604f408f4cb739fca66bc0764bbaf15a987eb9cc9a3
 DIST ccextractor-src-nowin.0.85.zip 1843154 BLAKE2B 507018e76ed075de033df10c8af235ab7095b3dcf85c10398d9a7c8dbec338c6fe43f98b4f337419945b5deb9290d8652caa54c70de5fdfb0364b9dc48468379 SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec
-DIST ccextractor.src.0.68.zip 927590 BLAKE2B 2f2e3423ef67acb76a9cdfec66a6bd3c41fac88b53b8fcabaf1c260589d117efe19f04b3b005ad30b549d23a5974509a242beabd61eda01fb5bfe77f52e9fe45 SHA512 c73eb007db7058cf17a818cd5bdf20dfb6f6f3585f55d9f7f1b894aaedcc6b74ac0c2b34b517b44491cdefe2fe7b1fc0035802326b61f7f6330acdb854b8c2ad
-DIST ccextractor.src.0.69.zip 940531 BLAKE2B c15d8936cbbae5d2fc54add13b0b80318280dd0250a57f0d8f188eac57847c5307da1fb633c59a90de189069e1850a1eb353a9337952831462f448a941521680 SHA512 51c3218a9a8e88aa86acfdd0cbd51bc52a734bde77dbea32c7e2a0f63835b25e0e86ea4b228564e5e996a5a19c74d5513d057bf510c324280f0c155a96b77775

diff --git a/media-video/ccextractor/ccextractor-0.59.ebuild b/media-video/ccextractor/ccextractor-0.59.ebuild
deleted file mode 100644
index 83c1fae4d22..00000000000
--- a/media-video/ccextractor/ccextractor-0.59.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Extract closed captioning subtitles from video to SRT"
-HOMEPAGE="http://ccextractor.sourceforge.net/"
-SRC_URI="mirror://sourceforge/ccextractor/${P}-src.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-
-S="${WORKDIR}/${PN}"
-
-src_compile() {
-	cd src
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} -D_FILE_OFFSET_BITS=64 -o ccextractor *.cpp || die
-}
-
-src_install() {
-	dobin src/ccextractor
-	dodoc docs/*.TXT
-}

diff --git a/media-video/ccextractor/ccextractor-0.68.ebuild b/media-video/ccextractor/ccextractor-0.68.ebuild
deleted file mode 100644
index 450af1ba16c..00000000000
--- a/media-video/ccextractor/ccextractor-0.68.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index c98da414d1b..00000000000
--- a/media-video/ccextractor/ccextractor-0.69.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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
deleted file mode 100644
index 518d434df36..00000000000
--- a/media-video/ccextractor/files/ccextractor-0.68-libpng.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/files/, media-video/ccextractor/
@ 2020-11-08 23:04 Sam James
  0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2020-11-08 23:04 UTC (permalink / raw
  To: gentoo-commits

commit:     56b84c7fc59ef6085d5080e679bda72470255d07
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  8 23:04:09 2020 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Nov  8 23:04:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56b84c7f

media-video/ccextractor: bump to 0.88

Bug: https://bugs.gentoo.org/752510
Package-Manager: Portage-3.0.8, Repoman-3.0.2
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/ccextractor/Manifest                   |  1 +
 media-video/ccextractor/ccextractor-0.88.ebuild    | 33 +++++++++++++
 .../files/ccextractor-0.88-cflags.patch            | 13 +++++
 .../files/ccextractor-0.88-fno-common.patch        | 55 ++++++++++++++++++++++
 .../files/ccextractor-0.88-libdir.patch            | 12 +++++
 5 files changed, 114 insertions(+)

diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index 58c7c84ab38..3dd0343cb3f 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1 +1,2 @@
+DIST ccextractor-0.88.tar.gz 41110344 BLAKE2B c0223f482eba2b1c0b80f24fcfbf0654fe6899d6123d4278b21df2558ba77da4e2212c5a0e67d27c670f466767022f1b3e5f557e156564f61269bc48c8ebfd31 SHA512 bb9442905f3c5d095b9b34eb318dc445a0ba484c22c4f061071cc2a1159ec9304b8aab5ea9e95348679e8c5ed378d4b2e471d6f7f933b7fa968f3443f1d5380f
 DIST ccextractor-src-nowin.0.85.zip 1843154 BLAKE2B 507018e76ed075de033df10c8af235ab7095b3dcf85c10398d9a7c8dbec338c6fe43f98b4f337419945b5deb9290d8652caa54c70de5fdfb0364b9dc48468379 SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec

diff --git a/media-video/ccextractor/ccextractor-0.88.ebuild b/media-video/ccextractor/ccextractor-0.88.ebuild
new file mode 100644
index 00000000000..72d1707c169
--- /dev/null
+++ b/media-video/ccextractor/ccextractor-0.88.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Extract closed captioning subtitles from video to SRT"
+HOMEPAGE="https://www.ccextractor.org/"
+SRC_URI="https://github.com/CCExtractor/ccextractor/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/src"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="app-arch/unzip
+	virtual/pkgconfig"
+RDEPEND="
+	media-libs/libpng:0=
+	sys-libs/zlib:="
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/ccextractor-0.88-fno-common.patch"
+	"${FILESDIR}/ccextractor-0.88-libdir.patch"
+	"${FILESDIR}/ccextractor-0.88-cflags.patch"
+)
+
+src_install() {
+	cmake_src_install
+	dodoc ../docs/*.TXT
+}

diff --git a/media-video/ccextractor/files/ccextractor-0.88-cflags.patch b/media-video/ccextractor/files/ccextractor-0.88-cflags.patch
new file mode 100644
index 00000000000..7f0e0e9b23d
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.88-cflags.patch
@@ -0,0 +1,13 @@
+diff --git a/lib_ccx/CMakeLists.txt b/lib_ccx/CMakeLists.txt
+index 172ef42..0d00660 100644
+--- a/lib_ccx/CMakeLists.txt
++++ b/lib_ccx/CMakeLists.txt
+@@ -3,7 +3,7 @@ cmake_policy (SET CMP0037 NEW)
+ if(MSVC)
+     set (CMAKE_C_FLAGS "-W3 /wd4005 /wd4996")
+ else (MSVC)
+-    set (CMAKE_C_FLAGS "-Wall -g -std=gnu99")
++    set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99")
+ endif(MSVC)
+ 
+ if(WIN32)

diff --git a/media-video/ccextractor/files/ccextractor-0.88-fno-common.patch b/media-video/ccextractor/files/ccextractor-0.88-fno-common.patch
new file mode 100644
index 00000000000..1f42132bf8b
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.88-fno-common.patch
@@ -0,0 +1,55 @@
+From dfd25022e2a775a8b5eb03e4ad28bab6fe6a0658 Mon Sep 17 00:00:00 2001
+From: Ed Marshall <esm@logic.net>
+Date: Sat, 1 Feb 2020 15:03:22 -0800
+Subject: [PATCH] Fix multiple definitions with new -fno-common default in GCC
+ 10
+
+---
+ ccextractor.c              | 3 +++
+ ccextractor.h              | 4 ++--
+ lib_ccx/ccx_decoders_708.h | 4 ++--
+ 3 files changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/ccextractor.c b/ccextractor.c
+index a2fb0a24f..8ed27936d 100644
+--- a/ccextractor.c
++++ b/ccextractor.c
+@@ -9,6 +9,9 @@ License: GPL 2.0
+ 
+ volatile int terminate_asap = 0;
+ 
++struct ccx_s_options ccx_options;
++struct lib_ccx_ctx *signal_ctx;
++
+ void sigusr1_handler(int sig)
+ {
+ 	mprint("Caught SIGUSR1. Filename Change Requested\n");
+diff --git a/ccextractor.h b/ccextractor.h
+index 4e9ae68f6..e5cde3055 100644
+--- a/ccextractor.h
++++ b/ccextractor.h
+@@ -41,8 +41,8 @@ char * api_param(struct ccx_s_options* api_options, int count);
+ #endif
+ 
+ 
+-struct ccx_s_options ccx_options;
+-struct lib_ccx_ctx *signal_ctx;
++extern struct ccx_s_options ccx_options;
++extern struct lib_ccx_ctx *signal_ctx;
+ //volatile int terminate_asap = 0;
+ 
+ struct ccx_s_options* api_init_options();
+diff --git a/lib_ccx/ccx_decoders_708.h b/lib_ccx/ccx_decoders_708.h
+index 324f3890d..df52c6002 100644
+--- a/lib_ccx/ccx_decoders_708.h
++++ b/lib_ccx/ccx_decoders_708.h
+@@ -371,7 +371,7 @@ void ccx_dtvcc_process_service_block(ccx_dtvcc_ctx *dtvcc,
+ 									 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

diff --git a/media-video/ccextractor/files/ccextractor-0.88-libdir.patch b/media-video/ccextractor/files/ccextractor-0.88-libdir.patch
new file mode 100644
index 00000000000..bb22a4b8a35
--- /dev/null
+++ b/media-video/ccextractor/files/ccextractor-0.88-libdir.patch
@@ -0,0 +1,12 @@
+diff --git a/lib_ccx/CMakeLists.txt b/lib_ccx/CMakeLists.txt
+index 5a784a9..172ef42 100644
+--- a/lib_ccx/CMakeLists.txt
++++ b/lib_ccx/CMakeLists.txt
+@@ -107,6 +107,6 @@ file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n"
+                   "Libs.private: -lpng\n"
+                   )
+ 
+-install (TARGETS ccx DESTINATION lib)
++install (TARGETS ccx DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ install (FILES ${HeaderFiles} DESTINATION include)
+ install (FILES ccx.pc DESTINATION lib/pkgconfig)


^ permalink raw reply related	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-11-08 23:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-08-26  8:51 [gentoo-commits] repo/gentoo:master commit in: media-video/ccextractor/files/, media-video/ccextractor/ Andreas Sturmlechner
  -- strict thread matches above, loose matches on Subject: below --
2019-06-12 10:37 Andreas Sturmlechner
2020-11-08 23:04 Sam James

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox