- Update to 1.0.0rc1

PR:		ports/82931
Submitted by:	Jose M Rodriguez  <josemi@freebsd.jazztel.es>
Approved by:	Hendrik Scholz <hscholz@raisdorf.net> (maintainer)

4 files changed, 63 insertions, 4 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 3885e169fc58..cfe121c6517f 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	transcode
-DISTVERSION=	1.0.0beta3
-PORTREVISION=	2
+DISTVERSION=	1.0.0rc1
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.fkb.wormulon.net/transcode/ \
 		http://dl.kel.wormulon.net/transcode/ \
+		http://rebels.plukwa.net/linux-video/transcode/ \
 		http://www.jakemsr.com/transcode/
 
 MAINTAINER=	hendrik@scholz.net
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index c0b1536ab4e7..e69b8b368bfa 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,2 +1,2 @@
-MD5 (transcode-1.0.0beta3.tar.gz) = 963645ae3c08363d8035e874dffc89e7
-SIZE (transcode-1.0.0beta3.tar.gz) = 2346963
+MD5 (transcode-1.0.0rc1.tar.gz) = bda8422a8b2fb83e5c750743b688b7a3
+SIZE (transcode-1.0.0rc1.tar.gz) = 2349974
diff --git a/multimedia/transcode/files/patch-import:af6_decore.cpp b/multimedia/transcode/files/patch-import:af6_decore.cpp
new file mode 100644
index 000000000000..4aac1d84a35d
--- /dev/null
+++ b/multimedia/transcode/files/patch-import:af6_decore.cpp
@@ -0,0 +1,58 @@
+--- import/af6_decore.cpp.orig	Sun Jul  3 17:03:28 2005
++++ import/af6_decore.cpp	Sun Jul  3 17:03:48 2005
+@@ -213,7 +213,7 @@
+ 
+       /* send sync token */
+       fflush(stdout);
+-      p_write(decode->fd_out, sync_str, sizeof(sync_str));
++      p_write(decode->fd_out, (uint8_t*)sync_str, sizeof(sync_str));
+ 
+       /* frame serve loop */
+       /* by default decode->frame_limit[0]=0 and ipipe->frame_limit[1]=LONG_MAX so all frames are decoded */
+@@ -268,13 +268,13 @@
+ 		    }
+ 		  }
+ 		  /* write unpacked frame */
+-		  if(p_write(decode->fd_out, pack_buffer, pack_size)!= pack_size) {
++		  if(p_write(decode->fd_out, (uint8_t*)pack_buffer, pack_size)!= pack_size) {
+ 		    fprintf(stderr,"(%s) ERROR: Pipe write error!\n",__FILE__);
+ 		    break;
+ 		  }
+ 		} else {
+ 		  /* directly write raw frame */
+-		  if(p_write(decode->fd_out, buf, buffer_size)!= buffer_size) {
++		  if(p_write(decode->fd_out, (uint8_t*)buf, buffer_size)!= buffer_size) {
+ 		    fprintf(stderr,"(%s) ERROR: Pipe write error!\n",__FILE__);
+ 		    break;
+ 		  }
+@@ -368,7 +368,7 @@
+ 
+       /* send sync token */
+       fflush(stdout);
+-      p_write(decode->fd_out, sync_str, sizeof(sync_str));
++      p_write(decode->fd_out, (uint8_t*)sync_str, sizeof(sync_str));
+       
+       /* sample server loop */
+       while(!ars->Eof()) { 
+@@ -393,18 +393,18 @@
+ 	{
+ 		if ( s_byte_read - ret_size <(unsigned int)decode->frame_limit[0])
+ 		{
+-			if((unsigned int)p_write(decode->fd_out,buffer+(ret_size-(s_byte_read-decode->frame_limit[0])),(s_byte_read-decode->frame_limit[0]))!=(unsigned int)(s_byte_read-decode->frame_limit[0])) 
++			if((unsigned int)p_write(decode->fd_out,(uint8_t*)(buffer+(ret_size-(s_byte_read-decode->frame_limit[0]))),(s_byte_read-decode->frame_limit[0]))!=(unsigned int)(s_byte_read-decode->frame_limit[0])) 
+ 			  	break;
+ 		}
+ 		else
+ 		{
+-			if((unsigned int)p_write(decode->fd_out,buffer,ret_size)!=ret_size) 
++			if((unsigned int)p_write(decode->fd_out,(uint8_t*)buffer,ret_size)!=ret_size) 
+ 			  break;
+ 		}
+ 	}
+ 	else if ((s_byte_read> decode->frame_limit[0]) && (s_byte_read - ret_size <=(unsigned int)decode->frame_limit[1]))
+ 	{
+-		if((unsigned int)p_write(decode->fd_out,buffer,(s_byte_read-decode->frame_limit[1]))!=(unsigned int)(s_byte_read-decode->frame_limit[1])) 
++		if((unsigned int)p_write(decode->fd_out,(uint8_t*)buffer,(s_byte_read-decode->frame_limit[1]))!=(unsigned int)(s_byte_read-decode->frame_limit[1])) 
+ 		 	break;
+ 	}
+ 	else if (s_byte_read - ret_size >(unsigned int)decode->frame_limit[1])
diff --git a/multimedia/transcode/pkg-plist b/multimedia/transcode/pkg-plist
index 00dbbe64c0d3..2e0885a23d04 100644
--- a/multimedia/transcode/pkg-plist
+++ b/multimedia/transcode/pkg-plist
@@ -119,6 +119,7 @@ lib/transcode/parse_csv.awk
 lib/transcode/import_ac3.so
 %%WITH_AVIFILE%%lib/transcode/import_af6.so
 lib/transcode/import_avi.so
+lib/transcode/import_bsdav.so
 lib/transcode/import_divx.so
 lib/transcode/import_dv.so
 lib/transcode/import_dvd.so