diff options
29 files changed, 475 insertions, 262 deletions
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index a0415c7e299f..f06691895e70 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -6,23 +6,21 @@ # PORTNAME= kino -PORTVERSION= 0.7.0 -PORTREVISION= 1 +PORTVERSION= 0.7.1 CATEGORIES= multimedia -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ - http://kino.schirmacher.de/filemanager/download/17/ +MASTER_SITES= http://kino.schirmacher.de/filemanager/download/31/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= pb@FreeBSD.org COMMENT= A DV non-linear video editor LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv \ - intl.6:${PORTSDIR}/devel/gettext \ Magick.6:${PORTSDIR}/graphics/ImageMagick \ - xml2.5:${PORTSDIR}/textproc/libxml2 + samplerate.0:${PORTSDIR}/audio/libsamplerate +USE_GETTEXT= yes +USE_GNOME= libgnomeui libxml2 USE_ICONV= yes -USE_GNOME= libgnomeui GNU_CONFIGURE= yes USE_X_PREFIX= yes CONFIGURE_ENV= CPPFLAGS=-"I${LOCALBASE}/include -I${X11BASE}/include" \ diff --git a/multimedia/kino/distinfo b/multimedia/kino/distinfo index dbc30e716044..83b467a21a19 100644 --- a/multimedia/kino/distinfo +++ b/multimedia/kino/distinfo @@ -1,2 +1,2 @@ -MD5 (kino-0.7.0.tar.gz) = 7caac99c0ebe1d76b835d76137c1e7d7 -SIZE (kino-0.7.0.tar.gz) = 1160303 +MD5 (kino-0.7.1.tar.gz) = 0980dd4ccf2d2282578f6bcb51d768e8 +SIZE (kino-0.7.1.tar.gz) = 769247 diff --git a/multimedia/kino/files/patch-Makefile.in b/multimedia/kino/files/patch-Makefile.in new file mode 100644 index 000000000000..b204bfda764f --- /dev/null +++ b/multimedia/kino/files/patch-Makefile.in @@ -0,0 +1,20 @@ +--- Makefile.in.orig Sat Apr 10 16:22:30 2004 ++++ Makefile.in Mon Apr 12 19:45:17 2004 +@@ -146,7 +146,7 @@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ + +-SUBDIRS = po src help scripts linux-hotplug ++SUBDIRS = po src help scripts + MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in + + #ACLOCAL_AMFLAGS = -I m4 +@@ -567,7 +567,7 @@ + @$(NORMAL_INSTALL) + if test -d $(srcdir)/pixmaps; then \ + $(mkinstalldirs) $(DESTDIR)$(datadir)/@PACKAGE@; \ +- for pixmap in $(srcdir)/pixmaps/*.{xpm,jpeg,png}; do \ ++ for pixmap in $(srcdir)/pixmaps/*.xpm $(srcdir)/pixmaps/*.jpeg $(srcdir)/pixmaps/*.png; do \ + if test -f $$pixmap; then \ + $(INSTALL_DATA) $$pixmap $(DESTDIR)$(datadir)/@PACKAGE@/; \ + fi \ diff --git a/multimedia/kino/files/patch-aa b/multimedia/kino/files/patch-aa index d038422df83e..81220783eae8 100644 --- a/multimedia/kino/files/patch-aa +++ b/multimedia/kino/files/patch-aa @@ -1,6 +1,14 @@ ---- configure.orig Mon Dec 15 22:42:05 2003 -+++ configure Sat Apr 10 12:13:08 2004 -@@ -4300,7 +4300,7 @@ +--- configure.orig Sat Apr 10 16:22:32 2004 ++++ configure Sun Apr 11 02:19:54 2004 +@@ -4293,13 +4293,13 @@ + + + +-echo "$as_me:$LINENO: checking for dv_is_normal_speed in -ldv" >&5 +-echo $ECHO_N "checking for dv_is_normal_speed in -ldv... $ECHO_C" >&6 ++echo "$as_me:$LINENO: checking for dv_decoder_new in -ldv" >&5 ++echo $ECHO_N "checking for dv_decoder_new in -ldv... $ECHO_C" >&6 + if test "${ac_cv_lib_dv_dv_is_normal_speed+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -9,7 +17,21 @@ cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" /* confdefs.h. */ -@@ -4630,7 +4630,7 @@ +@@ -4314,11 +4314,11 @@ + #endif + /* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +-char dv_is_normal_speed (); ++char dv_decoder_new (); + int + main () + { +-dv_is_normal_speed (); ++dv_decoder_new() + ; + return 0; + } +@@ -4629,7 +4629,7 @@ else { { echo "$as_me:$LINENO: error: Unable to link with libraw1394. Check that you have libraw1394 installed" >&5 echo "$as_me: error: Unable to link with libraw1394. Check that you have libraw1394 installed" >&2;} @@ -18,7 +40,7 @@ fi -@@ -4640,7 +4640,7 @@ +@@ -4639,7 +4639,7 @@ else { { echo "$as_me:$LINENO: error: raw1394.h not found install libraw1394-devel" >&5 echo "$as_me: error: raw1394.h not found install libraw1394-devel" >&2;} @@ -27,7 +49,7 @@ fi -@@ -4782,7 +4782,7 @@ +@@ -4781,7 +4781,7 @@ else { { echo "$as_me:$LINENO: error: avc1394.h not found, install libavc1394-devel" >&5 echo "$as_me: error: avc1394.h not found, install libavc1394-devel" >&2;} @@ -36,7 +58,7 @@ fi -@@ -4852,7 +4852,7 @@ +@@ -4851,7 +4851,7 @@ else { { echo "$as_me:$LINENO: error: Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer" >&5 echo "$as_me: error: Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer" >&2;} @@ -45,7 +67,7 @@ fi -@@ -4991,7 +4991,7 @@ +@@ -4990,7 +4990,7 @@ else { { echo "$as_me:$LINENO: error: rom1394.h not found, install libavc1394-devel" >&5 echo "$as_me: error: rom1394.h not found, install libavc1394-devel" >&2;} @@ -54,7 +76,7 @@ fi -@@ -5061,7 +5061,7 @@ +@@ -5060,7 +5060,7 @@ else { { echo "$as_me:$LINENO: 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" >&5 echo "$as_me: 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" >&2;} @@ -63,7 +85,7 @@ fi -@@ -5131,7 +5131,7 @@ +@@ -5130,7 +5130,7 @@ { { echo "$as_me:$LINENO: error: You need the pthread library to compile kino" >&5 echo "$as_me: error: You need the pthread library to compile kino" >&2;} diff --git a/multimedia/kino/files/patch-ag b/multimedia/kino/files/patch-ag index e123eb9530d4..48ec77d52698 100644 --- a/multimedia/kino/files/patch-ag +++ b/multimedia/kino/files/patch-ag @@ -1,6 +1,15 @@ ---- src/frame.cc Tue Nov 25 21:51:15 2003 -+++ src/frame.cc Fri Apr 9 16:24:36 2004 -@@ -1400,9 +1400,9 @@ +--- src/frame.cc.orig Sun Mar 28 20:13:54 2004 ++++ src/frame.cc Mon Apr 12 17:56:45 2004 +@@ -728,7 +728,7 @@ + { + bool normal_speed = true; + +-#ifdef HAVE_LIBDV ++#if 0 + /* don't do audio if speed is not 1 */ + return dv_is_normal_speed( decoder ); + #endif +@@ -1459,9 +1459,9 @@ if ( sample < -1.0 ) sample = -1.0; if ( sample >= 0 ) diff --git a/multimedia/kino/files/patch-ai b/multimedia/kino/files/patch-ai index 140a6c30d632..5c26d448f253 100644 --- a/multimedia/kino/files/patch-ai +++ b/multimedia/kino/files/patch-ai @@ -1,5 +1,5 @@ ---- src/ieee1394io.cc Fri Dec 12 22:58:55 2003 -+++ src/ieee1394io.cc Fri Apr 9 16:45:10 2004 +--- src/ieee1394io.cc.orig Sun Mar 28 20:42:44 2004 ++++ src/ieee1394io.cc Sat Apr 10 23:49:25 2004 @@ -61,11 +61,13 @@ #include <sys/mman.h> #include <sys/poll.h> @@ -28,7 +28,7 @@ pthread_mutex_t AVC::avc_mutex; -@@ -281,7 +285,7 @@ +@@ -283,7 +287,7 @@ raw1394Reader::raw1394Reader( int p, int c, int bufSize ) : IEEE1394Reader( c, bufSize ), port( p ) { @@ -37,7 +37,7 @@ cerr << ">>> Using raw1394 capture" << endl; } -@@ -353,28 +357,32 @@ +@@ -362,28 +366,32 @@ { bool success; int numcards; @@ -76,7 +76,7 @@ success = true; } catch ( string exc ) -@@ -393,11 +401,13 @@ +@@ -402,11 +410,13 @@ void raw1394Reader::Close() { @@ -90,7 +90,7 @@ } bool raw1394Reader::StartReceive() -@@ -407,7 +417,7 @@ +@@ -416,7 +426,7 @@ /* Starting iso receive */ try { @@ -99,7 +99,7 @@ success = true; } catch ( string exc ) -@@ -421,8 +431,8 @@ +@@ -430,8 +440,8 @@ void raw1394Reader::StopReceive() { @@ -110,7 +110,7 @@ } -@@ -458,6 +468,7 @@ +@@ -467,6 +477,7 @@ */ @@ -118,7 +118,7 @@ int raw1394Reader::Handler( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ) { -@@ -564,6 +575,7 @@ +@@ -573,6 +584,7 @@ return 0; } @@ -126,7 +126,7 @@ /** The thread responsible for polling the raw1394 interface. -@@ -574,6 +586,7 @@ +@@ -583,6 +595,7 @@ */ void* raw1394Reader::Thread( void* arg ) { @@ -134,7 +134,7 @@ raw1394Reader * theReader = ( raw1394Reader* ) arg; while ( true ) -@@ -581,6 +594,7 @@ +@@ -590,6 +603,7 @@ raw1394_loop_iterate( theReader->handle ); pthread_testcancel(); } @@ -142,7 +142,7 @@ return NULL; } -@@ -666,6 +680,7 @@ +@@ -682,6 +696,7 @@ bool dv1394Reader::Open() { @@ -150,7 +150,7 @@ int n_frames = DV1394_MAX_FRAMES / 4; struct dv1394_init init = { -@@ -699,6 +714,8 @@ +@@ -715,6 +730,8 @@ } return true; @@ -159,7 +159,7 @@ } -@@ -707,6 +724,7 @@ +@@ -723,6 +740,7 @@ */ void dv1394Reader::Close() { @@ -167,7 +167,7 @@ if ( m_dv1394_fd != -1 ) { if ( m_dv1394_map != NULL ) -@@ -715,11 +733,13 @@ +@@ -731,11 +749,13 @@ m_dv1394_map = NULL; m_dv1394_fd = -1; } @@ -181,7 +181,7 @@ /* Starting iso receive */ if ( ioctl( m_dv1394_fd, DV1394_START_RECEIVE, NULL ) ) { -@@ -727,6 +747,8 @@ +@@ -743,6 +763,8 @@ return false; } return true; @@ -190,7 +190,7 @@ } -@@ -735,6 +757,7 @@ +@@ -751,6 +773,7 @@ bool dv1394Reader::Handler( int handle ) { @@ -198,7 +198,7 @@ struct dv1394_status dvst; if ( ioctl( handle, DV1394_WAIT_FRAMES, 1 ) ) -@@ -812,6 +835,8 @@ +@@ -828,6 +851,8 @@ } return true; @@ -207,7 +207,7 @@ } -@@ -843,6 +868,7 @@ +@@ -859,6 +884,7 @@ AVC::AVC( int p ) : port( p ) { @@ -215,7 +215,7 @@ pthread_mutex_init( &avc_mutex, NULL ); avc_handle = NULL; int numcards; -@@ -874,6 +900,7 @@ +@@ -890,6 +916,7 @@ cerr << exc << endl; } return ; @@ -223,7 +223,7 @@ } -@@ -883,6 +910,7 @@ +@@ -899,6 +926,7 @@ AVC::~AVC() { @@ -231,7 +231,7 @@ if ( avc_handle != NULL ) { pthread_mutex_lock( &avc_mutex ); -@@ -890,11 +918,13 @@ +@@ -906,11 +934,13 @@ avc_handle = NULL; pthread_mutex_unlock( &avc_mutex ); } @@ -245,7 +245,7 @@ int AVC::ResetHandler( raw1394handle_t handle, unsigned int generation ) { cerr << "Reset Handler received" << endl; -@@ -902,7 +932,7 @@ +@@ -918,7 +948,7 @@ common->getPageCapture() ->driver_locked = true; return 0; } @@ -254,7 +254,7 @@ /** See if a node_id is still valid and pointing to an AV/C Recorder. -@@ -918,6 +948,7 @@ +@@ -934,6 +964,7 @@ int AVC::isPhyIDValid( int phyID ) { int value = -1; @@ -262,7 +262,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -960,6 +991,7 @@ +@@ -976,6 +1007,7 @@ } } pthread_mutex_unlock( &avc_mutex ); @@ -270,7 +270,7 @@ return value; } -@@ -968,6 +1000,7 @@ +@@ -984,6 +1016,7 @@ */ void AVC::Noop( void ) { @@ -278,7 +278,7 @@ struct pollfd raw1394_poll; raw1394_poll.fd = raw1394_get_fd( avc_handle ); raw1394_poll.events = POLLIN; -@@ -978,11 +1011,13 @@ +@@ -994,11 +1027,13 @@ || ( raw1394_poll.revents & POLLPRI ) ) raw1394_loop_iterate( avc_handle ); } @@ -292,7 +292,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -994,12 +1029,14 @@ +@@ -1010,12 +1045,14 @@ } } pthread_mutex_unlock( &avc_mutex ); @@ -307,7 +307,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1016,12 +1053,14 @@ +@@ -1032,12 +1069,14 @@ }; nanosleep( &t, NULL ); pthread_mutex_unlock( &avc_mutex ); @@ -322,7 +322,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1034,12 +1073,14 @@ +@@ -1050,12 +1089,14 @@ }; nanosleep( &t, NULL ); pthread_mutex_unlock( &avc_mutex ); @@ -337,7 +337,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1047,12 +1088,14 @@ +@@ -1063,12 +1104,14 @@ avc1394_vcr_rewind( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -352,7 +352,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1060,11 +1103,13 @@ +@@ -1076,11 +1119,13 @@ avc1394_vcr_forward( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -366,7 +366,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1072,11 +1117,13 @@ +@@ -1088,11 +1133,13 @@ avc1394_vcr_next( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -380,7 +380,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1084,11 +1131,13 @@ +@@ -1100,11 +1147,13 @@ avc1394_vcr_previous( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -394,7 +394,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1096,11 +1145,13 @@ +@@ -1112,11 +1161,13 @@ avc1394_vcr_next_index( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -408,7 +408,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1108,11 +1159,13 @@ +@@ -1124,11 +1175,13 @@ avc1394_vcr_previous_index( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -422,7 +422,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1120,11 +1173,13 @@ +@@ -1136,11 +1189,13 @@ avc1394_vcr_record( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -436,7 +436,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1132,12 +1187,14 @@ +@@ -1148,12 +1203,14 @@ avc1394_vcr_trick_play( avc_handle, phyID, speed ); } pthread_mutex_unlock( &avc_mutex ); @@ -451,7 +451,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1145,11 +1202,13 @@ +@@ -1161,11 +1218,13 @@ val = avc1394_vcr_status( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -465,7 +465,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1178,10 +1237,13 @@ +@@ -1194,10 +1253,13 @@ } pthread_mutex_unlock( &avc_mutex ); return true; @@ -479,7 +479,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1204,6 +1266,7 @@ +@@ -1220,6 +1282,7 @@ } } pthread_mutex_unlock( &avc_mutex ); @@ -487,65 +487,7 @@ return -1; } -@@ -1213,6 +1276,7 @@ - video1394Writer::video1394Writer( string device, unsigned int channel, unsigned int nBuffers, - unsigned int cip_n, unsigned int cip_d, unsigned int syt_offset ) - { -+#if 0 - m_fd = -1; - m_deviceName = device; - m_channel = channel; -@@ -1271,12 +1335,13 @@ - foo ); - modal_message( buf ); - } -- -+#endif - } - - - video1394Writer::~video1394Writer() - { -+#if 0 - if ( m_fd >= 0 ) - { - w.buffer = ( v.nb_buffers + w.buffer - 1 ) % v.nb_buffers; -@@ -1294,11 +1359,13 @@ - - close( m_fd ); - } -+#endif - } - - - int video1394Writer::FillBuffer( unsigned char *data, unsigned char* targetbuf, unsigned long targetbufsize, unsigned int * packet_sizes, int video_packets_per_frame, int min_out_packet_size ) - { -+#if 0 - unsigned long frame_size = video_packets_per_frame * 480; - unsigned long vdata = 0; - unsigned long i; -@@ -1354,12 +1421,14 @@ - - *packet_sizes++ = 0; - -+#endif - return 1; - } - - - void video1394Writer::SendFrame( Frame &frame ) - { -+#if 0 - bool have_PAL = frame.IsPAL(); - - while ( unused_buffers-- ) -@@ -1386,11 +1455,13 @@ - perror( "1. VIDEO1394_TALK_WAIT_BUFFER" ); - } - unused_buffers = 1; -+#endif - } - +@@ -1227,6 +1290,7 @@ dv1394Writer::dv1394Writer( string device, unsigned int channel, unsigned int nBuffers, unsigned int cip_n, unsigned int cip_d, unsigned int syt_offset ) : isInitialised( false ) { @@ -553,7 +495,7 @@ m_fd = -1; m_deviceName = device; m_channel = channel; -@@ -1400,6 +1471,7 @@ +@@ -1236,6 +1300,7 @@ m_syt_offset = syt_offset; m_fd = open( m_deviceName.c_str(), O_RDWR ); @@ -561,7 +503,7 @@ } -@@ -1415,6 +1487,7 @@ +@@ -1251,6 +1316,7 @@ void dv1394Writer::SendFrame( Frame &frame ) { @@ -569,7 +511,7 @@ bool isPAL = frame.IsPAL(); if ( !isInitialised ) -@@ -1439,4 +1512,5 @@ +@@ -1275,4 +1341,5 @@ } write( m_fd, frame.data, ( isPAL ? DV1394_PAL_FRAME_SIZE : DV1394_NTSC_FRAME_SIZE ) ); diff --git a/multimedia/kino/files/patch-aj b/multimedia/kino/files/patch-aj index 645d0cf1172b..72db38a1909c 100644 --- a/multimedia/kino/files/patch-aj +++ b/multimedia/kino/files/patch-aj @@ -1,18 +1,20 @@ ---- src/ieee1394io.h Tue Nov 25 20:51:15 2003 -+++ src/ieee1394io.h Sat Apr 10 12:19:14 2004 -@@ -20,8 +20,9 @@ +--- src/ieee1394io.h.orig Sun Mar 28 20:42:50 2004 ++++ src/ieee1394io.h Tue Apr 13 11:14:32 2004 +@@ -20,10 +20,13 @@ #ifndef _IEEE1394IO_H #define _IEEE1394IO_H 1 --#include <libraw1394/raw1394.h> --#include <libraw1394/csr.h> -+#include <pthread.h> -+//#include <libraw1394/raw1394.h> -+//#include <libraw1394/csr.h> - #include <libdv/dv1394.h> ++#if 0 + #include <libraw1394/raw1394.h> + #include <libraw1394/csr.h> ++#endif + #include "dv1394.h" ++#include <pthread.h> #include <string> -@@ -104,7 +105,7 @@ + using std::string; + #include <deque> +@@ -115,7 +118,7 @@ int port; /// the handle to the ieee1394 subsystem @@ -21,7 +23,7 @@ public: -@@ -119,7 +120,7 @@ +@@ -130,7 +133,7 @@ void StopThread( void ); private: @@ -30,7 +32,7 @@ static void* Thread( void *arg ); }; -@@ -160,7 +161,7 @@ +@@ -171,7 +174,7 @@ static pthread_mutex_t avc_mutex; /// the handle to the ieee1394 subsystem @@ -39,7 +41,7 @@ public: AVC( int crd = 0 ); -@@ -184,7 +185,7 @@ +@@ -195,7 +198,7 @@ int getNodeId( const char *guid ); private: diff --git a/multimedia/kino/files/patch-am b/multimedia/kino/files/patch-am index 3d06eac8f67f..c86ba098a72e 100644 --- a/multimedia/kino/files/patch-am +++ b/multimedia/kino/files/patch-am @@ -1,5 +1,5 @@ ---- src/jogshuttle.cc Wed Nov 26 00:01:01 2003 -+++ src/jogshuttle.cc Fri Apr 9 16:49:31 2004 +--- 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 @@ #include <fcntl.h> #include <unistd.h> @@ -9,18 +9,22 @@ #include "jogshuttle.h" #include "preferences.h" -@@ -316,6 +316,7 @@ +@@ -343,9 +343,10 @@ */ 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 ); -@@ -625,5 +626,6 @@ - } - return ; +- // 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 @@ + { + return; + } +#endif - #endif } diff --git a/multimedia/kino/files/patch-an b/multimedia/kino/files/patch-an index e4ba321807b7..55c5b0a9c3d4 100644 --- a/multimedia/kino/files/patch-an +++ b/multimedia/kino/files/patch-an @@ -1,6 +1,6 @@ ---- src/page_capture.cc Mon Dec 15 06:31:21 2003 -+++ src/page_capture.cc Fri Apr 9 16:51:50 2004 -@@ -288,6 +288,7 @@ +--- src/page_capture.cc.orig Thu Apr 1 23:50:01 2004 ++++ src/page_capture.cc Sun Apr 11 00:35:15 2004 +@@ -295,6 +295,7 @@ } gui_state_was = 0; } @@ -8,7 +8,7 @@ else if ( check_phyid == true ) { if ( gui_state_was != 1 ) -@@ -432,6 +433,7 @@ +@@ -438,6 +439,7 @@ gui_state_was = 3; } } diff --git a/multimedia/kino/files/patch-as b/multimedia/kino/files/patch-as index 969224d72a73..a58ec74cd245 100644 --- a/multimedia/kino/files/patch-as +++ b/multimedia/kino/files/patch-as @@ -1,5 +1,5 @@ ---- src/preferences_dialog.cc Sun Dec 14 02:12:48 2003 -+++ src/preferences_dialog.cc Fri Apr 9 16:21:25 2004 +--- src/preferences_dialog.cc.orig Tue Mar 30 06:35:13 2004 ++++ src/preferences_dialog.cc Sun Apr 11 02:45:04 2004 @@ -32,8 +32,10 @@ #include "support.h" #include "commands.h" @@ -11,7 +11,7 @@ /* Declare callbacks for the jogshuttle handling */ static void -@@ -62,9 +64,13 @@ +@@ -65,9 +67,13 @@ GtkWidget* glade_menuitem; GtkWidget* widget; int currentNode, itemCount = 0, currentItem = 0; @@ -23,9 +23,9 @@ static raw1394handle_t handle; +#endif - /* initialize temp variables, only use temp if Okay clicked and not cancel */ - gPrefsSelectedFileFormat = prefs.fileFormat; -@@ -271,6 +277,7 @@ + media_ctrl_key *mkeys; + +@@ -321,6 +327,7 @@ widget = lookup_widget( dialog, "optionmenu_avc_phyid" ); @@ -33,15 +33,15 @@ #ifdef LIBRAW1394_OLD if ( ( handle = raw1394_get_handle() ) ) -@@ -339,6 +346,7 @@ +@@ -383,6 +390,7 @@ + handle = NULL; } } - else +#endif - { - gtk_widget_set_sensitive( lookup_widget( dialog, "vbox_ieee1394_options" ), FALSE ); - modal_message( _( "The IEEE 1394 subsystem is not loaded; all IEEE 1394 options are disabled." ) ); -@@ -383,6 +391,7 @@ + + gtk_option_menu_set_menu ( GTK_OPTION_MENU ( widget ), glade_menu ); + gtk_option_menu_set_history( GTK_OPTION_MENU( widget ), currentItem ); +@@ -421,6 +429,7 @@ on_avc_phyid_activate( GtkMenuItem * menu_item, gpointer user_data ) { int currentNode = ( int ) user_data; @@ -49,7 +49,7 @@ static raw1394handle_t handle; #ifdef LIBRAW1394_OLD -@@ -401,6 +410,7 @@ +@@ -439,6 +448,7 @@ } raw1394_destroy_handle( handle ); handle = NULL; diff --git a/multimedia/kino/files/patch-au b/multimedia/kino/files/patch-au index 7f2c13c0817b..ed36b858a10b 100644 --- a/multimedia/kino/files/patch-au +++ b/multimedia/kino/files/patch-au @@ -1,7 +1,7 @@ ---- src/storyboard.cc Sat Dec 6 05:26:03 2003 -+++ src/storyboard.cc Fri Apr 9 17:45:51 2004 -@@ -28,6 +28,7 @@ - using std::vector; +--- src/storyboard.cc.orig Fri Apr 2 22:10:11 2004 ++++ src/storyboard.cc Sun Apr 11 00:35:26 2004 +@@ -26,6 +26,7 @@ + #include <string> #include <pthread.h> +#include <libgen.h> diff --git a/multimedia/kino/files/patch-av b/multimedia/kino/files/patch-av index 16ddbc2809cc..b0f6e8ef48f3 100644 --- a/multimedia/kino/files/patch-av +++ b/multimedia/kino/files/patch-av @@ -1,6 +1,6 @@ ---- src/v4l.cc Mon Dec 15 06:08:35 2003 -+++ src/v4l.cc Fri Apr 9 17:43:25 2004 -@@ -56,7 +56,7 @@ +--- src/v4l.cc.orig Mon Mar 15 21:25:09 2004 ++++ src/v4l.cc Sun Apr 11 00:35:28 2004 +@@ -71,7 +71,7 @@ V4LCapability::V4LCapability( V4LDevice *device ) { @@ -9,7 +9,7 @@ } V4LCapability::~V4LCapability() -@@ -66,82 +66,98 @@ +@@ -81,82 +81,98 @@ void *V4LCapability::getStruct() { @@ -124,7 +124,7 @@ } void V4LCapability::report() -@@ -173,13 +189,14 @@ +@@ -188,13 +204,14 @@ V4LTuner::V4LTuner( V4LDevice *device, int index ) { this->device = device; @@ -142,7 +142,7 @@ } void V4LTuner::report() -@@ -187,61 +204,68 @@ +@@ -202,61 +219,68 @@ int V4LTuner::getRangeLow() { @@ -222,7 +222,7 @@ } V4LChannel::~V4LChannel() -@@ -251,12 +275,14 @@ +@@ -266,12 +290,14 @@ void *V4LChannel::getStruct() { @@ -239,7 +239,7 @@ } bool V4LChannel::setTuner( unsigned int index ) -@@ -267,7 +293,8 @@ +@@ -282,7 +308,8 @@ // FIXME: Hardcoded tuner settings current->setRangeLow( 0 ); current->setRangeHigh( 0xffff ); @@ -249,7 +249,7 @@ } else { -@@ -277,7 +304,8 @@ +@@ -292,7 +319,8 @@ unsigned int V4LChannel::getNumberOfTuners() { @@ -259,7 +259,7 @@ } V4LTuner *V4LChannel::getTuner( unsigned int index ) -@@ -294,12 +322,13 @@ +@@ -309,12 +337,13 @@ int V4LChannel::getSignal() { @@ -274,7 +274,7 @@ cout << ">>>> Channel # " << channel.channel << endl; cout << ">>>> Name : " << this->getName() << endl; cout << ">>>> Tuners : " << this->getNumberOfTuners() << endl; -@@ -313,6 +342,7 @@ +@@ -328,6 +357,7 @@ cout << " TV" << endl; if ( channel.type & VIDEO_TYPE_CAMERA ) cout << " Camera" << endl; @@ -282,7 +282,7 @@ } /** Constructor for the V4L class. -@@ -416,7 +446,8 @@ +@@ -431,7 +461,8 @@ if ( channel >= 0 && channel < channels.size() ) { current = channels[ channel ]; @@ -292,7 +292,7 @@ } else { -@@ -538,6 +569,7 @@ +@@ -553,6 +584,7 @@ void V4L::startAudio() { @@ -300,7 +300,7 @@ struct video_audio audio; ioctl( fd, VIDIOCGAUDIO, &audio ); if ( audio.flags & VIDEO_AUDIO_MUTE ) -@@ -545,6 +577,7 @@ +@@ -560,6 +592,7 @@ cout << "Volume : " << audio.volume << endl; audio.volume = 65535; ioctl( fd, VIDIOCSAUDIO, &audio ); @@ -308,7 +308,7 @@ } /** Turn off audio. -@@ -552,16 +585,19 @@ +@@ -567,16 +600,19 @@ void V4L::stopAudio() { @@ -328,7 +328,7 @@ static video_mbuf buf; if ( init == true ) { -@@ -571,6 +607,8 @@ +@@ -586,6 +622,8 @@ frame_maps = buf.frames; } return buf.size; @@ -337,7 +337,7 @@ } /** Initialise capture. -@@ -581,6 +619,7 @@ +@@ -596,6 +634,7 @@ bool V4L::initialiseCapture( int format ) { @@ -345,7 +345,7 @@ size = width * height * 4; map = mmap( 0, mappedMemorySize( true ), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 ); -@@ -610,6 +649,8 @@ +@@ -625,6 +664,8 @@ { return false; } @@ -354,7 +354,7 @@ } /** Get the next frame. -@@ -620,6 +661,7 @@ +@@ -635,6 +676,7 @@ void *V4L::getNextFrame() { unsigned char * ret = NULL; @@ -362,7 +362,7 @@ int current = frame_next; frame_next = ( frame_next + 1 ) % frame_maps; -@@ -632,6 +674,7 @@ +@@ -647,6 +689,7 @@ frames ++; @@ -370,7 +370,7 @@ return ( void * ) ret; } -@@ -640,6 +683,7 @@ +@@ -655,6 +698,7 @@ void V4L::stopCapture() { @@ -378,7 +378,7 @@ if ( map != NULL ) { struct timeval tv; -@@ -652,6 +696,7 @@ +@@ -667,6 +711,7 @@ int enable = 0; ioctl( getHandle(), VIDIOCCAPTURE, &enable ); } @@ -386,7 +386,7 @@ } /** Get the current frequency of the tuner. -@@ -661,9 +706,12 @@ +@@ -676,9 +721,12 @@ int V4L::getFrequency() { @@ -399,7 +399,7 @@ } /** Set the current frequency of the tuner. -@@ -675,7 +723,8 @@ +@@ -690,7 +738,8 @@ bool V4L::setFrequency( int frequency ) { unsigned long val = ( unsigned long ) frequency & 0xffff; @@ -409,7 +409,7 @@ } /** Get the signal of the current tuned in frequency. -@@ -983,12 +1032,12 @@ +@@ -998,12 +1047,12 @@ void GDKV4L::draw() { @@ -423,7 +423,7 @@ switch ( displayer->format() ) { case DISPLAY_YUV: -@@ -1006,6 +1055,7 @@ +@@ -1021,6 +1070,7 @@ default: break; } @@ -431,7 +431,7 @@ gdk_threads_leave(); } -@@ -1031,6 +1081,7 @@ +@@ -1046,6 +1096,7 @@ gdk_threads_enter(); displayer = FindDisplayer::getDisplayer( widget, getWidth(), getHeight() ); @@ -439,7 +439,7 @@ if ( ENCODE_YUV ) { input = DISPLAY_YUV; // Fake - YUV422P isn't supported by Displayer -@@ -1041,6 +1092,7 @@ +@@ -1056,6 +1107,7 @@ input = DISPLAY_RGB; // Fake - YUV420P isn't supported by Displayer initialiseCapture( VIDEO_PALETTE_YUV420P ); } diff --git a/multimedia/kino/files/patch-aw b/multimedia/kino/files/patch-aw index b35f8478e1b8..ab2e7bc7614d 100644 --- a/multimedia/kino/files/patch-aw +++ b/multimedia/kino/files/patch-aw @@ -1,5 +1,5 @@ ---- src/v4l.h Mon Dec 15 05:08:35 2003 -+++ src/v4l.h Sat Apr 10 12:19:48 2004 +--- src/v4l.h.orig Tue Jan 20 02:22:02 2004 ++++ src/v4l.h Sun Apr 11 02:54:30 2004 @@ -28,6 +28,7 @@ #include <string> @@ -8,16 +8,16 @@ #include <unistd.h> #include <sys/mman.h> #include <sys/types.h> -@@ -37,7 +38,7 @@ - #include <time.h> - #include <sys/time.h> +@@ -39,7 +40,7 @@ + #define _DEVICE_H_ + #define _LINUX_TIME_H -#include <linux/videodev.h> +//#include <linux/videodev.h> #include "displayer.h" -@@ -67,7 +68,7 @@ +@@ -69,7 +70,7 @@ class V4LCapability : public V4LStruct { private: @@ -26,7 +26,7 @@ public: V4LCapability( V4LDevice *device ); -@@ -95,7 +96,7 @@ +@@ -97,7 +98,7 @@ { private: V4LDevice *device; @@ -35,7 +35,7 @@ public: V4LTuner( V4LDevice *device, int index ); -@@ -116,7 +117,7 @@ +@@ -118,7 +119,7 @@ { private: V4LDevice *device; @@ -44,7 +44,7 @@ vector <V4LTuner *> tuners; V4LTuner *current; -@@ -145,7 +146,7 @@ +@@ -147,7 +148,7 @@ int width; int height; void *map; diff --git a/multimedia/kino/files/patch-ay b/multimedia/kino/files/patch-ay deleted file mode 100644 index 34e4fad9eb59..000000000000 --- a/multimedia/kino/files/patch-ay +++ /dev/null @@ -1,10 +0,0 @@ ---- src/audio_transitions.h Mon Dec 15 05:08:34 2003 -+++ src/audio_transitions.h Sat Apr 10 12:17:24 2004 -@@ -27,7 +27,6 @@ - - // C Includes - --#include <stdint.h> - #include <gnome.h> - - /** Public interface for all audio transition classes. diff --git a/multimedia/kino/files/patch-az b/multimedia/kino/files/patch-az index 339b7b378f04..a94e154adde0 100644 --- a/multimedia/kino/files/patch-az +++ b/multimedia/kino/files/patch-az @@ -1,11 +1,11 @@ ---- src/filehandler.h Tue Nov 25 20:51:14 2003 -+++ src/filehandler.h Sat Apr 10 12:14:37 2004 -@@ -33,7 +33,7 @@ - #include "riff.h" - #include "avi.h" - #include <sys/types.h> --#include <stdint.h> -+//#include <stdint.h> - - enum FileCaptureMode { - CAPTURE_IGNORE, +--- src/filehandler.cc.orig Tue Mar 30 06:41:06 2004 ++++ src/filehandler.cc Sun Apr 11 02:47:44 2004 +@@ -243,7 +243,7 @@ + struct timeval tv; + struct timezone tz; + gettimeofday( &tv, &tz ); +- localtime_r( &tv.tv_sec, &date ); ++ localtime_r( (const time_t *)&tv.tv_sec, &date ); + } + sb << setfill( '0' ) + << setw( 4 ) << date.tm_year + 1900 << '.' diff --git a/multimedia/kino/files/patch-bc b/multimedia/kino/files/patch-bc deleted file mode 100644 index 046a93443d52..000000000000 --- a/multimedia/kino/files/patch-bc +++ /dev/null @@ -1,10 +0,0 @@ ---- src/image_filters.h Mon Dec 15 05:08:34 2003 -+++ src/image_filters.h Sat Apr 10 12:17:12 2004 -@@ -27,7 +27,6 @@ - - // C Includes - --#include <stdint.h> - #include <gnome.h> - - /** Dummy interface for non-image encoding filters (only ImageFilterKeep should implement diff --git a/multimedia/kino/files/patch-bd b/multimedia/kino/files/patch-bd deleted file mode 100644 index d34eb3e34df1..000000000000 --- a/multimedia/kino/files/patch-bd +++ /dev/null @@ -1,10 +0,0 @@ ---- src/image_transitions.h Mon Dec 15 05:08:34 2003 -+++ src/image_transitions.h Sat Apr 10 12:17:47 2004 -@@ -27,7 +27,6 @@ - - // C Includes - --#include <stdint.h> - #include <gnome.h> - - /** Public interface for all image transition classes. diff --git a/multimedia/kino/files/patch-help::Makefile.in b/multimedia/kino/files/patch-help::Makefile.in new file mode 100644 index 000000000000..81bebb8ec45a --- /dev/null +++ b/multimedia/kino/files/patch-help::Makefile.in @@ -0,0 +1,11 @@ +--- help/Makefile.in.orig Sat Apr 10 16:22:30 2004 ++++ help/Makefile.in Mon Apr 12 18:58:24 2004 +@@ -305,7 +305,7 @@ + install-data-local: + $(mkinstalldirs) $(DESTDIR)$(kino_helpdir); \ + $(mkinstalldirs) $(DESTDIR)$(kino_helpdir); \ +- for file in *.{html,png}; do \ ++ for file in *.html *.png; do \ + if test -f $$file; then \ + $(INSTALL_DATA) $$file $(DESTDIR)$(kino_helpdir); \ + fi \ diff --git a/multimedia/kino/files/patch-scripts::exports::ffmpeg_dvd.sh b/multimedia/kino/files/patch-scripts::exports::ffmpeg_dvd.sh new file mode 100644 index 000000000000..2e8a1a648b10 --- /dev/null +++ b/multimedia/kino/files/patch-scripts::exports::ffmpeg_dvd.sh @@ -0,0 +1,19 @@ +--- scripts/exports/ffmpeg_dvd.sh.orig Tue Apr 6 06:24:33 2004 ++++ scripts/exports/ffmpeg_dvd.sh Sun Apr 11 02:58:11 2004 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-function usage ++usage() + { + # Title + echo "Title: FFMPEG DVD-Video Export" +@@ -22,7 +22,7 @@ + fi + } + +-function execute ++execute() + { + # Arguments + normalisation="$1" diff --git a/multimedia/kino/files/patch-scripts::help.sh b/multimedia/kino/files/patch-scripts::help.sh new file mode 100644 index 000000000000..fac47d697d4c --- /dev/null +++ b/multimedia/kino/files/patch-scripts::help.sh @@ -0,0 +1,10 @@ +--- scripts/help.sh.orig Tue Apr 6 04:24:06 2004 ++++ scripts/help.sh Mon Apr 12 18:17:30 2004 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-GNOME_BROWSER=`gconftool --get /desktop/gnome/applications/browser/exec` ++GNOME_BROWSER=`gconftool-2 --get /desktop/gnome/applications/browser/exec` + which konqueror &> /dev/null + [ $? = 0 ] && KONQUEROR=konqueror + which mozilla &> /dev/null diff --git a/multimedia/kino/files/patch-src::audio_transitions.h b/multimedia/kino/files/patch-src::audio_transitions.h new file mode 100644 index 000000000000..d3cac8d18eef --- /dev/null +++ b/multimedia/kino/files/patch-src::audio_transitions.h @@ -0,0 +1,12 @@ +--- src/audio_transitions.h.orig Mon Dec 22 06:43:05 2003 ++++ src/audio_transitions.h Tue Apr 13 11:22:03 2004 +@@ -27,7 +27,8 @@ + + // C Includes + +-#include <stdint.h> ++//#include <stdint.h> ++#include <sys/types.h> + #include <gtk/gtk.h> + + /** Public interface for all audio transition classes. diff --git a/multimedia/kino/files/patch-src::filehandler.h b/multimedia/kino/files/patch-src::filehandler.h new file mode 100644 index 000000000000..9a97bce4f338 --- /dev/null +++ b/multimedia/kino/files/patch-src::filehandler.h @@ -0,0 +1,10 @@ +--- src/filehandler.h.orig Thu Feb 19 06:27:37 2004 ++++ src/filehandler.h Tue Apr 13 11:05:50 2004 +@@ -33,7 +33,6 @@ + #include "riff.h" + #include "avi.h" + #include <sys/types.h> +-#include <stdint.h> + + enum FileCaptureMode { + CAPTURE_IGNORE, diff --git a/multimedia/kino/files/patch-src::image_filters.h b/multimedia/kino/files/patch-src::image_filters.h new file mode 100644 index 000000000000..9478104732fc --- /dev/null +++ b/multimedia/kino/files/patch-src::image_filters.h @@ -0,0 +1,12 @@ +--- src/image_filters.h.orig Tue Apr 13 11:11:19 2004 ++++ src/image_filters.h Tue Apr 13 11:18:54 2004 +@@ -27,7 +27,8 @@ + + // C Includes + +-#include <stdint.h> ++//#include <stdint.h> ++#include <sys/types.h> + #include <gtk/gtk.h> + + /** Dummy interface for non-image encoding filters (only ImageFilterKeep should implement diff --git a/multimedia/kino/files/patch-src::image_transitions.h b/multimedia/kino/files/patch-src::image_transitions.h new file mode 100644 index 000000000000..0e04deab320b --- /dev/null +++ b/multimedia/kino/files/patch-src::image_transitions.h @@ -0,0 +1,12 @@ +--- src/image_transitions.h.orig Mon Dec 22 06:42:29 2003 ++++ src/image_transitions.h Tue Apr 13 11:20:19 2004 +@@ -27,7 +27,8 @@ + + // C Includes + +-#include <stdint.h> ++//#include <stdint.h> ++#include <sys/types.h> + #include <gtk/gtk.h> + + /** Public interface for all image transition classes. diff --git a/multimedia/kino/files/patch-src::kino_common.cc b/multimedia/kino/files/patch-src::kino_common.cc new file mode 100644 index 000000000000..6454a81a71c2 --- /dev/null +++ b/multimedia/kino/files/patch-src::kino_common.cc @@ -0,0 +1,20 @@ +--- src/kino_common.cc.orig Tue Apr 6 15:28:50 2004 ++++ src/kino_common.cc Tue Apr 13 18:48:18 2004 +@@ -1080,7 +1080,8 @@ + Frame *frame = GetFramePool()->GetFrame(); + if ( frame != NULL ) + { +- unsigned char pixels[ FRAME_MAX_WIDTH * FRAME_MAX_HEIGHT * 4 ]; ++ unsigned char *pixels; ++ pixels = (unsigned char *)malloc(FRAME_MAX_WIDTH * FRAME_MAX_HEIGHT * 4); + GError *gerror = NULL; + this->getPlayList()->GetFrame( this->g_currentFrame, *frame ); + +@@ -1115,6 +1116,7 @@ + g_error_free( gerror ); + } + g_object_unref( im ); ++ free(pixels); + GetFramePool()->DoneWithFrame( frame ); + } + } diff --git a/multimedia/kino/files/patch-src::mediactrl.c b/multimedia/kino/files/patch-src::mediactrl.c new file mode 100644 index 000000000000..a5cdc532a1a7 --- /dev/null +++ b/multimedia/kino/files/patch-src::mediactrl.c @@ -0,0 +1,76 @@ +--- src/mediactrl.c.orig Mon Mar 15 23:21:57 2004 ++++ src/mediactrl.c Tue Apr 13 11:10:03 2004 +@@ -18,14 +18,14 @@ + #include <sys/ioctl.h> + #include <sys/types.h> + #include <sys/stat.h> +-#include <asm/types.h> ++//#include <asm/types.h> + #include <fcntl.h> + #include <unistd.h> +-#include <stdint.h> ++//#include <stdint.h> + #include <string.h> + #include <errno.h> + +-#include <linux/input.h> ++//#include <linux/input.h> + #include "mediactrl.h" + + +@@ -119,6 +119,7 @@ + + void translate_contour_hid_event(struct media_ctrl *ctrl, struct input_event *ev, struct media_ctrl_event *me) + { ++#if 0 + + int lv, cv; + +@@ -176,10 +177,12 @@ + + } + ++#endif + } + + void translate_compliant(struct media_ctrl *ctrl, struct input_event *ev, struct media_ctrl_event *me) + { ++#if 0 + me->type = 0; + + // printf("Translate %02x %02x\n", ev->type, ev->code ); +@@ -220,6 +223,7 @@ + //printf("Key: %04x %02x: %s\n", ev->code, ev->value, key->name); + + } ++#endif + } + + struct media_ctrl_device supported_devices[] = { +@@ -264,8 +268,9 @@ + + if ( me->type == MEDIA_CTRL_EVENT_JOG ) { + struct timeval timev; ++ unsigned long now; + gettimeofday(&timev, NULL); +- unsigned long now = (unsigned long)timev.tv_usec + (1000000*(unsigned long)timev.tv_sec); ++ now = (unsigned long)timev.tv_usec + (1000000*(unsigned long)timev.tv_sec); + if ( now < ctrl->last_jog_time + 40000 ) { + //printf("*** Fast Jog %02d %05d ***\n", me->value, now - ctrl->last_jog_time); + ctrl->jogrel = me->value; +@@ -285,6 +290,7 @@ + + int probe_device(struct media_ctrl *mc) + { ++#if 0 + short devinfo[4]; + int i = 0; + +@@ -312,6 +318,7 @@ + + } while ( supported_devices[++i].vendor != 0 ); + ++#endif + return 0; + } + diff --git a/multimedia/kino/files/patch-src::mediactrl.h b/multimedia/kino/files/patch-src::mediactrl.h new file mode 100644 index 000000000000..0b24c41c53a8 --- /dev/null +++ b/multimedia/kino/files/patch-src::mediactrl.h @@ -0,0 +1,11 @@ +--- src/mediactrl.h.orig Mon Mar 15 21:25:09 2004 ++++ src/mediactrl.h Sun Apr 11 02:52:17 2004 +@@ -153,6 +153,8 @@ + + }; + ++struct input_event { ++}; + + struct media_ctrl_device { + int vendor; diff --git a/multimedia/kino/files/patch-src::smiltime.cc b/multimedia/kino/files/patch-src::smiltime.cc new file mode 100644 index 000000000000..dc0d2b14ec4e --- /dev/null +++ b/multimedia/kino/files/patch-src::smiltime.cc @@ -0,0 +1,35 @@ +--- src/smiltime.cc.orig Wed Apr 7 05:13:27 2004 ++++ src/smiltime.cc Tue Apr 13 11:25:32 2004 +@@ -28,6 +28,7 @@ + #include <iomanip> + #include <sstream> + ++#include <stdio.h> + #include <stdlib.h> + #include <math.h> + +@@ -333,13 +334,13 @@ + case TIME_FORMAT_MIN: + str << ( ms / 60000 ) << "." << + std::setfill( '0' ) << std::setw( 4 ) << +- round( ( float )( ms % 60000 ) / 6 ) << "min"; ++ floor( ( float )( ms % 60000 ) / 6 + .5) << "min"; + break; + + case TIME_FORMAT_H: + str << ( ms / 3600000 ) << "." << + std::setfill( '0' ) << std::setw( 5 ) << +- round( ( float )( ms % 3600000 ) / 36 ) << "h"; ++ floor( ( float )( ms % 3600000 ) / 36 + .5) << "h"; + break; + + default: +@@ -507,7 +508,7 @@ + mm << ":" << std::setfill( '0' ) << std::setw( 2 ) << ss << + ( m_framerate == 25.0 ? ":" : ";" ) << + std::setfill( '0' ) << std::setw( 2 ) << +- round( m_framerate * ms / 1000.0 ); ++ floor( m_framerate * ms / 1000.0 + .5); + if ( m_subframe == SMIL_SUBFRAME_0 ) + str << ".0"; + else if ( m_subframe == SMIL_SUBFRAME_1 ) diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist index a2d7298af08f..b5bcdffdbe52 100644 --- a/multimedia/kino/pkg-plist +++ b/multimedia/kino/pkg-plist @@ -1,21 +1,12 @@ bin/kino -include/kino/image_create.h -include/kino/image_filters.h -include/kino/image_transitions.h include/kino/audio_filters.h include/kino/audio_transitions.h -include/kino/playlist.h include/kino/frame.h +include/kino/image_create.h +include/kino/image_filters.h +include/kino/image_transitions.h include/kino/kino_extra.h -share/gnome/help/kino/C/commands.html -share/gnome/help/kino/C/fx.html -share/gnome/help/kino/C/index.html -share/gnome/help/kino/C/intro.html -share/gnome/help/kino/C/kino_ui.png -share/gnome/help/kino/C/prefs.html -share/gnome/help/kino/C/terms.html -share/gnome/help/kino/C/topic.dat -share/gnome/help/kino/C/ui.html +include/kino/playlist.h share/kino/editor_fast.xpm share/kino/editor_fast_i.xpm share/kino/editor_movie.xpm @@ -29,20 +20,47 @@ share/kino/editor_scene_i.xpm share/kino/editor_step.xpm share/kino/editor_step_i.xpm share/kino/editor_stop.xpm +share/kino/film.png share/kino/film.xpm share/kino/film_on.xpm +share/kino/join.xpm share/kino/kino.glade +share/kino/kino.jpeg share/kino/link.xpm +share/kino/link_off.xpm share/kino/magick.glade share/kino/photo-camera.xpm share/kino/play_record.xpm +share/kino/publish_project.png +share/kino/publish_still.png +share/kino/split.xpm +share/kino/trim_in.xpm +share/kino/trim_out.xpm +share/kino/help/commands.html +share/kino/help/edit.html +share/kino/help/export.html +share/kino/help/fx.html +share/kino/help/index.html +share/kino/help/intro.html +share/kino/help/kino_ui.png +share/kino/help/prefs.html +share/kino/help/publish.html +share/kino/help/terms.html +share/kino/help/time.html +share/kino/help/trim.html +share/kino/help/ui.html +share/kino/scripts/help.sh +share/kino/scripts/exports/extract_chapters share/kino/scripts/exports/ffmpeg_divx.sh +share/kino/scripts/exports/ffmpeg_dvd.sh share/kino/scripts/exports/ffmpeg_mp3.sh share/kino/scripts/exports/ffmpeg_vcd.sh share/kino/scripts/exports/rawplay.sh -@dirrm share/gnome/help/kino/C -@dirrm share/gnome/help/kino +share/kino/scripts/publish/frame.sh +share/kino/scripts/publish/project.sh +@dirrm include/kino +@dirrm share/kino/help @dirrm share/kino/scripts/exports +@dirrm share/kino/scripts/publish @dirrm share/kino/scripts @dirrm share/kino -@dirrm include/kino |