diff options
author | pb <pb@FreeBSD.org> | 2004-08-12 23:38:04 +0000 |
---|---|---|
committer | pb <pb@FreeBSD.org> | 2004-08-12 23:38:04 +0000 |
commit | add600548a27facc77dd221e5a3d82b334f5af69 (patch) | |
tree | de6a108f5dd100df0ac81137cb046e80483722b7 /multimedia | |
parent | 03d6149d30a8f0cd0a248fa443241a048a7f0541 (diff) | |
download | FreeBSD-ports-add600548a27facc77dd221e5a3d82b334f5af69.zip FreeBSD-ports-add600548a27facc77dd221e5a3d82b334f5af69.tar.gz |
Update to 0.7.3.
Diffstat (limited to 'multimedia')
22 files changed, 129 insertions, 395 deletions
diff --git a/multimedia/kino/Makefile b/multimedia/kino/Makefile index 6a5b032..1da17a1 100644 --- a/multimedia/kino/Makefile +++ b/multimedia/kino/Makefile @@ -6,10 +6,9 @@ # PORTNAME= kino -PORTVERSION= 0.7.1 -PORTREVISION= 1 +PORTVERSION= 0.7.3 CATEGORIES= multimedia -MASTER_SITES= http://kino.schirmacher.de/filemanager/download/31/ +MASTER_SITES= http://kino.schirmacher.de/filemanager/download/38/ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= pb@FreeBSD.org @@ -20,6 +19,7 @@ LIB_DEPENDS= dv.4:${PORTSDIR}/multimedia/libdv \ samplerate.1:${PORTSDIR}/audio/libsamplerate USE_GETTEXT= yes +USE_GMAKE= yes USE_GNOME= libgnomeui libxml2 USE_ICONV= yes GNU_CONFIGURE= yes diff --git a/multimedia/kino/distinfo b/multimedia/kino/distinfo index 83b467a..bff54e3 100644 --- a/multimedia/kino/distinfo +++ b/multimedia/kino/distinfo @@ -1,2 +1,2 @@ -MD5 (kino-0.7.1.tar.gz) = 0980dd4ccf2d2282578f6bcb51d768e8 -SIZE (kino-0.7.1.tar.gz) = 769247 +MD5 (kino-0.7.3.tar.gz) = a0aba6fbc4009ffe551c596a55fb3fa6 +SIZE (kino-0.7.3.tar.gz) = 813787 diff --git a/multimedia/kino/files/patch-Makefile.in b/multimedia/kino/files/patch-Makefile.in index b204bfd..80d9d13 100644 --- a/multimedia/kino/files/patch-Makefile.in +++ b/multimedia/kino/files/patch-Makefile.in @@ -1,20 +1,11 @@ ---- Makefile.in.orig Sat Apr 10 16:22:30 2004 -+++ Makefile.in Mon Apr 12 19:45:17 2004 -@@ -146,7 +146,7 @@ +--- Makefile.in.orig Fri Aug 6 01:40:29 2004 ++++ Makefile.in Thu Aug 12 20:27:02 2004 +@@ -188,7 +188,7 @@ + sharedstatedir = @sharedstatedir@ 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 \ + EXTRA_DIST = config.rpath \ diff --git a/multimedia/kino/files/patch-aa b/multimedia/kino/files/patch-aa index 8122078..65e4169 100644 --- a/multimedia/kino/files/patch-aa +++ b/multimedia/kino/files/patch-aa @@ -1,37 +1,15 @@ ---- 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 +--- configure.orig Fri Aug 13 01:15:49 2004 ++++ configure Fri Aug 13 01:15:35 2004 +@@ -5325,7 +5325,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. */ -@@ -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 @@ + _ACEOF +@@ -5693,7 +5693,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;} @@ -40,7 +18,7 @@ fi -@@ -4639,7 +4639,7 @@ +@@ -5703,7 +5703,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;} @@ -49,7 +27,7 @@ fi -@@ -4781,7 +4781,7 @@ +@@ -5853,7 +5853,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;} @@ -58,7 +36,7 @@ fi -@@ -4851,7 +4851,7 @@ +@@ -5933,7 +5933,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;} @@ -67,7 +45,7 @@ fi -@@ -4990,7 +4990,7 @@ +@@ -6080,7 +6080,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;} @@ -76,7 +54,7 @@ fi -@@ -5060,7 +5060,7 @@ +@@ -6160,7 +6160,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;} @@ -85,7 +63,7 @@ fi -@@ -5130,7 +5130,7 @@ +@@ -6240,7 +6240,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-ab b/multimedia/kino/files/patch-ab deleted file mode 100644 index 05088eb..0000000 --- a/multimedia/kino/files/patch-ab +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index db803b8..0000000 --- a/multimedia/kino/files/patch-ac +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index b0d0cd9..0000000 --- a/multimedia/kino/files/patch-ad +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 4939e48..0000000 --- a/multimedia/kino/files/patch-ae +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index 50f32b2..0000000 --- a/multimedia/kino/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 deleted file mode 100644 index 48ec77d..0000000 --- a/multimedia/kino/files/patch-ag +++ /dev/null @@ -1,23 +0,0 @@ ---- 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 ) -- 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-ai b/multimedia/kino/files/patch-ai index 5c26d44..82df59f 100644 --- a/multimedia/kino/files/patch-ai +++ b/multimedia/kino/files/patch-ai @@ -1,5 +1,5 @@ ---- src/ieee1394io.cc.orig Sun Mar 28 20:42:44 2004 -+++ src/ieee1394io.cc Sat Apr 10 23:49:25 2004 +--- src/ieee1394io.cc.orig Wed Jul 14 04:57:07 2004 ++++ src/ieee1394io.cc Thu Aug 12 21:16:47 2004 @@ -61,11 +61,13 @@ #include <sys/mman.h> #include <sys/poll.h> @@ -14,21 +14,7 @@ #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; - - -@@ -283,7 +287,7 @@ +@@ -260,7 +262,7 @@ raw1394Reader::raw1394Reader( int p, int c, int bufSize ) : IEEE1394Reader( c, bufSize ), port( p ) { @@ -37,46 +23,25 @@ cerr << ">>> Using raw1394 capture" << endl; } -@@ -362,28 +366,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 - { +@@ -337,7 +339,8 @@ + bool raw1394Reader::Open() + { +- bool success; ++ bool success = false; +#if 0 - #ifdef LIBRAW1394_OLD - handle = raw1394_get_handle(); - #else - - handle = raw1394_new_handle(); - #endif + int numcards; + struct raw1394_portinfo pinf[ 16 ]; + iso_handler_t oldhandler; +@@ -370,6 +373,7 @@ + cerr << exc << endl; + success = false; + } +#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 ) ); + return success; + } - oldhandler = raw1394_set_iso_handler( handle, channel, Handler ); -- -+#endif - success = true; - } - catch ( string exc ) -@@ -402,11 +410,13 @@ +@@ -380,11 +384,13 @@ void raw1394Reader::Close() { @@ -90,7 +55,7 @@ } bool raw1394Reader::StartReceive() -@@ -416,7 +426,7 @@ +@@ -394,7 +400,7 @@ /* Starting iso receive */ try { @@ -99,7 +64,7 @@ success = true; } catch ( string exc ) -@@ -430,8 +440,8 @@ +@@ -408,8 +414,8 @@ void raw1394Reader::StopReceive() { @@ -110,15 +75,15 @@ } -@@ -467,6 +477,7 @@ +@@ -445,6 +451,7 @@ */ +#if 0 - int raw1394Reader::Handler( raw1394handle_t handle, int channel, size_t length, - quadlet_t *data ) + int raw1394Reader::HandlerProxy( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ) { -@@ -573,6 +584,7 @@ + raw1394Reader *self = static_cast< raw1394Reader* >( raw1394_get_userdata( handle ) ); +@@ -556,6 +563,7 @@ return 0; } @@ -126,23 +91,22 @@ /** The thread responsible for polling the raw1394 interface. -@@ -583,6 +595,7 @@ - */ - void* raw1394Reader::Thread( void* arg ) +@@ -572,12 +580,13 @@ + + void* raw1394Reader::Thread() { +- +#if 0 - raw1394Reader * theReader = ( raw1394Reader* ) arg; - while ( true ) -@@ -590,6 +603,7 @@ - raw1394_loop_iterate( theReader->handle ); + { + raw1394_loop_iterate( handle ); pthread_testcancel(); } +#endif return NULL; } -@@ -682,6 +696,7 @@ +@@ -670,6 +679,7 @@ bool dv1394Reader::Open() { @@ -150,7 +114,7 @@ int n_frames = DV1394_MAX_FRAMES / 4; struct dv1394_init init = { -@@ -715,6 +730,8 @@ +@@ -703,6 +713,8 @@ } return true; @@ -159,7 +123,7 @@ } -@@ -723,6 +740,7 @@ +@@ -711,6 +723,7 @@ */ void dv1394Reader::Close() { @@ -167,7 +131,7 @@ if ( m_dv1394_fd != -1 ) { if ( m_dv1394_map != NULL ) -@@ -731,11 +749,13 @@ +@@ -719,11 +732,13 @@ m_dv1394_map = NULL; m_dv1394_fd = -1; } @@ -181,7 +145,7 @@ /* Starting iso receive */ if ( ioctl( m_dv1394_fd, DV1394_START_RECEIVE, NULL ) ) { -@@ -743,6 +763,8 @@ +@@ -731,6 +746,8 @@ return false; } return true; @@ -190,7 +154,7 @@ } -@@ -751,6 +773,7 @@ +@@ -739,6 +756,7 @@ bool dv1394Reader::Handler( int handle ) { @@ -198,7 +162,7 @@ struct dv1394_status dvst; if ( ioctl( handle, DV1394_WAIT_FRAMES, 1 ) ) -@@ -828,6 +851,8 @@ +@@ -816,6 +834,8 @@ } return true; @@ -207,7 +171,7 @@ } -@@ -859,6 +884,7 @@ +@@ -852,6 +872,7 @@ AVC::AVC( int p ) : port( p ) { @@ -215,7 +179,7 @@ pthread_mutex_init( &avc_mutex, NULL ); avc_handle = NULL; int numcards; -@@ -890,6 +916,7 @@ +@@ -883,6 +904,7 @@ cerr << exc << endl; } return ; @@ -223,7 +187,7 @@ } -@@ -899,6 +926,7 @@ +@@ -892,6 +914,7 @@ AVC::~AVC() { @@ -231,7 +195,7 @@ if ( avc_handle != NULL ) { pthread_mutex_lock( &avc_mutex ); -@@ -906,11 +934,13 @@ +@@ -899,11 +922,13 @@ avc_handle = NULL; pthread_mutex_unlock( &avc_mutex ); } @@ -245,7 +209,7 @@ int AVC::ResetHandler( raw1394handle_t handle, unsigned int generation ) { cerr << "Reset Handler received" << endl; -@@ -918,7 +948,7 @@ +@@ -911,7 +936,7 @@ common->getPageCapture() ->driver_locked = true; return 0; } @@ -254,7 +218,7 @@ /** See if a node_id is still valid and pointing to an AV/C Recorder. -@@ -934,6 +964,7 @@ +@@ -927,6 +952,7 @@ int AVC::isPhyIDValid( int phyID ) { int value = -1; @@ -262,7 +226,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -976,6 +1007,7 @@ +@@ -969,6 +995,7 @@ } } pthread_mutex_unlock( &avc_mutex ); @@ -270,7 +234,7 @@ return value; } -@@ -984,6 +1016,7 @@ +@@ -977,6 +1004,7 @@ */ void AVC::Noop( void ) { @@ -278,7 +242,7 @@ struct pollfd raw1394_poll; raw1394_poll.fd = raw1394_get_fd( avc_handle ); raw1394_poll.events = POLLIN; -@@ -994,11 +1027,13 @@ +@@ -987,11 +1015,13 @@ || ( raw1394_poll.revents & POLLPRI ) ) raw1394_loop_iterate( avc_handle ); } @@ -292,7 +256,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1010,12 +1045,14 @@ +@@ -1003,12 +1033,14 @@ } } pthread_mutex_unlock( &avc_mutex ); @@ -307,7 +271,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1032,12 +1069,14 @@ +@@ -1025,12 +1057,14 @@ }; nanosleep( &t, NULL ); pthread_mutex_unlock( &avc_mutex ); @@ -322,7 +286,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1050,12 +1089,14 @@ +@@ -1043,12 +1077,14 @@ }; nanosleep( &t, NULL ); pthread_mutex_unlock( &avc_mutex ); @@ -337,7 +301,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1063,12 +1104,14 @@ +@@ -1056,12 +1092,14 @@ avc1394_vcr_rewind( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -352,7 +316,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1076,11 +1119,13 @@ +@@ -1069,11 +1107,13 @@ avc1394_vcr_forward( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -366,7 +330,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1088,11 +1133,13 @@ +@@ -1081,11 +1121,13 @@ avc1394_vcr_next( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -380,7 +344,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1100,11 +1147,13 @@ +@@ -1093,11 +1135,13 @@ avc1394_vcr_previous( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -394,7 +358,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1112,11 +1161,13 @@ +@@ -1105,11 +1149,13 @@ avc1394_vcr_next_index( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -408,7 +372,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1124,11 +1175,13 @@ +@@ -1117,11 +1163,13 @@ avc1394_vcr_previous_index( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -422,7 +386,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1136,11 +1189,13 @@ +@@ -1129,11 +1177,13 @@ avc1394_vcr_record( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -436,7 +400,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1148,12 +1203,14 @@ +@@ -1141,12 +1191,14 @@ avc1394_vcr_trick_play( avc_handle, phyID, speed ); } pthread_mutex_unlock( &avc_mutex ); @@ -451,7 +415,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1161,11 +1218,13 @@ +@@ -1154,11 +1206,13 @@ val = avc1394_vcr_status( avc_handle, phyID ); } pthread_mutex_unlock( &avc_mutex ); @@ -465,7 +429,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1194,10 +1253,13 @@ +@@ -1187,10 +1241,13 @@ } pthread_mutex_unlock( &avc_mutex ); return true; @@ -479,7 +443,7 @@ pthread_mutex_lock( &avc_mutex ); if ( avc_handle != NULL ) { -@@ -1220,6 +1282,7 @@ +@@ -1213,6 +1270,7 @@ } } pthread_mutex_unlock( &avc_mutex ); @@ -487,7 +451,7 @@ return -1; } -@@ -1227,6 +1290,7 @@ +@@ -1220,6 +1278,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 ) { @@ -495,7 +459,7 @@ m_fd = -1; m_deviceName = device; m_channel = channel; -@@ -1236,6 +1300,7 @@ +@@ -1229,6 +1288,7 @@ m_syt_offset = syt_offset; m_fd = open( m_deviceName.c_str(), O_RDWR ); @@ -503,7 +467,7 @@ } -@@ -1251,6 +1316,7 @@ +@@ -1244,6 +1304,7 @@ void dv1394Writer::SendFrame( Frame &frame ) { @@ -511,7 +475,7 @@ bool isPAL = frame.IsPAL(); if ( !isInitialised ) -@@ -1275,4 +1341,5 @@ +@@ -1268,4 +1329,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 72db38a..035676f 100644 --- a/multimedia/kino/files/patch-aj +++ b/multimedia/kino/files/patch-aj @@ -1,5 +1,5 @@ ---- src/ieee1394io.h.orig Sun Mar 28 20:42:50 2004 -+++ src/ieee1394io.h Tue Apr 13 11:14:32 2004 +--- src/ieee1394io.h.orig Sat Jul 3 02:01:32 2004 ++++ src/ieee1394io.h Thu Aug 12 21:11:41 2004 @@ -20,10 +20,13 @@ #ifndef _IEEE1394IO_H #define _IEEE1394IO_H 1 @@ -18,30 +18,35 @@ int port; /// the handle to the ieee1394 subsystem -- static raw1394handle_t handle; -+ //static raw1394handle_t handle; +- raw1394handle_t handle; ++ //raw1394handle_t handle; public: -@@ -130,7 +133,7 @@ +@@ -128,11 +131,11 @@ + void StopReceive( void ); + bool StartThread( void ); void StopThread( void ); +- int Handler( int channel, size_t length, quadlet_t *data ); ++ //int Handler( int channel, size_t length, quadlet_t *data ); + void *Thread(); 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 ); +- static int HandlerProxy( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ); ++ //static int HandlerProxy( raw1394handle_t handle, int channel, size_t length, quadlet_t *data ); + static void* ThreadProxy( void *arg ); }; -@@ -171,7 +174,7 @@ - static pthread_mutex_t avc_mutex; +@@ -174,7 +177,7 @@ + pthread_mutex_t avc_mutex; /// the handle to the ieee1394 subsystem -- static raw1394handle_t avc_handle; -+ //static raw1394handle_t avc_handle; +- raw1394handle_t avc_handle; ++ //raw1394handle_t avc_handle; public: AVC( int crd = 0 ); -@@ -195,7 +198,7 @@ +@@ -198,7 +201,7 @@ int getNodeId( const char *guid ); private: diff --git a/multimedia/kino/files/patch-al b/multimedia/kino/files/patch-al deleted file mode 100644 index 2903729..0000000 --- a/multimedia/kino/files/patch-al +++ /dev/null @@ -1,10 +0,0 @@ ---- 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-aq b/multimedia/kino/files/patch-aq deleted file mode 100644 index edea0b4..0000000 --- a/multimedia/kino/files/patch-aq +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 2f02858..0000000 --- a/multimedia/kino/files/patch-ar +++ /dev/null @@ -1,11 +0,0 @@ ---- 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-az b/multimedia/kino/files/patch-az index a94e154..e8ca4e8 100644 --- a/multimedia/kino/files/patch-az +++ b/multimedia/kino/files/patch-az @@ -1,11 +1,11 @@ ---- src/filehandler.cc.orig Tue Mar 30 06:41:06 2004 -+++ src/filehandler.cc Sun Apr 11 02:47:44 2004 +--- src/filehandler.cc.orig Sun Jul 11 22:00:33 2004 ++++ src/filehandler.cc Thu Aug 12 21:07:57 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 ); +- localtime_r( static_cast< const time_t * >( &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-help::Makefile.in b/multimedia/kino/files/patch-help::Makefile.in deleted file mode 100644 index 81bebb8..0000000 --- a/multimedia/kino/files/patch-help::Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 deleted file mode 100644 index 2e8a1a6..0000000 --- a/multimedia/kino/files/patch-scripts::exports::ffmpeg_dvd.sh +++ /dev/null @@ -1,19 +0,0 @@ ---- 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 deleted file mode 100644 index fac47d6..0000000 --- a/multimedia/kino/files/patch-scripts::help.sh +++ /dev/null @@ -1,10 +0,0 @@ ---- 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::mediactrl.c b/multimedia/kino/files/patch-src::mediactrl.c index a5cdc53..1f26e55 100644 --- a/multimedia/kino/files/patch-src::mediactrl.c +++ b/multimedia/kino/files/patch-src::mediactrl.c @@ -1,9 +1,9 @@ ---- 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> +--- src/mediactrl.c.orig Tue Jul 13 02:46:15 2004 ++++ src/mediactrl.c Fri Aug 13 01:26:56 2004 +@@ -19,14 +19,14 @@ #include <sys/types.h> #include <sys/stat.h> + #include <sys/time.h> -#include <asm/types.h> +//#include <asm/types.h> #include <fcntl.h> @@ -18,7 +18,16 @@ #include "mediactrl.h" -@@ -119,6 +119,7 @@ +@@ -101,7 +101,7 @@ + Griffin PowerMate + */ + static struct media_ctrl_key mc_powermate_keys[] = { +- { BTN_0, "Button", MEDIA_CTRL_B1 }, ++ { 0xdead, "Button", MEDIA_CTRL_B1 }, + { 0, NULL, 0 } + }; + +@@ -126,6 +126,7 @@ void translate_contour_hid_event(struct media_ctrl *ctrl, struct input_event *ev, struct media_ctrl_event *me) { @@ -26,7 +35,7 @@ int lv, cv; -@@ -176,10 +177,12 @@ +@@ -183,10 +184,12 @@ } @@ -39,7 +48,7 @@ me->type = 0; // printf("Translate %02x %02x\n", ev->type, ev->code ); -@@ -220,6 +223,7 @@ +@@ -227,6 +230,7 @@ //printf("Key: %04x %02x: %s\n", ev->code, ev->value, key->name); } @@ -47,7 +56,7 @@ } struct media_ctrl_device supported_devices[] = { -@@ -264,8 +268,9 @@ +@@ -273,8 +277,9 @@ if ( me->type == MEDIA_CTRL_EVENT_JOG ) { struct timeval timev; @@ -58,7 +67,7 @@ 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 @@ +@@ -294,6 +299,7 @@ int probe_device(struct media_ctrl *mc) { @@ -66,7 +75,7 @@ short devinfo[4]; int i = 0; -@@ -312,6 +318,7 @@ +@@ -321,6 +327,7 @@ } while ( supported_devices[++i].vendor != 0 ); diff --git a/multimedia/kino/files/patch-src::smiltime.cc b/multimedia/kino/files/patch-src::smiltime.cc deleted file mode 100644 index dc0d2b1..0000000 --- a/multimedia/kino/files/patch-src::smiltime.cc +++ /dev/null @@ -1,35 +0,0 @@ ---- 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 b5bcdff..57ddbf3 100644 --- a/multimedia/kino/pkg-plist +++ b/multimedia/kino/pkg-plist @@ -7,6 +7,7 @@ include/kino/image_filters.h include/kino/image_transitions.h include/kino/kino_extra.h include/kino/playlist.h +share/applications/kino.desktop share/kino/editor_fast.xpm share/kino/editor_fast_i.xpm share/kino/editor_movie.xpm @@ -26,6 +27,7 @@ share/kino/film_on.xpm share/kino/join.xpm share/kino/kino.glade share/kino/kino.jpeg +share/kino/kino.png share/kino/link.xpm share/kino/link_off.xpm share/kino/magick.glade @@ -59,6 +61,7 @@ share/kino/scripts/exports/rawplay.sh share/kino/scripts/publish/frame.sh share/kino/scripts/publish/project.sh @dirrm include/kino +@dirrm share/applications @dirrm share/kino/help @dirrm share/kino/scripts/exports @dirrm share/kino/scripts/publish |