Update to 0.6.4

Changes:
- update MASTER_SITES since the maintainer changed
- add %%WITH_NASM%% knob to Makefile and pkg-plist to honor WITH_NASM
  option correctly. Attention: WITH_NASM gets set if bin/nasm is
  found but this may not be enough for transcode as nasm >= 0.98.34
  is needed. Checking for bin/nasm-0.98.35 might be a way of achieving
  this but leads to more work when updating nasm itself.
- add WITH_SUBRIP knob suggested by Michael Nottebrock in
  ports/47923 and implemented in ports/48649.
- incorporate dvd_reader.c patch by Atte Peltomaeki which has already
  been added in ports/48649
- remove the transcode.c patch from ports/48649 since it made its way
  into the main distribution
- add threading patch by Andriy Gapon in ports/48126
- pkg-plist update

PR:		50377
Submitted by:	maintainer

7 files changed, 125 insertions, 8 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index f49816f5b182..143d3e468c08 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -6,9 +6,10 @@
 #
 
 PORTNAME=	transcode
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 CATEGORIES=	multimedia
-MASTER_SITES=	http://www.theorie.physik.uni-goettingen.de/~ostreich/transcode/pre/
+MASTER_SITES=	http://www.zebra.fh-weingarten.de/~transcode/pre/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.20030325
 
 MAINTAINER=	hendrik@scholz.net
 COMMENT=	A text-console utility for video stream processing
@@ -89,7 +90,7 @@ WITH_LAME=	yes
 WITH_OGG=	yes
 .endif
 
-.if exists(${LOCALBASE}/lib/liblavplay.so)
+.if exists(${LOCALBASE}/include/mjpegtools/yuv4mpeg.h)
 WITH_MJPEG=	yes
 .endif
 
@@ -104,6 +105,9 @@ PLIST_SUB+=	WITH_IMAGEMAGICK="@comment "
 .if defined(WITH_NASM)
 BUILD_DEPENDS+=	${LOCALBASE}/bin/nasm:${PORTSDIR}/devel/nasm
 ONLY_FOR_ARCHS=	i386
+PLIST_SUB+=	WITH_NASM=""
+.else
+PLIST_SUB+=	WITH_NASM="@comment"
 .endif
 
 .if defined(WITH_AVIFILE)
@@ -202,6 +206,12 @@ PLIST_SUB+=	WITH_MJPEG=""
 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}
@@ -273,7 +283,11 @@ pre-everything::
 .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:
