8 files changed, 62 insertions, 83 deletions

diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile
index 429205d02eb7..6bc0fb65951a 100644
--- a/multimedia/kino/Makefile
+++ b/multimedia/kino/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kino
-PORTVERSION=	0.9.5
+PORTVERSION=	1.0.0
 CATEGORIES=	multimedia
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,13 +15,13 @@ MAINTAINER=	pb@FreeBSD.org
 COMMENT=	A DV non-linear video editor
 
 LIB_DEPENDS=	dv.4:${PORTSDIR}/multimedia/libdv	\
-		avcodec.1:$(PORTSDIR)/multimedia/ffmpeg-devel	\
 		Magick.10:${PORTSDIR}/graphics/ImageMagick	\
 		samplerate.1:${PORTSDIR}/audio/libsamplerate
 RUN_DEPENDS=	mencoder:${PORTSDIR}/multimedia/mplayer	\
 		mplex:${PORTSDIR}/multimedia/mjpegtools
 
-OPTIONS=	QUICKTIME "With Quicktime support" off
+OPTIONS=	QUICKTIME "With Quicktime support" off	\
+		FFMPEG_KINO "With ffmpeg-kino" on
 
 USE_AUTOTOOLS=	autoconf:259
 USE_GETTEXT=	yes
@@ -49,4 +49,12 @@ LIB_DEPENDS+=	quicktime.0:${PORTSDIR}/multimedia/libquicktime
 CONFIGURE_ARGS+=	--with-quicktime
 .endif
 
+.if defined(WITH_FFMPEG_KINO)
+PLIST_SUB+=	FFMPEG_KINO=""
+.else
+CONFIGURE_ARGS+= --disable-local-ffmpeg
+PLIST_SUB+=	FFMPEG_KINO="@comment "
+LIB_DEPENDS+=	avcodec.1:$(PORTSDIR)/multimedia/ffmpeg-devel
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/multimedia/kino/distinfo b/multimedia/kino/distinfo
index 765f5cdd081c..4a6fc70c7af2 100644
--- a/multimedia/kino/distinfo
+++ b/multimedia/kino/distinfo
@@ -1,3 +1,3 @@
-MD5 (kino-0.9.5.tar.gz) = e6a15f96523c2dcd8cc4a2f21c994687
-SHA256 (kino-0.9.5.tar.gz) = 0b0a9e879ae77b795e962c5a0272c8e387ce19e4a832d27b8d5a836ef9efcebe
-SIZE (kino-0.9.5.tar.gz) = 2449937
+MD5 (kino-1.0.0.tar.gz) = 8af99b09f044c210382ad63b63ca9268
+SHA256 (kino-1.0.0.tar.gz) = 8d0963605f47934e3713397b950493da94f41429523eb15bf7d13f1b4ec0afbe
+SIZE (kino-1.0.0.tar.gz) = 5428151
diff --git a/multimedia/kino/files/patch-Makefile.in b/multimedia/kino/files/patch-Makefile.in
deleted file mode 100644
index 4a2dff2277f6..000000000000
--- a/multimedia/kino/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	Mon Nov 28 21:15:11 2005
-+++ Makefile.in	Mon Nov 28 21:16:37 2005
-@@ -249,7 +249,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = po src help scripts linux-hotplug pixmaps
-+SUBDIRS = po src help scripts pixmaps
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in \
- 	intltool-extract.in intltool-merge.in intltool-update.in
- 
diff --git a/multimedia/kino/files/patch-am b/multimedia/kino/files/patch-am
index c86ba098a72e..b92432fdbefa 100644
--- a/multimedia/kino/files/patch-am
+++ b/multimedia/kino/files/patch-am
@@ -1,6 +1,6 @@
---- src/jogshuttle.cc.orig	Mon Mar 15 23:13:46 2004
-+++ src/jogshuttle.cc	Tue Apr 13 11:51:37 2004
-@@ -26,7 +26,7 @@
+--- src/jogshuttle.cc.orig	Tue Feb 20 07:32:05 2007
++++ src/jogshuttle.cc	Sat Mar 17 21:05:33 2007
+@@ -27,7 +27,7 @@
  #include <fcntl.h>
  #include <unistd.h>
  #include <errno.h>
@@ -9,20 +9,15 @@
  
  #include "jogshuttle.h"
  #include "preferences.h"
