diff options
| author | Matteo Bernardini <ponce@slackbuilds.org> | 2021-02-02 18:37:27 +0100 |
|---|---|---|
| committer | Robby Workman <rworkman@slackbuilds.org> | 2021-04-17 23:15:54 -0500 |
| commit | 81d4e04f07f47ba2de63c5c858dffa07363dd911 (patch) | |
| tree | 2339a0c90f7741440e55b60d5edd7ba6c9444bbb /multimedia/ccextractor | |
| parent | 771be9cd94bd71cc2304a69cc8fd94a734210bc7 (diff) | |
multimedia/ccextractor: Patch for gcc >= 10.x.
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
Diffstat (limited to 'multimedia/ccextractor')
| -rw-r--r-- | multimedia/ccextractor/ccextractor-0.88-fno-common.patch | 55 | ||||
| -rw-r--r-- | multimedia/ccextractor/ccextractor.SlackBuild | 3 |
2 files changed, 58 insertions, 0 deletions
diff --git a/multimedia/ccextractor/ccextractor-0.88-fno-common.patch b/multimedia/ccextractor/ccextractor-0.88-fno-common.patch new file mode 100644 index 0000000000000..1f42132bf8bdf --- /dev/null +++ b/multimedia/ccextractor/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/multimedia/ccextractor/ccextractor.SlackBuild b/multimedia/ccextractor/ccextractor.SlackBuild index 78018a2b3b928..56f59a96f81bd 100644 --- a/multimedia/ccextractor/ccextractor.SlackBuild +++ b/multimedia/ccextractor/ccextractor.SlackBuild @@ -79,6 +79,9 @@ 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 |