rpms/subtitleripper/devel .cvsignore, 1.3, 1.4 Makefile.patch, NONE, 1.1 binutils-gold.patch, NONE, 1.1 pgm2txt.patch, NONE, 1.1 sources, 1.3, 1.4 dead.package, 1.1, NONE

[Rahul Sundaram]

Author: sundaram

Update of /cvs/free/rpms/subtitleripper/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv17667

Added Files:
	.cvsignore Makefile.patch binutils-gold.patch pgm2txt.patch 
	sources 
Removed Files:
	dead.package 
Log Message:
* Sun Mar 03 2013 Rahul Sundaram <sundaram at fedoraproject.org> - 0.3-7
- included and modified some patches from Debian/Ubuntu and Gentoo
- re-enable png support
- included .sed files for gocr
- included vobsub2pgm binary
- added requires on gocr and transcode
- cleanup spec to follow current Fedora guidelines



Index: .cvsignore
===================================================================
RCS file: .cvsignore
diff -N .cvsignore
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ .cvsignore	22 May 2013 22:07:24 -0000	1.4
@@ -0,0 +1 @@
+subtitleripper-0.3-4.tgz

Makefile.patch:
 Makefile |    7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE Makefile.patch ---
--- subtitleripper-0.3.4/Makefile.orig	2013-03-03 03:00:35.598130743 -0500
+++ subtitleripper-0.3.4/Makefile	2013-03-03 03:03:16.889727156 -0500
@@ -9,7 +9,12 @@
 
 ### enable ppm support ###
 DEFINES  += -D_HAVE_LIB_PPM_
-LIBS     += -lppm
+LIBS     += -lnetpbm
+INCLUDES += -I/usr/include/netpbm
+
+
+### getline is defined for us
+DEFINES += -DHAVE_GETLINE
 
 ### enable PNG support ###
 DEFINES += -D_HAVE_PNG_

binutils-gold.patch:
 Makefile |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

--- NEW FILE binutils-gold.patch ---
diff -urNad subtitleripper-0.3.4~/Makefile subtitleripper-0.3.4/Makefile
--- subtitleripper-0.3.4~/Makefile	2011-02-17 20:51:42.183047389 +0700
+++ subtitleripper-0.3.4/Makefile	2011-02-17 20:52:02.291199592 +0700
@@ -73,19 +73,19 @@
 # Target
 subtitle2pgm: subtitle2pgm.o spudec.o
 	@echo "Linking $@"
-	@$(CC) $(LIBS) $^ -o $@  
+	@$(CC) $^ -o $@ $(LIBS)
 
 subtitle2vobsub: subtitle2vobsub.o vobsub.o 
 	@echo "Linking $@"
-	@$(CC) $(LIBS) $^ -o $@  
+	@$(CC) $^ -o $@ $(LIBS)
 
 srttool: srttool.o
 	@echo "Linking $@"
-	@$(CC) $(LIBS) -g $^ -o $@  
+	@$(CC) -g $^ -o $@ $(LIBS)
 
 vobsub2pgm: vobsub2pgm.o vobsub.o spudec.o
 	@echo "Linking $@"
-	@$(CC) $(LIBS) -g $^ -o $@  
+	@$(CC) -g $^ -o $@ $(LIBS)
 
 .PHONY: clean dist rpm
 clean:

pgm2txt.patch:
 pgm2txt |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

--- NEW FILE pgm2txt.patch ---
--- subtitleripper-0.3.4.orig/pgm2txt	2004-11-18 13:59:04.000000000 +0100
+++ subtitleripper-0.3.4/pgm2txt	2004-11-18 14:00:25.000000000 +0100
@@ -16,7 +16,7 @@
 # Adjust this path to where the files
 # gocrfilter_en.sed  gocrfilter_fr.sed  gocrfilter_none.sed
 # are located
-PATH_TO_LANGUAGE_FILTER=~/sourceforge/subtitleripper/src/
+PATH_TO_LANGUAGE_FILTER=/usr/share/subtitleripper
 
 # set your options for gocr. Please read the gocr
 # docs to find out more about this
@@ -35,8 +35,8 @@
 # Choose your favorite image viewer if you want to see
 # the current pgm image while gocr is running.
 # Enable the viewer with -v command line option.
-IMAGE_VIWER=xv
-IMAGE_VIEWER_OPTIONS=-q
+IMAGE_VIEWER=display
+IMAGE_VIEWER_OPTIONS=
 
 ###### End of configuration section #########
 
@@ -108,8 +108,8 @@
 shift $(($OPTIND - 1))
 PGM_BASE_NAME=$1
     
-if [ -f ${PATH_TO_LANGUAGE_FILTER}gocrfilter_${LANGUAGE}.sed ]; then
-	FILTER_SCRIPT=${PATH_TO_LANGUAGE_FILTER}gocrfilter_${LANGUAGE}.sed
+if [ -f ${PATH_TO_LANGUAGE_FILTER}/gocrfilter_${LANGUAGE}.sed ]; then
+	FILTER_SCRIPT=${PATH_TO_LANGUAGE_FILTER}/gocrfilter_${LANGUAGE}.sed
 	echo "Using ${FILTER_SCRIPT} to filter gocr output"
 else
 	echo "    ------------------------------------------------"
@@ -153,7 +153,7 @@
 
     echo "Converting $i into text"
     if [ ! "$DISPLAY_PGM" = "false" ]; then
-	${IMAGE_VIWER} ${IMAGE_VIEWER_OPTIONS} $i &
+	${IMAGE_VIEWER} ${IMAGE_VIEWER_OPTIONS} $i &
     fi
     if [ "none" = "${LANGUAGE}" ]; then
 	gocr ${GOCR_OPTIONS} -p ${DB_PATH}  $i > $i.txt
@@ -163,7 +163,7 @@
 
     # close the viewer
     if [ ! "$DISPLAY_PGM" = "false" ]; then
-	killall ${IMAGE_VIWER}
+	killall ${IMAGE_VIEWER}
     fi
 
 done


Index: sources
===================================================================
RCS file: sources
diff -N sources
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ sources	22 May 2013 22:07:30 -0000	1.4
@@ -0,0 +1 @@
+c0bd49a88f667c68c4430ad25bbed510  subtitleripper-0.3-4.tgz


--- dead.package DELETED ---