Your message dated Sat, 10 Sep 2011 14:51:10 +0000 with message-id <e1r2oti-0004fz...@franck.debian.org> and subject line Bug#628197: fixed in xine-lib 1.1.19-3.1 has caused the Debian Bug report #628197, regarding xine-lib: FTBFS with libav 0.7 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 628197: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=628197 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: xine-lib Version: 1.1.19-2 Severity: important Tags: patch Hi, I've just uploaded a patch with changes cherry-picked from the 1.2 branch to unbreak compilation against Libav 0.7, which is currently read in debian/experimental and just waiting for the release team's OK to be uploaded to unstable. Find the patch attached to this bug. Cheers, -- System Information: Debian Release: squeeze/sid APT prefers natty-updates APT policy: (500, 'natty-updates'), (500, 'natty-security'), (500, 'natty') Architecture: amd64 (x86_64) Kernel: Linux 2.6.38-8-generic (SMP w/4 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash--- Begin Message ---Index: xine-lib/src/combined/ffmpeg/ff_video_decoder.c =================================================================== --- xine-lib.orig/src/combined/ffmpeg/ff_video_decoder.c 2011-05-27 19:46:33.550935020 +0200 +++ xine-lib/src/combined/ffmpeg/ff_video_decoder.c 2011-05-27 19:58:40.030934613 +0200 @@ -58,12 +58,28 @@ #define ENABLE_DIRECT_RENDERING +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) +# define AVVIDEO 2 +#else +# define AVVIDEO 1 +# define pp_context pp_context_t +# define pp_mode pp_mode_t +#endif + /* reordered_opaque appeared in libavcodec 51.68.0 */ #define AVCODEC_HAS_REORDERED_OPAQUE #if LIBAVCODEC_VERSION_INT < 0x334400 # undef AVCODEC_HAS_REORDERED_OPAQUE #endif +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) +# define AVVIDEO 2 +#else +# define AVVIDEO 1 +# define pp_context pp_context_t +# define pp_mode pp_mode_t +#endif + typedef struct ff_video_decoder_s ff_video_decoder_t; typedef struct ff_video_class_s { @@ -116,8 +132,8 @@ int pp_quality; int pp_flags; - pp_context_t *pp_context; - pp_mode_t *pp_mode; + pp_context *pp_context; + pp_mode *pp_mode; /* mpeg-es parsing */ mpeg_parser_t *mpeg_parser; @@ -1055,12 +1071,26 @@ } /* skip decoding b frames if too late */ +#if AVVIDEO > 1 + this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; +#else this->context->hurry_up = (this->skipframes > 0); +#endif lprintf("avcodec_decode_video: size=%d\n", this->mpeg_parser->buffer_size); +#if AVVIDEO > 1 + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = (uint8_t *)this->mpeg_parser->chunk_buffer; + avpkt.size = this->mpeg_parser->buffer_size; + avpkt.flags = AV_PKT_FLAG_KEY; + len = avcodec_decode_video2 (this->context, this->av_frame, + &got_picture, &avpkt); +#else len = avcodec_decode_video (this->context, this->av_frame, &got_picture, this->mpeg_parser->chunk_buffer, this->mpeg_parser->buffer_size); +#endif lprintf("avcodec_decode_video: decoded_size=%d, got_picture=%d\n", len, got_picture); len = current - buf->content - offset; @@ -1112,7 +1142,13 @@ } else { - if (this->context->hurry_up) { + if ( +#if AVVIDEO > 1 + this->context->skip_frame != AVDISCARD_DEFAULT +#else + this->context->hurry_up +#endif + ) { /* skipped frame, output a bad frame */ img = this->stream->video_out->get_frame (this->stream->video_out, this->bih.biWidth, @@ -1304,13 +1340,25 @@ got_picture = 0; } else { /* skip decoding b frames if too late */ +#if AVVIDEO > 1 + this->context->skip_frame = (this->skipframes > 0) ? AVDISCARD_NONREF : AVDISCARD_DEFAULT; +#else this->context->hurry_up = (this->skipframes > 0); - +#endif lprintf("buffer size: %d\n", this->size); +#if AVVIDEO > 1 + AVPacket avpkt; + av_init_packet(&avpkt); + avpkt.data = (uint8_t *)&chunk_buf[offset]; + avpkt.size = this->size; + avpkt.flags = AV_PKT_FLAG_KEY; + len = avcodec_decode_video2 (this->context, this->av_frame, + &got_picture, &avpkt); +#else len = avcodec_decode_video (this->context, this->av_frame, &got_picture, &chunk_buf[offset], this->size); - +#endif #ifdef AVCODEC_HAS_REORDERED_OPAQUE /* reset consumed pts value */ this->context->reordered_opaque = ff_tag_pts(this, 0); Index: xine-lib/src/input/input_cdda.c =================================================================== --- xine-lib.orig/src/input/input_cdda.c 2011-05-27 19:46:33.570934872 +0200 +++ xine-lib/src/input/input_cdda.c 2011-05-27 19:46:38.340934964 +0200 @@ -89,6 +89,14 @@ #define CD_LEADOUT_TRACK 0xAA #define CD_BLOCK_OFFSET 150 +#ifdef HAVE_LIBAVUTIL_SHA1_H +/* old libavutil/sha1.h was found... */ +#define AVSHA AVSHA1 +# define av_sha_init(c,b) av_sha1_init(c) +# define av_sha_update av_sha1_update +# define av_sha_final av_sha1_final +#endif + typedef struct _cdrom_toc_entry { int track_mode; int first_frame; Index: xine-lib/src/post/planar/pp.c =================================================================== --- xine-lib.orig/src/post/planar/pp.c 2011-05-27 19:46:33.540935109 +0200 +++ xine-lib/src/post/planar/pp.c 2011-05-27 19:51:21.830934917 +0200 @@ -35,6 +35,12 @@ # include <libpostproc/postprocess.h> #endif +#if LIBPOSTPROC_VERSION_MAJOR < 52 +# define pp_context pp_context_t +# define pp_mode pp_mode_t +# define PP_PARAMETERS_T +#endif + #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ /* plugin class initialization function */ @@ -76,8 +82,8 @@ /* libpostproc specific stuff */ int pp_flags; - pp_context_t *pp_context; - pp_mode_t *pp_mode; + pp_context *pp_context; + pp_mode *pp_mode; pthread_mutex_t lock; }; Index: xine-lib/src/combined/ffmpeg/ff_audio_decoder.c =================================================================== --- xine-lib.orig/src/combined/ffmpeg/ff_audio_decoder.c 2011-05-27 19:53:22.700933869 +0200 +++ xine-lib/src/combined/ffmpeg/ff_audio_decoder.c 2011-05-27 19:55:40.820939483 +0200 @@ -46,6 +46,13 @@ #define AUDIOBUFSIZE (64 * 1024) +#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32) +# define AVAUDIO 3 +#else +# define AVAUDIO 2 +#endif + + typedef struct { audio_decoder_class_t decoder_class; } ff_audio_class_t; @@ -255,6 +262,9 @@ buf->decoder_info[2]); } else if (!(buf->decoder_flags & BUF_FLAG_SPECIAL)) { +#if AVAUDIO > 2 + AVPacket avpkt; +#endif if( !this->decoder_ok ) { if ( ! this->context || ! this->codec ) { @@ -286,11 +296,21 @@ if (!this->output_open) { if (!this->audio_bits || !this->audio_sample_rate || !this->audio_channels) { decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; +#if AVAUDIO > 2 + av_init_packet (&avpkt); + avpkt.data = (uint8_t *)&this->buf[0]; + avpkt.size = this->size; + avpkt.flags = AV_PKT_FLAG_KEY; + avcodec_decode_audio3 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, &avpkt); +#else avcodec_decode_audio2 (this->context, (int16_t *)this->decode_buffer, &decode_buffer_size, &this->buf[0], this->size); +#endif this->audio_bits = this->context->bits_per_sample; this->audio_sample_rate = this->context->sample_rate; this->audio_channels = this->context->channels; @@ -311,12 +331,21 @@ offset = 0; while (this->size>0) { decode_buffer_size = AVCODEC_MAX_AUDIO_FRAME_SIZE; +#if AVAUDIO > 2 + av_init_packet (&avpkt); + avpkt.data = (uint8_t *)&this->buf[offset]; + avpkt.size = this->size; + avpkt.flags = AV_PKT_FLAG_KEY; + bytes_consumed = avcodec_decode_audio3 (this->context, + (int16_t *)this->decode_buffer, + &decode_buffer_size, &avpkt); +#else bytes_consumed = avcodec_decode_audio2 (this->context, (int16_t *)this->decode_buffer, &decode_buffer_size, &this->buf[offset], this->size); - +#endif if (bytes_consumed<0) { xprintf (this->stream->xine, XINE_VERBOSITY_DEBUG, "ffmpeg_audio_dec: error decompressing audio frame\n");
--- End Message ---
--- End Message ---
--- Begin Message ---Source: xine-lib Source-Version: 1.1.19-3.1 We believe that the bug you reported is fixed in the latest version of xine-lib, which is due to be installed in the Debian FTP archive: libxine-dev_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine-dev_1.1.19-3.1_amd64.deb libxine1-all-plugins_1.1.19-3.1_all.deb to main/x/xine-lib/libxine1-all-plugins_1.1.19-3.1_all.deb libxine1-bin_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-bin_1.1.19-3.1_amd64.deb libxine1-console_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-console_1.1.19-3.1_amd64.deb libxine1-dbg_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-dbg_1.1.19-3.1_amd64.deb libxine1-doc_1.1.19-3.1_all.deb to main/x/xine-lib/libxine1-doc_1.1.19-3.1_all.deb libxine1-ffmpeg_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-ffmpeg_1.1.19-3.1_amd64.deb libxine1-gnome_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-gnome_1.1.19-3.1_amd64.deb libxine1-misc-plugins_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-misc-plugins_1.1.19-3.1_amd64.deb libxine1-plugins_1.1.19-3.1_all.deb to main/x/xine-lib/libxine1-plugins_1.1.19-3.1_all.deb libxine1-x_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1-x_1.1.19-3.1_amd64.deb libxine1_1.1.19-3.1_amd64.deb to main/x/xine-lib/libxine1_1.1.19-3.1_amd64.deb xine-lib_1.1.19-3.1.debian.tar.gz to main/x/xine-lib/xine-lib_1.1.19-3.1.debian.tar.gz xine-lib_1.1.19-3.1.dsc to main/x/xine-lib/xine-lib_1.1.19-3.1.dsc A summary of the changes between this version and the previous one is attached. Thank you for reporting the bug, which will now be closed. If you have further comments please address them to 628...@bugs.debian.org, and the maintainer will reopen the bug report if appropriate. Debian distribution maintenance software pp. Aurelien Jarno <aure...@debian.org> (supplier of updated xine-lib package) (This message was generated automatically at their request; if you believe that there is a problem with it please contact the archive administrators by mailing ftpmas...@debian.org) -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Format: 1.8 Date: Sat, 10 Sep 2011 15:21:31 +0200 Source: xine-lib Binary: libxine1-doc libxine1 libxine1-bin libxine-dev libxine1-ffmpeg libxine1-gnome libxine1-console libxine1-x libxine1-misc-plugins libxine1-dbg libxine1-plugins libxine1-all-plugins Architecture: source all amd64 Version: 1.1.19-3.1 Distribution: unstable Urgency: low Maintainer: Darren Salt <li...@youmustbejoking.demon.co.uk> Changed-By: Aurelien Jarno <aure...@debian.org> Description: libxine-dev - the xine video player library, development packages libxine1 - the xine video/media player library, meta-package libxine1-all-plugins - the xine video/media player library, meta package libxine1-bin - the xine video/media player library, binary files libxine1-console - libaa/libcaca/framebuffer/directfb related plugins for libxine1 libxine1-dbg - debug symbols for libxine1 libxine1-doc - the xine video player library, documentation files libxine1-ffmpeg - MPEG-related plugins for libxine1 libxine1-gnome - GNOME-related plugins for libxine1 libxine1-misc-plugins - Input, audio output and post plugins for libxine1 libxine1-plugins - the xine video/media player library, meta package libxine1-x - X desktop video output plugins for libxine1 Closes: 623595 628197 Changes: xine-lib (1.1.19-3.1) unstable; urgency=low . * Non-maintainer upload. * Add patch from Reinhard Tartler to fix FTBFS with libav 0.7. Closes: #628197. * Add patch from Loic Dachary to remove pvr from the plugins now that v4l is gone. Enable v4l on linux instead of on !linux. Closes: #623595. Checksums-Sha1: 049ec1bcf1e37f1715383a661e1d9b601c1d7754 2329 xine-lib_1.1.19-3.1.dsc ebe1df32d159fc584ee1e56cfe5d72ff007b263b 48583 xine-lib_1.1.19-3.1.debian.tar.gz e675dd1408cd7f18230549f16956629c3fbb13f8 149588 libxine1-doc_1.1.19-3.1_all.deb 744026915c2ae89d47e65dbd5cbe3d7b05badf66 63240 libxine1-plugins_1.1.19-3.1_all.deb d4af2f6f1c6793e88823b28b3bd706906f3df7d6 63236 libxine1-all-plugins_1.1.19-3.1_all.deb 2ecbaca338a19e0a171472bb4b0ff41b23450d6c 1560 libxine1_1.1.19-3.1_amd64.deb 87da7b5c4314c86729d54895876986110c69b2b4 1538930 libxine1-bin_1.1.19-3.1_amd64.deb d132909712b998a73c435597aab777a98716c37e 328366 libxine-dev_1.1.19-3.1_amd64.deb 93453aadcd5c5e1e205a02049d793a23efa32bb5 244230 libxine1-ffmpeg_1.1.19-3.1_amd64.deb 75045a4c18cfb9154063f3837436b23683b4577a 15512 libxine1-gnome_1.1.19-3.1_amd64.deb 8d3f1e538d0931ba2f6344a111bafe107c8b90ba 46368 libxine1-console_1.1.19-3.1_amd64.deb dd00c4e22b7a88cfa66168f0d72582f5a85d3d1e 154512 libxine1-x_1.1.19-3.1_amd64.deb 7efa0b196b053054c5030c12e36e50b4047f4c75 640884 libxine1-misc-plugins_1.1.19-3.1_amd64.deb 301006b7a0f8b6216d21d43019f1c08eaaeffa6b 3133518 libxine1-dbg_1.1.19-3.1_amd64.deb Checksums-Sha256: 63b96d796cbbdc085ac54dacf72aee358c2338d796c4bcace99f3d7ead8d29f1 2329 xine-lib_1.1.19-3.1.dsc aa7b355767445346f74955c5297c3abf1129e1aa81ce120244f871be2379f573 48583 xine-lib_1.1.19-3.1.debian.tar.gz 74f5f743ea0b8091918f9bf40d33cbadb8b4ca2e3766b4871cbe462355b96c49 149588 libxine1-doc_1.1.19-3.1_all.deb 023a302bf20a0fd6f5efc524931c15b07bc2702f98d05146be819b2b59a23785 63240 libxine1-plugins_1.1.19-3.1_all.deb 4820987ad3135dbd53a5b090ad68750ac85eae66b51f8965bd31bd55301de60b 63236 libxine1-all-plugins_1.1.19-3.1_all.deb cb2501152e1a1079bee519a51c1b8a22bfd7f10a088e264f3f0a2bbbd22baf50 1560 libxine1_1.1.19-3.1_amd64.deb 46541db238deaa895bf2c2c5059e47d50a3ad4967cd10b44f1ff8b70651b5f6a 1538930 libxine1-bin_1.1.19-3.1_amd64.deb aab25e3656c93b7d99df41fe9fd22ff5aaf2eeb56d96d1140398534f1b692d7c 328366 libxine-dev_1.1.19-3.1_amd64.deb a64bdfe757f46f309f033e133778af1a374901d10966d1e4a5416d3d4ece98ef 244230 libxine1-ffmpeg_1.1.19-3.1_amd64.deb 543d9253c52892612d55f120f125a9089c483b32a2762b8184f36a1bbdb25162 15512 libxine1-gnome_1.1.19-3.1_amd64.deb 52608761cbf46b68a12fc8bffe698dd7edac6011b3fb6b276c7f536f047d0669 46368 libxine1-console_1.1.19-3.1_amd64.deb e7f15e21f7d267a2ee6a3961295b2486fc18e6a7e7609735bc73094a3c60a9e9 154512 libxine1-x_1.1.19-3.1_amd64.deb 65dcc054a07923ca83445a88ce4c61dcd08f5a153e67220846329a1d75640e5d 640884 libxine1-misc-plugins_1.1.19-3.1_amd64.deb 249f7b1a47056ee7cd2dcd5718f588e0cf9707c275c987d46d0a8a59962925d4 3133518 libxine1-dbg_1.1.19-3.1_amd64.deb Files: c2415092a93d9f84c3e9f820d2721433 2329 libs optional xine-lib_1.1.19-3.1.dsc 0bfda0290f2d3b73e6d06c9be48e4cd9 48583 libs optional xine-lib_1.1.19-3.1.debian.tar.gz 6496425d38190f17275c4785563ee0c6 149588 doc optional libxine1-doc_1.1.19-3.1_all.deb 622ea7e616baf6bebe31979e8cf90955 63240 libs extra libxine1-plugins_1.1.19-3.1_all.deb 2c4e5cd9c7b42ea12fd51a1271e82b27 63236 video extra libxine1-all-plugins_1.1.19-3.1_all.deb e02d0ed0919d1653d608087491e6a11c 1560 libs optional libxine1_1.1.19-3.1_amd64.deb 0f0d177e4eea8b858dc0e1d404ca9c6d 1538930 libs optional libxine1-bin_1.1.19-3.1_amd64.deb d1e3e662201b2af9eadaf562df49364c 328366 libdevel optional libxine-dev_1.1.19-3.1_amd64.deb 4e450de8cacfd8c365b4fef283877333 244230 video optional libxine1-ffmpeg_1.1.19-3.1_amd64.deb 370f6cd250c8f9601261e219a38f7403 15512 video optional libxine1-gnome_1.1.19-3.1_amd64.deb 5441bdc216da4085d5c3fe8f0c4e7638 46368 libs extra libxine1-console_1.1.19-3.1_amd64.deb fb886910836fba23a361a1d1f2a78a11 154512 libs optional libxine1-x_1.1.19-3.1_amd64.deb bf0381d6e7d1957ab52d66d400e11e44 640884 video optional libxine1-misc-plugins_1.1.19-3.1_amd64.deb 15a275e253ae29415a7d6f4a9b1e8a11 3133518 debug extra libxine1-dbg_1.1.19-3.1_amd64.deb -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iD8DBQFOa252w3ao2vG823MRAkw5AJ0X2LMoYfyGop0mzwuwY+EwOObxSgCeLd4k 8mWQe/b2TwXBMbBAy5p0jcY= =A+Il -----END PGP SIGNATURE-----
--- End Message ---
