gentoo auto-resync : 22:12:2022 - 01:55:45

5 files changed, 2 insertions, 126 deletions

diff --git a/media-video/ccextractor/Manifest b/media-video/ccextractor/Manifest
index 80a670d32e1f..1431a56fed4f 100644
--- a/media-video/ccextractor/Manifest
+++ b/media-video/ccextractor/Manifest
@@ -1,10 +1,6 @@
-AUX ccextractor-0.85-cmake.patch 3008 BLAKE2B a6ce3f6004dbaaa2cb2b5d87798d8125779f380923f930210440165c09ddedc4027f71e338acf560f25ebbb235064e35c4afec7cec588e058367a2cbb4069cf7 SHA512 d2fee97a35c3b104d311d9424cdd199655b12a114172c3b152cca8503b06900897a5334709770af3b1b1294893376d9d4f5f3fc0486250dd90899df0bc7af3d0
-AUX ccextractor-0.85-fno-common.patch 412 BLAKE2B d3f72608417e2b8083eb2215baff4914f1a9ab562445792fd492af8ecd618724750e64a45962e9a086a6043a9ca2ac77173c373048c3bd2325325f00b1e6d8d5 SHA512 1738eab83961296f65eae6ade44ad6c8823542cb06809340cd0ff155d17405cb7f1a6dae2a5b5059194cb6fc205f1820a048b67b1ed41b6f6c2315dc8804808c
 AUX ccextractor-0.88-cflags.patch 394 BLAKE2B f400c071f762b1e300d883eb184ab79c4a413a22ea8ed27afba751d9ba6c830935ed67fbdb9b170af8e41d832e458e1d9cbc999f38ebee440cc87d1230e9b52b SHA512 8d572687bb1059485e106c76162f58304de8a97411e357fbd3719dfef7ccd2aea033e437361072db550e64cd3d440e8dda59af0dff5103ff6cdc42b4e67f3cb5
 AUX ccextractor-0.88-fno-common.patch 1724 BLAKE2B b74a0e411f4d7012feae108aae5e914b596bfaf1446e4c4f1fbcddae59aa6d8a42d8be88d9c78dddf180e411f4b94f57418f0290a9c9c6236d3820d878d32cb1 SHA512 7df3a9c4008ca77e430828769cc963eb599f0e132c098c375361f73a9b9636f98fa4a2919ccf7be495a22db76bcd4767806cfb73e248f3a506bb33563116e132
 AUX ccextractor-0.88-libdir.patch 489 BLAKE2B 92e2176680bb8273fc59430307c103b78da4b13e0b758b7b8b7e951401ed5a34e0a5e2dfe144e78d7a7871eb55767121489e25655df4def9c97c29a7ea5bd12d SHA512 98883556e1be13b4a1c1ee09dc964e97584a59b076e63506ddc3ca63d120d958a166e93374610203ae8fbdfbcd57b10db60a5af0925029c10fd5a96e1ea28f0d
 DIST ccextractor-0.88.tar.gz 41110344 BLAKE2B c0223f482eba2b1c0b80f24fcfbf0654fe6899d6123d4278b21df2558ba77da4e2212c5a0e67d27c670f466767022f1b3e5f557e156564f61269bc48c8ebfd31 SHA512 bb9442905f3c5d095b9b34eb318dc445a0ba484c22c4f061071cc2a1159ec9304b8aab5ea9e95348679e8c5ed378d4b2e471d6f7f933b7fa968f3443f1d5380f
