Update to latest upstream stable version (still in package.mask).

(Portage version: 2.0.51.22-r1)

5 files changed, 10 insertions, 72 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index 13b4d2cad14a..e86b392dca6c 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/transcode
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.110 2005/07/09 00:38:37 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.111 2005/07/13 16:44:21 flameeyes Exp $
+
+*transcode-1.0.0 (13 Jul 2005)
+
+  13 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  -files/transcode-1.0.0_rc1-gcc4.patch, -transcode-1.0.0_rc1.ebuild,
+  +transcode-1.0.0.ebuild:
+  Update to latest upstream stable version (still in package.mask).
 
 *transcode-1.0.0_rc1 (09 Jul 2005)
 
diff --git a/media-video/transcode/files/digest-transcode-1.0.0 b/media-video/transcode/files/digest-transcode-1.0.0
new file mode 100644
index 000000000000..166c81843a27
--- /dev/null
+++ b/media-video/transcode/files/digest-transcode-1.0.0
@@ -0,0 +1 @@
+MD5 28990470fb92a28e351cb96bcad0c890 transcode-1.0.0.tar.gz 2347710
diff --git a/media-video/transcode/files/digest-transcode-1.0.0_rc1 b/media-video/transcode/files/digest-transcode-1.0.0_rc1
deleted file mode 100644
index cd0be2143cf8..000000000000
--- a/media-video/transcode/files/digest-transcode-1.0.0_rc1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 bda8422a8b2fb83e5c750743b688b7a3 transcode-1.0.0rc1.tar.gz 2349974
diff --git a/media-video/transcode/files/transcode-1.0.0_rc1-gcc4.patch b/media-video/transcode/files/transcode-1.0.0_rc1-gcc4.patch
deleted file mode 100644
index a005a3f7f57c..000000000000
--- a/media-video/transcode/files/transcode-1.0.0_rc1-gcc4.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -ur -x '*~' transcode-1.0.0rc1/import/af6_decore.cpp transcode-1.0.0rc1-gcc4/import/af6_decore.cpp
---- transcode-1.0.0rc1/import/af6_decore.cpp	2004-10-18 04:04:15.000000000 +0200
-+++ transcode-1.0.0rc1-gcc4/import/af6_decore.cpp	2005-07-09 02:04:20.138301240 +0200
-@@ -1,7 +1,7 @@
- /*
-  *  af6_decore.cpp
-  *
-- *  Copyright (C) Thomas Östreich - January 2002
-+ *  Copyright (C) Thomas �treich - January 2002
-  *  Updated by Christian Vogelgsang <Vogelgsang@informatik.uni-erlangen.de>
-  *
-  *  This file is part of transcode, a linux video stream processing tool
-@@ -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/media-video/transcode/transcode-1.0.0_rc1.ebuild b/media-video/transcode/transcode-1.0.0.ebuild
index c3277f6ada90..5625292fee4f 100644
--- a/media-video/transcode/transcode-1.0.0_rc1.ebuild
+++ b/media-video/transcode/transcode-1.0.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.0_rc1.ebuild,v 1.3 2005/07/13 16:34:07 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.0.ebuild,v 1.1 2005/07/13 16:44:21 flameeyes Exp $
 
 inherit libtool flag-o-matic eutils multilib
 
@@ -59,7 +59,6 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-gcc4.patch
 	sed -i -e "s:\$(datadir)/doc/transcode:\$(datadir)/doc/${PF}:" \
 		${S}/docs/Makefile.am ${S}/docs/html/Makefile.am