Added latest version upstream (works with GCC4). Removed 1.0.0_beta3. Fixed docs installation path.

(Portage version: 2.0.51.22-r1)

6 files changed, 86 insertions, 13 deletions

diff --git a/media-video/transcode/ChangeLog b/media-video/transcode/ChangeLog
index affeeb4985cb..13b4d2cad14a 100644
--- a/media-video/transcode/ChangeLog
+++ b/media-video/transcode/ChangeLog
@@ -1,6 +1,14 @@
 # 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.109 2005/05/24 09:29:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/ChangeLog,v 1.110 2005/07/09 00:38:37 flameeyes Exp $
+
+*transcode-1.0.0_rc1 (09 Jul 2005)
+
+  09 Jul 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +files/transcode-1.0.0_rc1-gcc4.patch, -transcode-1.0.0_beta3.ebuild,
+  +transcode-1.0.0_rc1.ebuild:
+  Added latest version upstream (works with GCC4). Removed 1.0.0_beta3. Fixed
+  docs installation path.
 
   24 May 2005; Diego Pettenò <flameeyes@gentoo.org>
   transcode-1.0.0_beta3.ebuild:
diff --git a/media-video/transcode/Manifest b/media-video/transcode/Manifest
index 290539907c29..3c4325dfd077 100644
--- a/media-video/transcode/Manifest
+++ b/media-video/transcode/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 9f905c3bb5f70dffdec8f2aa7ce1cff9 ChangeLog 20207
 MD5 7300a7b361fa9f48e37722c6952bd432 metadata.xml 158
 MD5 03b5a2c3e1a9e7148ca0d786b14ad78f transcode-0.6.11.ebuild 4042
@@ -10,6 +7,7 @@ MD5 89bfa93308a46f45e9b41adb7747ad0f transcode-0.6.13-r1.ebuild 2843
 MD5 aeb808af25c7e03bab1de600cf787435 transcode-0.6.14-r2.ebuild 4182
 MD5 119a7d425650a2c2ad7ee46ed133bcda transcode-0.6.14.ebuild 3566
 MD5 4b23761029cc19919ff28ce9ddca536c transcode-1.0.0_beta3.ebuild 3963
+MD5 f898f3cf5f0fbffe90c37a64c0444d28 transcode-1.0.0_rc1.ebuild 4000
 MD5 bc1cb5a39d56ce5216c803c74e73545d files/digest-transcode-0.6.11 69
 MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r1 69
 MD5 8fde4803c96e026f6caa94fa0e42687f files/digest-transcode-0.6.12-r2 69
@@ -23,10 +21,5 @@ MD5 085f514d559cd32a401241bbbf639d39 files/transcode-0.6.12-r2-dvdmenu.patch 484
 MD5 90f42fff1c2a0b4be8df0b015ac2b309 files/transcode-0.6.12-r2-gcc34.patch 2963
 MD5 936b66bb309cb3c1dfa33924d3114fa9 files/transcode-0.6.13-r1-bitstream.patch 446
 MD5 2cb7b1a00a0529a8256fc0104b5f2a09 files/transcode-gcc34.patch 460
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCkvMpj5H05b2HAEkRAsHOAJ9EoNZPcmep1/NC2PNbsGEWXxhxxQCfWqL5
-HqOYXQ/zYJ0HjtUppZxuPnQ=
-=CO/T
------END PGP SIGNATURE-----
+MD5 37881dfd11a9f51ba8ca5923f3f42a55 files/digest-transcode-1.0.0_rc1 71
+MD5 c0764123585a1f43aa26a9ff6482a042 files/transcode-1.0.0_rc1-gcc4.patch 2989
diff --git a/media-video/transcode/files/digest-transcode-1.0.0_beta3 b/media-video/transcode/files/digest-transcode-1.0.0_beta3
deleted file mode 100644
index 44349da779dc..000000000000
--- a/media-video/transcode/files/digest-transcode-1.0.0_beta3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 963645ae3c08363d8035e874dffc89e7 transcode-1.0.0beta3.tar.gz 2346963
diff --git a/media-video/transcode/files/digest-transcode-1.0.0_rc1 b/media-video/transcode/files/digest-transcode-1.0.0_rc1
new file mode 100644
index 000000000000..cd0be2143cf8
--- /dev/null
+++ b/media-video/transcode/files/digest-transcode-1.0.0_rc1
@@ -0,0 +1 @@
+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
new file mode 100644
index 000000000000..a005a3f7f57c
--- /dev/null
+++ b/media-video/transcode/files/transcode-1.0.0_rc1-gcc4.patch
@@ -0,0 +1,68 @@
+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_beta3.ebuild b/media-video/transcode/transcode-1.0.0_rc1.ebuild
index 345f6f948717..bd47ee2f9d4a 100644
--- a/media-video/transcode/transcode-1.0.0_beta3.ebuild
+++ b/media-video/transcode/transcode-1.0.0_rc1.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_beta3.ebuild,v 1.4 2005/05/24 09:29:42 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/transcode/transcode-1.0.0_rc1.ebuild,v 1.1 2005/07/09 00:38:37 flameeyes Exp $
 
 inherit libtool flag-o-matic eutils multilib
 
@@ -59,6 +59,10 @@ 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
+
 	libtoolize --copy --force || die "libtoolize failed"
 	autoreconf -i || die "autoreconf failed"