kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 0.7.6.

Browse source
This commit is contained in:
Pierre Beyssac 2005-07-14 19:24:54 +00:00
parent dcb7f22ad2
commit 204ee61347
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=139233
9 changed files with 143 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
multimedia/kino/Makefile
View file

@ -6,11 +6,9 @@
#
PORTNAME= kino
PORTVERSION= 0.7.5
PORTREVISION= 5
PORTVERSION= 0.7.6
CATEGORIES= multimedia
MASTER_SITES= http://kino.schirmacher.de/filemanager/download/42/ \
http://perso.enst.fr/~beyssac/mirrors/
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= pb@FreeBSD.org

4
multimedia/kino/distinfo
View file

@ -1,2 +1,2 @@
MD5 (kino-0.7.5.tar.gz) = 592f90be63feb7e63940cedd68edcf79
SIZE (kino-0.7.5.tar.gz) = 1227042
MD5 (kino-0.7.6.tar.gz) = c1fa929096f5a754455f5a3dd33dd203
SIZE (kino-0.7.6.tar.gz) = 1089097

4
multimedia/kino/files/patch-Makefile.in
View file

@ -4,8 +4,8 @@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-SUBDIRS = po src help scripts linux-hotplug
+SUBDIRS = po src help scripts
-SUBDIRS = po src help scripts linux-hotplug pixmaps
+SUBDIRS = po src help scripts pixmaps
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config.h.in
#ACLOCAL_AMFLAGS = -I m4
EXTRA_DIST = config.rpath \

48
multimedia/kino/files/patch-aa
View file

@ -1,6 +1,6 @@
--- configure.orig Fri Aug 13 01:15:49 2004
+++ configure Fri Aug 13 01:15:35 2004
@@ -5325,7 +5325,7 @@
--- configure.orig Thu Jul 14 00:44:15 2005
+++ configure Thu Jul 14 00:57:23 2005
@@ -5448,7 +5448,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
@ -9,7 +9,7 @@
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
@@ -5693,7 +5693,7 @@
@@ -5816,7 +5816,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 +18,7 @@
fi
@@ -5703,7 +5703,7 @@
@@ -5826,7 +5826,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 +27,7 @@
fi
@@ -5853,7 +5853,7 @@
@@ -5976,7 +5976,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 +36,7 @@
fi
@@ -5933,7 +5933,7 @@
@@ -6056,7 +6056,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 +45,7 @@
fi
@@ -6080,7 +6080,7 @@
@@ -6203,7 +6203,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 +54,7 @@
fi
@@ -6160,7 +6160,7 @@
@@ -6283,7 +6283,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 +63,7 @@
fi
@@ -6240,7 +6240,7 @@
@@ -6363,7 +6363,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;}
@ -72,26 +72,20 @@
fi
@@ -10187,15 +10187,15 @@
fi
fi
- if test $succeeded = yes; then
- cat >>confdefs.h <<\_ACEOF
@@ -10297,11 +10297,11 @@
echo "$as_me:$LINENO: result: not using file chooser dialogs" >&5
echo "${ECHO_T}not using file chooser dialogs" >&6
else
- GTK24_CFLAGS=$pkg_cv_GTK24_CFLAGS
- GTK24_LIBS=$pkg_cv_GTK24_LIBS
- cat >>confdefs.h <<\_ACEOF
-#define HAVE_GTK24 1
-_ACEOF
-
- else
+# if test $succeeded = yes; then
+# cat >>confdefs.h <<\_ACEOF
+# GTK24_CFLAGS=$pkg_cv_GTK24_CFLAGS
+# GTK24_LIBS=$pkg_cv_GTK24_LIBS
+# cat >>confdefs.h <<\_ACEOF
+##define HAVE_GTK24 1
+#_ACEOF
+#
+# else
echo "$as_me:$LINENO: result: not using file chooser dialogs" >&5
echo "${ECHO_T}not using file chooser dialogs" >&6
- fi
+# fi
fi
# ######################################################################

