Control: tags -1 + pending Dear maintainer,
I've prepared an NMU for electricsheep (versioned as 2.7~b12+svn20091224-1.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. -- Sebastian Ramacher
diff -u electricsheep-2.7~b12+svn20091224/debian/changelog electricsheep-2.7~b12+svn20091224/debian/changelog --- electricsheep-2.7~b12+svn20091224/debian/changelog +++ electricsheep-2.7~b12+svn20091224/debian/changelog @@ -1,3 +1,11 @@ +electricsheep (2.7~b12+svn20091224-1.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/patches/fix-ftbfs-libav9.patch: Fix build failure with libav 9 API. + Thanks to Reinhard Tartler for the patch. (Closes: #692980) + + -- Sebastian Ramacher <[email protected]> Fri, 06 Sep 2013 01:48:27 +0200 + electricsheep (2.7~b12+svn20091224-1.1) unstable; urgency=low * Non-maintainer upload. diff -u electricsheep-2.7~b12+svn20091224/debian/patches/series electricsheep-2.7~b12+svn20091224/debian/patches/series --- electricsheep-2.7~b12+svn20091224/debian/patches/series +++ electricsheep-2.7~b12+svn20091224/debian/patches/series @@ -3,0 +4 @@ +fix-ftbfs-libav9.patch only in patch2: unchanged: --- electricsheep-2.7~b12+svn20091224.orig/debian/patches/fix-ftbfs-libav9.patch +++ electricsheep-2.7~b12+svn20091224/debian/patches/fix-ftbfs-libav9.patch @@ -0,0 +1,77 @@ +Author: Reinhard Tartler +Description: Fixes FTBFS with libav 9 +Bug-Debian: http://bugs.debian.org/692980 +Bug-Ubunut: https://bugs.launchpad.net/bugs/1077657 + +Index: electricsheep-2.7~b12+svn20091224/electricsheep.c +=================================================================== +--- electricsheep-2.7~b12+svn20091224.orig/electricsheep.c 2012-11-11 09:26:13.668980478 +0000 ++++ electricsheep-2.7~b12+svn20091224/electricsheep.c 2012-11-11 15:52:41.300263686 +0000 +@@ -657,12 +657,12 @@ + return; + } + +- if (0 > av_open_input_file(&ictx, fname, NULL, 0, NULL)) { ++ if (0 > avformat_open_input(&ictx, fname, NULL, NULL)) { + perror(fname); + exit(1); + } + +- if (0 > av_find_stream_info(ictx)) { ++ if (0 > avformat_find_stream_info(ictx, NULL)) { + fprintf(logout, "%s: could not find codec parameters\n", fname); + exit(1); + } +@@ -682,7 +682,6 @@ + + if (NULL == output_ctx) { + AVCodecContext *codec, *icodec; +- AVStream *st; + char pipe[20]; + if (1) + sprintf(pipe, "pipe:%d", fileno(avi_pipe)); +@@ -703,9 +702,8 @@ + } + output_ctx->oformat = ofmt; + +- st = av_new_stream(output_ctx, output_ctx->nb_streams); +- st->stream_copy = 1; +- av_set_parameters(output_ctx, NULL); ++ // NB: This is pointless, cf http://lists.libav.org/pipermail/libav-devel/2012-November/038967.html ++ // st->stream_copy = 1; + + icodec = ictx->streams[input_stream_index]->codec; + codec = output_ctx->streams[0]->codec; +@@ -723,12 +721,12 @@ + codec->height = icodec->height; + codec->has_b_frames = icodec->has_b_frames; + +- if (url_fopen(&output_ctx->pb, pipe, URL_WRONLY) < 0) { ++ if (avio_open(&output_ctx->pb, pipe, AVIO_FLAG_WRITE) < 0) { + fprintf(logout, "Could not open '%s'\n", pipe); + exit(1); + } + +- av_write_header(output_ctx); ++ avformat_write_header(output_ctx, NULL); + } + + while (1) { +@@ -748,7 +746,7 @@ + av_free_packet(&opkt); + av_free_packet(&ipkt); + } +- av_close_input_file(ictx); ++ avformat_close_input(&ictx); + } + + time_t search_time; +@@ -1771,7 +1769,7 @@ + (unsigned)XML_GetCurrentLineNumber(parser)); + break; + } +- if (debug > 1) fprintf(logout, "list read loop len=%d\n", len); ++ if (debug > 1) fprintf(logout, "list read loop len=%zd\n", len); + } while (!done); + XML_ParserFree(parser); +
signature.asc
Description: Digital signature
