diff options
Diffstat (limited to 'ccextractor')
| -rw-r--r-- | ccextractor/ccextractor-system-libraries-and-cflags.patch | 258 | ||||
| -rw-r--r-- | ccextractor/ccextractor.spec | 42 |
2 files changed, 172 insertions, 128 deletions
diff --git a/ccextractor/ccextractor-system-libraries-and-cflags.patch b/ccextractor/ccextractor-system-libraries-and-cflags.patch index dd8510e..e1b1ae2 100644 --- a/ccextractor/ccextractor-system-libraries-and-cflags.patch +++ b/ccextractor/ccextractor-system-libraries-and-cflags.patch @@ -1,127 +1,129 @@ -diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefile.am ---- ccextractor-0.88.old/linux/Makefile.am 2019-05-21 20:41:08.000000000 +0200 -+++ ccextractor-0.88/linux/Makefile.am 2019-06-16 10:03:26.968105592 +0200 -@@ -82,28 +82,6 @@ - ../src/gpacmp4/gpac/internal/odf_dev.h \ - ../src/gpacmp4/gpac/internal/odf_parse_common.h \ - ../src/gpacmp4/gpac/internal/ogg.h \ -- ../src/libpng/pngstruct.h \ -- ../src/libpng/pngpriv.h \ -- ../src/libpng/pnginfo.h \ -- ../src/libpng/pnglibconf.h \ -- ../src/libpng/pngconf.h \ -- ../src/libpng/pngdebug.h \ -- ../src/libpng/png.h \ -- ../src/libpng/png.c \ -- ../src/libpng/pngerror.c \ -- ../src/libpng/pngget.c \ -- ../src/libpng/pngmem.c \ -- ../src/libpng/pngpread.c \ -- ../src/libpng/pngread.c \ -- ../src/libpng/pngrio.c \ -- ../src/libpng/pngrtran.c \ -- ../src/libpng/pngrutil.c \ -- ../src/libpng/pngset.c \ -- ../src/libpng/pngtrans.c \ -- ../src/libpng/pngwio.c \ -- ../src/libpng/pngwrite.c \ -- ../src/libpng/pngwtran.c \ -- ../src/libpng/pngwutil.c \ +diff -Naur ccextractor-0.89.old/linux/Makefile.am ccextractor-0.89/linux/Makefile.am +--- ccextractor-0.89.old/linux/Makefile.am 2021-06-20 14:04:42.569388396 +0200 ++++ ccextractor-0.89/linux/Makefile.am 2021-06-20 14:05:14.733984021 +0200 +@@ -87,28 +87,6 @@ + ../src/thirdparty/gpacmp4/gpac/internal/odf_dev.h \ + ../src/thirdparty/gpacmp4/gpac/internal/odf_parse_common.h \ + ../src/thirdparty/gpacmp4/gpac/internal/ogg.h \ +- ../src/thirdparty/libpng/pngstruct.h \ +- ../src/thirdparty/libpng/pngpriv.h \ +- ../src/thirdparty/libpng/pnginfo.h \ +- ../src/thirdparty/libpng/pnglibconf.h \ +- ../src/thirdparty/libpng/pngconf.h \ +- ../src/thirdparty/libpng/pngdebug.h \ +- ../src/thirdparty/libpng/png.h \ +- ../src/thirdparty/libpng/png.c \ +- ../src/thirdparty/libpng/pngerror.c \ +- ../src/thirdparty/libpng/pngget.c \ +- ../src/thirdparty/libpng/pngmem.c \ +- ../src/thirdparty/libpng/pngpread.c \ +- ../src/thirdparty/libpng/pngread.c \ +- ../src/thirdparty/libpng/pngrio.c \ +- ../src/thirdparty/libpng/pngrtran.c \ +- ../src/thirdparty/libpng/pngrutil.c \ +- ../src/thirdparty/libpng/pngset.c \ +- ../src/thirdparty/libpng/pngtrans.c \ +- ../src/thirdparty/libpng/pngwio.c \ +- ../src/thirdparty/libpng/pngwrite.c \ +- ../src/thirdparty/libpng/pngwtran.c \ +- ../src/thirdparty/libpng/pngwutil.c \ ../src/lib_ccx/ccx_common_common.h \ ../src/lib_ccx/ccx_common_option.h \ ../src/lib_ccx/utility.h \ -@@ -222,34 +200,6 @@ +@@ -230,34 +208,6 @@ ../src/lib_ccx/ts_tables_epg.c \ ../src/lib_ccx/wtv_constants.h \ ../src/lib_ccx/wtv_functions.c \ -- ../src/zlib/adler32.c \ -- ../src/zlib/compress.c \ -- ../src/zlib/crc32.c \ -- ../src/zlib/crc32.h \ -- ../src/zlib/deflate.c \ -- ../src/zlib/deflate.h \ -- ../src/zlib/gzclose.c \ -- ../src/zlib/gzguts.h \ -- ../src/zlib/gzlib.c \ -- ../src/zlib/gzread.c \ -- ../src/zlib/gzwrite.c \ -- ../src/zlib/infback.c \ -- ../src/zlib/inffast.c \ -- ../src/zlib/inffast.h \ -- ../src/zlib/inffixed.h \ -- ../src/zlib/inflate.c \ -- ../src/zlib/inflate.h \ -- ../src/zlib/inftrees.c \ -- ../src/zlib/inftrees.h \ -- ../src/zlib/trees.c \ -- ../src/zlib/trees.h \ -- ../src/zlib/uncompr.c \ -- ../src/zlib/zconf.h \ -- ../src/zlib/zlib.h \ -- ../src/zlib/zutil.c \ -- ../src/zlib/zutil.h \ -- ../src/utf8proc/utf8proc.c \ -- ../src/utf8proc/utf8proc.h \ - ../src/lib_hash/sha2.c \ - ../src/lib_hash/sha2.h \ - ../src/protobuf-c/protobuf-c.c \ -@@ -267,58 +217,17 @@ - ../src/zvbi/sliced.h \ - ../src/zvbi/zvbi_decoder.h \ - ../src/wrappers/wrapper.c \ -- ../src/wrappers/wrapper.h \ -- ../src/freetype/autofit/autofit.c \ -- ../src/freetype/base/ftbase.c \ -- ../src/freetype/base/ftbbox.c \ -- ../src/freetype/base/ftbdf.c \ -- ../src/freetype/base/ftbitmap.c \ -- ../src/freetype/base/ftcid.c \ -- ../src/freetype/base/ftfntfmt.c \ -- ../src/freetype/base/ftfstype.c \ -- ../src/freetype/base/ftgasp.c \ -- ../src/freetype/base/ftglyph.c \ -- ../src/freetype/base/ftgxval.c \ -- ../src/freetype/base/ftinit.c \ -- ../src/freetype/base/ftlcdfil.c \ -- ../src/freetype/base/ftmm.c \ -- ../src/freetype/base/ftotval.c \ -- ../src/freetype/base/ftpatent.c \ -- ../src/freetype/base/ftpfr.c \ -- ../src/freetype/base/ftstroke.c \ -- ../src/freetype/base/ftsynth.c \ -- ../src/freetype/base/ftsystem.c \ -- ../src/freetype/base/fttype1.c \ -- ../src/freetype/base/ftwinfnt.c \ -- ../src/freetype/bdf/bdf.c \ -- ../src/freetype/bzip2/ftbzip2.c \ -- ../src/freetype/cache/ftcache.c \ -- ../src/freetype/cff/cff.c \ -- ../src/freetype/cid/type1cid.c \ -- ../src/freetype/gzip/ftgzip.c \ -- ../src/freetype/lzw/ftlzw.c \ -- ../src/freetype/pcf/pcf.c \ -- ../src/freetype/pfr/pfr.c \ -- ../src/freetype/psaux/psaux.c \ -- ../src/freetype/pshinter/pshinter.c \ -- ../src/freetype/psnames/psnames.c \ -- ../src/freetype/raster/raster.c \ -- ../src/freetype/sfnt/sfnt.c \ -- ../src/freetype/smooth/smooth.c \ -- ../src/freetype/truetype/truetype.c \ -- ../src/freetype/type1/type1.c \ -- ../src/freetype/type42/type42.c \ -- ../src/freetype/winfonts/winfnt.c -+ ../src/wrappers/wrapper.h +- ../src/thirdparty/zlib/adler32.c \ +- ../src/thirdparty/zlib/compress.c \ +- ../src/thirdparty/zlib/crc32.c \ +- ../src/thirdparty/zlib/crc32.h \ +- ../src/thirdparty/zlib/deflate.c \ +- ../src/thirdparty/zlib/deflate.h \ +- ../src/thirdparty/zlib/gzclose.c \ +- ../src/thirdparty/zlib/gzguts.h \ +- ../src/thirdparty/zlib/gzlib.c \ +- ../src/thirdparty/zlib/gzread.c \ +- ../src/thirdparty/zlib/gzwrite.c \ +- ../src/thirdparty/zlib/infback.c \ +- ../src/thirdparty/zlib/inffast.c \ +- ../src/thirdparty/zlib/inffast.h \ +- ../src/thirdparty/zlib/inffixed.h \ +- ../src/thirdparty/zlib/inflate.c \ +- ../src/thirdparty/zlib/inflate.h \ +- ../src/thirdparty/zlib/inftrees.c \ +- ../src/thirdparty/zlib/inftrees.h \ +- ../src/thirdparty/zlib/trees.c \ +- ../src/thirdparty/zlib/trees.h \ +- ../src/thirdparty/zlib/uncompr.c \ +- ../src/thirdparty/zlib/zconf.h \ +- ../src/thirdparty/zlib/zlib.h \ +- ../src/thirdparty/zlib/zutil.c \ +- ../src/thirdparty/zlib/zutil.h \ +- ../src/thirdparty/utf8proc/utf8proc.c \ +- ../src/thirdparty/utf8proc/utf8proc.h \ + ../src/thirdparty/lib_hash/sha2.c \ + ../src/thirdparty/lib_hash/sha2.h \ + ../src/thirdparty/protobuf-c/protobuf-c.c \ +@@ -273,65 +223,22 @@ + ../src/lib_ccx/zvbi/sampling_par.c \ + ../src/lib_ccx/zvbi/sampling_par.h \ + ../src/lib_ccx/zvbi/sliced.h \ +- ../src/lib_ccx/zvbi/zvbi_decoder.h \ +- ../src/freetype/* \ +- ../src/thirdparty/freetype/autofit/autofit.c \ +- ../src/thirdparty/freetype/base/ftbase.c \ +- ../src/thirdparty/freetype/base/ftbbox.c \ +- ../src/thirdparty/freetype/base/ftbdf.c \ +- ../src/thirdparty/freetype/base/ftbitmap.c \ +- ../src/thirdparty/freetype/base/ftcid.c \ +- ../src/thirdparty/freetype/base/ftfntfmt.c \ +- ../src/thirdparty/freetype/base/ftfstype.c \ +- ../src/thirdparty/freetype/base/ftgasp.c \ +- ../src/thirdparty/freetype/base/ftglyph.c \ +- ../src/thirdparty/freetype/base/ftgxval.c \ +- ../src/thirdparty/freetype/base/ftinit.c \ +- ../src/thirdparty/freetype/base/ftlcdfil.c \ +- ../src/thirdparty/freetype/base/ftmm.c \ +- ../src/thirdparty/freetype/base/ftotval.c \ +- ../src/thirdparty/freetype/base/ftpatent.c \ +- ../src/thirdparty/freetype/base/ftpfr.c \ +- ../src/thirdparty/freetype/base/ftstroke.c \ +- ../src/thirdparty/freetype/base/ftsynth.c \ +- ../src/thirdparty/freetype/base/ftsystem.c \ +- ../src/thirdparty/freetype/base/fttype1.c \ +- ../src/thirdparty/freetype/base/ftwinfnt.c \ +- ../src/thirdparty/freetype/bdf/bdf.c \ +- ../src/thirdparty/freetype/bzip2/ftbzip2.c \ +- ../src/thirdparty/freetype/cache/ftcache.c \ +- ../src/thirdparty/freetype/cff/cff.c \ +- ../src/thirdparty/freetype/cid/type1cid.c \ +- ../src/thirdparty/freetype/gzip/ftgzip.c \ +- ../src/thirdparty/freetype/include/ft2build.h \ +- ../src/thirdparty/freetype/lzw/ftlzw.c \ +- ../src/thirdparty/freetype/pcf/pcf.c \ +- ../src/thirdparty/freetype/pfr/pfr.c \ +- ../src/thirdparty/freetype/psaux/psaux.c \ +- ../src/thirdparty/freetype/pshinter/pshinter.c \ +- ../src/thirdparty/freetype/psnames/psnames.c \ +- ../src/thirdparty/freetype/raster/raster.c \ +- ../src/thirdparty/freetype/sfnt/sfnt.c \ +- ../src/thirdparty/freetype/smooth/smooth.c \ +- ../src/thirdparty/freetype/truetype/truetype.c \ +- ../src/thirdparty/freetype/type1/type1.c \ +- ../src/thirdparty/freetype/type42/type42.c \ +- ../src/thirdparty/freetype/winfonts/winfnt.c ++ ../src/lib_ccx/zvbi/zvbi_decoder.h --ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -+ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP +-ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DFT2_BUILD_LIBRARY -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H ++ccextractor_CFLAGS = -std=gnu99 -Wno-write-strings -Wno-pointer-sign -D_FILE_OFFSET_BITS=64 -DVERSION_FILE_PRESENT -DGPAC_DISABLE_VTT -DGPAC_DISABLE_OD_DUMP -DGPAC_DISABLE_REMOTERY -DNO_GZIP -DGPAC_HAVE_CONFIG_H --ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/libpng/ -I../src/zlib/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/utf8proc/ -I../src/ -I../src/freetype/include/ -+ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/gpacmp4/ -I../src/zvbi/ -I../src/lib_hash/ -I../src/protobuf-c/ -I../src/ -I/usr/include/freetype2 +-ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/libpng/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I../src/thirdparty/freetype/include/ ++ccextractor_CPPFLAGS =-I../src/lib_ccx/ -I../src/thirdparty/gpacmp4/ -I../src/thirdparty/zlib/ -I../src/thirdparty/zvbi/ -I../src/thirdparty/lib_hash/ -I../src/thirdparty/protobuf-c/ -I../src/thirdparty -I../src/ -I/usr/include/freetype2/ --ccextractor_LDADD=-lm -+ccextractor_LDADD=-lm -lpng -lz -lutf8proc -lfreetype +-ccextractor_LDADD=-lm -lpthread -ldl ++ccextractor_LDADD=-lm -lpthread -ldl -lcrypto -lpng -lz -lutf8proc -lfreetype -lprotobuf-c if SYS_IS_LINUX -ccextractor_CFLAGS += -O3 -s -DGPAC_CONFIG_LINUX @@ -129,7 +131,13 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil endif if SYS_IS_MAC -@@ -350,7 +259,7 @@ + ccextractor_CFLAGS += -DPAC_CONFIG_DARWIN -Dfopen64=fopen -Dopen64=open -Dlseek64=lseek +-ccextractor_LDADD += -liconv -lz ++ccextractor_LDADD += -liconv -lz + endif + + if SYS_IS_64_BIT +@@ -358,7 +265,7 @@ if TESSERACT_PRESENT TESS_LIB = ${tesseract_LIBS} @@ -138,16 +146,16 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil else #fix for raspberry pi not having a pkgconfig file for tesseract -@@ -367,7 +276,7 @@ +@@ -375,7 +282,7 @@ ccextractor_LDADD += $(LEPT_LIB) endif --EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/utf8proc/utf8proc_data.c fonts/ icon/ -+EXTRA_DIST = ../src/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ +-EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm ../src/thirdparty/utf8proc/utf8proc_data.c fonts/ icon/ ++EXTRA_DIST = ../src/thirdparty/gpacmp4/gpac/sync_layer.h ../src/lib_ccx/ccfont2.xbm fonts/ icon/ #For GUI if BUILD_WITH_GUI -@@ -404,14 +313,14 @@ +@@ -412,14 +319,14 @@ if SYS_IS_LINUX @@ -164,15 +172,15 @@ diff -Naur ccextractor-0.88.old/linux/Makefile.am ccextractor-0.88/linux/Makefil ccextractorGUI_CFLAGS += ${glew_CFLAGS} ccextractorGUI_LDADD += ${glew_LIBS} ccextractorGUI_LDFLAGS = -framework OpenGL -framework Cocoa -framework IOKit -framework CoreVideo -diff -Naur ccextractor-0.88.old/src/lib_ccx/params.c ccextractor-0.88/src/lib_ccx/params.c ---- ccextractor-0.88.old/src/lib_ccx/params.c 2019-05-21 20:41:08.000000000 +0200 -+++ ccextractor-0.88/src/lib_ccx/params.c 2019-06-16 10:04:33.404332826 +0200 +diff -Naur ccextractor-0.89.old/src/lib_ccx/params.c ccextractor-0.89/src/lib_ccx/params.c +--- ccextractor-0.89.old/src/lib_ccx/params.c 2021-06-20 14:04:42.583388655 +0200 ++++ ccextractor-0.89/src/lib_ccx/params.c 2021-06-20 14:04:50.704539043 +0200 @@ -13,7 +13,7 @@ #include "../lib_hash/sha2.h" #include <string.h> #include <stdio.h> --#include "utf8proc/utf8proc.h" -+#include "utf8proc.h" +-#include <utf8proc/utf8proc.h> ++#include <utf8proc.h> #ifdef ENABLE_OCR - #include "tesseract/capi.h" + #include <tesseract/capi.h> diff --git a/ccextractor/ccextractor.spec b/ccextractor/ccextractor.spec index 03d8598..0fbb748 100644 --- a/ccextractor/ccextractor.spec +++ b/ccextractor/ccextractor.spec @@ -1,11 +1,22 @@ +%define _legacy_common_support 1 + +%global commit0 67e15aaf80a576f6f9b79442eaa355d544f0d5c2 +%global date 20210527 +%global shortcommit0 %(c=%{commit0}; echo ${c:0:7}) +%global tag %{version} + Name: ccextractor -Version: 0.88 +Version: 0.93 Release: 1%{?dist} Summary: A closed captions and teletext subtitles extractor for video streams. License: GPL URL: http://ccextractor.org/ -Source0: https://github.com/CCExtractor/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +%if 0%{?tag:1} +Source0: https://github.com/CCExtractor/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz +%else +Source0: https://github.com/CCExtractor/%{name}/archive/%{commit0}.tar.gz#/%{name}-%{shortcommit0}.tar.gz +%endif Patch0: %{name}-system-libraries-and-cflags.patch @@ -14,6 +25,7 @@ BuildRequires: automake BuildRequires: gcc BuildRequires: freetype-devel BuildRequires: libpng-devel +BuildRequires: openssl-devel BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glfw3) BuildRequires: pkgconfig(lept) @@ -22,12 +34,12 @@ BuildRequires: pkgconfig(libavformat) BuildRequires: pkgconfig(libavutil) BuildRequires: pkgconfig(libswscale) BuildRequires: pkgconfig(tesseract) +BuildRequires: protobuf-c-devel BuildRequires: utf8proc-devel BuildRequires: zlib-devel # Unbundle! Provides: bundled(gpac) -Provides: bundled(protobuf-c) Provides: bundled(zvbi) %description @@ -35,8 +47,14 @@ CCExtractor is a tool used to produce subtitles for TV recordings from almost anywhere in the world. We intend to keep up with all sources and formats. %prep +%if 0%{?tag:1} %autosetup -p1 +%else +%autosetup -p1 -n %{name}-%{commit0} +%endif + rm -fr src/{freetype,libpng,utf8proc,zlib} +rm -fr OpenBSD mac windows %build cd linux @@ -60,6 +78,24 @@ cd linux %{_bindir}/%{name} %changelog +* Fri Sep 24 2021 Simone Caronni <negativo17@gmail.com> - 0.93-1 +- Update to 0.93. + +* Wed Jul 21 2021 Simone Caronni <negativo17@gmail.com> - 0.90-1 +- Update to 0.90. + +* Sun Jun 20 2021 Simone Caronni <negativo17@gmail.com> - 0.89-4 +- Update to final 0.89. + +* Thu May 27 2021 Simone Caronni <negativo17@gmail.com> - 0.89-3.20210527git67e15aa +- Update to latest snapshot. + +* Fri Mar 26 2021 Simone Caronni <negativo17@gmail.com> - 0.89-2.20210325git19da837 +- Update to latest snapshot. + +* Thu Jul 16 2020 Simone Caronni <negativo17@gmail.com> - 0.89-1.20200508git33eccce +- Update to latest snapshot. + * Sun Jun 16 2019 Simone Caronni <negativo17@gmail.com> - 0.88-1 - Update to 0.88. |