@@ -301,6 +315,12 @@ post-install:
 	@${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 --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index bddb3131accb..faff59120d2f 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1 +1 @@
-MD5 (transcode-0.6.3.tar.gz) = 65f0982c73821add9b6b78b662496da0
+MD5 (transcode-0.6.4.20030325.tar.gz) = 8a635c3d262fcafe1055af440a964c1b
diff --git a/multimedia/transcode/files/patch-contrib:subrip:Makefile b/multimedia/transcode/files/patch-contrib:subrip:Makefile
new file mode 100644
index 000000000000..461565adcdd8
--- /dev/null
+++ b/multimedia/transcode/files/patch-contrib:subrip:Makefile
@@ -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 --git a/multimedia/transcode/files/patch-dvdread:dvd_reader.c b/multimedia/transcode/files/patch-dvdread:dvd_reader.c
new file mode 100644
index 000000000000..623c2512ba73
--- /dev/null
+++ b/multimedia/transcode/files/patch-dvdread:dvd_reader.c
@@ -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 --git a/multimedia/transcode/files/patch-import:clone.c b/multimedia/transcode/files/patch-import:clone.c
new file mode 100644
index 000000000000..90bc190a4e8d
--- /dev/null
+++ b/multimedia/transcode/files/patch-import:clone.c
@@ -0,0 +1,21 @@
+--- import/clone.c.orig	Thu Mar 27 19:17:57 2003
++++ import/clone.c	Thu Mar 27 19:19:16 2003
+@@ -74,6 +74,8 @@
+     perror("open file");
+     return(-1);
+   }
++  fcntl(sfd, F_SETFD, FD_CLOEXEC);
++
+   
+   if(verbose & TC_DEBUG) fprintf(stderr, "(%s) reading video frame sync data from %s\n", __FILE__, logfile);
+   
+@@ -349,7 +351,8 @@
+ 	if(verbose & TC_SYNC) fprintf(stderr, "READ (%d)\n", i);
+ 
+ 	if((j=p_read(sfd, (char *) ptr->sync_info, sizeof(sync_info_t))) != sizeof(sync_info_t)) {
+-	    
++	   
++		if(j < 0) perror("p_read failed");
+ 	    if(verbose & TC_DEBUG) fprintf(stderr, "(%s) p_read error (%d/%d)\n",  __FILE__, j, sizeof(sync_info_t));
+ 	    pthread_mutex_lock(&buffer_fill_lock);
+ 	    clone_read_thread_flag=0;
diff --git a/multimedia/transcode/files/patch-import:ioaux.c b/multimedia/transcode/files/patch-import:ioaux.c
new file mode 100644
index 000000000000..c7d69cc3dcbf
--- /dev/null
+++ b/multimedia/transcode/files/patch-import:ioaux.c
@@ -0,0 +1,35 @@
+--- import/ioaux.c.orig	Thu Mar 27 19:14:55 2003
++++ import/ioaux.c	Thu Mar 27 19:17:21 2003
+@@ -36,8 +36,14 @@
+    while (r < len) {
+       n = read (fd, buf + r, len - r);
+ 
+-      if (n <= 0)
+-	  return r;
++	  if (n == 0)
++		break;
++	  if (n < 0) {
++		if (errno == EINTR)
++		  continue;
++		else
++		  break;
++	  } 
+       r += n;
+    }
+ 
+@@ -51,9 +57,12 @@
+ 
+    while (r < len) {
+       n = write (fd, buf + r, len - r);
+-      if (n < 0)
+-         return n;
+-      
++      if (n < 0) {
++		if (errno == EINTR)
++		  continue;
++		else
++		  break;
++	  }
+       r += n;
+    }
+    return r;
diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist
index 83c45f750be6..5b5c524bd060 100644
--- a/multimedia/transcode/pkg-plist
+++ b/multimedia/transcode/pkg-plist
@@ -2,6 +2,9 @@ bin/avifix
 bin/avimerge
 bin/avisplit
 bin/avisync
+%%WITH_SUBRIP%%bin/srttool
+%%WITH_SUBRIP%%bin/subtitle2pgm
+%%WITH_SUBRIP%%bin/subtitle2vobsub
 bin/tccat
 bin/tcdecode
 bin/tcdemux
@@ -13,6 +16,7 @@ bin/tcscan
 bin/transcode
 %%WITH_LIBA52%%lib/transcode/a52_decore.so
 lib/transcode/af6_decore.so
+lib/transcode/export_ac3.so
 lib/transcode/export_af6.conf
 %%WITH_AVIFILE%%lib/transcode/export_af6.so
 lib/transcode/export_divx4.so
@@ -20,14 +24,17 @@ lib/transcode/export_divx4raw.so
 lib/transcode/export_divx5.so
 lib/transcode/export_divx5raw.so
 lib/transcode/export_ffmpeg.so
+lib/transcode/export_jpg.so
 lib/transcode/export_lame.so
 lib/transcode/export_sampeg.so
 %%WITH_LIBDV%%lib/transcode/export_dv.so
 %%WITH_LIBDV%%lib/transcode/export_dvraw.so
 %%WITH_FAME%%lib/transcode/export_fame.so
 %%WITH_IMAGEMAGICK%%lib/transcode/export_im.so
-%%WITH_MJPEG%%lib/transcode/export_mjpeg.so
-lib/transcode/export_mpeg.so
+lib/transcode/export_mjpeg.so
+%%WITH_NASM%%lib/transcode/export_mpeg.so
+%%WITH_MJPEG%%lib/transcode/export_mpeg2enc.so
+%%WITH_MJPEG%%lib/transcode/export_mp2enc.so
 lib/transcode/export_net.so
 lib/transcode/export_null.so
 %%WITH_OGG%%lib/transcode/export_ogg.so
@@ -39,6 +46,7 @@ lib/transcode/export_wav.so
 lib/transcode/export_xvid.so
 lib/transcode/export_xvidcvs.so
 lib/transcode/export_xvidraw.so
+%%WITH_MJPEG%%lib/transcode/export_yuv4mpeg.so
 lib/transcode/filter_29to23.so
 lib/transcode/filter_32detect.so
 lib/transcode/filter_32drop.so
@@ -57,6 +65,7 @@ lib/transcode/filter_fields.so
 lib/transcode/filter_invert.so
 lib/transcode/filter_ivtc.so
 %%WITH_IMAGEMAGICK%%lib/transcode/filter_logo.so
+%%WITH_IMAGEMAGICK%%lib/transcode/filter_logoaway.so
 lib/transcode/filter_mask.so
 lib/transcode/filter_normalize.so
 lib/transcode/filter_null.so
@@ -88,7 +97,6 @@ lib/transcode/import_dvd.so
 %%WITH_IMAGEMAGICK%%lib/transcode/import_imlist.so
 lib/transcode/import_ffmpeg.so
 lib/transcode/import_lav.so
-%%WITH_MJPEG%%lib/transcode/import_mjpeg.so
 lib/transcode/import_mpeg2.so
 %%WITH_LAME%%lib/transcode/import_mp3.so
 lib/transcode/import_mplayer.so
@@ -118,6 +126,7 @@ share/doc/transcode/export_mpeg.txt
 share/doc/transcode/export-API.txt
 share/doc/transcode/filter_dnr.txt
 share/doc/transcode/filter_logo.txt
+share/doc/transcode/filter_logoaway.txt
 share/doc/transcode/filter_yuvdenoise.txt
 share/doc/transcode/filter-socket.txt
 share/doc/transcode/filter-API.txt