94
multimedia/kino/files/patch-ai
View file

@ -1,5 +1,5 @@
--- src/ieee1394io.cc.orig Sat Aug 21 06:55:56 2004
+++ src/ieee1394io.cc Sun Oct 10 19:43:02 2004
--- src/ieee1394io.cc.orig Thu May 19 00:40:12 2005
+++ src/ieee1394io.cc Thu Jul 14 00:39:30 2005
@@ -62,11 +62,13 @@
#include <sys/poll.h>
#include <errno.h>
@ -14,7 +14,7 @@
#include "ieee1394io.h"
#include "preferences.h"
@@ -261,7 +263,7 @@
@@ -263,7 +265,7 @@
raw1394Reader::raw1394Reader( int p, int c, int bufSize ) :
IEEE1394Reader( c, bufSize ), port( p )
{
@ -33,7 +33,7 @@
int numcards;
struct raw1394_portinfo pinf[ 16 ];
iso_handler_t oldhandler;
@@ -365,6 +368,7 @@
@@ -367,6 +370,7 @@
cerr << exc << endl;
success = false;
}
@ -41,7 +41,7 @@
return success;
}
@@ -375,11 +379,13 @@
@@ -377,11 +381,13 @@
void raw1394Reader::Close()
{
@ -55,7 +55,7 @@
}
bool raw1394Reader::StartReceive()
@@ -389,7 +395,7 @@
@@ -391,7 +397,7 @@
/* Starting iso receive */
try
{
@ -64,7 +64,7 @@
success = true;
}
catch ( string exc )
@@ -403,8 +409,8 @@
@@ -405,8 +411,8 @@
void raw1394Reader::StopReceive()
{
@ -75,7 +75,7 @@
}
@@ -440,6 +446,7 @@
@@ -442,6 +448,7 @@
*/
@ -83,7 +83,7 @@
int raw1394Reader::HandlerProxy( raw1394handle_t handle, int channel, size_t length, quadlet_t *data )
{
raw1394Reader *self = static_cast< raw1394Reader* >( raw1394_get_userdata( handle ) );
@@ -551,6 +558,7 @@
@@ -553,6 +560,7 @@
return 0;
}
@ -91,7 +91,7 @@
/** The thread responsible for polling the raw1394 interface.
@@ -570,6 +578,7 @@
@@ -572,6 +580,7 @@
struct pollfd raw1394_poll;
int result;
@ -99,7 +99,7 @@
raw1394_poll.fd = raw1394_get_fd( handle );
raw1394_poll.events = POLLIN | POLLERR | POLLHUP | POLLPRI;
@@ -587,6 +596,7 @@
@@ -589,6 +598,7 @@
|| ( raw1394_poll.revents & POLLPRI ) ) )
result = raw1394_loop_iterate( handle );
}
@ -107,7 +107,7 @@
return NULL;
}
@@ -673,6 +683,7 @@
@@ -674,6 +684,7 @@
bool dv1394Reader::Open()
{
@ -115,7 +115,7 @@
int n_frames = DV1394_MAX_FRAMES / 4;
struct dv1394_init init =
{
@@ -706,6 +717,8 @@
@@ -704,6 +715,8 @@
}
return true;
@ -124,7 +124,7 @@
}
@@ -714,6 +727,7 @@
@@ -712,6 +725,7 @@
*/
void dv1394Reader::Close()
{
@ -132,7 +132,7 @@
if ( m_dv1394_fd != -1 )
{
if ( m_dv1394_map != NULL )
@@ -722,11 +736,13 @@
@@ -720,11 +734,13 @@
m_dv1394_map = NULL;
m_dv1394_fd = -1;
}
@ -146,7 +146,7 @@
/* Starting iso receive */
if ( ioctl( m_dv1394_fd, DV1394_START_RECEIVE, NULL ) )
{
@@ -734,6 +750,8 @@
@@ -732,6 +748,8 @@
return false;
}
return true;
@ -155,7 +155,7 @@
}
@@ -742,6 +760,7 @@
@@ -740,6 +758,7 @@
bool dv1394Reader::Handler( int handle )
{
@ -163,7 +163,7 @@
struct dv1394_status dvst;
struct pollfd pol;
int result;
@@ -828,6 +847,8 @@
@@ -826,6 +845,8 @@
}
return true;
@ -172,7 +172,7 @@
}
@@ -863,6 +884,7 @@
@@ -861,6 +882,7 @@
AVC::AVC( int p ) : port( p )
{
@ -180,15 +180,15 @@
pthread_mutex_init( &avc_mutex, NULL );
avc_handle = NULL;
int numcards;
@@ -894,6 +916,7 @@
@@ -897,6 +919,7 @@
avc_handle = NULL;
cerr << exc << endl;
}
return ;
+#endif
return;
}
@@ -903,6 +926,7 @@
@@ -907,6 +930,7 @@
AVC::~AVC()
{
@ -196,7 +196,7 @@
if ( avc_handle != NULL )
{
pthread_mutex_lock( &avc_mutex );
@@ -910,11 +934,13 @@
@@ -914,11 +938,13 @@
avc_handle = NULL;
pthread_mutex_unlock( &avc_mutex );
}
@ -210,7 +210,7 @@
int AVC::ResetHandler( raw1394handle_t handle, unsigned int generation )
{
cerr << "Reset Handler received" << endl;
@@ -922,7 +948,7 @@
@@ -926,7 +952,7 @@
common->getPageCapture() ->driver_locked = true;
return 0;
}
@ -219,7 +219,7 @@
/** See if a node_id is still valid and pointing to an AV/C Recorder.
@@ -938,6 +964,7 @@
@@ -942,6 +968,7 @@
int AVC::isPhyIDValid( int phyID )
{
int value = -1;
@ -227,7 +227,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -980,6 +1007,7 @@
@@ -984,6 +1011,7 @@
}
}
pthread_mutex_unlock( &avc_mutex );
@ -235,7 +235,7 @@
return value;
}
@@ -988,6 +1016,7 @@
@@ -992,6 +1020,7 @@
*/
void AVC::Noop( void )
{
@ -243,7 +243,7 @@
struct pollfd raw1394_poll;
raw1394_poll.fd = raw1394_get_fd( avc_handle );
raw1394_poll.events = POLLIN | POLLPRI;
@@ -998,11 +1027,13 @@
@@ -1002,11 +1031,13 @@
|| ( raw1394_poll.revents & POLLPRI ) )
raw1394_loop_iterate( avc_handle );
}
@ -257,7 +257,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1014,12 +1045,14 @@
@@ -1018,12 +1049,14 @@
}
}
pthread_mutex_unlock( &avc_mutex );
@ -272,7 +272,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1036,12 +1069,14 @@
@@ -1040,12 +1073,14 @@
};
nanosleep( &t, NULL );
pthread_mutex_unlock( &avc_mutex );
@ -287,7 +287,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1054,12 +1089,14 @@
@@ -1058,12 +1093,14 @@
};
nanosleep( &t, NULL );
pthread_mutex_unlock( &avc_mutex );
@ -302,7 +302,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1067,12 +1104,14 @@
@@ -1071,12 +1108,14 @@
avc1394_vcr_rewind( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -317,7 +317,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1080,11 +1119,13 @@
@@ -1084,11 +1123,13 @@
avc1394_vcr_forward( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -331,7 +331,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1092,11 +1133,13 @@
@@ -1096,11 +1137,13 @@
avc1394_vcr_next( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -345,7 +345,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1104,11 +1147,13 @@
@@ -1108,11 +1151,13 @@
avc1394_vcr_previous( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -359,7 +359,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1116,11 +1161,13 @@
@@ -1120,11 +1165,13 @@
avc1394_vcr_next_index( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -373,7 +373,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1128,11 +1175,13 @@
@@ -1132,11 +1179,13 @@
avc1394_vcr_previous_index( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -387,7 +387,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1140,11 +1189,13 @@
@@ -1144,11 +1193,13 @@
avc1394_vcr_record( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -401,7 +401,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1152,12 +1203,14 @@
@@ -1156,12 +1207,14 @@
avc1394_vcr_trick_play( avc_handle, phyID, speed );
}
pthread_mutex_unlock( &avc_mutex );
@ -416,7 +416,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1165,11 +1218,13 @@
@@ -1169,11 +1222,13 @@
val = avc1394_vcr_status( avc_handle, phyID );
}
pthread_mutex_unlock( &avc_mutex );
@ -430,7 +430,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1198,10 +1253,13 @@
@@ -1202,10 +1257,13 @@
}
pthread_mutex_unlock( &avc_mutex );
return true;
@ -444,7 +444,7 @@
pthread_mutex_lock( &avc_mutex );
if ( avc_handle != NULL )
{
@@ -1224,6 +1282,7 @@
@@ -1228,6 +1286,7 @@
}
}
pthread_mutex_unlock( &avc_mutex );
@ -452,7 +452,7 @@
return -1;
}
@@ -1231,6 +1290,7 @@
@@ -1235,6 +1294,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 )
{
@ -460,7 +460,7 @@
m_fd = -1;
m_deviceName = device;
m_channel = channel;
@@ -1240,6 +1300,7 @@
@@ -1244,6 +1304,7 @@
m_syt_offset = syt_offset;
m_fd = open( m_deviceName.c_str(), O_RDWR );
@ -468,7 +468,7 @@
}
@@ -1255,6 +1316,7 @@
@@ -1259,6 +1320,7 @@
void dv1394Writer::SendFrame( Frame &frame )
{
@ -476,7 +476,7 @@
bool isPAL = frame.IsPAL();
if ( !isInitialised )
@@ -1279,4 +1341,5 @@
@@ -1283,4 +1345,5 @@
}
write( m_fd, frame.data, ( isPAL ? DV1394_PAL_FRAME_SIZE : DV1394_NTSC_FRAME_SIZE ) );

12
multimedia/kino/files/patch-as
View file

@ -1,5 +1,5 @@
--- src/preferences_dialog.cc.orig Tue Mar 30 06:35:13 2004
+++ src/preferences_dialog.cc Sun Apr 11 02:45:04 2004
--- src/preferences_dialog.cc.orig Tue Dec 28 16:22:48 2004
+++ src/preferences_dialog.cc Thu Jul 14 00:42:56 2005
@@ -32,8 +32,10 @@
#include "support.h"
#include "commands.h"
@ -41,15 +41,15 @@
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 @@
@@ -422,6 +430,7 @@
void
on_avc_phyid_activate( GtkMenuItem * menu_item, gpointer user_data )
{
int currentNode = ( int ) user_data;
+#if 0
nodeid_t currentNode = ( nodeid_t )( long )user_data;
static raw1394handle_t handle;
#ifdef LIBRAW1394_OLD
@@ -439,6 +448,7 @@
@@ -441,6 +450,7 @@
}
raw1394_destroy_handle( handle );
handle = NULL;

51
multimedia/kino/files/patch-src_endian_types.h Normal file
View file

@ -0,0 +1,51 @@
--- src/endian_types.h.orig Sat Apr 2 01:02:46 2005
+++ src/endian_types.h Thu Jul 14 20:35:49 2005
@@ -30,14 +30,45 @@
/* Needed for BYTE_ORDER and BIG/LITTLE_ENDIAN macros. */
#ifndef _BSD_SOURCE
# define _BSD_SOURCE
-# include <endian.h>
+# include <sys/endian.h>
# undef _BSD_SOURCE
#else
-# include <endian.h>
+# include <sys/endian.h>
#endif
#include <sys/types.h>
-#include <byteswap.h>
+//#include <byteswap.h>
+
+#if __FreeBSD_version__ >= 500000
+#define bswap_16 bswap16
+#define bswap_32 bswap32
+#define bswap_64 bswap64
+#else
+static inline int16_t bswap_16(const int16_t& x)
+{
+ return (x>>8)|((x&255)<<8);
+}
+
+static inline int32_t bswap_32(const int32_t& x)
+{
+ return (x>>24)|((x&0xff0000)>>8)|((x&0xff00)<<8)|((x&255)<<8);
+}
+
+static inline int64_t bswap_64(const int64_t& x)
+{
+ union {
+ unsigned char x[8];
+ int64_t x64;
+ } u;
+ unsigned char t;
+ u.x64 = x;
+ t = u.x[7]; u.x[7] = u.x[0]; u.x[0] =t;
+ t = u.x[6]; u.x[6] = u.x[1]; u.x[1] =t;
+ t = u.x[5]; u.x[5] = u.x[2]; u.x[2] =t;
+ t = u.x[4]; u.x[4] = u.x[3]; u.x[3] =t;
+ return u.x64;
+}
+#endif
static inline int8_t bswap(const int8_t& x)
{

2
multimedia/kino/pkg-descr
View file

@ -2,5 +2,5 @@ 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://www.kinodv.org/
WWW: http://sourceforge.net/projects/kino/

13
multimedia/kino/pkg-plist
View file

@ -19,14 +19,13 @@ share/gnome/kino/insert_before-16.png
share/gnome/kino/insert_before.png
share/gnome/kino/join.xpm
share/gnome/kino/kino.glade
share/gnome/kino/kino.jpeg
share/gnome/kino/kino.png
share/gnome/kino/link.xpm
share/gnome/kino/link_off.xpm
share/gnome/kino/magick.glade
share/gnome/kino/photo-camera.xpm
share/gnome/kino/publish_project.png
share/gnome/kino/publish_still.png
share/gnome/kino/saveframe.png
share/gnome/kino/split.xpm
share/gnome/kino/stock_media-begin-16.png
share/gnome/kino/stock_media-end-16.png
@ -61,10 +60,14 @@ share/gnome/kino/help/ui.html
share/gnome/kino/scripts/help.sh
share/gnome/kino/scripts/exports/extract_chapters
share/gnome/kino/scripts/exports/ffmpeg2theora.sh
share/gnome/kino/scripts/exports/ffmpeg_3gp.sh
share/gnome/kino/scripts/exports/ffmpeg_divx.sh
share/gnome/kino/scripts/exports/ffmpeg_divx_dual.sh
share/gnome/kino/scripts/exports/ffmpeg_dvd.sh
share/gnome/kino/scripts/exports/ffmpeg_dvd_dual.sh
share/gnome/kino/scripts/exports/ffmpeg_flv.sh
share/gnome/kino/scripts/exports/ffmpeg_mp3.sh
share/gnome/kino/scripts/exports/ffmpeg_mp4.sh
share/gnome/kino/scripts/exports/ffmpeg_vcd.sh
share/gnome/kino/scripts/exports/mencoder.sh
share/gnome/kino/scripts/exports/rawplay.sh
@ -75,7 +78,12 @@ share/locale/cs/LC_MESSAGES/kino.mo
share/locale/da/LC_MESSAGES/kino.mo
share/locale/es/LC_MESSAGES/kino.mo
share/locale/fr/LC_MESSAGES/kino.mo
share/locale/it/LC_MESSAGES/kino.mo
share/locale/no/LC_MESSAGES/kino.mo
share/locale/sv/LC_MESSAGES/kino.mo
share/locale/nb/LC_MESSAGES/kino.mo
share/locale/eu/LC_MESSAGES/kino.mo
share/mime/packages/kino.xml
@dirrm include/kino
@dirrm share/gnome/kino/help
@dirrm share/gnome/kino/scripts/exports
@ -84,3 +92,4 @@ share/locale/sv/LC_MESSAGES/kino.mo
@dirrm share/gnome/kino
@unexec rmdir %D/share/gnome/applications 2>/dev/null || true
@unexec rmdir %D/share/gnome/pixmaps 2>/dev/null || true
@unexec rmdir %D/share/mime/packages 2>/dev/null || true