Your message dated Sat, 02 Jul 2011 15:02:43 +0000
with message-id <[email protected]>
and subject line Bug#632415: fixed in dvbcut 0.5.4+svn170-1
has caused the Debian Bug report #632415,
regarding Prepare dvbcut for 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 [email protected]
immediately.)
--
632415: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632415
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: dvbcut
Version: 0.5.4+svn146-2
Severity: wishlist
Tags: patch
User: [email protected]
Usertags: origin-ubuntu oneiric ubuntu-patch
Hi,
libavcodec 0.7 is in experimental as well as in next release of Ubuntu, and
as it deprecate several functions, dvbcut has to be patched to build and run
correctly.
This is the patch we applied in Ubuntu to fix dvbcut:
*** /tmp/tmpd_3rwk
The resulting package builds fine in sid
Thanks for considering the patch.
Fabrice
-- 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/2 CPU cores)
Locale: LANG=es_ES.UTF8, LC_CTYPE=es_ES.UTF8 (charmap=UTF-8) (ignored: LC_ALL
set to es_ES.UTF8)
Shell: /bin/sh linked to /bin/dash
diff -Nru dvbcut-0.5.4+svn146/debian/patches/fit-ftbfs-libav0.7.patch dvbcut-0.5.4+svn146/debian/patches/fit-ftbfs-libav0.7.patch
--- dvbcut-0.5.4+svn146/debian/patches/fit-ftbfs-libav0.7.patch 1970-01-01 01:00:00.000000000 +0100
+++ dvbcut-0.5.4+svn146/debian/patches/fit-ftbfs-libav0.7.patch 2011-07-01 19:01:14.000000000 +0200
@@ -0,0 +1,110 @@
+Description: fix FTBFS with libav 0.7 by replacing deprecated functions with
+ their substitute.
+Author: Fabrice Coutadeur <[email protected]>
+
+--- dvbcut-0.5.4+svn146.orig/src/lavfmuxer.h
++++ dvbcut-0.5.4+svn146/src/lavfmuxer.h
+@@ -73,7 +73,7 @@ public:
+ avp.dts=dts;
+ avp.stream_index=st[str].stream_index;
+ if (flags & MUXER_FLAG_KEY)
+- avp.flags |= PKT_FLAG_KEY;
++ avp.flags |= AV_PKT_FLAG_KEY;
+
+ int rv=av_interleaved_write_frame(avfc,&avp);
+
+--- dvbcut-0.5.4+svn146.orig/src/lavfmuxer.cpp
++++ dvbcut-0.5.4+svn146/src/lavfmuxer.cpp
+@@ -34,12 +34,12 @@ extern "C" {
+ lavfmuxer::lavfmuxer(const char *format, uint32_t audiostreammask, mpgfile &mpg, const char *filename)
+ : muxer(), avfc(0), fileopened(false)
+ {
+- fmt = guess_format(format, NULL, NULL);
++ fmt = av_guess_format(format, NULL, NULL);
+ if (!fmt) {
+ return;
+ }
+
+- avfc=av_alloc_format_context();
++ avfc=avformat_alloc_context();
+ if (!avfc)
+ return;
+
+@@ -73,7 +73,7 @@ lavfmuxer::lavfmuxer(const char *format,
+ av_free(s->codec);
+ s->codec = avcodec_alloc_context();
+ avcodec_get_context_defaults(s->codec);
+- s->codec->codec_type=CODEC_TYPE_AUDIO;
++ s->codec->codec_type=AVMEDIA_TYPE_AUDIO;
+ s->codec->codec_id = (mpg.getstreamtype(astr)==streamtype::ac3audio) ?
+ CODEC_ID_AC3 : CODEC_ID_MP2;
+ s->codec->rc_buffer_size = 224*1024*8;
+@@ -92,6 +92,14 @@ lavfmuxer::lavfmuxer(const char *format,
+ int16_t samples[AVCODEC_MAX_AUDIO_FRAME_SIZE/sizeof(int16_t)];
+ int frame_size=sizeof(samples);
+ //fprintf(stderr, "** decode audio size=%d\n", sd->inbytes());
++#if LIBAVCODEC_VERSION_INT > ((52<<16)+(25<<8)+0)
++ AVPacket pkt;
++ av_init_packet( &pkt );
++ pkt.data = (uint8_t*) sd->getdata();
++ pkt.size = sd->inbytes();
++ avcodec_decode_audio3
++ (s->codec,samples,&frame_size, &pkt);
++#else
+ #if LIBAVCODEC_VERSION_INT >= ((52<<16)+(0<<8)+0)
+ avcodec_decode_audio2
+ #else
+@@ -100,6 +108,7 @@ lavfmuxer::lavfmuxer(const char *format,
+ (s->codec,samples,&frame_size,
+ (uint8_t*) sd->getdata(),sd->inbytes());
+ avcodec_close(s->codec);
++#endif
+ }
+ break;
+ }
+--- dvbcut-0.5.4+svn146.orig/src/mpgfile.cpp
++++ dvbcut-0.5.4+svn146/src/mpgfile.cpp
+@@ -159,8 +159,17 @@ void mpgfile::decodegop(int start, int s
+ while (decodebytes>0)
+ {
+ frameFinished=0;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,23,0)
++ AVPacket pkt;
++ av_init_packet( &pkt );
++ pkt.data = (uint8_t*) data;
++ pkt.size = decodebytes;
++ int bytesDecoded=avcodec_decode_video2( S->avcc, avf,
++ &frameFinished, &pkt );
++#else
+ int bytesDecoded=avcodec_decode_video(S->avcc, avf, &frameFinished,
+ (uint8_t*) data, decodebytes);
++#endif
+ if (bytesDecoded<0)
+ {
+ fprintf(stderr,"libavcodec error while decoding frame #%d\n",pic);
+@@ -199,7 +208,16 @@ void mpgfile::decodegop(int start, int s
+ if (pic < stop)
+ {
+ int frameFinished=0;
++#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(52,23,0)
++ AVPacket pkt;
++ av_init_packet( &pkt );
++ pkt.data = NULL;
++ pkt.size = 0;
++ avcodec_decode_video2( S->avcc, avf,
++ &frameFinished, &pkt );
++#else
+ avcodec_decode_video(S->avcc, avf, &frameFinished, NULL, 0);
++#endif
+ if (frameFinished)
+ {
+ if (last_cpn!=avf->coded_picture_number)
+@@ -246,7 +264,7 @@ void mpgfile::initcodeccontexts(int vid)
+ stream *S=&s[VIDEOSTREAM];
+ S->id=vid;
+ S->allocavcc();
+- S->avcc->codec_type=CODEC_TYPE_VIDEO;
++ S->avcc->codec_type=AVMEDIA_TYPE_VIDEO;
+ S->avcc->codec_id=CODEC_ID_MPEG2VIDEO;
+ S->dec=avcodec_find_decoder(CODEC_ID_MPEG2VIDEO);
+ S->enc=avcodec_find_encoder(CODEC_ID_MPEG2VIDEO);
diff -Nru dvbcut-0.5.4+svn146/debian/patches/series dvbcut-0.5.4+svn146/debian/patches/series
--- dvbcut-0.5.4+svn146/debian/patches/series 2011-05-05 14:22:48.000000000 +0200
+++ dvbcut-0.5.4+svn146/debian/patches/series 2011-07-01 18:59:17.000000000 +0200
@@ -2,3 +2,4 @@
fix-ftbfs-gcc4.4.patch
fix-ftbfs-gcc4.5.patch
fix-ftbfs-gcc4.6.patch
+fit-ftbfs-libav0.7.patch
--- End Message ---
--- Begin Message ---
Source: dvbcut
Source-Version: 0.5.4+svn170-1
We believe that the bug you reported is fixed in the latest version of
dvbcut, which is due to be installed in the Debian FTP archive:
dvbcut_0.5.4+svn170-1.debian.tar.gz
to main/d/dvbcut/dvbcut_0.5.4+svn170-1.debian.tar.gz
dvbcut_0.5.4+svn170-1.dsc
to main/d/dvbcut/dvbcut_0.5.4+svn170-1.dsc
dvbcut_0.5.4+svn170-1_amd64.deb
to main/d/dvbcut/dvbcut_0.5.4+svn170-1_amd64.deb
dvbcut_0.5.4+svn170.orig.tar.gz
to main/d/dvbcut/dvbcut_0.5.4+svn170.orig.tar.gz
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 [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Reinhard Tartler <[email protected]> (supplier of updated dvbcut 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 [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 02 Jul 2011 10:59:23 +0200
Source: dvbcut
Binary: dvbcut
Architecture: source amd64
Version: 0.5.4+svn170-1
Distribution: experimental
Urgency: low
Maintainer: siretart <[email protected]>
Changed-By: Reinhard Tartler <[email protected]>
Description:
dvbcut - Qt application for cutting parts out of DVB streams
Closes: 632415
Changes:
dvbcut (0.5.4+svn170-1) experimental; urgency=low
.
* New upstream version
* Drop patches that are already applied in this upstream version
* Apply patch from upstream to support qt4
* Build against qt4
* Add patch to build against Libav 0.7, Closes: #632415
Thanks to Fabrice Coutadeur <[email protected]>
* Tighten build dependencies to build against Libav 0.7
Checksums-Sha1:
5b544adf5f12a0ab9e22e739e2d759aef7012bd4 1550 dvbcut_0.5.4+svn170-1.dsc
6ba543c6c17a9cad86711ab3fdd16142c00a3164 214566 dvbcut_0.5.4+svn170.orig.tar.gz
2c18091a10ddd01fa82ad38ac03bd8d606af4e9b 50997
dvbcut_0.5.4+svn170-1.debian.tar.gz
90176d37d19aa1f72f64217e0abe2be3794881e7 217296 dvbcut_0.5.4+svn170-1_amd64.deb
Checksums-Sha256:
45e622eaee3fb92d7ac64cf728a2651b11901e145f04583ff3c090886d16d88a 1550
dvbcut_0.5.4+svn170-1.dsc
57584ae01e92cf8e021a3f89c8bbafc2b29a7754a5a22ac7352d638f1f0a0bd1 214566
dvbcut_0.5.4+svn170.orig.tar.gz
9719f2c245803913b3bc44b349bb7efc002d1cb862714cb573008fd0501f9bba 50997
dvbcut_0.5.4+svn170-1.debian.tar.gz
95a12a5bfad5040e463feb315cdebeb354b2a44996f38e29c7079edc8a04a92c 217296
dvbcut_0.5.4+svn170-1_amd64.deb
Files:
0559591d1fea8a0eec2e42f5cbdb21c9 1550 graphics optional
dvbcut_0.5.4+svn170-1.dsc
42eae8512c526fc293d03ebb22d60dcf 214566 graphics optional
dvbcut_0.5.4+svn170.orig.tar.gz
1118d48c3674af2000842cbf5a50ee76 50997 graphics optional
dvbcut_0.5.4+svn170-1.debian.tar.gz
3c57799daa5e7fd80f8f23ded366a916 217296 graphics optional
dvbcut_0.5.4+svn170-1_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Debian Powered!
iEYEARECAAYFAk4PIXoACgkQmAg1RJRTSKTKQQCdF0558jr6nT1hutLmaYizLAej
HoUAn3uLeOwxJwfNGXPltLK/F35ewvUl
=Y15D
-----END PGP SIGNATURE-----
--- End Message ---
_______________________________________________
pkg-multimedia-maintainers mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-multimedia-maintainers
