diff options
Diffstat (limited to 'multimedia/kino/files')
34 files changed, 0 insertions, 1710 deletions
diff --git a/multimedia/kino/files/patch-Makefile.in b/multimedia/kino/files/patch-Makefile.in deleted file mode 100644 index d780b7a79965..000000000000 --- a/multimedia/kino/files/patch-Makefile.in +++ /dev/null @@ -1,12 +0,0 @@ ---- Makefile.in.orig Tue Mar 27 16:15:11 2007 -+++ Makefile.in Tue Mar 27 16:15:55 2007 -@@ -715,8 +715,7 @@ - - info-am: - --install-data-am: install-data-local install-desktopDATA \ -- install-udevrulesDATA -+install-data-am: install-data-local install-desktopDATA - - install-exec-am: - diff --git a/multimedia/kino/files/patch-am b/multimedia/kino/files/patch-am deleted file mode 100644 index b92432fdbefa..000000000000 --- a/multimedia/kino/files/patch-am +++ /dev/null @@ -1,25 +0,0 @@ ---- src/jogshuttle.cc.orig Tue Feb 20 07:32:05 2007 -+++ src/jogshuttle.cc Sat Mar 17 21:05:33 2007 -@@ -27,7 +27,7 @@ - #include <fcntl.h> - #include <unistd.h> - #include <errno.h> --#include <linux/input.h> -+//#include <linux/input.h> - - #include "jogshuttle.h" - #include "preferences.h" -@@ -343,6 +343,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 ); -@@ -405,4 +406,5 @@ - { - return; - } -+#endif - } diff --git a/multimedia/kino/files/patch-an b/multimedia/kino/files/patch-an deleted file mode 100644 index 55c5b0a9c3d4..000000000000 --- a/multimedia/kino/files/patch-an +++ /dev/null @@ -1,18 +0,0 @@ ---- src/page_capture.cc.orig Thu Apr 1 23:50:01 2004 -+++ src/page_capture.cc Sun Apr 11 00:35:15 2004 -@@ -295,6 +295,7 @@ - } - gui_state_was = 0; - } -+#if 0 - else if ( check_phyid == true ) - { - if ( gui_state_was != 1 ) -@@ -438,6 +439,7 @@ - gui_state_was = 3; - } - } -+#endif - } - - /** Define active widgets. diff --git a/multimedia/kino/files/patch-ao b/multimedia/kino/files/patch-ao deleted file mode 100644 index f10219edb340..000000000000 --- a/multimedia/kino/files/patch-ao +++ /dev/null @@ -1,16 +0,0 @@ ---- 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 <libavc1394/avc1394.h> -+//#include <libavc1394/avc1394.h> - - /** This class controls the firewire capture notebook page. - */ -+ -+typedef unsigned long quadlet_t; - - class PageCapture : public Page - { diff --git a/multimedia/kino/files/patch-at b/multimedia/kino/files/patch-at deleted file mode 100644 index bc056bbb1077..000000000000 --- a/multimedia/kino/files/patch-at +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 <stdio.h> - #include <iostream> - #include <iomanip> --#include <byteswap.h> -+//#include <byteswap.h> - - using std::cout; - using std::hex; diff --git a/multimedia/kino/files/patch-au b/multimedia/kino/files/patch-au deleted file mode 100644 index ed36b858a10b..000000000000 --- a/multimedia/kino/files/patch-au +++ /dev/null @@ -1,10 +0,0 @@ ---- src/storyboard.cc.orig Fri Apr 2 22:10:11 2004 -+++ src/storyboard.cc Sun Apr 11 00:35:26 2004 -@@ -26,6 +26,7 @@ - #include <string> - - #include <pthread.h> -+#include <libgen.h> - - #include "storyboard.h" - #include "frame.h" diff --git a/multimedia/kino/files/patch-av b/multimedia/kino/files/patch-av deleted file mode 100644 index b0f6e8ef48f3..000000000000 --- a/multimedia/kino/files/patch-av +++ /dev/null @@ -1,449 +0,0 @@ ---- src/v4l.cc.orig Mon Mar 15 21:25:09 2004 -+++ src/v4l.cc Sun Apr 11 00:35:28 2004 -@@ -71,7 +71,7 @@ - - V4LCapability::V4LCapability( V4LDevice *device ) - { -- device->request( VIDIOCGCAP, this ); -+// device->request( VIDIOCGCAP, this ); - } - - V4LCapability::~V4LCapability() -@@ -81,82 +81,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() -@@ -188,13 +204,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() -@@ -202,61 +219,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() -@@ -266,12 +290,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 ) -@@ -282,7 +308,8 @@ - // FIXME: Hardcoded tuner settings - current->setRangeLow( 0 ); - current->setRangeHigh( 0xffff ); -- return device->request( VIDIOCSTUNER, current ); -+ //return device->request( VIDIOCSTUNER, current ); -+ return false; - } - else - { -@@ -292,7 +319,8 @@ - - unsigned int V4LChannel::getNumberOfTuners() - { -- return channel.tuners; -+ //return channel.tuners; -+ return 0; - } - - V4LTuner *V4LChannel::getTuner( unsigned int index ) -@@ -309,12 +337,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; -@@ -328,6 +357,7 @@ - cout << " TV" << endl; - if ( channel.type & VIDEO_TYPE_CAMERA ) - cout << " Camera" << endl; -+#endif - } - - /** Constructor for the V4L class. -@@ -431,7 +461,8 @@ - if ( channel >= 0 && channel < channels.size() ) - { - current = channels[ channel ]; -- return this->request( VIDIOCSCHAN, current ); -+ //return this->request( VIDIOCSCHAN, current ); -+ return false; - } - else - { -@@ -553,6 +584,7 @@ - - void V4L::startAudio() - { -+#if 0 - struct video_audio audio; - ioctl( fd, VIDIOCGAUDIO, &audio ); - if ( audio.flags & VIDEO_AUDIO_MUTE ) -@@ -560,6 +592,7 @@ - cout << "Volume : " << audio.volume << endl; - audio.volume = 65535; - ioctl( fd, VIDIOCSAUDIO, &audio ); -+#endif - } - - /** Turn off audio. -@@ -567,16 +600,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 ) - { -@@ -586,6 +622,8 @@ - frame_maps = buf.frames; - } - return buf.size; -+#endif -+ return 0; - } - - /** Initialise capture. -@@ -596,6 +634,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 ); -@@ -625,6 +664,8 @@ - { - return false; - } -+#endif -+ return false; - } - - /** Get the next frame. -@@ -635,6 +676,7 @@ - void *V4L::getNextFrame() - { - unsigned char * ret = NULL; -+#if 0 - - int current = frame_next; - frame_next = ( frame_next + 1 ) % frame_maps; -@@ -647,6 +689,7 @@ - - frames ++; - -+#endif - return ( void * ) ret; - } - -@@ -655,6 +698,7 @@ - - void V4L::stopCapture() - { -+#if 0 - if ( map != NULL ) - { - struct timeval tv; -@@ -667,6 +711,7 @@ - int enable = 0; - ioctl( getHandle(), VIDIOCCAPTURE, &enable ); - } -+#endif - } - - /** Get the current frequency of the tuner. -@@ -676,9 +721,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. -@@ -690,7 +738,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. -@@ -998,12 +1047,12 @@ - - void GDKV4L::draw() - { -- - if ( displayer == NULL ) - { - gdk_threads_enter(); - displayer = FindDisplayer::getDisplayer( widget, getWidth(), getHeight() ); - -+#if 0 - switch ( displayer->format() ) - { - case DISPLAY_YUV: -@@ -1021,6 +1070,7 @@ - default: - break; - } -+#endif - gdk_threads_leave(); - } - -@@ -1046,6 +1096,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 -@@ -1056,6 +1107,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 deleted file mode 100644 index ab2e7bc7614d..000000000000 --- a/multimedia/kino/files/patch-aw +++ /dev/null @@ -1,55 +0,0 @@ ---- src/v4l.h.orig Tue Jan 20 02:22:02 2004 -+++ src/v4l.h Sun Apr 11 02:54:30 2004 -@@ -28,6 +28,7 @@ - #include <string> - - #include <fcntl.h> -+#include <pthread.h> - #include <unistd.h> - #include <sys/mman.h> - #include <sys/types.h> -@@ -39,7 +40,7 @@ - - #define _DEVICE_H_ - #define _LINUX_TIME_H --#include <linux/videodev.h> -+//#include <linux/videodev.h> - - #include "displayer.h" - -@@ -69,7 +70,7 @@ - class V4LCapability : public V4LStruct - { - private: -- struct video_capability capability; -+ //struct video_capability capability; - - public: - V4LCapability( V4LDevice *device ); -@@ -97,7 +98,7 @@ - { - private: - V4LDevice *device; -- struct video_tuner tuner; -+ //struct video_tuner tuner; - - public: - V4LTuner( V4LDevice *device, int index ); -@@ -118,7 +119,7 @@ - { - private: - V4LDevice *device; -- struct video_channel channel; -+ //struct video_channel channel; - vector <V4LTuner *> tuners; - V4LTuner *current; - -@@ -147,7 +148,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 deleted file mode 100644 index 18cb2a17c571..000000000000 --- a/multimedia/kino/files/patch-ax +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <stdint.h> - #include <gtk/gtk.h> - - /** Public interface for all audio filter classes. diff --git a/multimedia/kino/files/patch-az b/multimedia/kino/files/patch-az deleted file mode 100644 index e8ca4e86f161..000000000000 --- a/multimedia/kino/files/patch-az +++ /dev/null @@ -1,11 +0,0 @@ ---- 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( 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-bb b/multimedia/kino/files/patch-bb deleted file mode 100644 index ceb2f3414de0..000000000000 --- a/multimedia/kino/files/patch-bb +++ /dev/null @@ -1,10 +0,0 @@ ---- src/image_create.h.orig Thu Jul 28 16:36:23 2005 -+++ src/image_create.h Mon Nov 28 21:27:51 2005 -@@ -27,7 +27,6 @@ - - // C Includes - --#include <stdint.h> - #include <gtk/gtk.h> - - /** Public interface for all image create classes. diff --git a/multimedia/kino/files/patch-be b/multimedia/kino/files/patch-be deleted file mode 100644 index 4dfe1e80adaa..000000000000 --- a/multimedia/kino/files/patch-be +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <stdio.h> --#include <stdint.h> - #include <stdlib.h> - - class KinoAudioInput diff --git a/multimedia/kino/files/patch-bf b/multimedia/kino/files/patch-bf deleted file mode 100644 index 5a8b79bf04cf..000000000000 --- a/multimedia/kino/files/patch-bf +++ /dev/null @@ -1,10 +0,0 @@ ---- src/kino_common.h.orig Fri Nov 11 06:42:22 2005 -+++ src/kino_common.h Mon Nov 28 21:28:55 2005 -@@ -25,7 +25,6 @@ - #include <gdk/gdkkeysyms.h> - #include <limits.h> - #include <stdlib.h> --#include <stdint.h> - - #include "playlist.h" - #include "frame.h" diff --git a/multimedia/kino/files/patch-bh b/multimedia/kino/files/patch-bh deleted file mode 100644 index 208555d2ec29..000000000000 --- a/multimedia/kino/files/patch-bh +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 <pthread.h> - #include "kino_common.h" - #include "page.h" - diff --git a/multimedia/kino/files/patch-configure.in b/multimedia/kino/files/patch-configure.in deleted file mode 100644 index 605439e305c6..000000000000 --- a/multimedia/kino/files/patch-configure.in +++ /dev/null @@ -1,82 +0,0 @@ ---- configure.in.orig 2008-02-24 07:12:40.000000000 +0100 -+++ configure.in 2008-03-09 19:32:24.000000000 +0100 -@@ -40,32 +40,32 @@ - AC_SUBST(LIBDV_CFLAGS) - AC_SUBST(LIBDV_LIBS) - --PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0, AC_DEFINE(HAVE_LIBRAW1394, 1, [libraw1394 present])) --AC_SUBST(LIBRAW1394_CFLAGS) --AC_SUBST(LIBRAW1394_LIBS) -+#PKG_CHECK_MODULES(LIBRAW1394, libraw1394 >= 1.0.0, AC_DEFINE(HAVE_LIBRAW1394, 1, [libraw1394 present])) -+#AC_SUBST(LIBRAW1394_CFLAGS) -+#AC_SUBST(LIBRAW1394_LIBS) - LIBS="$LIBS $LIBRAW1394_LIBS -lm" - CFLAGS="$CFLAGS $LIBRAW1394_CFLAGS" - - # LIBAVC1394 and LIBROM1394 --AC_CHECK_HEADER([libavc1394/avc1394.h], , -- [AC_MSG_ERROR([avc1394.h not found, install libavc1394-devel]) --]) --AC_CHECK_LIB(avc1394, avc1394_vcr_record, , -- [AC_MSG_ERROR([Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer])] --) --AC_CHECK_HEADER([libavc1394/rom1394.h], , -- [AC_MSG_ERROR([rom1394.h not found, install libavc1394-devel]) --]) --AC_CHECK_LIB(rom1394, rom1394_get_node_type, , -- [AC_MSG_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])] --) -- --AC_CHECK_LIB(pthread, pthread_create, , -- [AC_MSG_ERROR([You need the pthread library to compile kino])] --) --AC_CHECK_LIB(dl, dlopen, , -- [AC_MSG_ERROR([You need libdl to compile kino])] --) -+#AC_CHECK_HEADER([libavc1394/avc1394.h], , -+# [AC_MSG_ERROR([avc1394.h not found, install libavc1394-devel]) -+#]) -+#AC_CHECK_LIB(avc1394, avc1394_vcr_record, , -+# [AC_MSG_ERROR([Unable to link with libavc1394. Check that you have libavc1394 installed and that the version is 0.4.1 or newer])] -+#) -+#AC_CHECK_HEADER([libavc1394/rom1394.h], , -+# [AC_MSG_ERROR([rom1394.h not found, install libavc1394-devel]) -+#]) -+#AC_CHECK_LIB(rom1394, rom1394_get_node_type, , -+# [AC_MSG_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])] -+#) -+ -+#AC_CHECK_LIB(pthread, pthread_create, , -+# [AC_MSG_ERROR([You need the pthread library to compile kino])] -+#) -+#AC_CHECK_LIB(dl, dlopen, , -+# [AC_MSG_ERROR([You need libdl to compile kino])] -+#) - - # LIBIEC61883 - AC_ARG_WITH(dv1394, AC_HELP_STRING([--with-dv1394],[Use dv1394 instead of libiec61883 for DV I/O (only if you must).])) -@@ -187,11 +187,11 @@ - tar -xzf ffmpeg-svn-r12186.tar.gz - fi - if ! (test -f ffmpeg/config.mak) ; then -- pushd ffmpeg -+ (cd ffmpeg - ./configure --disable-ffserver --disable-ffplay --disable-network --disable-zlib \ - --disable-vhook --build-suffix=-kino --enable-gpl --enable-swscaler --enable-pthreads \ - --prefix="$prefix" -- popd -+ ) - fi - fi - ]) -@@ -341,8 +341,8 @@ - # This is a feature of the GNU libc that is documented at e.g. - # http://www.gnu.org/software/libc/manual/html_node/Backtraces.html - # ###################################################################### --AC_CHECK_HEADER(execinfo.h, [AC_DEFINE(HAVE_EXECINFO_H, 1, Wheter or not execinfo.h is present) -- EXTRA_LIBS="$EXTRA_LIBS -rdynamic"]) -+#AC_CHECK_HEADER(execinfo.h, [AC_DEFINE(HAVE_EXECINFO_H, 1, Wheter or not execinfo.h is present) -+# EXTRA_LIBS="$EXTRA_LIBS -rdynamic"]) - - # ###################################################################### - # libsamplerate diff --git a/multimedia/kino/files/patch-libav7 b/multimedia/kino/files/patch-libav7 deleted file mode 100644 index d7ebbdcd562b..000000000000 --- a/multimedia/kino/files/patch-libav7 +++ /dev/null @@ -1,60 +0,0 @@ ---- src/frame.cc.orig 2011-07-17 14:54:59.089481638 +0200 -+++ src/frame.cc 2011-07-17 15:09:23.199481714 +0200 -@@ -1063,7 +1063,12 @@ - AVPicture dest; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &dest, static_cast<uint8_t*>( rgb ), PIX_FMT_RGB24, GetWidth(), GetHeight() ); -@@ -1123,7 +1128,12 @@ - AVPicture output; - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - if ( got_picture ) - { - avpicture_fill( &output, static_cast<uint8_t*>( yuv ), PIX_FMT_YUV422, GetWidth(), GetHeight() ); -@@ -1156,7 +1166,12 @@ - AVFrame *frame = avcodec_alloc_frame(); - int got_picture; - -- avcodec_decode_video( libavcodec, frame, &got_picture, data, GetFrameSize() ); -+ AVPacket pkt; -+ av_init_packet(&pkt); -+ pkt.data = data; -+ pkt.size = GetFrameSize(); -+ -+ avcodec_decode_video2( libavcodec, frame, &got_picture, &pkt ); - - int width = GetWidth(), height = GetHeight(); - -@@ -1319,12 +1334,12 @@ - #if defined(HAVE_LIBAVCODEC) - if ( avformatEncoder == NULL ) - { -- avformatEncoder = av_alloc_format_context(); -+ avformatEncoder = avformat_alloc_context(); - if ( avformatEncoder ) - { -- avformatEncoder->oformat = guess_format( "dv", NULL, NULL ); -+ avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); - AVStream* vst = av_new_stream( avformatEncoder, 0 ); -- vst->codec->codec_type = CODEC_TYPE_VIDEO; -+ vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; - vst->start_time = 0; diff --git a/multimedia/kino/files/patch-libav8 b/multimedia/kino/files/patch-libav8 deleted file mode 100644 index 06ae38659e1b..000000000000 --- a/multimedia/kino/files/patch-libav8 +++ /dev/null @@ -1,57 +0,0 @@ ---- src/frame.cc.orig 2012-05-14 19:55:42.153772418 -0700 -+++ src/frame.cc 2012-05-14 20:28:34.448838653 -0700 -@@ -101,8 +101,9 @@ - #if defined(HAVE_LIBAVCODEC) - pthread_mutex_lock( &avcodec_mutex ); - av_register_all(); -- libavcodec = avcodec_alloc_context(); -- avcodec_open( libavcodec, avcodec_find_decoder( CODEC_ID_DVVIDEO ) ); -+ libavcodec = avcodec_alloc_context3(NULL); -+ avcodec_open2( libavcodec, -+ avcodec_find_decoder( CODEC_ID_DVVIDEO ), NULL ); - pthread_mutex_unlock( &avcodec_mutex ); - data = ( unsigned char* ) av_mallocz( 144000 ); - #if defined(HAVE_SWSCALE) -@@ -1338,7 +1339,7 @@ - if ( avformatEncoder ) - { - avformatEncoder->oformat = av_guess_format( "dv", NULL, NULL ); -- AVStream* vst = av_new_stream( avformatEncoder, 0 ); -+ AVStream* vst = avformat_new_stream( avformatEncoder, NULL ); - vst->codec->codec_type = AVMEDIA_TYPE_VIDEO; - vst->codec->codec_id = CODEC_ID_DVVIDEO; - vst->codec->bit_rate = 25000000; -@@ -1364,12 +1365,10 @@ - vst->sample_aspect_ratio = avcodecEncoder->sample_aspect_ratio; - #endif - avcodecEncoder->thread_count = 2; -- avcodec_thread_init( avcodecEncoder, avcodecEncoder->thread_count ); - avcodecEncoder->time_base= isPAL ? ( AVRational ){ 1, 25 } : ( AVRational ){ 1001, 30000 }; - avcodecEncoder->pix_fmt = isPAL ? PIX_FMT_YUV420P : PIX_FMT_YUV411P; - avcodecEncoder->flags |= CODEC_FLAG_INTERLACED_DCT; -- av_set_parameters( avformatEncoder, NULL ); -- avcodec_open( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ) ); -+ avcodec_open2( avcodecEncoder, avcodec_find_encoder( CODEC_ID_DVVIDEO ), NULL ); - av_new_packet( &avpacketEncoder, 144000 ); - tempImage = ( uint8_t* ) av_malloc( - avpicture_get_size( avcodecEncoder->pix_fmt, avcodecEncoder->width, avcodecEncoder->height ) ); -@@ -1475,16 +1474,16 @@ - - // Encode - bytesInFrame = avcodec_encode_video( avcodecEncoder, avpacketEncoder.data, size, output ); -- url_open_buf( &avformatEncoder->pb, data, bytesInFrame, URL_WRONLY ); -+ avformatEncoder->pb = avio_alloc_context(data, bytesInFrame, 0, NULL, NULL, NULL, NULL); - avpacketEncoder.size = bytesInFrame; - if ( !isEncoderHeaderWritten ) - { -- av_write_header( avformatEncoder ); -+ avformat_write_header( avformatEncoder, NULL ); - isEncoderHeaderWritten = true; - } - av_write_frame( avformatEncoder, &avpacketEncoder ); - #if LIBAVFORMAT_VERSION_INT >= ((52<<16)+(0<<8)+0) -- url_close_buf( avformatEncoder->pb ); -+ avio_close( avformatEncoder->pb ); - #else - url_close_buf( &avformatEncoder->pb ); - #endif diff --git a/multimedia/kino/files/patch-src::audio_transitions.h b/multimedia/kino/files/patch-src::audio_transitions.h deleted file mode 100644 index d3cac8d18eef..000000000000 --- a/multimedia/kino/files/patch-src::audio_transitions.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/audio_transitions.h.orig Mon Dec 22 06:43:05 2003 -+++ src/audio_transitions.h Tue Apr 13 11:22:03 2004 -@@ -27,7 +27,8 @@ - - // C Includes - --#include <stdint.h> -+//#include <stdint.h> -+#include <sys/types.h> - #include <gtk/gtk.h> - - /** Public interface for all audio transition classes. diff --git a/multimedia/kino/files/patch-src::filehandler.h b/multimedia/kino/files/patch-src::filehandler.h deleted file mode 100644 index 9a97bce4f338..000000000000 --- a/multimedia/kino/files/patch-src::filehandler.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/filehandler.h.orig Thu Feb 19 06:27:37 2004 -+++ src/filehandler.h Tue Apr 13 11:05:50 2004 -@@ -33,7 +33,6 @@ - #include "riff.h" - #include "avi.h" - #include <sys/types.h> --#include <stdint.h> - - enum FileCaptureMode { - CAPTURE_IGNORE, diff --git a/multimedia/kino/files/patch-src::image_filters.h b/multimedia/kino/files/patch-src::image_filters.h deleted file mode 100644 index 9478104732fc..000000000000 --- a/multimedia/kino/files/patch-src::image_filters.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/image_filters.h.orig Tue Apr 13 11:11:19 2004 -+++ src/image_filters.h Tue Apr 13 11:18:54 2004 -@@ -27,7 +27,8 @@ - - // C Includes - --#include <stdint.h> -+//#include <stdint.h> -+#include <sys/types.h> - #include <gtk/gtk.h> - - /** Dummy interface for non-image encoding filters (only ImageFilterKeep should implement diff --git a/multimedia/kino/files/patch-src::image_transitions.h b/multimedia/kino/files/patch-src::image_transitions.h deleted file mode 100644 index 0e04deab320b..000000000000 --- a/multimedia/kino/files/patch-src::image_transitions.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/image_transitions.h.orig Mon Dec 22 06:42:29 2003 -+++ src/image_transitions.h Tue Apr 13 11:20:19 2004 -@@ -27,7 +27,8 @@ - - // C Includes - --#include <stdint.h> -+//#include <stdint.h> -+#include <sys/types.h> - #include <gtk/gtk.h> - - /** Public interface for all image transition classes. diff --git a/multimedia/kino/files/patch-src::kino_common.cc b/multimedia/kino/files/patch-src::kino_common.cc deleted file mode 100644 index 9bc6cdcd3dd2..000000000000 --- a/multimedia/kino/files/patch-src::kino_common.cc +++ /dev/null @@ -1,29 +0,0 @@ ---- src/kino_common.cc.orig Wed Mar 7 10:23:12 2007 -+++ src/kino_common.cc Sat Mar 17 21:17:18 2007 -@@ -35,6 +35,8 @@ - #ifndef _GNU_SOURCE - #define _GNU_SOURCE - #endif -+#include <libgen.h> -+#include <signal.h> - #include <string.h> - #include <stdarg.h> - #include <time.h> -@@ -1527,7 +1529,8 @@ - Frame *frame = GetFramePool()->GetFrame(); - if ( frame != NULL ) - { -- unsigned char pixels[ FRAME_MAX_WIDTH * FRAME_MAX_HEIGHT * 4 ]; -+ unsigned char *pixels; -+ pixels = (unsigned char *)malloc(FRAME_MAX_WIDTH * FRAME_MAX_HEIGHT * 4); - GError *gerror = NULL; - this->getPlayList()->GetFrame( this->g_currentFrame, *frame ); - -@@ -1562,6 +1565,7 @@ - g_error_free( gerror ); - } - g_object_unref( im ); -+ free(pixels); - GetFramePool()->DoneWithFrame( frame ); - } - } diff --git a/multimedia/kino/files/patch-src::mediactrl.c b/multimedia/kino/files/patch-src::mediactrl.c deleted file mode 100644 index 1f26e5506aba..000000000000 --- a/multimedia/kino/files/patch-src::mediactrl.c +++ /dev/null @@ -1,85 +0,0 @@ ---- 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> - #include <unistd.h> --#include <stdint.h> -+//#include <stdint.h> - #include <string.h> - #include <errno.h> - --#include <linux/input.h> -+//#include <linux/input.h> - #include "mediactrl.h" - - -@@ -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) - { -+#if 0 - - int lv, cv; - -@@ -183,10 +184,12 @@ - - } - -+#endif - } - - void translate_compliant(struct media_ctrl *ctrl, struct input_event *ev, struct media_ctrl_event *me) - { -+#if 0 - me->type = 0; - - // printf("Translate %02x %02x\n", ev->type, ev->code ); -@@ -227,6 +230,7 @@ - //printf("Key: %04x %02x: %s\n", ev->code, ev->value, key->name); - - } -+#endif - } - - struct media_ctrl_device supported_devices[] = { -@@ -273,8 +277,9 @@ - - if ( me->type == MEDIA_CTRL_EVENT_JOG ) { - struct timeval timev; -+ unsigned long now; - gettimeofday(&timev, NULL); -- unsigned long now = (unsigned long)timev.tv_usec + (1000000*(unsigned long)timev.tv_sec); -+ now = (unsigned long)timev.tv_usec + (1000000*(unsigned long)timev.tv_sec); - if ( now < ctrl->last_jog_time + 40000 ) { - //printf("*** Fast Jog %02d %05d ***\n", me->value, now - ctrl->last_jog_time); - ctrl->jogrel = me->value; -@@ -294,6 +299,7 @@ - - int probe_device(struct media_ctrl *mc) - { -+#if 0 - short devinfo[4]; - int i = 0; - -@@ -321,6 +327,7 @@ - - } while ( supported_devices[++i].vendor != 0 ); - -+#endif - return 0; - } - diff --git a/multimedia/kino/files/patch-src::mediactrl.h b/multimedia/kino/files/patch-src::mediactrl.h deleted file mode 100644 index 0b24c41c53a8..000000000000 --- a/multimedia/kino/files/patch-src::mediactrl.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/mediactrl.h.orig Mon Mar 15 21:25:09 2004 -+++ src/mediactrl.h Sun Apr 11 02:52:17 2004 -@@ -153,6 +153,8 @@ - - }; - -+struct input_event { -+}; - - struct media_ctrl_device { - int vendor; diff --git a/multimedia/kino/files/patch-src__Makefile.in b/multimedia/kino/files/patch-src__Makefile.in deleted file mode 100644 index bb7d2ae18131..000000000000 --- a/multimedia/kino/files/patch-src__Makefile.in +++ /dev/null @@ -1,29 +0,0 @@ ---- src/Makefile.in.orig Tue Jul 18 23:15:15 2006 -+++ src/Makefile.in Tue Jul 18 23:16:30 2006 -@@ -203,8 +203,6 @@ - LIBOBJS = @LIBOBJS@ - LIBQUICKTIME_CFLAGS = @LIBQUICKTIME_CFLAGS@ - LIBQUICKTIME_LIBS = @LIBQUICKTIME_LIBS@ --LIBRAW1394_CFLAGS = @LIBRAW1394_CFLAGS@ --LIBRAW1394_LIBS = @LIBRAW1394_LIBS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ - LIBXML2_CFLAGS = @LIBXML2_CFLAGS@ -@@ -352,8 +350,6 @@ - EXTRA_kino_SOURCES = cmd_ref.c - kino_LDADD = \ - $(LIBDV_LIBS) \ -- $(LIBRAW1394_LIBS) \ -- $(LIBAVC1394_LIBS) \ - $(LIBIEC61883_LIBS) \ - $(LIBQUICKTIME_LIBS) \ - $(ALSA_LIBS) \ -@@ -366,8 +362,6 @@ - kino_LDFLAGS = -export-dynamic - INCLUDES = -Wall \ - $(LIBDV_CFLAGS) \ -- $(LIBRAW1394_CFLAGS) \ -- $(LIBAVC1394_CFLAGS) \ - $(LIBIEC61883_CFLAGS) \ - $(LIBQUICKTIME_CFLAGS) \ - $(ALSA_CFLAGS) \ diff --git a/multimedia/kino/files/patch-src__dvtitler__textblock.cc b/multimedia/kino/files/patch-src__dvtitler__textblock.cc deleted file mode 100644 index fb009cfb63ef..000000000000 --- a/multimedia/kino/files/patch-src__dvtitler__textblock.cc +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dvtitler/textblock.cc.orig Tue Oct 4 09:15:44 2005 -+++ src/dvtitler/textblock.cc Sat Dec 17 23:25:26 2005 -@@ -22,7 +22,7 @@ - #endif - - #include "textblock.h" --#include <stdint.h> -+#include <sys/types.h> - - struct DVColor - { diff --git a/multimedia/kino/files/patch-src__gtkenhancedscale.c b/multimedia/kino/files/patch-src__gtkenhancedscale.c deleted file mode 100644 index de9b7f8c59b3..000000000000 --- a/multimedia/kino/files/patch-src__gtkenhancedscale.c +++ /dev/null @@ -1,11 +0,0 @@ ---- 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> - #include <stdio.h> --#include <malloc.h> -+#include <stdlib.h> - #include <math.h> - - #undef FANCY diff --git a/multimedia/kino/files/patch-src__ieee1394io.cc b/multimedia/kino/files/patch-src__ieee1394io.cc deleted file mode 100644 index e9c7bf5b96dc..000000000000 --- a/multimedia/kino/files/patch-src__ieee1394io.cc +++ /dev/null @@ -1,431 +0,0 @@ ---- 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> - -+#if 0 - #include <libavc1394/avc1394.h> - #include <libavc1394/avc1394_vcr.h> - #include <libavc1394/rom1394.h> -+#endif - - #include "ieee1394io.h" - #include "preferences.h" -@@ -388,6 +390,7 @@ - - bool iec61883Reader::Open( int port ) - { -+#if 0 - bool success; - - assert( !m_handle ); -@@ -409,6 +412,8 @@ - success = false; - } - return success; -+#endif -+ return true; - } - - -@@ -494,6 +499,7 @@ - - return 0; - } -+#endif - - - /** The thread responsible for polling the raw1394 interface. -@@ -502,14 +508,19 @@ - but only in the pthread_testcancel() function. - - */ -+#ifdef HAVE_IEC61883 - void* iec61883Reader::ThreadProxy( void* arg ) - { -+#if 0 - iec61883Reader* self = static_cast< iec61883Reader* >( arg ); - return self->Thread(); -+#endif -+ return NULL; - } - - void* iec61883Reader::Thread() - { -+#if 0 - struct pollfd raw1394_poll; - int result; - -@@ -531,6 +542,7 @@ - || ( raw1394_poll.revents & POLLPRI ) ) ) - result = raw1394_loop_iterate( m_handle ); - } -+#endif - return NULL; - } - #endif -@@ -617,6 +629,7 @@ - - bool dv1394Reader::Open( int port ) - { -+#if 0 - int n_frames = DV1394_MAX_FRAMES / 4; - struct dv1394_init init = - { -@@ -647,6 +660,8 @@ - } - - return true; -+#endif -+ return false; - } - - -@@ -655,6 +670,7 @@ - */ - void dv1394Reader::Close() - { -+#if 0 - if ( m_dv1394_fd != -1 ) - { - if ( m_dv1394_map != NULL ) -@@ -663,11 +679,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 ) ) - { -@@ -675,6 +693,8 @@ - return false; - } - return true; -+#endif -+ return false; - } - - -@@ -683,6 +703,7 @@ - - bool dv1394Reader::Handler( int handle ) - { -+#if 0 - struct dv1394_status dvst; - struct pollfd pol; - int result; -@@ -769,6 +790,8 @@ - - } - return true; -+#endif -+ return false; - } - - -@@ -805,6 +828,7 @@ - - AVC::AVC( void ) : port( -1 ), totalPorts( 0 ) - { -+#if 0 - pthread_mutex_init( &avc_mutex, NULL ); - avc_handle = NULL; - struct raw1394_portinfo pinf[ 16 ]; -@@ -825,6 +849,7 @@ - avc_handle = NULL; - cerr << exc << endl; - } -+#endif - return; - } - -@@ -835,6 +860,7 @@ - - AVC::~AVC() - { -+#if 0 - if ( avc_handle != NULL ) - { - pthread_mutex_lock( &avc_mutex ); -@@ -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; -@@ -855,7 +883,7 @@ - common->getPageCapture()->driver_locked = true; - return 0; - } -- -+#endif - - /** See if a node_id is still valid and pointing to an AV/C Recorder. - -@@ -871,6 +899,7 @@ - int AVC::isPhyIDValid( int phyID ) - { - int value = -1; -+#if 0 - int currentNode, nodeCount; - rom1394_directory rom1394_dir; - -@@ -935,6 +964,7 @@ - if ( value == -1 ) - port = -1; - pthread_mutex_unlock( &avc_mutex ); -+#endif - return value; - } - -@@ -943,6 +973,7 @@ - */ - void AVC::Noop( void ) - { -+#if 0 - struct pollfd raw1394_poll; - raw1394_poll.fd = raw1394_get_fd( avc_handle ); - raw1394_poll.events = POLLIN | POLLPRI; -@@ -953,11 +984,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 ) - { -@@ -969,12 +1002,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 ) - { -@@ -991,12 +1026,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 ) - { -@@ -1009,12 +1046,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 ) - { -@@ -1022,12 +1061,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 ) - { -@@ -1035,11 +1076,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 ) - { -@@ -1047,11 +1090,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 ) - { -@@ -1059,11 +1104,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 ) - { -@@ -1071,11 +1118,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 ) - { -@@ -1083,11 +1132,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 ) - { -@@ -1095,11 +1146,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 ) - { -@@ -1107,12 +1160,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 ) - { -@@ -1120,11 +1175,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 ) - { -@@ -1152,12 +1209,14 @@ - - } - pthread_mutex_unlock( &avc_mutex ); -+#endif - return true; - } - - int AVC::getNodeId( const char *guid ) - { - int value = -1; -+#if 0 - pthread_mutex_lock( &avc_mutex ); - if ( avc_handle != NULL ) - { -@@ -1199,6 +1258,7 @@ - if ( value == -1 ) - port = -1; - pthread_mutex_unlock( &avc_mutex ); -+#endif - return value; - } - -@@ -1322,6 +1382,7 @@ - int iec61883Writer::HandlerProxy( unsigned char *data, int n_dif_blocks, - unsigned int dropped, void *callback_data) - { -+#if 0 - if ( callback_data ) - { - iec61883Writer* writer = static_cast< iec61883Writer* >( callback_data ); -@@ -1331,6 +1392,8 @@ - { - return -1; - } -+#endif -+ return -1; - } - - diff --git a/multimedia/kino/files/patch-src__ieee1394io.h b/multimedia/kino/files/patch-src__ieee1394io.h deleted file mode 100644 index e98b0cdbd40e..000000000000 --- a/multimedia/kino/files/patch-src__ieee1394io.h +++ /dev/null @@ -1,57 +0,0 @@ ---- src/ieee1394io.h.orig Sun May 21 19:14:23 2006 -+++ src/ieee1394io.h Tue Jul 18 22:56:29 2006 -@@ -20,8 +20,10 @@ - #ifndef _IEEE1394IO_H - #define _IEEE1394IO_H 1 - -+#if 0 - #include <libraw1394/raw1394.h> - #include <libraw1394/csr.h> -+#endif - #ifdef HAVE_IEC61883 - #include <libiec61883/iec61883.h> - #endif -@@ -29,6 +31,7 @@ - #include "dv1394.h" - #endif - -+#include <pthread.h> - #include <string> - using std::string; - #include <deque> -@@ -114,7 +117,7 @@ - { - private: - /// the handle to libraw1394 -- raw1394handle_t m_handle; -+ // raw1394handle_t m_handle; - - /// the handle to libiec61883 - iec61883_dv_fb_t m_iec61883dv; -@@ -130,7 +133,7 @@ - void StopReceive( void ); - bool StartThread( int port ); - void StopThread( void ); -- int Handler( int length, int complete, unsigned char *data ); -+ // int Handler( int length, int complete, unsigned char *data ); - void *Thread(); - void ResetHandler( void ); - -@@ -183,7 +186,7 @@ - pthread_mutex_t avc_mutex; - - /// the handle to the ieee1394 subsystem -- raw1394handle_t avc_handle; -+ //raw1394handle_t avc_handle; - - public: - AVC( void ); -@@ -211,7 +214,7 @@ - } - - 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-src__jogshuttle.h b/multimedia/kino/files/patch-src__jogshuttle.h deleted file mode 100644 index 3a7f4a70de51..000000000000 --- a/multimedia/kino/files/patch-src__jogshuttle.h +++ /dev/null @@ -1,10 +0,0 @@ ---- src/jogshuttle.h.orig Mon Oct 3 01:40:59 2005 -+++ src/jogshuttle.h Sat Dec 17 23:22:45 2005 -@@ -26,6 +26,7 @@ - #endif - - #include <gtk/gtk.h> -+#include <sys/time.h> - #include "mediactrl.h" - - /** diff --git a/multimedia/kino/files/patch-src__kino_extra.h b/multimedia/kino/files/patch-src__kino_extra.h deleted file mode 100644 index 0b4e686adb3b..000000000000 --- a/multimedia/kino/files/patch-src__kino_extra.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/kino_extra.h.orig Thu Apr 13 08:07:40 2006 -+++ src/kino_extra.h Tue Jul 18 23:09:33 2006 -@@ -20,7 +20,8 @@ - #ifndef _KINO_EXTRA_H_ - #define _KINO_EXTRA_H_ - --#include <stdint.h> -+// #include <stdint.h> -+#include <sys/types.h> - #include <gtk/gtk.h> - - // This is mandatory for plug-ins to be able to access the functionality here diff --git a/multimedia/kino/files/patch-src__page_export_1394.cc b/multimedia/kino/files/patch-src__page_export_1394.cc deleted file mode 100644 index 8ab73090478e..000000000000 --- a/multimedia/kino/files/patch-src__page_export_1394.cc +++ /dev/null @@ -1,18 +0,0 @@ ---- src/page_export_1394.cc.orig Sat Dec 23 08:24:23 2006 -+++ src/page_export_1394.cc Mon Dec 25 23:37:13 2006 -@@ -63,6 +63,7 @@ - - void Export1394::start() - { -+#if 0 - static raw1394handle_t handle; - gchar s[ 512 ]; - -@@ -140,6 +141,7 @@ - { - gtk_widget_set_sensitive ( GTK_WIDGET ( tmp ), FALSE ); - } -+#endif - } - - /** Define active widgets. diff --git a/multimedia/kino/files/patch-src__preferences_dialog.cc b/multimedia/kino/files/patch-src__preferences_dialog.cc deleted file mode 100644 index be599f9826f5..000000000000 --- a/multimedia/kino/files/patch-src__preferences_dialog.cc +++ /dev/null @@ -1,53 +0,0 @@ ---- 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" - #include "message.h" -+#if 0 - #include <libavc1394/avc1394.h> - #include <libavc1394/rom1394.h> -+#endif - - /* Declare callbacks for the jogshuttle handling */ - static void -@@ -67,9 +69,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 - - media_ctrl_key *mkeys; - -@@ -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]; -@@ -373,6 +380,7 @@ - } - } - } -+#endif - - gtk_option_menu_set_menu ( GTK_OPTION_MENU ( widget ), glade_menu ); - gtk_option_menu_set_history( GTK_OPTION_MENU( widget ), currentItem ); -@@ -409,7 +417,9 @@ - void - on_avc_phyid_activate( GtkMenuItem * menu_item, gpointer user_data ) - { -+#if 0 - strncpy( Preferences::getInstance().avcGUID, (char *) user_data, 64 ); -+#endif - } - - void diff --git a/multimedia/kino/files/patch-src_endian_types.h b/multimedia/kino/files/patch-src_endian_types.h deleted file mode 100644 index 25e7671696c0..000000000000 --- a/multimedia/kino/files/patch-src_endian_types.h +++ /dev/null @@ -1,51 +0,0 @@ ---- 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) - { |