- Update to 1.0.0 final

PR:		ports/84916
Submitted by:	Ulrich Spoerlein <q@galgenberg.net>
Approved by:	Hendrik Scholz <hscholz@raisdorf.net> (maintainer)

4 files changed, 16 insertions, 64 deletions

diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index 147ef5a7e8a2..40d2abdcf283 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	transcode
-DISTVERSION=	1.0.0rc1
-PORTREVISION=	1
+DISTVERSION=	1.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	http://dl.fkb.wormulon.net/transcode/ \
 		http://dl.kel.wormulon.net/transcode/ \
@@ -142,6 +141,13 @@ PLIST_SUB+=	WITH_OGG="@comment "
 CONFIGURE_ARGS+=	--enable-ogg=no
 .endif
 
+.if defined(WITH_BKTR)
+PLIST_SUB+=	WITH_BKTR=""
+CONFIGURE_ARGS+=	--enable-bktr
+.else
+PLIST_SUB+=	WITH_BKTR="@comment "
+.endif
+
 .if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
 CONFIGURE_ARGS+=	--with-vorbis-prefix=${LOCALBASE} --enable-vorbis
@@ -284,7 +290,6 @@ PLIST_SUB+=	WITH_LZO="@comment "
 .if defined(WITH_DIVX5)
 BUILD_DEPENDS+=	${LINUXBASE}/usr/lib/libdivxdecore.so:${PORTSDIR}/multimedia/linux-divx4linux
 CFLAGS+=	-I${LINUXBASE}/usr/include/divx
-CPPFLAGS+=	-I${LINUXBASE}/usr/include/divx
 .else
 .endif
 
@@ -388,6 +393,10 @@ pre-everything::
 	@${ECHO_MSG}
 	@${ECHO_MSG} "You can enable experimental DivX 5 support by defining WITH_DIVX5."
 .endif
+.if !defined(WITH_BKTR)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "You can enable support for bktr(4) devices by defining WITH_BKTR."
+.endif
 
 post-patch:
 .if ${OSVERSION} <= 500027
@@ -415,7 +424,7 @@ pre-configure:
 		${WRKSRC}/import/decode_mov.c \
 		${WRKSRC}/import/import_mov.c \
 		${WRKSRC}/import/probe_mov.c
-	
+
 post-install:
 .if defined(WITH_XVID)
 	@${LN} -sf ${LOCALBASE}/lib/libxvidcore.so \
diff --git a/multimedia/transcode/distinfo b/multimedia/transcode/distinfo
index e69b8b368bfa..519cc99a9f2c 100644
--- a/multimedia/transcode/distinfo
+++ b/multimedia/transcode/distinfo
@@ -1,2 +1,2 @@
-MD5 (transcode-1.0.0rc1.tar.gz) = bda8422a8b2fb83e5c750743b688b7a3
-SIZE (transcode-1.0.0rc1.tar.gz) = 2349974
+MD5 (transcode-1.0.0.tar.gz) = 28990470fb92a28e351cb96bcad0c890
+SIZE (transcode-1.0.0.tar.gz) = 2347710
diff --git a/multimedia/transcode/files/patch-import:af6_decore.cpp b/multimedia/transcode/files/patch-import:af6_decore.cpp
deleted file mode 100644
index 4aac1d84a35d..000000000000
--- a/multimedia/transcode/files/patch-import:af6_decore.cpp
+++ /dev/null
@@ -1,58 +0,0 @@
---- 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 2e0885a23d04..1fcf41318edc 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
+%%WITH_BKTR%%lib/transcode/import_bktr.so
 lib/transcode/import_bsdav.so
 lib/transcode/import_divx.so
 lib/transcode/import_dv.so