-@@ -343,9 +343,10 @@
+@@ -343,6 +343,7 @@
  */
  void JogShuttle::inputCallback( gint source, GdkInputCondition condition )
  {
 +#if 0
  	g_return_if_fail( this != NULL );
--	// g_return_if_fail( input_ >= 0 );
--	// g_return_if_fail( input_ == source );
-+	g_return_if_fail( input_ >= 0 );
-+	g_return_if_fail( input_ == source );
- 	g_return_if_fail( condition == GDK_INPUT_READ );
- 
- 	struct media_ctrl_event ev;
-@@ -402,4 +403,5 @@
+ 	// g_return_if_fail( input_ >= 0 );
+ 	// g_return_if_fail( input_ == source );
+@@ -405,4 +406,5 @@
  	{
  		return;
  	}
diff --git a/multimedia/kino/files/patch-configure.in b/multimedia/kino/files/patch-configure.in
index 3af6b9a5416d..04726c22e365 100644
--- a/multimedia/kino/files/patch-configure.in
+++ b/multimedia/kino/files/patch-configure.in
@@ -1,5 +1,5 @@
---- configure.in.orig	Tue Apr 25 20:18:28 2006
-+++ configure.in	Tue Jul 18 23:14:58 2006
+--- configure.in.orig	Thu Mar  8 04:52:54 2007
++++ configure.in	Sun Mar 18 00:00:50 2007
 @@ -40,32 +40,32 @@
  AC_SUBST(LIBDV_CFLAGS)
  AC_SUBST(LIBDV_LIBS)
@@ -26,6 +26,13 @@
 -AC_CHECK_LIB(rom1394, rom1394_get_node_type, ,
 -	[AC_MSG_ERROR([Unable to link with librom1394. Check that your have librom1394 installed (usually part of libavc1394) and that the version is 0.4.1 or newer])]
 -)
+-
+-AC_CHECK_LIB(pthread, pthread_create, ,
+-	[AC_MSG_ERROR([You need the pthread library to compile kino])]
+-)
+-AC_CHECK_LIB(dl, dlopen, ,
+-	[AC_MSG_ERROR([You need libdl to compile kino])]
+-)
 +#AC_CHECK_HEADER([libavc1394/avc1394.h], ,
 +#	[AC_MSG_ERROR([avc1394.h not found, install libavc1394-devel])
 +#])
@@ -38,13 +45,7 @@
 +#AC_CHECK_LIB(rom1394, rom1394_get_node_type, ,
 +#	[AC_MSG_ERROR([Unable to link with librom1394. Check that your have librom1394 installed (usually part of libavc1394) and that the version is 0.4.1 or newer])]
 +#)
- 
--AC_CHECK_LIB(pthread, pthread_create, ,
--	[AC_MSG_ERROR([You need the pthread library to compile kino])]
--)
--AC_CHECK_LIB(dl, dlopen, ,
--	[AC_MSG_ERROR([You need libdl to compile kino])]
--)
++
 +#AC_CHECK_LIB(pthread, pthread_create, ,
 +#	[AC_MSG_ERROR([You need the pthread library to compile kino])]
 +#)
@@ -52,5 +53,20 @@
 +#	[AC_MSG_ERROR([You need libdl to compile kino])]
 +#)
  
- # ######################################################################
- # checks for optional packages
+ # LIBIEC61883
+ AC_ARG_WITH(dv1394, AC_HELP_STRING([--with-dv1394],[Use dv1394 instead of libiec61883 for DV I/O (only if you must).]))
+@@ -187,12 +187,12 @@
+ 			tar -xzf ffmpeg-svn-r8218.tar.gz
+ 		fi
+ 		if ! (test -f ffmpeg/config.mak) ; then
+-			pushd ffmpeg
++			(cd ffmpeg
+ 			./configure --disable-ffserver --disable-ffplay --disable-v4l \
+ 			--disable-v4l2 --disable-dv1394 --disable-network --disable-zlib \
+ 			--disable-vhook --build-suffix=-kino --enable-gpl --enable-swscaler \
+ 			--prefix="$prefix"
+-			popd
++			)
+ 		fi
+ 	fi
+ ])
diff --git a/multimedia/kino/files/patch-src::kino_common.cc b/multimedia/kino/files/patch-src::kino_common.cc
index 68888f3089ce..9bc6cdcd3dd2 100644
--- a/multimedia/kino/files/patch-src::kino_common.cc
+++ b/multimedia/kino/files/patch-src::kino_common.cc
@@ -1,14 +1,15 @@
---- src/kino_common.cc.orig	Fri Dec 15 09:49:52 2006
-+++ src/kino_common.cc	Mon Dec 25 23:46:08 2006
-@@ -34,6 +34,7 @@
+--- src/kino_common.cc.orig	Wed Mar  7 10:23:12 2007
++++ src/kino_common.cc	Sat Mar 17 21:17:18 2007
+@@ -35,6 +35,8 @@
  #ifndef _GNU_SOURCE
  #define _GNU_SOURCE
  #endif
 +#include <libgen.h>
++#include <signal.h>
  #include <string.h>
  #include <stdarg.h>
  #include <time.h>
