From f3599b1e52e3d95bf9c69930949443a1e3b1bf1a Mon Sep 17 00:00:00 2001 From: Pierre Beyssac Date: Sat, 10 Apr 2004 16:49:19 +0000 Subject: Kino 0.7.0. Kino is an IEEE 1394 DV non-linear video editor. Note: IEEE 1394 and V4L are disabled in this port. --- multimedia/kino/Makefile | 33 +++ multimedia/kino/distinfo | 2 + multimedia/kino/files/patch-aa | 74 ++++++ multimedia/kino/files/patch-ab | 19 ++ multimedia/kino/files/patch-ac | 19 ++ multimedia/kino/files/patch-ad | 19 ++ multimedia/kino/files/patch-ae | 19 ++ multimedia/kino/files/patch-af | 10 + multimedia/kino/files/patch-ag | 14 + multimedia/kino/files/patch-ah | 11 + multimedia/kino/files/patch-ai | 577 +++++++++++++++++++++++++++++++++++++++++ multimedia/kino/files/patch-aj | 50 ++++ multimedia/kino/files/patch-ak | 10 + multimedia/kino/files/patch-al | 10 + multimedia/kino/files/patch-am | 26 ++ multimedia/kino/files/patch-an | 18 ++ multimedia/kino/files/patch-ao | 16 ++ multimedia/kino/files/patch-ap | 19 ++ multimedia/kino/files/patch-aq | 11 + multimedia/kino/files/patch-ar | 11 + multimedia/kino/files/patch-as | 59 +++++ multimedia/kino/files/patch-at | 11 + multimedia/kino/files/patch-au | 10 + multimedia/kino/files/patch-av | 449 ++++++++++++++++++++++++++++++++ multimedia/kino/files/patch-aw | 55 ++++ multimedia/kino/files/patch-ax | 10 + multimedia/kino/files/patch-ay | 10 + multimedia/kino/files/patch-az | 11 + multimedia/kino/files/patch-bb | 10 + multimedia/kino/files/patch-bc | 10 + multimedia/kino/files/patch-bd | 10 + multimedia/kino/files/patch-be | 10 + multimedia/kino/files/patch-bf | 11 + multimedia/kino/files/patch-bg | 11 + multimedia/kino/files/patch-bh | 10 + multimedia/kino/pkg-descr | 6 + multimedia/kino/pkg-plist | 48 ++++ 37 files changed, 1709 insertions(+) create mode 100644 multimedia/kino/Makefile create mode 100644 multimedia/kino/distinfo create mode 100644 multimedia/kino/files/patch-aa create mode 100644 multimedia/kino/files/patch-ab create mode 100644 multimedia/kino/files/patch-ac create mode 100644 multimedia/kino/files/patch-ad create mode 100644 multimedia/kino/files/patch-ae create mode 100644 multimedia/kino/files/patch-af create mode 100644 multimedia/kino/files/patch-ag create mode 100644 multimedia/kino/files/patch-ah create mode 100644 multimedia/kino/files/patch-ai create mode 100644 multimedia/kino/files/patch-aj create mode 100644 multimedia/kino/files/patch-ak create mode 100644 multimedia/kino/files/patch-al create mode 100644 multimedia/kino/files/patch-am create mode 100644 multimedia/kino/files/patch-an create mode 100644 multimedia/kino/files/patch-ao create mode 100644 multimedia/kino/files/patch-ap create mode 100644 multimedia/kino/files/patch-aq create mode 100644 multimedia/kino/files/patch-ar create mode 100644 multimedia/kino/files/patch-as create mode 100644 multimedia/kino/files/patch-at create mode 100644 multimedia/kino/files/patch-au create mode 100644 multimedia/kino/files/patch-av create mode 100644 multimedia/kino/files/patch-aw create mode 100644 multimedia/kino/files/patch-ax create mode 100644 multimedia/kino/files/patch-ay create mode 100644 multimedia/kino/files/patch-az create mode 100644 multimedia/kino/files/patch-bb create mode 100644 multimedia/kino/files/patch-bc create mode 100644 multimedia/kino/files/patch-bd create mode 100644 multimedia/kino/files/patch-be create mode 100644 multimedia/kino/files/patch-bf create mode 100644 multimedia/kino/files/patch-bg create mode 100644 multimedia/kino/files/patch-bh create mode 100644 multimedia/kino/pkg-descr create mode 100644 multimedia/kino/pkg-plist (limited to 'multimedia') diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile new file mode 100644 index 000000000000..5c8569d72ef8 --- /dev/null +++ b/multimedia/kino/Makefile @@ -0,0 +1,33 @@ +# New ports collection makefile for: kino +# Date created: 10 April 2004 +# Whom: pb@FreeBSD.org +# +# $FreeBSD$ +# + +PORTNAME= kino +PORTVERSION= 0.7.0 +CATEGORIES= multimedia +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ + http://kino.schirmacher.de/filemanager/download/17/ +MASTER_SITE_SUBDIR= ${PORTNAME} + +MAINTAINER= pb@FreeBSD.org +COMMENT= A DV non-linear video editor + +LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv \ + glade-2.0:${PORTSDIR}/devel/libglade2 \ + gnomeui-2.600:${PORTSDIR}/x11-toolkits/libgnomeui \ + ICE.6:${PORTSDIR}/x11/libICE \ + intl.6:${PORTSDIR}/devel/gettext \ + Magick.6:${PORTSDIR}/graphics/ImageMagick \ + xml2.5:${PORTSDIR}/textproc/libxml2 + +USE_ICONV= yes +GNU_CONFIGURE= yes +USE_X_PREFIX= yes +CONFIGURE_ENV= CPPFLAGS=-"I${LOCALBASE}/include -I${X11BASE}/include" \ + LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" +MAN1= kino.1 + +.include diff --git a/multimedia/kino/distinfo b/multimedia/kino/distinfo new file mode 100644 index 000000000000..dbc30e716044 --- /dev/null +++ b/multimedia/kino/distinfo @@ -0,0 +1,2 @@ +MD5 (kino-0.7.0.tar.gz) = 7caac99c0ebe1d76b835d76137c1e7d7 +SIZE (kino-0.7.0.tar.gz) = 1160303 diff --git a/multimedia/kino/files/patch-aa b/multimedia/kino/files/patch-aa new file mode 100644 index 000000000000..d038422df83e --- /dev/null +++ b/multimedia/kino/files/patch-aa @@ -0,0 +1,74 @@ +--- configure.orig Mon Dec 15 22:42:05 2003 ++++ configure Sat Apr 10 12:13:08 2004 +@@ -4300,7 +4300,7 @@ + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-ldv $LIBS" ++LIBS="-ldv -lc_r $LIBS" + cat >conftest.$ac_ext <<_ACEOF + #line $LINENO "configure" + /* confdefs.h. */ +@@ -4630,7 +4630,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;} +- { (exit 1); exit 1; }; } ++ } + + fi + +@@ -4640,7 +4640,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;} +- { (exit 1); exit 1; }; } ++ } + + fi + +@@ -4782,7 +4782,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;} +- { (exit 1); exit 1; }; } ++ } + + fi + +@@ -4852,7 +4852,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;} +- { (exit 1); exit 1; }; } ++ } + fi + + +@@ -4991,7 +4991,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;} +- { (exit 1); exit 1; }; } ++ } + + fi + +@@ -5061,7 +5061,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;} +- { (exit 1); exit 1; }; } ++ } + fi + + +@@ -5131,7 +5131,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;} +- { (exit 1); exit 1; }; } ++ } + + fi + diff --git a/multimedia/kino/files/patch-ab b/multimedia/kino/files/patch-ab new file mode 100644 index 000000000000..05088eb306b3 --- /dev/null +++ b/multimedia/kino/files/patch-ab @@ -0,0 +1,19 @@ +--- scripts/exports/ffmpeg_divx.sh Mon Nov 24 15:22:16 2003 ++++ scripts/exports/ffmpeg_divx.sh Fri Apr 9 18:09:10 2004 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-function usage ++usage() + { + # Title + echo "Title: FFMPEG DivX Export" +@@ -19,7 +19,7 @@ + echo Profile: Low Quality + } + +-function execute ++execute() + { + # Arguments + normalisation="$1" diff --git a/multimedia/kino/files/patch-ac b/multimedia/kino/files/patch-ac new file mode 100644 index 000000000000..db803b853c6a --- /dev/null +++ b/multimedia/kino/files/patch-ac @@ -0,0 +1,19 @@ +--- scripts/exports/ffmpeg_mp3.sh Mon Nov 24 15:22:16 2003 ++++ scripts/exports/ffmpeg_mp3.sh Fri Apr 9 18:09:18 2004 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-function usage ++usage() + { + # Title + echo "Title: FFMPEG MP3 Export" +@@ -22,7 +22,7 @@ + echo Profile: MP3 64kb/s, 32000 khz, Mono + } + +-function execute ++execute() + { + # Arguments + normalisation="$1" diff --git a/multimedia/kino/files/patch-ad b/multimedia/kino/files/patch-ad new file mode 100644 index 000000000000..b0d0cd979c45 --- /dev/null +++ b/multimedia/kino/files/patch-ad @@ -0,0 +1,19 @@ +--- scripts/exports/ffmpeg_vcd.sh Sun Nov 23 23:12:13 2003 ++++ scripts/exports/ffmpeg_vcd.sh Fri Apr 9 18:09:25 2004 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-function usage ++usage() + { + # Title + echo "Title: FFMPEG VCD Export" +@@ -13,7 +13,7 @@ + echo Flags: single-pass file-producer + } + +-function execute ++execute() + { + # Arguments + normalisation="$1" diff --git a/multimedia/kino/files/patch-ae b/multimedia/kino/files/patch-ae new file mode 100644 index 000000000000..4939e4889c1c --- /dev/null +++ b/multimedia/kino/files/patch-ae @@ -0,0 +1,19 @@ +--- scripts/exports/rawplay.sh Sat Dec 6 05:24:33 2003 ++++ scripts/exports/rawplay.sh Fri Apr 9 18:09:31 2004 +@@ -1,6 +1,6 @@ + #!/bin/sh + +-function usage ++usage() + { + # Title + echo "Title: rawplay playback" +@@ -21,7 +21,7 @@ + echo Profile: Windowed, ESD audio output + } + +-function execute ++execute() + { + # Arguments + normalisation="$1" diff --git a/multimedia/kino/files/patch-af b/multimedia/kino/files/patch-af new file mode 100644 index 000000000000..50f32b2051fe --- /dev/null +++ b/multimedia/kino/files/patch-af @@ -0,0 +1,10 @@ +--- src/displayer.cc Wed Dec 10 04:32:40 2003 ++++ src/displayer.cc Sat Apr 10 03:12:22 2004 +@@ -561,6 +561,7 @@ + { + gotPort = false; + } ++ XSync(display, false); + shmctl( shmInfo.shmid, IPC_RMID, 0 ); + #if 0 + diff --git a/multimedia/kino/files/patch-ag b/multimedia/kino/files/patch-ag new file mode 100644 index 000000000000..e123eb9530d4 --- /dev/null +++ b/multimedia/kino/files/patch-ag @@ -0,0 +1,14 @@ +--- src/frame.cc Tue Nov 25 21:51:15 2003 ++++ src/frame.cc Fri Apr 9 16:24:36 2004 +@@ -1400,9 +1400,9 @@ + if ( sample < -1.0 ) + sample = -1.0; + if ( sample >= 0 ) +- output[ i ] = lrint( 32767.0 * sample ); ++ output[ i ] = (long int)( 32767.0 * sample ); + else +- output[ i ] = lrint( 32768.0 * sample ); ++ output[ i ] = (long int)( 32768.0 * sample ); + } + } + diff --git a/multimedia/kino/files/patch-ah b/multimedia/kino/files/patch-ah new file mode 100644 index 000000000000..7efb839eea9a --- /dev/null +++ b/multimedia/kino/files/patch-ah @@ -0,0 +1,11 @@ +--- src/gtkenhancedscale.c Tue Nov 25 21:51:18 2003 ++++ src/gtkenhancedscale.c Fri Apr 9 17:44:14 2004 +@@ -33,7 +33,7 @@ + #include "gtkenhancedscale.h" + #include + #include +-#include ++#include + #include + + #define ENHANCED_SCALE_CLASS(w) GTK_ENHANCED_SCALE_CLASS ( G_OBJECT_GET_CLASS( G_OBJECT( w ) ) ) diff --git a/multimedia/kino/files/patch-ai b/multimedia/kino/files/patch-ai new file mode 100644 index 000000000000..140a6c30d632 --- /dev/null +++ b/multimedia/kino/files/patch-ai @@ -0,0 +1,577 @@ +--- src/ieee1394io.cc Fri Dec 12 22:58:55 2003 ++++ src/ieee1394io.cc Fri Apr 9 16:45:10 2004 +@@ -61,11 +61,13 @@ + #include + #include + ++#if 0 + #include + #include + #include + #include + #include ++#endif + + #include "ieee1394io.h" + #include "preferences.h" +@@ -93,10 +95,12 @@ + Frame *IEEE1394Reader::currentFrame; + deque < Frame* > IEEE1394Reader::inFrames; + deque < Frame* > IEEE1394Reader::outFrames; +-raw1394handle_t raw1394Reader::handle; ++//raw1394handle_t raw1394Reader::handle; + unsigned char *dv1394Reader::m_dv1394_map; + int dv1394Reader::m_dv1394_fd; ++#if 0 + raw1394handle_t AVC::avc_handle; ++#endif + pthread_mutex_t AVC::avc_mutex; + + +@@ -281,7 +285,7 @@ + raw1394Reader::raw1394Reader( int p, int c, int bufSize ) : + IEEE1394Reader( c, bufSize ), port( p ) + { +- handle = NULL; ++ //handle = NULL; + cerr << ">>> Using raw1394 capture" << endl; + } + +@@ -353,28 +357,32 @@ + { + bool success; + int numcards; +- struct raw1394_portinfo pinf[ 16 ]; +- iso_handler_t oldhandler; ++ //struct raw1394_portinfo pinf[ 16 ]; ++ //iso_handler_t oldhandler; + +- assert( handle == NULL ); ++ //assert( handle == NULL ); + + try + { + ++#if 0 + #ifdef LIBRAW1394_OLD + handle = raw1394_get_handle(); + #else + + handle = raw1394_new_handle(); + #endif ++#endif ++ //handle = 0; + +- if ( handle == 0 ) +- return false; ++// if ( handle == 0 ) ++// return false; ++#if 0 + fail_neg( numcards = raw1394_get_port_info( handle, pinf, 16 ) ); + fail_neg( raw1394_set_port( handle, port ) ); + + oldhandler = raw1394_set_iso_handler( handle, channel, Handler ); +- ++#endif + success = true; + } + catch ( string exc ) +@@ -393,11 +401,13 @@ + + void raw1394Reader::Close() + { ++#if 0 + if ( handle != NULL ) + { + raw1394_destroy_handle( handle ); + handle = NULL; + } ++#endif + } + + bool raw1394Reader::StartReceive() +@@ -407,7 +417,7 @@ + /* Starting iso receive */ + try + { +- fail_neg( raw1394_start_iso_rcv( handle, channel ) ); ++// fail_neg( raw1394_start_iso_rcv( handle, channel ) ); + success = true; + } + catch ( string exc ) +@@ -421,8 +431,8 @@ + + void raw1394Reader::StopReceive() + { +- if ( handle != NULL ) +- raw1394_stop_iso_rcv( handle, channel ); ++// if ( handle != NULL ) ++// raw1394_stop_iso_rcv( handle, channel ); + } + + +@@ -458,6 +468,7 @@ + + */ + ++#if 0 + int raw1394Reader::Handler( raw1394handle_t handle, int channel, size_t length, + quadlet_t *data ) + { +@@ -564,6 +575,7 @@ + + return 0; + } ++#endif + + + /** The thread responsible for polling the raw1394 interface. +@@ -574,6 +586,7 @@ + */ + void* raw1394Reader::Thread( void* arg ) + { ++#if 0 + raw1394Reader * theReader = ( raw1394Reader* ) arg; + + while ( true ) +@@ -581,6 +594,7 @@ + raw1394_loop_iterate( theReader->handle ); + pthread_testcancel(); + } ++#endif + return NULL; + } + +@@ -666,6 +680,7 @@ + + bool dv1394Reader::Open() + { ++#if 0 + int n_frames = DV1394_MAX_FRAMES / 4; + struct dv1394_init init = + { +@@ -699,6 +714,8 @@ + } + + return true; ++#endif ++ return false; + } + + +@@ -707,6 +724,7 @@ + */ + void dv1394Reader::Close() + { ++#if 0 + if ( m_dv1394_fd != -1 ) + { + if ( m_dv1394_map != NULL ) +@@ -715,11 +733,13 @@ + m_dv1394_map = NULL; + m_dv1394_fd = -1; + } ++#endif + } + + + bool dv1394Reader::StartReceive() + { ++#if 0 + /* Starting iso receive */ + if ( ioctl( m_dv1394_fd, DV1394_START_RECEIVE, NULL ) ) + { +@@ -727,6 +747,8 @@ + return false; + } + return true; ++#endif ++ return false; + } + + +@@ -735,6 +757,7 @@ + + bool dv1394Reader::Handler( int handle ) + { ++#if 0 + struct dv1394_status dvst; + + if ( ioctl( handle, DV1394_WAIT_FRAMES, 1 ) ) +@@ -812,6 +835,8 @@ + + } + return true; ++#endif ++ return false; + } + + +@@ -843,6 +868,7 @@ + + AVC::AVC( int p ) : port( p ) + { ++#if 0 + pthread_mutex_init( &avc_mutex, NULL ); + avc_handle = NULL; + int numcards; +@@ -874,6 +900,7 @@ + cerr << exc << endl; + } + return ; ++#endif + } + + +@@ -883,6 +910,7 @@ + + AVC::~AVC() + { ++#if 0 + if ( avc_handle != NULL ) + { + pthread_mutex_lock( &avc_mutex ); +@@ -890,11 +918,13 @@ + avc_handle = NULL; + pthread_mutex_unlock( &avc_mutex ); + } ++#endif + } + + + extern KinoCommon *common; + ++#if 0 + int AVC::ResetHandler( raw1394handle_t handle, unsigned int generation ) + { + cerr << "Reset Handler received" << endl; +@@ -902,7 +932,7 @@ + common->getPageCapture() ->driver_locked = true; + return 0; + } +- ++#endif + + /** See if a node_id is still valid and pointing to an AV/C Recorder. + +@@ -918,6 +948,7 @@ + int AVC::isPhyIDValid( int phyID ) + { + int value = -1; ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -960,6 +991,7 @@ + } + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return value; + } + +@@ -968,6 +1000,7 @@ + */ + void AVC::Noop( void ) + { ++#if 0 + struct pollfd raw1394_poll; + raw1394_poll.fd = raw1394_get_fd( avc_handle ); + raw1394_poll.events = POLLIN; +@@ -978,11 +1011,13 @@ + || ( raw1394_poll.revents & POLLPRI ) ) + raw1394_loop_iterate( avc_handle ); + } ++#endif + } + + + int AVC::Play( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -994,12 +1029,14 @@ + } + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + + int AVC::Pause( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1016,12 +1053,14 @@ + }; + nanosleep( &t, NULL ); + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + + int AVC::Stop( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1034,12 +1073,14 @@ + }; + nanosleep( &t, NULL ); + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + + int AVC::Rewind( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1047,12 +1088,14 @@ + avc1394_vcr_rewind( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + + int AVC::FastForward( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1060,11 +1103,13 @@ + avc1394_vcr_forward( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + int AVC::Forward( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1072,11 +1117,13 @@ + avc1394_vcr_next( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + int AVC::Back( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1084,11 +1131,13 @@ + avc1394_vcr_previous( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + int AVC::NextScene( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1096,11 +1145,13 @@ + avc1394_vcr_next_index( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + int AVC::PreviousScene( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1108,11 +1159,13 @@ + avc1394_vcr_previous_index( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + int AVC::Record( int phyID ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1120,11 +1173,13 @@ + avc1394_vcr_record( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + int AVC::Shuttle( int phyID, int speed ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1132,12 +1187,14 @@ + avc1394_vcr_trick_play( avc_handle, phyID, speed ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return 0; + } + + unsigned int AVC::TransportStatus( int phyID ) + { + quadlet_t val = 0; ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1145,11 +1202,13 @@ + val = avc1394_vcr_status( avc_handle, phyID ); + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + return val; + } + + bool AVC::Timecode( int phyID, char* timecode ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1178,10 +1237,13 @@ + } + pthread_mutex_unlock( &avc_mutex ); + return true; ++#endif ++ return false; + } + + int AVC::getNodeId( const char *guid ) + { ++#if 0 + pthread_mutex_lock( &avc_mutex ); + if ( avc_handle != NULL ) + { +@@ -1204,6 +1266,7 @@ + } + } + pthread_mutex_unlock( &avc_mutex ); ++#endif + 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 + } + + dv1394Writer::dv1394Writer( string device, unsigned int channel, unsigned int nBuffers, + unsigned int cip_n, unsigned int cip_d, unsigned int syt_offset ) : isInitialised( false ) + { ++#if 0 + m_fd = -1; + m_deviceName = device; + m_channel = channel; +@@ -1400,6 +1471,7 @@ + m_syt_offset = syt_offset; + + m_fd = open( m_deviceName.c_str(), O_RDWR ); ++#endif + } + + +@@ -1415,6 +1487,7 @@ + + void dv1394Writer::SendFrame( Frame &frame ) + { ++#if 0 + bool isPAL = frame.IsPAL(); + + if ( !isInitialised ) +@@ -1439,4 +1512,5 @@ + } + + write( m_fd, frame.data, ( isPAL ? DV1394_PAL_FRAME_SIZE : DV1394_NTSC_FRAME_SIZE ) ); ++#endif + } diff --git a/multimedia/kino/files/patch-aj b/multimedia/kino/files/patch-aj new file mode 100644 index 000000000000..645d0cf1172b --- /dev/null +++ b/multimedia/kino/files/patch-aj @@ -0,0 +1,50 @@ +--- src/ieee1394io.h Tue Nov 25 20:51:15 2003 ++++ src/ieee1394io.h Sat Apr 10 12:19:14 2004 +@@ -20,8 +20,9 @@ + #ifndef _IEEE1394IO_H + #define _IEEE1394IO_H 1 + +-#include +-#include ++#include ++//#include ++//#include + #include + + #include +@@ -104,7 +105,7 @@ + int port; + + /// the handle to the ieee1394 subsystem +- static raw1394handle_t handle; ++ //static raw1394handle_t handle; + + public: + +@@ -119,7 +120,7 @@ + void StopThread( void ); + + private: +- static int Handler( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ); ++ //static int Handler( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ); + static void* Thread( void *arg ); + }; + +@@ -160,7 +161,7 @@ + static pthread_mutex_t avc_mutex; + + /// the handle to the ieee1394 subsystem +- static raw1394handle_t avc_handle; ++ //static raw1394handle_t avc_handle; + + public: + AVC( int crd = 0 ); +@@ -184,7 +185,7 @@ + int getNodeId( const char *guid ); + + private: +- static int ResetHandler( raw1394handle_t handle, unsigned int generation ); ++ //static int ResetHandler( raw1394handle_t handle, unsigned int generation ); + + }; + diff --git a/multimedia/kino/files/patch-ak b/multimedia/kino/files/patch-ak new file mode 100644 index 000000000000..64e86effe3ff --- /dev/null +++ b/multimedia/kino/files/patch-ak @@ -0,0 +1,10 @@ +--- src/image_filters.cc Tue Nov 25 21:51:18 2003 ++++ src/image_filters.cc Sat Apr 10 00:48:34 2004 +@@ -519,6 +519,7 @@ + GDKImageFilterRepository::GDKImageFilterRepository() + { + printf( ">> image filter repository created\n" ); ++ selected_filter = NULL; + + // Register an instance of each object (adapting raw filters to GDK filters where necessary) + Register( new ImageFilterKeep() ); diff --git a/multimedia/kino/files/patch-al b/multimedia/kino/files/patch-al new file mode 100644 index 000000000000..2903729d5297 --- /dev/null +++ b/multimedia/kino/files/patch-al @@ -0,0 +1,10 @@ +--- src/image_transitions.cc Tue Nov 25 21:51:18 2003 ++++ src/image_transitions.cc Sat Apr 10 00:51:24 2004 +@@ -439,6 +439,7 @@ + GDKImageTransitionRepository::GDKImageTransitionRepository() + { + printf( ">> image transition repository created\n" ); ++ selected_transition = NULL; + // Register an instance of each object (adapting raw transitions to GDK transitions where necessary) + Register( new ImageTransitionSwitch() ); + Register( new ImageTransitionFade() ); diff --git a/multimedia/kino/files/patch-am b/multimedia/kino/files/patch-am new file mode 100644 index 000000000000..3d06eac8f67f --- /dev/null +++ b/multimedia/kino/files/patch-am @@ -0,0 +1,26 @@ +--- src/jogshuttle.cc Wed Nov 26 00:01:01 2003 ++++ src/jogshuttle.cc Fri Apr 9 16:49:31 2004 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++//#include + + #include "jogshuttle.h" + #include "preferences.h" +@@ -316,6 +316,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 ); +@@ -625,5 +626,6 @@ + } + return ; + ++#endif + #endif + } diff --git a/multimedia/kino/files/patch-an b/multimedia/kino/files/patch-an new file mode 100644 index 000000000000..e4ba321807b7 --- /dev/null +++ b/multimedia/kino/files/patch-an @@ -0,0 +1,18 @@ +--- 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 @@ + } + gui_state_was = 0; + } ++#if 0 + else if ( check_phyid == true ) + { + if ( gui_state_was != 1 ) +@@ -432,6 +433,7 @@ + gui_state_was = 3; + } + } ++#endif + } + + /** Define active widgets. diff --git a/multimedia/kino/files/patch-ao b/multimedia/kino/files/patch-ao new file mode 100644 index 000000000000..f10219edb340 --- /dev/null +++ b/multimedia/kino/files/patch-ao @@ -0,0 +1,16 @@ +--- src/page_capture.h Wed Dec 10 05:17:38 2003 ++++ src/page_capture.h Fri Apr 9 16:40:51 2004 +@@ -26,10 +26,12 @@ + + #include "kino_common.h" + #include "page.h" +-#include ++//#include + + /** This class controls the firewire capture notebook page. + */ ++ ++typedef unsigned long quadlet_t; + + class PageCapture : public Page + { diff --git a/multimedia/kino/files/patch-ap b/multimedia/kino/files/patch-ap new file mode 100644 index 000000000000..8917e8d0ccad --- /dev/null +++ b/multimedia/kino/files/patch-ap @@ -0,0 +1,19 @@ +--- src/page_export_1394.cc Tue Nov 25 21:51:16 2003 ++++ src/page_export_1394.cc Fri Apr 9 16:53:22 2004 +@@ -68,6 +68,7 @@ + + void Export1394::start() + { ++#if 0 + static raw1394handle_t handle; + GtkLabel * load_label + = GTK_LABEL( lookup_widget ( exportPage->getWidget(), +@@ -128,7 +129,7 @@ + { + gtk_widget_set_sensitive ( GTK_WIDGET ( tmp ), FALSE ); + } +- ++#endif + } + + /** Define active widgets. diff --git a/multimedia/kino/files/patch-aq b/multimedia/kino/files/patch-aq new file mode 100644 index 000000000000..edea0b4d7fb5 --- /dev/null +++ b/multimedia/kino/files/patch-aq @@ -0,0 +1,11 @@ +--- src/page_magick.cc Mon Dec 15 20:37:21 2003 ++++ src/page_magick.cc Sat Apr 10 03:14:16 2004 +@@ -214,7 +214,7 @@ + return dlsym( ptr, symbol ); + } + +-char *Plugin::GetError( ) ++const char *Plugin::GetError( ) + { + return dlerror(); + } diff --git a/multimedia/kino/files/patch-ar b/multimedia/kino/files/patch-ar new file mode 100644 index 000000000000..2f0285850b93 --- /dev/null +++ b/multimedia/kino/files/patch-ar @@ -0,0 +1,11 @@ +--- src/page_magick.h Mon Dec 15 20:24:16 2003 ++++ src/page_magick.h Fri Apr 9 17:07:58 2004 +@@ -41,7 +41,7 @@ + bool Open( char *file ); + void Close( ); + void *Find( char *symbol ); +- char *GetError( ); ++ const char *GetError( ); + }; + + /** Holds the complete collection of shared objects. diff --git a/multimedia/kino/files/patch-as b/multimedia/kino/files/patch-as new file mode 100644 index 000000000000..969224d72a73 --- /dev/null +++ b/multimedia/kino/files/patch-as @@ -0,0 +1,59 @@ +--- src/preferences_dialog.cc Sun Dec 14 02:12:48 2003 ++++ src/preferences_dialog.cc Fri Apr 9 16:21:25 2004 +@@ -32,8 +32,10 @@ + #include "support.h" + #include "commands.h" + #include "message.h" ++#if 0 + #include + #include ++#endif + + /* Declare callbacks for the jogshuttle handling */ + static void +@@ -62,9 +64,13 @@ + GtkWidget* glade_menuitem; + GtkWidget* widget; + int currentNode, itemCount = 0, currentItem = 0; ++#if 0 + rom1394_directory rom1394_dir; ++#endif + glade_menu = gtk_menu_new (); ++#if 0 + static raw1394handle_t handle; ++#endif + + /* initialize temp variables, only use temp if Okay clicked and not cancel */ + gPrefsSelectedFileFormat = prefs.fileFormat; +@@ -271,6 +277,7 @@ + + widget = lookup_widget( dialog, "optionmenu_avc_phyid" ); + ++#if 0 + #ifdef LIBRAW1394_OLD + + if ( ( handle = raw1394_get_handle() ) ) +@@ -339,6 +346,7 @@ + } + } + 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 @@ + on_avc_phyid_activate( GtkMenuItem * menu_item, gpointer user_data ) + { + int currentNode = ( int ) user_data; ++#if 0 + static raw1394handle_t handle; + #ifdef LIBRAW1394_OLD + +@@ -401,6 +410,7 @@ + } + raw1394_destroy_handle( handle ); + handle = NULL; ++#endif + } + + void diff --git a/multimedia/kino/files/patch-at b/multimedia/kino/files/patch-at new file mode 100644 index 000000000000..bc056bbb1077 --- /dev/null +++ b/multimedia/kino/files/patch-at @@ -0,0 +1,11 @@ +--- src/riff.cc Wed Nov 26 00:01:24 2003 ++++ src/riff.cc Fri Apr 9 16:22:28 2004 +@@ -69,7 +69,7 @@ + //#include + #include + #include +-#include ++//#include + + using std::cout; + using std::hex; diff --git a/multimedia/kino/files/patch-au b/multimedia/kino/files/patch-au new file mode 100644 index 000000000000..7f2c13c0817b --- /dev/null +++ b/multimedia/kino/files/patch-au @@ -0,0 +1,10 @@ +--- 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; + + #include ++#include + + #include "storyboard.h" + #include "frame.h" diff --git a/multimedia/kino/files/patch-av b/multimedia/kino/files/patch-av new file mode 100644 index 000000000000..16ddbc2809cc --- /dev/null +++ b/multimedia/kino/files/patch-av @@ -0,0 +1,449 @@ +--- src/v4l.cc Mon Dec 15 06:08:35 2003 ++++ src/v4l.cc Fri Apr 9 17:43:25 2004 +@@ -56,7 +56,7 @@ + + V4LCapability::V4LCapability( V4LDevice *device ) + { +- device->request( VIDIOCGCAP, this ); ++// device->request( VIDIOCGCAP, this ); + } + + V4LCapability::~V4LCapability() +@@ -66,82 +66,98 @@ + + void *V4LCapability::getStruct() + { +- return & capability; ++ //return & capability; ++ return NULL; + } + + char *V4LCapability::getName() + { +- return capability.name; ++ //return capability.name; ++ return ""; + } + + int V4LCapability::getNumberOfChannels() + { +- return capability.channels; ++ //return capability.channels; ++ return 0; + } + + int V4LCapability::getNumberOfAudioDevices() + { +- return capability.audios; ++// return capability.audios; ++ return 0; + } + + int V4LCapability::getMinWidth() + { +- return capability.minwidth; ++// return capability.minwidth; ++ return 0; + } + + int V4LCapability::getMinHeight() + { +- return capability.minheight; ++// return capability.minheight; ++ return 0; + } + + int V4LCapability::getMaxWidth() + { +- return capability.maxwidth; ++ //return capability.maxwidth; ++ return 0; + } + + int V4LCapability::getMaxHeight() + { +- return capability.maxheight; ++ //return capability.maxheight; ++ return 0; + } + + bool V4LCapability::canCapture() + { +- return capability.type & VID_TYPE_CAPTURE; ++ //return capability.type & VID_TYPE_CAPTURE; ++ return false; + } + + bool V4LCapability::hasTuner() + { +- return capability.type & VID_TYPE_TUNER; ++ //return capability.type & VID_TYPE_TUNER; ++ return false; + } + + bool V4LCapability::hasChromakey() + { +- return capability.type & VID_TYPE_CHROMAKEY; ++ //return capability.type & VID_TYPE_CHROMAKEY; ++ return false; + } + + bool V4LCapability::hasClipping() + { +- return capability.type & VID_TYPE_CLIPPING; ++ //return capability.type & VID_TYPE_CLIPPING; ++ return false; + } + + bool V4LCapability::hasOverwrite() + { +- return capability.type & VID_TYPE_FRAMERAM; ++ //return capability.type & VID_TYPE_FRAMERAM; ++ return false; + } + + bool V4LCapability::hasScaling() + { +- return capability.type & VID_TYPE_SCALES; ++ //return capability.type & VID_TYPE_SCALES; ++ return false; + } + + bool V4LCapability::isMonochrome() + { +- return capability.type & VID_TYPE_MONOCHROME; ++ //return capability.type & VID_TYPE_MONOCHROME; ++ return false; + } + + bool V4LCapability::canSubCapture() + { +- return capability.type & VID_TYPE_SUBCAPTURE; ++ //return capability.type & VID_TYPE_SUBCAPTURE; ++ return false; + } + + void V4LCapability::report() +@@ -173,13 +189,14 @@ + V4LTuner::V4LTuner( V4LDevice *device, int index ) + { + this->device = device; +- this->tuner.tuner = index; +- this->device->request( VIDIOCGTUNER, this ); ++ //this->tuner.tuner = index; ++ //this->device->request( VIDIOCGTUNER, this ); + } + + void *V4LTuner::getStruct() + { +- return & tuner; ++ //return & tuner; ++ return NULL; + } + + void V4LTuner::report() +@@ -187,61 +204,68 @@ + + int V4LTuner::getRangeLow() + { +- return tuner.rangelow; ++ //return tuner.rangelow; ++ return 0; + } + + void V4LTuner::setRangeLow( int low ) + { +- tuner.rangelow = low; ++ //tuner.rangelow = low; + } + + int V4LTuner::getRangeHigh() + { +- return tuner.rangehigh; ++ //return tuner.rangehigh; ++ return 0; + } + + void V4LTuner::setRangeHigh( int high ) + { +- tuner.rangehigh = high; ++ //tuner.rangehigh = high; + } + + int V4LTuner::getFlags() + { +- return tuner.flags; ++ //return tuner.flags; ++ return 0; + } + + void V4LTuner::setFlags( int flags ) + { +- tuner.flags = flags; ++ //tuner.flags = flags; + } + + int V4LTuner::getMode() + { +- return tuner.mode; ++ //return tuner.mode; ++ return 0; + } + + void V4LTuner::setMode( int mode ) + { +- tuner.mode = mode; ++ //tuner.mode = mode; + } + + int V4LTuner::getSignal() + { +- return tuner.signal; ++ //return tuner.signal; ++ return 0; + } + + V4LChannel::V4LChannel( V4LDevice *device, int index ) + { ++#if 0 + memset( &channel, 0, sizeof( struct video_channel ) ); + this->device = device; + this->channel.channel = index; +- device->request( VIDIOCGCHAN, this ); +- device->request( VIDIOCSCHAN, this ); ++ //device->request( VIDIOCGCHAN, this ); ++ //device->request( VIDIOCSCHAN, this ); + for ( unsigned int i = 0; i < getNumberOfTuners(); i ++ ) + { + V4LTuner *tuner = new V4LTuner( this->device, i ); + tuners.insert( tuners.end(), tuner ); + } ++#endif + } + + V4LChannel::~V4LChannel() +@@ -251,12 +275,14 @@ + + void *V4LChannel::getStruct() + { +- return & channel; ++ //return & channel; ++ return NULL; + } + + char *V4LChannel::getName() + { +- return channel.name; ++ //return channel.name; ++ return ""; + } + + bool V4LChannel::setTuner( unsigned int index ) +@@ -267,7 +293,8 @@ + // FIXME: Hardcoded tuner settings + current->setRangeLow( 0 ); + current->setRangeHigh( 0xffff ); +- return device->request( VIDIOCSTUNER, current ); ++ //return device->request( VIDIOCSTUNER, current ); ++ return false; + } + else + { +@@ -277,7 +304,8 @@ + + unsigned int V4LChannel::getNumberOfTuners() + { +- return channel.tuners; ++ //return channel.tuners; ++ return 0; + } + + V4LTuner *V4LChannel::getTuner( unsigned int index ) +@@ -294,12 +322,13 @@ + + int V4LChannel::getSignal() + { +- device->request( VIDIOCGTUNER, current ); ++ //device->request( VIDIOCGTUNER, current ); + return current->getSignal(); + } + + void V4LChannel::report() + { ++#if 0 + cout << ">>>> Channel # " << channel.channel << endl; + cout << ">>>> Name : " << this->getName() << endl; + cout << ">>>> Tuners : " << this->getNumberOfTuners() << endl; +@@ -313,6 +342,7 @@ + cout << " TV" << endl; + if ( channel.type & VIDEO_TYPE_CAMERA ) + cout << " Camera" << endl; ++#endif + } + + /** Constructor for the V4L class. +@@ -416,7 +446,8 @@ + if ( channel >= 0 && channel < channels.size() ) + { + current = channels[ channel ]; +- return this->request( VIDIOCSCHAN, current ); ++ //return this->request( VIDIOCSCHAN, current ); ++ return false; + } + else + { +@@ -538,6 +569,7 @@ + + void V4L::startAudio() + { ++#if 0 + struct video_audio audio; + ioctl( fd, VIDIOCGAUDIO, &audio ); + if ( audio.flags & VIDEO_AUDIO_MUTE ) +@@ -545,6 +577,7 @@ + cout << "Volume : " << audio.volume << endl; + audio.volume = 65535; + ioctl( fd, VIDIOCSAUDIO, &audio ); ++#endif + } + + /** Turn off audio. +@@ -552,16 +585,19 @@ + + void V4L::stopAudio() + { ++#if 0 + struct video_audio audio; + ioctl( fd, VIDIOCGAUDIO, &audio ); + audio.flags |= VIDEO_AUDIO_MUTE; + cout << "Volume : " << audio.volume << endl; + audio.volume = 0; + ioctl( fd, VIDIOCSAUDIO, &audio ); ++#endif + } + + int V4L::mappedMemorySize( bool init ) + { ++#if 0 + static video_mbuf buf; + if ( init == true ) + { +@@ -571,6 +607,8 @@ + frame_maps = buf.frames; + } + return buf.size; ++#endif ++ return 0; + } + + /** Initialise capture. +@@ -581,6 +619,7 @@ + + bool V4L::initialiseCapture( int format ) + { ++#if 0 + size = width * height * 4; + + map = mmap( 0, mappedMemorySize( true ), PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0 ); +@@ -610,6 +649,8 @@ + { + return false; + } ++#endif ++ return false; + } + + /** Get the next frame. +@@ -620,6 +661,7 @@ + void *V4L::getNextFrame() + { + unsigned char * ret = NULL; ++#if 0 + + int current = frame_next; + frame_next = ( frame_next + 1 ) % frame_maps; +@@ -632,6 +674,7 @@ + + frames ++; + ++#endif + return ( void * ) ret; + } + +@@ -640,6 +683,7 @@ + + void V4L::stopCapture() + { ++#if 0 + if ( map != NULL ) + { + struct timeval tv; +@@ -652,6 +696,7 @@ + int enable = 0; + ioctl( getHandle(), VIDIOCCAPTURE, &enable ); + } ++#endif + } + + /** Get the current frequency of the tuner. +@@ -661,9 +706,12 @@ + + int V4L::getFrequency() + { ++#if 0 + unsigned long current; + ioctl( fd, VIDIOCGFREQ, ¤t ); + return ( int ) current; ++#endif ++ return 0; + } + + /** Set the current frequency of the tuner. +@@ -675,7 +723,8 @@ + bool V4L::setFrequency( int frequency ) + { + unsigned long val = ( unsigned long ) frequency & 0xffff; +- return ioctl( fd, VIDIOCSFREQ, &val ) != -1; ++ //return ioctl( fd, VIDIOCSFREQ, &val ) != -1; ++ return false; + } + + /** Get the signal of the current tuned in frequency. +@@ -983,12 +1032,12 @@ + + void GDKV4L::draw() + { +- + if ( displayer == NULL ) + { + gdk_threads_enter(); + displayer = FindDisplayer::getDisplayer( widget, getWidth(), getHeight() ); + ++#if 0 + switch ( displayer->format() ) + { + case DISPLAY_YUV: +@@ -1006,6 +1055,7 @@ + default: + break; + } ++#endif + gdk_threads_leave(); + } + +@@ -1031,6 +1081,7 @@ + gdk_threads_enter(); + displayer = FindDisplayer::getDisplayer( widget, getWidth(), getHeight() ); + ++#if 0 + if ( ENCODE_YUV ) + { + input = DISPLAY_YUV; // Fake - YUV422P isn't supported by Displayer +@@ -1041,6 +1092,7 @@ + input = DISPLAY_RGB; // Fake - YUV420P isn't supported by Displayer + initialiseCapture( VIDEO_PALETTE_YUV420P ); + } ++#endif + + // skip the first frame + f = getNextFrame(); diff --git a/multimedia/kino/files/patch-aw b/multimedia/kino/files/patch-aw new file mode 100644 index 000000000000..b35f8478e1b8 --- /dev/null +++ b/multimedia/kino/files/patch-aw @@ -0,0 +1,55 @@ +--- src/v4l.h Mon Dec 15 05:08:35 2003 ++++ src/v4l.h Sat Apr 10 12:19:48 2004 +@@ -28,6 +28,7 @@ + #include + + #include ++#include + #include + #include + #include +@@ -37,7 +38,7 @@ + #include + #include + +-#include ++//#include + + #include "displayer.h" + +@@ -67,7 +68,7 @@ + class V4LCapability : public V4LStruct + { + private: +- struct video_capability capability; ++ //struct video_capability capability; + + public: + V4LCapability( V4LDevice *device ); +@@ -95,7 +96,7 @@ + { + private: + V4LDevice *device; +- struct video_tuner tuner; ++ //struct video_tuner tuner; + + public: + V4LTuner( V4LDevice *device, int index ); +@@ -116,7 +117,7 @@ + { + private: + V4LDevice *device; +- struct video_channel channel; ++ //struct video_channel channel; + vector tuners; + V4LTuner *current; + +@@ -145,7 +146,7 @@ + int width; + int height; + void *map; +- struct video_mmap frame[ 32 ]; ++ //struct video_mmap frame[ 32 ]; + int frame_maps; + int frame_next; + int size; diff --git a/multimedia/kino/files/patch-ax b/multimedia/kino/files/patch-ax new file mode 100644 index 000000000000..18cb2a17c571 --- /dev/null +++ b/multimedia/kino/files/patch-ax @@ -0,0 +1,10 @@ +--- src/audio_filters.h.orig Mon Dec 15 05:08:34 2003 ++++ src/audio_filters.h Sat Apr 10 12:17:38 2004 +@@ -27,7 +27,6 @@ + + // C Includes + +-#include + #include + + /** Public interface for all audio filter classes. diff --git a/multimedia/kino/files/patch-ay b/multimedia/kino/files/patch-ay new file mode 100644 index 000000000000..34e4fad9eb59 --- /dev/null +++ b/multimedia/kino/files/patch-ay @@ -0,0 +1,10 @@ +--- 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 + #include + + /** Public interface for all audio transition classes. diff --git a/multimedia/kino/files/patch-az b/multimedia/kino/files/patch-az new file mode 100644 index 000000000000..339b7b378f04 --- /dev/null +++ b/multimedia/kino/files/patch-az @@ -0,0 +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 +-#include ++//#include + + enum FileCaptureMode { + CAPTURE_IGNORE, diff --git a/multimedia/kino/files/patch-bb b/multimedia/kino/files/patch-bb new file mode 100644 index 000000000000..dcec64b1ea2e --- /dev/null +++ b/multimedia/kino/files/patch-bb @@ -0,0 +1,10 @@ +--- src/image_create.h Mon Dec 15 05:08:34 2003 ++++ src/image_create.h Sat Apr 10 12:16:27 2004 +@@ -27,7 +27,6 @@ + + // C Includes + +-#include + #include + + /** Public interface for all image create classes. diff --git a/multimedia/kino/files/patch-bc b/multimedia/kino/files/patch-bc new file mode 100644 index 000000000000..046a93443d52 --- /dev/null +++ b/multimedia/kino/files/patch-bc @@ -0,0 +1,10 @@ +--- 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 + #include + + /** 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 new file mode 100644 index 000000000000..d34eb3e34df1 --- /dev/null +++ b/multimedia/kino/files/patch-bd @@ -0,0 +1,10 @@ +--- 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 + #include + + /** Public interface for all image transition classes. diff --git a/multimedia/kino/files/patch-be b/multimedia/kino/files/patch-be new file mode 100644 index 000000000000..4dfe1e80adaa --- /dev/null +++ b/multimedia/kino/files/patch-be @@ -0,0 +1,10 @@ +--- src/kino_av_pipe.h Tue Nov 25 20:51:18 2003 ++++ src/kino_av_pipe.h Sat Apr 10 12:20:10 2004 +@@ -21,7 +21,6 @@ + #define _KINO_AV_PIPE_H 1 + + #include +-#include + #include + + class KinoAudioInput diff --git a/multimedia/kino/files/patch-bf b/multimedia/kino/files/patch-bf new file mode 100644 index 000000000000..0d3ed3818b85 --- /dev/null +++ b/multimedia/kino/files/patch-bf @@ -0,0 +1,11 @@ +--- src/kino_common.h Mon Dec 15 04:23:12 2003 ++++ src/kino_common.h Sat Apr 10 12:15:02 2004 +@@ -24,7 +24,7 @@ + #include + + #include +-#include ++//#include + #include "playlist.h" + #include "frame.h" + #include "preferences.h" diff --git a/multimedia/kino/files/patch-bg b/multimedia/kino/files/patch-bg new file mode 100644 index 000000000000..c6c9fd821d8b --- /dev/null +++ b/multimedia/kino/files/patch-bg @@ -0,0 +1,11 @@ +--- src/kino_extra.h Tue Jan 7 07:52:29 2003 ++++ src/kino_extra.h Sat Apr 10 12:20:44 2004 +@@ -20,7 +20,7 @@ + #ifndef _KINO_EXTRA_H_ + #define _KINO_EXTRA_H_ + +-#include ++#include + + // This is mandatory for plug-ins to be able to access the functionality here + // and is mandatory throughout (in fact, the define should be dropped) diff --git a/multimedia/kino/files/patch-bh b/multimedia/kino/files/patch-bh new file mode 100644 index 000000000000..208555d2ec29 --- /dev/null +++ b/multimedia/kino/files/patch-bh @@ -0,0 +1,10 @@ +--- src/page_timeline.h Tue Nov 25 20:51:16 2003 ++++ src/page_timeline.h Sat Apr 10 12:18:36 2004 +@@ -20,6 +20,7 @@ + #ifndef _PAGE_TIMELINE_H + #define _PAGE_TIMELINE_H + ++#include + #include "kino_common.h" + #include "page.h" + diff --git a/multimedia/kino/pkg-descr b/multimedia/kino/pkg-descr new file mode 100644 index 000000000000..cfab7916c2a8 --- /dev/null +++ b/multimedia/kino/pkg-descr @@ -0,0 +1,6 @@ +Kino is an IEEE 1394 DV non-linear video editor. + +Note: IEEE 1394 and V4L are disabled in this port. + +WWW: http://kino.schirmacher.de/ +WWW: http://sourceforge.net/projects/kino/ diff --git a/multimedia/kino/pkg-plist b/multimedia/kino/pkg-plist new file mode 100644 index 000000000000..a2d7298af08f --- /dev/null +++ b/multimedia/kino/pkg-plist @@ -0,0 +1,48 @@ +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/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 +share/kino/editor_fast.xpm +share/kino/editor_fast_i.xpm +share/kino/editor_movie.xpm +share/kino/editor_movie_i.xpm +share/kino/editor_pause.xpm +share/kino/editor_play.xpm +share/kino/editor_play_i.xpm +share/kino/editor_record.xpm +share/kino/editor_scene.xpm +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.xpm +share/kino/film_on.xpm +share/kino/kino.glade +share/kino/link.xpm +share/kino/magick.glade +share/kino/photo-camera.xpm +share/kino/play_record.xpm +share/kino/scripts/exports/ffmpeg_divx.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 +@dirrm share/kino/scripts/exports +@dirrm share/kino/scripts +@dirrm share/kino +@dirrm include/kino -- cgit v1.2.3