From 1a35a0ad345d96f0256b69b4e33d421f37b576d7 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Fri, 20 Feb 2015 22:44:10 +0100 Subject: [PATCH] kino-1.3.4 fixes; thanks to gentoo --- pkgs/applications/video/kino/default.nix | 7 ++- .../video/kino/kino-1.3.4-libav-0.7.patch | 60 +++++++++++++++++++ .../video/kino/kino-1.3.4-libav-0.8.patch | 57 ++++++++++++++++++ .../kino-1.3.4-libavcodec-pkg-config.patch | 11 ++++ .../video/kino/kino-1.3.4-v4l1.patch | 21 +++++++ 5 files changed, 154 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch create mode 100644 pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch create mode 100644 pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch create mode 100644 pkgs/applications/video/kino/kino-1.3.4-v4l1.patch diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 7dd089537b73..2f3193a5617a 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -52,7 +52,7 @@ { stdenv, fetchurl, gtk, libglade, libxml2, libraw1394, libsamplerate, libdv , pkgconfig, perl, perlXMLParser, libavc1394, libiec61883, libXv, gettext -, libX11, glib, cairo, intltool, ffmpeg +, libX11, glib, cairo, intltool, ffmpeg, libv4l }: stdenv.mkDerivation { @@ -64,7 +64,7 @@ stdenv.mkDerivation { }; buildInputs = [ gtk libglade libxml2 libraw1394 libsamplerate libdv - pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg ]; # TODOoptional packages + pkgconfig perl perlXMLParser libavc1394 libiec61883 intltool libXv gettext libX11 glib cairo ffmpeg libv4l ]; # TODOoptional packages configureFlags = "--enable-local-ffmpeg=no"; #preConfigure = " @@ -72,6 +72,9 @@ stdenv.mkDerivation { # ex #"; + patches = [ ./kino-1.3.4-v4l1.patch ./kino-1.3.4-libav-0.7.patch ./kino-1.3.4-libav-0.8.patch ]; #./kino-1.3.4-libavcodec-pkg-config.patch ]; + + postInstall = " rpath=`patchelf --print-rpath \$out/bin/kino`; for i in $\buildInputs; do diff --git a/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch b/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch new file mode 100644 index 000000000000..65c5bc38276d --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-libav-0.7.patch @@ -0,0 +1,60 @@ +--- kino-1.3.4.orig/src/frame.cc 2011-07-17 14:54:59.089481638 +0200 ++++ kino-1.3.4/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( 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( 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/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch b/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch new file mode 100644 index 000000000000..f98cbda0bc49 --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-libav-0.8.patch @@ -0,0 +1,57 @@ +--- kino-1.3.4.orig/src/frame.cc 2012-05-14 19:55:42.153772418 -0700 ++++ kino-1.3.4/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/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch b/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch new file mode 100644 index 000000000000..d6a8953cf00a --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-libavcodec-pkg-config.patch @@ -0,0 +1,11 @@ +--- a/kino-1.3.4/configure.in 2009-09-08 02:35:23.000000000 -0400 ++++ b/kino-1.3.4/configure.in 2014-01-27 14:53:01.366063037 -0500 +@@ -221,7 +221,7 @@ + if (test "x$avcodec_include" != x) || (test "x$avcodec_lib" != x) ; then + local_legacy_ffmpeg_test + else +- PKG_CHECK_MODULES(AVCODEC, libavformat, ++ PKG_CHECK_MODULES(AVCODEC, [libavcodec libavformat libavutil], + [ + AC_DEFINE(HAVE_LIBAVCODEC, 1, [Enable FFMPEG libavcodec]) + AC_SUBST(AVCODEC_LIBS) diff --git a/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch b/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch new file mode 100644 index 000000000000..05ec7386709e --- /dev/null +++ b/pkgs/applications/video/kino/kino-1.3.4-v4l1.patch @@ -0,0 +1,21 @@ +no-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:20:37.161004916 +0400 ++++ kino-1.3.3.orig/ffmpeg/libavdevice/v4l.c 2011-05-17 02:21:57.302377529 +0400 +@@ -26,7 +26,7 @@ + #include + #include + #define _LINUX_TIME_H 1 +-#include ++#include + #include + + typedef struct { +--- kino-1.3.3.orig/src/v4l.h 2011-05-17 02:20:38.896969666 +0400 ++++ kino-1.3.3.orig/src/v4l.h 2011-05-17 02:21:39.922730395 +0400 +@@ -40,7 +40,7 @@ + + #define _DEVICE_H_ + #define _LINUX_TIME_H +-#include ++#include + + #include "displayer.h"