-@@ -1486,7 +1487,8 @@
+@@ -1527,7 +1529,8 @@
  	Frame *frame = GetFramePool()->GetFrame();
  	if ( frame != NULL )
  	{
@@ -18,7 +19,7 @@
  		GError *gerror = NULL;
  		this->getPlayList()->GetFrame( this->g_currentFrame, *frame );
  
-@@ -1521,6 +1523,7 @@
+@@ -1562,6 +1565,7 @@
  			g_error_free( gerror );
  		}
  		g_object_unref( im );
diff --git a/multimedia/kino/files/patch-src__displayer.cc b/multimedia/kino/files/patch-src__displayer.cc
deleted file mode 100644
index df759d03236e..000000000000
--- a/multimedia/kino/files/patch-src__displayer.cc
+++ /dev/null
@@ -1,37 +0,0 @@
---- src/displayer.cc.orig	Tue Jan 16 01:52:01 2007
-+++ src/displayer.cc	Tue Jan 16 01:55:59 2007
-@@ -573,20 +573,23 @@
- 			xvImage = ( XvImage * ) XvShmCreateImage( display, port, 0x32595559, 0, width, height, &shmInfo );
- 
- 			shmInfo.shmid = shmget( IPC_PRIVATE, xvImage->data_size, IPC_CREAT | 0777 );
--			shmInfo.shmaddr = ( char * ) shmat( shmInfo.shmid, 0, 0 );
--			xvImage->data = shmInfo.shmaddr;
--			shmInfo.readOnly = 0;
--			if ( !XShmAttach( gdk_display, &shmInfo ) )
--			{
-+			if (shmInfo.shmid < 0) {
-+				perror("shmget");
- 				gotPort = false;
--			}
--			XSync( display, false );
--			shmctl( shmInfo.shmid, IPC_RMID, 0 );
-+			} else {
-+				shmInfo.shmaddr = ( char * ) shmat( shmInfo.shmid, 0, 0 );
-+				xvImage->data = shmInfo.shmaddr;
-+				shmInfo.readOnly = 0;
-+				if ( !XShmAttach( gdk_display, &shmInfo ) )
-+				{
-+					gotPort = false;
-+				}
-+				XSync( display, false );
-+				shmctl( shmInfo.shmid, IPC_RMID, 0 );
- #if 0
--
--			xvImage = ( XvImage * ) XvCreateImage( display, port, 0x32595559, pix, width , height );
-+				xvImage = ( XvImage * ) XvCreateImage( display, port, 0x32595559, pix, width , height );
- #endif
--
-+			}
- 		}
- 	}
- 	else
diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist
index 3e194b97773c..4497e2331fc8 100644
--- a/multimedia/kino/pkg-plist
+++ b/multimedia/kino/pkg-plist
@@ -1,4 +1,6 @@
+%%FFMPEG_KINO%%bin/ffmpeg-kino
 bin/kino
+bin/kino2raw
 include/kino/audio_filters.h
 include/kino/audio_transitions.h
 include/kino/endian_types.h
@@ -100,6 +102,7 @@ share/gnome/kino/help/en/keyboard.html
 share/gnome/kino/help/en/kino.xml
 share/gnome/kino/help/en/links.html
 share/gnome/kino/help/en/locked.html
+share/gnome/kino/help/en/media/terms/jogshuttle/shuttlepro.png
 share/gnome/kino/help/en/media/ui/kinoui.png
 share/gnome/kino/help/en/metadata.html
 share/gnome/kino/help/en/metadata_example.html
@@ -238,10 +241,12 @@ share/gnome/kino/scripts/exports/ffmpeg_vcd.sh
 share/gnome/kino/scripts/exports/ffmpeg_xvid.sh
 share/gnome/kino/scripts/exports/ffmpeg_xvid_dual.sh
 share/gnome/kino/scripts/exports/mencoder.sh
-share/gnome/kino/scripts/exports/mencoder_dual.sh
 share/gnome/kino/scripts/exports/rawplay.sh
 share/gnome/kino/scripts/import/audio.sh
 share/gnome/kino/scripts/import/media.sh
+share/gnome/kino/scripts/publish/bliptv_frame.sh
+share/gnome/kino/scripts/publish/bliptv_project.sh
+share/gnome/kino/scripts/publish/echo.sh
 share/gnome/kino/scripts/publish/frame.sh
 share/gnome/kino/scripts/publish/project.sh
 share/gnome/kino/lumas/bar_bottom.png
@@ -296,6 +301,8 @@ share/mime/packages/kino.xml
 @dirrm include/kino
 @dirrm lib/kino-gtk2
 @dirrm share/gnome/kino/help/en/images
+@dirrm share/gnome/kino/help/en/media/terms/jogshuttle
+@dirrm share/gnome/kino/help/en/media/terms
 @dirrm share/gnome/kino/help/en/media/ui
 @dirrm share/gnome/kino/help/en/media
 @dirrm share/gnome/kino/help/en