Author: arekm Date: Fri Feb 10 10:15:39 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 5; fix build
---- Files affected: packages/kino: kino.spec (1.70 -> 1.71) , kino-1.3.4-libav-0.7.patch (NONE -> 1.1) (NEW), kino-1.3.4-v4l1.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/kino/kino.spec diff -u packages/kino/kino.spec:1.70 packages/kino/kino.spec:1.71 --- packages/kino/kino.spec:1.70 Tue Feb 7 23:03:22 2012 +++ packages/kino/kino.spec Fri Feb 10 11:15:34 2012 @@ -6,12 +6,14 @@ Summary(pl.UTF-8): Narzędzie do edycji DV Name: kino Version: 1.3.4 -Release: 4 +Release: 5 License: GPL Group: Applications/Multimedia -Source0: http://dl.sourceforge.net/kino/%{name}-%{version}.tar.gz +Source0: http://downloads.sourceforge.net/kino/%{name}-%{version}.tar.gz # Source0-md5: 52f8ce690e45a089e3edc6c7af61a05c Patch0: %{name}-desktop.patch +Patch1: %{name}-1.3.4-libav-0.7.patch +Patch2: %{name}-1.3.4-v4l1.patch URL: http://www.kinodv.org/ BuildRequires: autoconf >= 2.52 BuildRequires: automake @@ -83,6 +85,8 @@ %prep %setup -q %patch0 -p0 +%patch1 -p1 +%patch2 -p1 # use lib64 when needed sed -i -e 's|lib/kino-gtk2|%{_lib}/kino-gtk2|' src/*/Makefile.am @@ -164,6 +168,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.71 2012/02/10 10:15:34 arekm +- rel 5; fix build + Revision 1.70 2012/02/07 22:03:22 arekm - release 4 ================================================================ Index: packages/kino/kino-1.3.4-libav-0.7.patch diff -u /dev/null packages/kino/kino-1.3.4-libav-0.7.patch:1.1 --- /dev/null Fri Feb 10 11:15:39 2012 +++ packages/kino/kino-1.3.4-libav-0.7.patch Fri Feb 10 11:15:34 2012 @@ -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<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; ================================================================ Index: packages/kino/kino-1.3.4-v4l1.patch diff -u /dev/null packages/kino/kino-1.3.4-v4l1.patch:1.1 --- /dev/null Fri Feb 10 11:15:39 2012 +++ packages/kino/kino-1.3.4-v4l1.patch Fri Feb 10 11:15:34 2012 @@ -0,0 +1,22 @@ +--- kino-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 <sys/mman.h> + #include <sys/time.h> + #define _LINUX_TIME_H 1 +-#include <linux/videodev.h> ++#include <libv4l1-videodev.h> + #include <time.h> + + 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 <linux/videodev.h> ++#include <libv4l1-videodev.h> + + #include "displayer.h" + ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/kino/kino.spec?r1=1.70&r2=1.71&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
