Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 24 Feb 2003 23:30:02 +0100 (CET)
From:      Hendrik Scholz <hendrik@scholz.net>
To:        FreeBSD-gnats-submit@FreeBSD.org
Cc:        Hendrik Scholz <hendrik@scholz.net>
Subject:   ports/48649: maintainer-update: graphics/transcode
Message-ID:  <200302242230.h1OMU2Os019683@goanna.lan.raisdorf.net>

next in thread | raw e-mail | index | archive | help

>Number:         48649
>Category:       ports
>Synopsis:       maintainer-update: graphics/transcode
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Feb 24 14:40:08 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hendrik Scholz
>Release:        FreeBSD 5.0-CURRENT i386
>Organization:
NetUSE AG
>Environment:
System: FreeBSD goanna.lan.raisdorf.net 5.0-CURRENT FreeBSD 5.0-CURRENT #2: Fri Jan 24 01:44:03 CET 2003 hscholz@goanna.lan.raisdorf.net:/source/src/sys/i386/compile/GOANNA i386


	
>Description:
Changes:

 - de-pkg-comment (remove pkg-comment)
 - add WITH_SUBRIP knob proposed by Michael Nottebrock in ports/47923
 - add two patches submitted by Atte Peltomäki and Pierre Beyssac
 - bump PORTREVISION

>How-To-Repeat:
	
>Fix:

	

--- transcode-0.6.3-1.patch begins here ---
diff -urP transcode-0.6.3/Makefile transcode/Makefile
--- transcode-0.6.3/Makefile	Mon Feb 17 23:46:44 2003
+++ transcode/Makefile	Fri Feb 21 14:35:54 2003
@@ -7,10 +7,12 @@
 
 PORTNAME=	transcode
 PORTVERSION=	0.6.3
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
 
 MAINTAINER=	hendrik@scholz.net
+COMMENT=	A text-console utility for video stream processing
 
 LIB_DEPENDS=	dvdread.2:${PORTSDIR}/multimedia/libdvdread \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt \
@@ -201,6 +203,12 @@
 PLIST_SUB+=	WITH_MJPEG="@comment "
 .endif
 
+.if defined(WITH_SUBRIP)
+PLIST_SUB+=	WITH_SUBRIP=""
+.else
+PLIST_SUB+=	WITH_SUBRIP="@comment "
+.endif
+
 pre-everything::
 .if !defined(WITH_OPTIMIZED_CFLAGS)
 	@${ECHO_MSG}
@@ -272,7 +280,11 @@
 .endif
 .if !defined(WITH_MJPEG)
 	@${ECHO_MSG}
-	@${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG"
+	@${ECHO_MSG} "You can enable support for the MJPEG toolkit by defining WITH_MJPEG."
+.endif
+.if !defined(WITH_SUBRIP)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable compilation of subtitleripper by defining WITH_SUBRIP."
 .endif
 
 post-patch:
@@ -300,6 +312,12 @@
 	@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \
 		${PREFIX}/lib/transcode/libxvidcore.so
 .endif
+
+.if defined(WITH_SUBRIP)
+	@cd ${WRKSRC}/contrib/subrip; ${GMAKE} clean all; \
+		${INSTALL_PROGRAM} srttool subtitle2pgm subtitle2vobsub ${PREFIX}/bin
+.endif
+
 	@${RM} ${PREFIX}/lib/transcode/*.la
 
 .include <bsd.port.post.mk>
diff -urP transcode-0.6.3/files/patch-contrib:subrip:Makefile transcode/files/patch-contrib:subrip:Makefile
--- transcode-0.6.3/files/patch-contrib:subrip:Makefile	Thu Jan  1 01:00:00 1970
+++ transcode/files/patch-contrib:subrip:Makefile	Fri Feb 21 14:35:17 2003
@@ -0,0 +1,13 @@
+--- contrib/subrip/Makefile.orig	Wed Feb  5 02:23:45 2003
++++ contrib/subrip/Makefile	Wed Feb  5 02:23:56 2003
+@@ -8,8 +8,8 @@
+ INCLUDES :=
+ 
+ ### enable ppm support ###
+-DEFINES  += -D_HAVE_LIB_PPM_
+-LIBS     += -lppm
++#DEFINES  += -D_HAVE_LIB_PPM_
++#LIBS     += -lppm
+ 
+ ### enable zlib support ###
+ DEFINES += -D_HAVE_ZLIB_
diff -urP transcode-0.6.3/files/patch-dvdread:dvd_reader.c transcode/files/patch-dvdread:dvd_reader.c
--- transcode-0.6.3/files/patch-dvdread:dvd_reader.c	Thu Jan  1 01:00:00 1970
+++ transcode/files/patch-dvdread:dvd_reader.c	Wed Feb 19 10:28:00 2003
@@ -0,0 +1,19 @@
+--- dvdread/dvd_reader.c.orig	Wed Feb 19 10:27:09 2003
++++ dvdread/dvd_reader.c	Wed Feb 19 10:27:36 2003
+@@ -140,15 +140,7 @@
+             dvdcss_error = (char* (*)(dvdcss_handle))
+                                 dlsym( dvdcss_library, U_S "dvdcss_error" );
+ 
+-            if( dlsym( dvdcss_library, U_S "dvdcss_crack" ) ) {
+-                fprintf( stderr, "libdvdread: Old (pre-0.0.2) version of "
+-                                 "libdvdcss found.\n"
+-                                 "libdvdread: You should get the "
+-                                 "latest version from "
+-                                 "http://www.videolan.org/\n" );
+-                dlclose( dvdcss_library );
+-                dvdcss_library = 0;
+-            } else if( !dvdcss_open  || !dvdcss_close || !dvdcss_seek ||
++            if( !dvdcss_open  || !dvdcss_close || !dvdcss_seek ||
+                        !dvdcss_title || !dvdcss_read  || !dvdcss_error ) {
+ 
+                 fprintf( stderr, "libdvdread: Unknown incompatible version "
diff -urP transcode-0.6.3/files/patch-src:transcode.c transcode/files/patch-src:transcode.c
--- transcode-0.6.3/files/patch-src:transcode.c	Thu Jan  1 01:00:00 1970
+++ transcode/files/patch-src:transcode.c	Mon Feb 17 23:58:12 2003
@@ -0,0 +1,11 @@
+--- src/transcode.c.orig	Mon Feb 17 23:49:13 2003
++++ src/transcode.c	Mon Feb 17 23:57:47 2003
+@@ -831,6 +831,8 @@
+     vob->vob_psu_num2     = INT_MAX;
+     vob->vob_info_file    = NULL;
+     vob->vob_percentage   = 0;
++	vob->im_a_string	  = NULL;
++	vob->im_v_string	  = NULL;
+ 
+     vob->reduce_h         = 1;
+     vob->reduce_w         = 1;
Only in transcode-0.6.3/: pkg-comment
diff -urP transcode-0.6.3/pkg-plist transcode/pkg-plist
--- transcode-0.6.3/pkg-plist	Mon Feb 17 23:46:44 2003
+++ transcode/pkg-plist	Fri Feb 21 14:35:17 2003
@@ -2,6 +2,9 @@
 bin/avimerge
 bin/avisplit
 bin/avisync
+%%WITH_SUBRIP%%bin/srttool
+%%WITH_SUBRIP%%bin/subtitle2pgm
+%%WITH_SUBRIP%%bin/subtitle2vobsub
 bin/tccat
 bin/tcdecode
 bin/tcdemux
--- transcode-0.6.3-1.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302242230.h1OMU2Os019683>