Control: tags -1 + patch pending Dear maintainer,
I've prepared an NMU for kino (versioned as 1.3.4-1.4) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -u kino-1.3.4/debian/changelog kino-1.3.4/debian/changelog
--- kino-1.3.4/debian/changelog
+++ kino-1.3.4/debian/changelog
@@ -1,3 +1,12 @@
+kino (1.3.4-1.4) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * debian/patches/100_libav_9.diff: Port to libav 9 API. (Closes: #720661).
+ * debian/control: Bump libavformat-dev and libavcoded-dev to >= 6:9 since
+ some version checks have been dropped.
+
+ -- Sebastian Ramacher <sramac...@debian.org> Thu, 12 Sep 2013 13:50:06 +0200
+
kino (1.3.4-1.3) unstable; urgency=low
* Non-maintainer upload.
diff -u kino-1.3.4/debian/control kino-1.3.4/debian/control
--- kino-1.3.4/debian/control
+++ kino-1.3.4/debian/control
@@ -28,8 +28,8 @@
libglib2.0-dev | libglib-dev,
libquicktime-dev (>= 2:1.0.0),
libsamplerate0-dev,
- libavcodec-dev,
- libavformat-dev,
+ libavcodec-dev (>= 6:9),
+ libavformat-dev (>= 6:9),
libasound2-dev,
liba52-dev,
libgsm1-dev,
diff -u kino-1.3.4/debian/patches/series kino-1.3.4/debian/patches/series
--- kino-1.3.4/debian/patches/series
+++ kino-1.3.4/debian/patches/series
@@ -5,0 +6 @@
+100_libav_9.diff
only in patch2:
unchanged:
--- kino-1.3.4.orig/debian/patches/100_libav_9.diff
+++ kino-1.3.4/debian/patches/100_libav_9.diff
@@ -0,0 +1,69 @@
+Description: Port to libav 9 API.
+Author: Moritz Mühlenhoff <j...@inutil.org>
+Bug-Debian: http://bugs.debian.org/720661
+Last-Update: 2013-09-10
+
+diff -aur kino-1.3.4.orig/src/frame.cc kino-1.3.4/src/frame.cc
+--- kino-1.3.4.orig/src/frame.cc 2013-09-06 00:14:45.224000000 +0200
++++ kino-1.3.4/src/frame.cc 2013-09-06 00:15:26.492000000 +0200
+@@ -101,8 +101,8 @@
+ #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)
+@@ -1364,12 +1364,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,19 +1473,15 @@
+
+ // 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 );
+-#else
+- url_close_buf( &avformatEncoder->pb );
+-#endif
++ avio_close(avformatEncoder->pb);
+
+ // Update this frame's metadata
+ ExtractHeader();
+diff -aur kino-1.3.4.orig/src/frame.cc kino-1.3.4/src/frame.cc
+--- kino-1.3.4.orig/src/frame.cc 2013-09-06 01:16:23.356000000 +0200
++++ kino-1.3.4/src/frame.cc 2013-09-06 01:21:57.416000000 +0200
+@@ -1338,7 +1338,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;
+
signature.asc
Description: Digital signature
