diff options
| -rw-r--r-- | multimedia/ccextractor/README | 8 | ||||
| -rw-r--r-- | multimedia/ccextractor/ccextractor-0.88-fno-common.patch | 55 | ||||
| -rw-r--r-- | multimedia/ccextractor/ccextractor.SlackBuild | 13 | ||||
| -rw-r--r-- | multimedia/ccextractor/ccextractor.info | 8 |
4 files changed, 9 insertions, 75 deletions
diff --git a/multimedia/ccextractor/README b/multimedia/ccextractor/README index 6dccda83a44de..8f1e782dc50d9 100644 --- a/multimedia/ccextractor/README +++ b/multimedia/ccextractor/README @@ -3,10 +3,4 @@ independent subtitle files from the closed captions data. CCExtractor is portable, small, and very fast. Notable features include the ability to extract subtitles in real-time, translate subtitles, extract closed captions from DVDs, and convert closed captions -to subtitles. - -By default only build the CLI version of ccextractor. If you would -like to also build the GUI version, then install glfw3 available -here at SBo and run the script like so - -GUI=yes ./ccextractor.SlackBuild +to subtitles. diff --git a/multimedia/ccextractor/ccextractor-0.88-fno-common.patch b/multimedia/ccextractor/ccextractor-0.88-fno-common.patch deleted file mode 100644 index 1f42132bf8bdf..0000000000000 --- a/multimedia/ccextractor/ccextractor-0.88-fno-common.patch +++ /dev/null @@ -1,55 +0,0 @@ -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/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild index 7a211e2912869..c7825134a4873 100644 --- a/multimedia/ccextractor/ccextractor.SlackBuild +++ b/multimedia/ccextractor/ccextractor.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=ccextractor -VERSION=${VERSION:-0.88} +VERSION=${VERSION:-0.94} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -50,9 +50,6 @@ TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} -# Pass GUI=yes if you want to build gui support -GUI=${GUI:-"no"} - if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -73,7 +70,6 @@ else gui="" fi - set -e rm -rf $PKG @@ -89,9 +85,6 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; -# Thanks gentoo for this patch! -( cd ../src ; patch -p1 < $CWD/ccextractor-0.88-fno-common.patch ) - CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./autogen.sh @@ -102,7 +95,9 @@ CXXFLAGS="$SLKCFLAGS" \ --localstatedir=/var \ --enable-static=no \ --docdir=/usr/doc/$PRGNAM-$VERSION \ - $gui \ + --without-rust \ + --enable-hardsubx \ + --enable-ffmpeg \ --enable-ocr \ --build=$ARCH-slackware-linux diff --git a/multimedia/ccextractor/ccextractor.info b/multimedia/ccextractor/ccextractor.info index 2e5ee2b47cf37..07374db12e522 100644 --- a/multimedia/ccextractor/ccextractor.info +++ b/multimedia/ccextractor/ccextractor.info @@ -1,10 +1,10 @@ PRGNAM="ccextractor" -VERSION="0.88" +VERSION="0.94" HOMEPAGE="https://www.ccextractor.org/" -DOWNLOAD="https://github.com/CCExtractor/ccextractor/archive/v0.88/ccextractor-0.88.tar.gz" -MD5SUM="914f8704251ce24dcbb756590cf39955" +DOWNLOAD="https://github.com/CCExtractor/ccextractor/archive/v0.94/ccextractor-0.94.tar.gz" +MD5SUM="218f8f4628294fa218f2aad162bf68c7" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="tesseract" MAINTAINER="M.Dinslage" -EMAIL="daedra1980@gmail.com" +EMAIL="matthewdinslage@gmail.com" |