-DIST ccextractor-src-nowin.0.85.zip 1843154 BLAKE2B 507018e76ed075de033df10c8af235ab7095b3dcf85c10398d9a7c8dbec338c6fe43f98b4f337419945b5deb9290d8652caa54c70de5fdfb0364b9dc48468379 SHA512 53adc017b7b1679302677e3773aabdcceddabdd8a6550cf8b9fb98150b7323a1cc6dbe67a48ebcdf22a4d013c00831907799032dd0f7f6f06943252be8177cec
-EBUILD ccextractor-0.85-r2.ebuild 639 BLAKE2B 69437f1b71ac9772e74a3a3842181aa9ec60eb5ec2958af87734e37dc30472a97acbe63a5d157863880415b196abfcfc673639514377ff7447a3e0a8c5c50ae0 SHA512 323330b95c9a6efc295e18e6e61738b33a67984382a70e4bd63ab2e81ef70392c984de528b6a826b9936f2fe06ac453a2d6b168934aff4a5930885fe37e4d6c6
 EBUILD ccextractor-0.88.ebuild 723 BLAKE2B a404759914f8f4eedd4f413844581ac28e41d43f5cbb7a5aa3f9623b2bb08822126c84b73b0d11982a3dc5c4d60c144084747c3e9ade6fb47bc614cd3da6befc SHA512 8368124b9a140ca3342ae40b3307aeb38cdd10f120cba233a4988359eca1d333a99d31f3c054f0d80de1407150183ca7b74f7ea5d0ab40d6c3697fd9e347ccd8
-MISC metadata.xml 528 BLAKE2B 22f7e19938a50e6823df58e663c50590feafd46417f1b1e76d32b3a09ccf2da9a139e810bef378c81e641e1c83cf4c3fa447012979cfadead80661246f1d08de SHA512 27fe967fa29628076fd6c0df97aa651a948e2f41e569c62d34d4b40ff9150a6fdb6f75a92ff48956bbf2bb97d714e8e250605c5934a018eba1f0a65dd22bb014
+MISC metadata.xml 591 BLAKE2B c9f9c6e0cb909d5b9f5a5733db50f99f3c9b275e206a030dedc08b8a579c787f3f4a5d1b1ade42334f1ecba370d7a38311ac85959be886aed1c74f6bcb13c1aa SHA512 09c04a99f44ab3ebb594c0bbf10b915ff1a9f18f2b244c3ab46524f1ad988751a72aaa1943feccdb9735abd92a56b0797d24a533321960c7c0a638c6636bbd88
diff --git a/media-video/ccextractor/ccextractor-0.85-r2.ebuild b/media-video/ccextractor/ccextractor-0.85-r2.ebuild
deleted file mode 100644
index 982bba8df303..000000000000
--- a/media-video/ccextractor/ccextractor-0.85-r2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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"
-
-BDEPEND="app-arch/unzip
-	virtual/pkgconfig"
-RDEPEND="
-	media-libs/libpng:0=
-	sys-libs/zlib:="
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-cmake.patch"
-	"${FILESDIR}/${PN}-0.85-fno-common.patch"
-)
-
-src_install() {
-	cmake_src_install
-	dodoc ../docs/*.TXT
-}
diff --git a/media-video/ccextractor/files/ccextractor-0.85-cmake.patch b/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
deleted file mode 100644
index 2fcf6cfee4b0..000000000000
--- a/media-video/ccextractor/files/ccextractor-0.85-cmake.patch
+++ /dev/null
@@ -1,76 +0,0 @@
---- 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")
- 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
---- 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)
- 
--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)
diff --git a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch b/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch
deleted file mode 100644
index 6e543f74910a..000000000000
--- a/media-video/ccextractor/files/ccextractor-0.85-fno-common.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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
diff --git a/media-video/ccextractor/metadata.xml b/media-video/ccextractor/metadata.xml
index 5c31a9e31586..2bc9619e4c0e 100644
--- a/media-video/ccextractor/metadata.xml
+++ b/media-video/ccextractor/metadata.xml
@@ -10,5 +10,6 @@
 	</longdescription>
 	<upstream>
 		<remote-id type="sourceforge">ccextractor</remote-id>
+		<remote-id type="github">CCExtractor/ccextractor</remote-id>
 	</upstream>
 </pkgmetadata>