mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

Update to 0.9.2.

Browse Source
This commit is contained in:
Pierre Beyssac 2006-09-02 20:35:49 +00:00
parent 9ab34309b6
commit 853aa82310
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=171915
7 changed files with 43 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
multimedia/kino/Makefile
View File

@ -6,7 +6,7 @@
#
PORTNAME= kino
PORTVERSION= 0.9.0
PORTVERSION= 0.9.2
CATEGORIES= multimedia
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
@ -32,6 +32,7 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/lqt \
LDFLAGS="-L${LOCALBASE}/lib/libquicktime \
-L${LOCALBASE}/lib -L${X11BASE}/lib" \
PTHREAD_LIBS="${PTHREAD_LIBS}"
CONFIGURE_ARGS= --with-dv1394
MAN1= kino.1
.include <bsd.port.pre.mk>

6
multimedia/kino/distinfo
View File

@ -1,3 +1,3 @@
MD5 (kino-0.9.0.tar.gz) = 95c6a550f1f3462efac639132ab6f990
SHA256 (kino-0.9.0.tar.gz) = 2b975caee1c0f97caf453a0a878387ab7d35f1e774b788c19a603340dc965d74
SIZE (kino-0.9.0.tar.gz) = 1571415
MD5 (kino-0.9.2.tar.gz) = 9c0d5a4d2fb04896c719e44df44a2622
SHA256 (kino-0.9.2.tar.gz) = 2df8937eff8ac2848bf5d5d533bb2b322fbd17d455b5a7d56794026008074ce1
SIZE (kino-0.9.2.tar.gz) = 1580036

22
multimedia/kino/files/patch-src__gtkenhancedscale.c
View File

