From ab5544691a0e0dba07c424fc01626b01f6b01d14 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Wed, 29 Mar 2017 19:52:22 +0530 Subject: [PATCH 01/10] Initial commit --- package_creators/PKGBUILD | 22 ++++++++++++++++++++++ package_creators/arch.sh | 8 ++++++++ 2 files changed, 30 insertions(+) create mode 100644 package_creators/PKGBUILD create mode 100755 package_creators/arch.sh diff --git a/package_creators/PKGBUILD b/package_creators/PKGBUILD new file mode 100644 index 00000000..4bc1e96f --- /dev/null +++ b/package_creators/PKGBUILD @@ -0,0 +1,22 @@ +pkgname=ccextractor +pkgver=0.85 +pkgrel=1 +pkgdesc="A closed captions and teletext subtitles extractor for video streams." +arch=('i686' 'x86_64') +url="http://www.ccextractor.org" +license=('GPL') +depends=('gcc-libs' 'tesseract') +source=( + $pkgname-$pkgver.tar.gz +) + +build() { + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix="$pkgdir/usr/local" --CC=gcc + make -j4 +} + +package() { + cd "$srcdir/$pkgname-$pkgver" + make install +} diff --git a/package_creators/arch.sh b/package_creators/arch.sh new file mode 100755 index 00000000..3db15a25 --- /dev/null +++ b/package_creators/arch.sh @@ -0,0 +1,8 @@ +#!/bin/sh + +./tarball.sh +makepkg -g >> PKGBUILD +makepkg -sic +rm ./*.tar.gz +rm ./*.pkg.tar.xz +sed -i '$ d' PKGBUILD From 236840919d249d287b9b34f026b7c274cb7c4640 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Thu, 30 Mar 2017 11:24:55 +0530 Subject: [PATCH 02/10] Use gcc as the C compiler during configure --- package_creators/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_creators/PKGBUILD b/package_creators/PKGBUILD index 4bc1e96f..8f319095 100644 --- a/package_creators/PKGBUILD +++ b/package_creators/PKGBUILD @@ -12,7 +12,7 @@ source=( build() { cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix="$pkgdir/usr/local" --CC=gcc + CC=gcc ./configure --prefix="$pkgdir/usr/local" make -j4 } From 8878aebe0bf95877729d4da5be6e5b76f85bb2fc Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Thu, 30 Mar 2017 11:25:41 +0530 Subject: [PATCH 03/10] Allow option to build .pkg.tar.xz archive without installing package --- package_creators/arch.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package_creators/arch.sh b/package_creators/arch.sh index 3db15a25..d19eaa21 100755 --- a/package_creators/arch.sh +++ b/package_creators/arch.sh @@ -2,7 +2,11 @@ ./tarball.sh makepkg -g >> PKGBUILD -makepkg -sic -rm ./*.tar.gz -rm ./*.pkg.tar.xz +makepkg -sc +rm -f ./*.tar.gz sed -i '$ d' PKGBUILD +read -p "Do you wish to install ccextractor? [Y/n] " yn +case $yn in + [Nn]* ) exit;; + * ) sudo pacman -U ./*.pkg.tar.xz; rm -f ./*.pkg.tar.xz;; +esac From 4c73649b9c621e346927f992afff9939d65eb360 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Thu, 30 Mar 2017 11:42:15 +0530 Subject: [PATCH 04/10] Add --enable-ocr as a configure option by default --- package_creators/PKGBUILD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_creators/PKGBUILD b/package_creators/PKGBUILD index 8f319095..05ef2601 100644 --- a/package_creators/PKGBUILD +++ b/package_creators/PKGBUILD @@ -12,7 +12,7 @@ source=( build() { cd "$srcdir/$pkgname-$pkgver" - CC=gcc ./configure --prefix="$pkgdir/usr/local" + CC=gcc ./configure --enable-ocr --prefix="$pkgdir/usr/local" make -j4 } From 96ca325a258fbe2d2db5265578f42d17fe73c436 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Mon, 10 Apr 2017 11:46:15 +0530 Subject: [PATCH 05/10] Use bash as shell; su instead of sudo; don't proceed if a command fails; change default to not installing --- package_creators/arch.sh | 21 +++++++++++++++++---- package_creators/tarball.sh | 2 +- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/package_creators/arch.sh b/package_creators/arch.sh index d19eaa21..4b927f5e 100755 --- a/package_creators/arch.sh +++ b/package_creators/arch.sh @@ -1,12 +1,25 @@ -#!/bin/sh +#!/bin/bash ./tarball.sh +retval=$? +if [ $retval -ne 0 ]; then + echo "Sorry, the package could not be created as the tarball building process failed with return code $retval" + rm -f ./*.tar.gz + exit $retval +fi makepkg -g >> PKGBUILD makepkg -sc +retval=$? +if [ $retval -ne 0 ]; then + echo "Sorry, the package could not be created as the makepkg failed with return code $retval" + rm -rf ./*.tar.gz src + sed -i '$ d' PKGBUILD + exit $retval +fi rm -f ./*.tar.gz sed -i '$ d' PKGBUILD -read -p "Do you wish to install ccextractor? [Y/n] " yn +read -p "Do you wish to install ccextractor? [y/N] " yn case $yn in - [Nn]* ) exit;; - * ) sudo pacman -U ./*.pkg.tar.xz; rm -f ./*.pkg.tar.xz;; + [Yy]* ) su -c "pacman -U ./*.pkg.tar.xz"; rm -f ./*.pkg.tar.xz;; + * ) exit;; esac diff --git a/package_creators/tarball.sh b/package_creators/tarball.sh index e949911b..113ce340 100755 --- a/package_creators/tarball.sh +++ b/package_creators/tarball.sh @@ -27,4 +27,4 @@ rm -rf config.log rm -rf aclocal.m4 rm -rf build-conf rm -rf autom4te.cache -cd package_creators \ No newline at end of file +cd package_creators From d3946450ebc89184549fd500d7e5771b6e9aa546 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Mon, 10 Apr 2017 11:50:57 +0530 Subject: [PATCH 06/10] Fix small grammatical mistake --- package_creators/arch.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package_creators/arch.sh b/package_creators/arch.sh index 4b927f5e..366a9663 100755 --- a/package_creators/arch.sh +++ b/package_creators/arch.sh @@ -11,7 +11,7 @@ makepkg -g >> PKGBUILD makepkg -sc retval=$? if [ $retval -ne 0 ]; then - echo "Sorry, the package could not be created as the makepkg failed with return code $retval" + echo "Sorry, the package could not be created as makepkg failed with return code $retval" rm -rf ./*.tar.gz src sed -i '$ d' PKGBUILD exit $retval From 27311f53e6986a1ce597f8d403a2e52edb191ca9 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Mon, 10 Apr 2017 17:30:34 +0530 Subject: [PATCH 07/10] Use sudo when available; fallback to su --- package_creators/arch.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package_creators/arch.sh b/package_creators/arch.sh index 366a9663..d8e0cd75 100755 --- a/package_creators/arch.sh +++ b/package_creators/arch.sh @@ -20,6 +20,11 @@ rm -f ./*.tar.gz sed -i '$ d' PKGBUILD read -p "Do you wish to install ccextractor? [y/N] " yn case $yn in - [Yy]* ) su -c "pacman -U ./*.pkg.tar.xz"; rm -f ./*.pkg.tar.xz;; + [Yy]* ) if [ -x "$(command -v sudo)" ]; then + sudo pacman -U ./*.pkg.tar.xz; + else + su -c "pacman -U ./*.pkg.tar.xz"; + fi + rm -f ./*.pkg.tar.xz;; * ) exit;; esac From 83704e306fef4f1696a1678a2dbb9879bd027d6a Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Mon, 10 Apr 2017 17:33:29 +0530 Subject: [PATCH 08/10] Update gitignore for pkg.tar.xz files --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index aad1229a..c4ddd6d3 100644 --- a/.gitignore +++ b/.gitignore @@ -91,4 +91,7 @@ src/utf8proc/.dirstamp src/zlib/.deps/ src/zlib/.dirstamp src/zvbi/.deps/ -src/zvbi/.dirstamp \ No newline at end of file +src/zvbi/.dirstamp + +# Arch +package_creators/*.pkg.tar.xz From 58f7345b4283ad0562768b33ac9dec09bf5e389a Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Mon, 10 Apr 2017 17:37:59 +0530 Subject: [PATCH 09/10] Update CHANGES.TXT --- docs/CHANGES.TXT | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/CHANGES.TXT b/docs/CHANGES.TXT index 2a29c066..1ef7dfda 100644 --- a/docs/CHANGES.TXT +++ b/docs/CHANGES.TXT @@ -2,6 +2,7 @@ ----------------- - Fix: Prevent the OCR being initialized more than once (happened on multiprogram and PAT changes) +- New: Added build/installation script for .pkg.tar.xz (Arch Linux). 0.85b (2017-1-26) From fddede57fd170bf063d50abac365307dc3220bf6 Mon Sep 17 00:00:00 2001 From: Abhinav Baid Date: Mon, 10 Apr 2017 17:47:54 +0530 Subject: [PATCH 10/10] Update README.md --- README.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/README.md b/README.md index 870816fc..6c2a18fc 100644 --- a/README.md +++ b/README.md @@ -89,6 +89,16 @@ More usage information can be found on our website: # test your build ./ccextractor +### Arch Linux + # make sure you have CCExtractor repository forked + # clone repository + sudo pacman -S git + git clone https://github.com/%USERNAME%/ccextractor.git # paste your github username + + # building installation package (.pkg.tar.xz) or installing directly + cd ccextractor/package_creators + ./arch.sh + ### Windows Open the windows/ccextractor.sln file with Visual Studio (2015 at least), and build it. Configurations "(Debug|Release)-Full" includes dependent libraries which are used for OCR.