@ -1,5 +1,5 @@
--- src/gtkenhancedscale.c.orig Mon Apr 10 03:56:16 2006
+++ src/gtkenhancedscale.c Wed Jul 19 00:39:53 2006
--- src/gtkenhancedscale.c.orig Thu Jul 20 05:47:54 2006
+++ src/gtkenhancedscale.c Sat Sep 2 19:54:17 2006
@@ -33,7 +33,7 @@
#include "gtkenhancedscale.h"
#include <string.h>
@ -9,21 +9,3 @@
#include <math.h>
#undef FANCY
@@ -159,7 +159,7 @@
enhanced_scale->adjustment = adjustment;
enhanced_scale->num_adjustments = num_adjustments;
- enhanced_scale->handler_id = malloc( num_adjustments );
+ enhanced_scale->handler_id = malloc( num_adjustments * sizeof(*enhanced_scale->handler_id) );
for ( i = 0;i < num_adjustments;i++ )
{
@@ -254,7 +254,7 @@
enhanced_scale->trough = gdk_window_new ( widget->window, &attributes, attributes_mask );
- enhanced_scale->slider = malloc( enhanced_scale->num_adjustments );
+ enhanced_scale->slider = malloc( enhanced_scale->num_adjustments * sizeof(*enhanced_scale->slider) );
attributes.width = ENHANCED_SCALE_CLASS ( enhanced_scale ) ->arrow_width;
attributes.height = ENHANCED_SCALE_CLASS ( enhanced_scale ) ->arrow_height;
attributes.event_mask |= ( GDK_BUTTON_MOTION_MASK |

51
multimedia/kino/files/patch-src__ieee1394io.cc
View File

@ -1,5 +1,5 @@
--- src/ieee1394io.cc.orig Mon May 22 00:16:33 2006
+++ src/ieee1394io.cc Tue Jul 18 23:29:20 2006
--- src/ieee1394io.cc.orig Sun Jul 2 22:52:08 2006
+++ src/ieee1394io.cc Sat Sep 2 19:32:07 2006
@@ -64,9 +64,11 @@
#include <time.h>
#include <sys/time.h>
@ -154,21 +154,22 @@
if ( avc_handle != NULL )
{
pthread_mutex_lock( &avc_mutex );
@@ -842,11 +868,13 @@
@@ -842,12 +868,14 @@
avc_handle = NULL;
pthread_mutex_unlock( &avc_mutex );
}
+#endif
}
extern "C" {
extern KinoCommon *common;
}
+#if 0
int AVC::ResetHandler( raw1394handle_t handle, unsigned int generation )
{
cerr << "Reset Handler received" << endl;
@@ -854,7 +882,7 @@
@@ -855,7 +883,7 @@
common->getPageCapture()->driver_locked = true;
return 0;
}
@ -177,7 +178,7 @@
/** See if a node_id is still valid and pointing to an AV/C Recorder.
@@ -870,6 +898,7 @@
@@ -871,6 +899,7 @@
int AVC::isPhyIDValid( int phyID )
{
int value = -1;
@ -185,7 +186,7 @@
int currentNode, nodeCount;
rom1394_directory rom1394_dir;
@@ -934,6 +963,7 @@
@@ -935,6 +964,7 @@
if ( value == -1 )
port = -1;
pthread_mutex_unlock( &avc_mutex );
@ -193,7 +194,7 @@
return value;
}
@@ -942,6 +972,7 @@
@@ -943,6 +973,7 @@
*/
void AVC::Noop( void )
{
@ -201,7 +202,7 @@
struct pollfd raw1394_poll;
raw1394_poll.fd = raw1394_get_fd( avc_handle );
raw1394_poll.events = POLLIN | POLLPRI;
@@ -952,11 +983,13 @@
@@ -953,11 +984,13 @@
|| ( raw1394_poll.revents & POLLPRI ) )
raw1394_loop_iterate( avc_handle );
}
@ -215,7 +216,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -968,12 +1001,14 @@
@@ -969,12 +1002,14 @@
}
}
pthread_mutex_unlock( &avc_mutex );
@ -230,7 +231,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -990,12 +1025,14 @@
@@ -991,12 +1026,14 @@
};
nanosleep( &t, NULL );
pthread_mutex_unlock( &avc_mutex );
@ -245,7 +246,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1008,12 +1045,14 @@
@@ -1009,12 +1046,14 @@
};
nanosleep( &t, NULL );
pthread_mutex_unlock( &avc_mutex );
@ -260,7 +261,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1021,12 +1060,14 @@
@@ -1022,12 +1061,14 @@
avc1394_vcr_rewind( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -275,7 +276,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1034,11 +1075,13 @@
@@ -1035,11 +1076,13 @@
avc1394_vcr_forward( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -289,7 +290,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1046,11 +1089,13 @@
@@ -1047,11 +1090,13 @@
avc1394_vcr_next( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -303,7 +304,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1058,11 +1103,13 @@
@@ -1059,11 +1104,13 @@
avc1394_vcr_previous( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -317,7 +318,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1070,11 +1117,13 @@
@@ -1071,11 +1118,13 @@
avc1394_vcr_next_index( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -331,7 +332,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1082,11 +1131,13 @@
@@ -1083,11 +1132,13 @@
avc1394_vcr_previous_index( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -345,7 +346,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1094,11 +1145,13 @@
@@ -1095,11 +1146,13 @@
avc1394_vcr_record( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -359,7 +360,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1106,12 +1159,14 @@
@@ -1107,12 +1160,14 @@
avc1394_vcr_trick_play( avc_handle, phyID, speed );
}
pthread_mutex_unlock( &avc_mutex );
@ -374,7 +375,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1119,11 +1174,13 @@
@@ -1120,11 +1175,13 @@
val = avc1394_vcr_status( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -388,7 +389,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1151,12 +1208,14 @@
@@ -1152,12 +1209,14 @@
}
pthread_mutex_unlock( &avc_mutex );
@ -403,7 +404,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1198,6 +1257,7 @@
@@ -1199,6 +1258,7 @@
if ( value == -1 )
port = -1;
pthread_mutex_unlock( &avc_mutex );
@ -411,7 +412,7 @@
return value;
}
@@ -1321,6 +1381,7 @@
@@ -1322,6 +1382,7 @@
int iec61883Writer::HandlerProxy( unsigned char *data, int n_dif_blocks,
unsigned int dropped, void *callback_data)
{
@ -419,7 +420,7 @@
if ( callback_data )
{
iec61883Writer* writer = static_cast< iec61883Writer* >( callback_data );
@@ -1330,6 +1391,8 @@
@@ -1331,6 +1392,8 @@
{
return -1;
}

108
multimedia/kino/files/patch-src__playlist.cc
View File

@ -1,108 +0,0 @@
--- src/playlist.cc.orig Mon Apr 24 07:14:21 2006
+++ src/playlist.cc Wed Jul 19 15:25:22 2006
@@ -301,7 +301,7 @@
return output;
}
-typedef bool ( *callback ) ( xmlNodePtr node, void *p );
+typedef bool ( *callback ) ( xmlNodePtr node, void *p, bool *freed );
typedef struct
{
@@ -340,7 +340,7 @@
\param p pointer to MovieInfo struct
\result true if file has been found and xml tree walk is done */
-static bool findFile( xmlNodePtr node, void *p )
+static bool findFile( xmlNodePtr node, void *p, bool *freed )
{
MovieInfo * data = ( MovieInfo* ) p;
@@ -412,7 +412,7 @@
\param p pointer to a string containing the project directory
\result true if file has been found and xml tree walk is done */
-static bool fillMap( xmlNodePtr node, void *p )
+static bool fillMap( xmlNodePtr node, void *p, bool *freed )
{
if ( xmlStrcmp( node->name, ( const xmlChar* ) "video" ) == 0 )
{
@@ -468,6 +468,7 @@
<< " - removing from list" << endl;
xmlUnlinkNode( node );
xmlFreeNode( node );
+ *freed = true;
}
}
}
@@ -489,7 +490,7 @@
If the scene has been found in the playlist, the file name
and first frame number are returned in the private data. */
-static bool findSceneStart( xmlNodePtr node, void *p )
+static bool findSceneStart( xmlNodePtr node, void *p, bool *freed )
{
int fileCount = 0;
MovieInfo *data = ( MovieInfo* ) p;
@@ -562,7 +563,7 @@
}
-static bool findSceneEnd( xmlNodePtr node, void *p )
+static bool findSceneEnd( xmlNodePtr node, void *p, bool *freed )
{
bool found = false;
xmlChar *src = NULL;
@@ -640,7 +641,7 @@
\note This code requires a <video> node format that is not defined in smil. */
-static bool countFrames( xmlNodePtr node, void *p )
+static bool countFrames( xmlNodePtr node, void *p, bool *freed )
{
if ( xmlStrcmp( node->name, ( const xmlChar* ) "video" ) == 0 )
{
@@ -686,7 +687,7 @@
<video src="file.avi" clipBegin="200" clipEnd="800" \>
\note This code requires a <video> node format that is not defined in smil. */
-static bool convertEli( xmlNodePtr node, void *p )
+static bool convertEli( xmlNodePtr node, void *p, bool *freed )
{
if ( xmlStrcmp( node->name, ( const xmlChar* ) "video" ) == 0 )
{
@@ -741,10 +742,13 @@
while ( node != NULL && done == false )
{
- done = ( *func ) ( node, p );
- if ( done == false && node->xmlChildrenNode != NULL )
+ bool freed = false;
+ xmlNodePtr next = node->next;
+ done = ( *func ) ( node, p, &freed );
+ if ( done == false && freed == false
+ && node->xmlChildrenNode != NULL )
done = parse( node->xmlChildrenNode, func, p );
- node = node->next;
+ node = next;
}
return done;
}
@@ -1724,7 +1728,7 @@
return true;
}
-static bool relativeMap( xmlNodePtr node, void *p )
+static bool relativeMap( xmlNodePtr node, void *p, bool *freed )
{
if ( xmlStrcmp( node->name, ( const xmlChar* ) "video" ) == 0 )
{
@@ -1922,7 +1926,7 @@
\result true if file has been found and xml tree walk is done
*/
-static bool checkIfFileUsed( xmlNodePtr node, void *p )
+static bool checkIfFileUsed( xmlNodePtr node, void *p, bool *freed )
{
if ( xmlStrcmp( node->name, ( const xmlChar* ) "video" ) == 0 )
{

16
multimedia/kino/files/patch-src__preferences_dialog.cc
View File

@ -1,5 +1,5 @@
--- src/preferences_dialog.cc.orig Mon May 22 00:44:30 2006
+++ src/preferences_dialog.cc Tue Jul 18 23:06:23 2006
--- src/preferences_dialog.cc.orig Fri Jul 14 08:11:36 2006
+++ src/preferences_dialog.cc Sat Sep 2 19:34:27 2006
@@ -34,8 +34,10 @@
#include "support.h"
#include "commands.h"
@ -25,15 +25,15 @@
media_ctrl_key *mkeys;
@@ -309,6 +315,7 @@
widget = lookup_widget( dialog, "optionmenu_avc_phyid" );
@@ -312,6 +318,7 @@
#ifdef HAVE_DV1394
gtk_widget_hide_all( lookup_widget( dialog, "hbox_ieee1394_warning" ) );
#endif
+#if 0
if ( ( handle = raw1394_new_handle() ) )
{
raw1394_portinfo ports[MAX_1394_PORTS];
@@ -370,6 +377,7 @@
@@ -373,6 +380,7 @@
}
}
}
@ -41,7 +41,7 @@
gtk_option_menu_set_menu ( GTK_OPTION_MENU ( widget ), glade_menu );
gtk_option_menu_set_history( GTK_OPTION_MENU( widget ), currentItem );
@@ -406,7 +414,9 @@
@@ -409,7 +417,9 @@
void
on_avc_phyid_activate( GtkMenuItem * menu_item, gpointer user_data )
{

1
multimedia/kino/pkg-plist
View File

@ -1,6 +1,7 @@
bin/kino
include/kino/audio_filters.h
include/kino/audio_transitions.h
include/kino/endian_types.h
include/kino/frame.h
include/kino/image_create.h
include/kino/image_filters.h