Bug#739460: openscenegraph: diff for NMU version 3.2.0~rc1-5.1
Reinhard Tartler writes: On 18.05.2014 09:00, Manuel A. Fernandez Montecelo wrote: 2014-05-18 12:10 GMT+01:00 Reinhard Tartler siret...@tauware.de: So, can you please remove that change in the NMU, if you want to keep the NMU at all? Sure, I've just canceled the NMU. Thanks. From my side, I have no objection that the NMU goes ahead if it contains only the fix for libav. I don't know if Alberto has any objection or plans to fix this himself, so please wait at least until 20th for his reply. No problem. In this case, I'm building openscenegraph with only the libav issue (#739460) fixed to DELAYED/2-days to give Alberto time to the 20th to react to this. Updated debdiff is attached to this email. Reinhard, I agree with the changes you have attached. Thank you, Alberto -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#739460: openscenegraph: diff for NMU version 3.2.0~rc1-5.1
Hi Reinhard, 2014-05-17 22:30 GMT+01:00 Reinhard Tartler siret...@tauware.de: Package: openscenegraph Version: 3.2.0~rc1-5 Severity: normal Tags: patch pending Dear maintainer, I've prepared an NMU for openscenegraph (versioned as 3.2.0~rc1-5.1) and uploaded it to DELAYED/02. Please feel free to tell me if I should delay it longer. The patch provided for the older bug (687332) was sent only a week ago, part of the information/testing provided based on a derivative and not Debian, with not very popular desktops/setups, and (original author said) untested and not sure if this should be considered an openscenegraph bug or an Xfce bug . The patch might fix the issue for flightgear, but it can have widespread consequences and may beak other applications within Debian or in user's systems using the library for other purposes which happen to rely on this behaviour, so it's not something to include lightly and without asking upstream, for example. The package is not unmaintained, so you should not include fixes for minor bugs unrelated to the main purpose of fixing the RC/important bugs in general. See How confident are you about your changes? in the NMU section of Developer Reference Guide. So, can you please remove that change in the NMU, if you want to keep the NMU at all? Apart from that, the NMU was reopened ~7 days ago without any explanation about the transition until ~5 days ago (Sebastian Ramacher). It would not have hurt to ask first about the plans to fix the RC bug (which we were already discussing in private and group mailing lists), or give more than 2 days period, specially if you are including more changes than for the RC bug. Cheers. -- Manuel A. Fernandez Montecelo manuel.montez...@gmail.com -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#739460: openscenegraph: diff for NMU version 3.2.0~rc1-5.1
On 18.05.2014 06:24, Manuel A. Fernandez Montecelo wrote: Hi Reinhard, 2014-05-17 22:30 GMT+01:00 Reinhard Tartler siret...@tauware.de: Package: openscenegraph Version: 3.2.0~rc1-5 Severity: normal Tags: patch pending Dear maintainer, I've prepared an NMU for openscenegraph (versioned as 3.2.0~rc1-5.1) and uploaded it to DELAYED/02. Please feel free to tell me if I should delay it longer. The patch provided for the older bug (687332) was sent only a week ago, part of the information/testing provided based on a derivative and not Debian, with not very popular desktops/setups, and (original author said) untested and not sure if this should be considered an openscenegraph bug or an Xfce bug . The patch might fix the issue for flightgear, but it can have widespread consequences and may beak other applications within Debian or in user's systems using the library for other purposes which happen to rely on this behaviour, so it's not something to include lightly and without asking upstream, for example. The package is not unmaintained, so you should not include fixes for minor bugs unrelated to the main purpose of fixing the RC/important bugs in general. See How confident are you about your changes? in the NMU section of Developer Reference Guide. So, can you please remove that change in the NMU, if you want to keep the NMU at all? Sure, I've just canceled the NMU. Apart from that, the NMU was reopened ~7 days ago without any explanation about the transition until ~5 days ago (Sebastian Ramacher). It would not have hurt to ask first about the plans to fix the RC bug (which we were already discussing in private and group mailing lists), or give more than 2 days period, specially if you are including more changes than for the RC bug. Well, that's exactly what Sebastian did in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739460#44, without visible response. So what are your plans regarding #739460? FYI, in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739079#82, proposed a timeline that allows 0-days NMUs for bugs like #739460 starting from tomorrow. Thanks for responding and keeping the bugs with up-to-date information. Reinhard -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#739460: openscenegraph: diff for NMU version 3.2.0~rc1-5.1
2014-05-18 12:10 GMT+01:00 Reinhard Tartler siret...@tauware.de: So, can you please remove that change in the NMU, if you want to keep the NMU at all? Sure, I've just canceled the NMU. Thanks. From my side, I have no objection that the NMU goes ahead if it contains only the fix for libav. I don't know if Alberto has any objection or plans to fix this himself, so please wait at least until 20th for his reply. Apart from that, the NMU was reopened ~7 days ago without any explanation about the transition until ~5 days ago (Sebastian Ramacher). It would not have hurt to ask first about the plans to fix the RC bug (which we were already discussing in private and group mailing lists), or give more than 2 days period, specially if you are including more changes than for the RC bug. Well, that's exactly what Sebastian did in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739460#44, without visible response. So what are your plans regarding #739460? FYI, in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=739079#82, proposed a timeline that allows 0-days NMUs for bugs like #739460 starting from tomorrow. Thanks for responding and keeping the bugs with up-to-date information. As I said above, my only issue is that it does not apply to changes other than to fix the specific problem of the transition. We made several uploads this year, so the package maintainers are active. Also, I pointed that the reply from Sebastian was less than 5 days ago, which is not a whole lot of time all things considered (I was travelling yesterday all day, so could not reply to pending questions from Alberto, for example). And I don't have room in my computer to build OSG at the moment, which is kind of a problem to get this fixed :-) I understand the desire of getting through the transitions quickly, and I appreciate your work and others to get things running quickly and helping maintainers, though. We didn't object to your NMU to experimental, and neither I nor probably Alberto are against fixing the libav issue -- instead, we thank you for it. About plans. We were thinking if to continue with the current version (which is an ~rc1 immediately obsoleted by other changes), or upload a new version (which maybe has already support for libav10, so would not need patches). As things are now, I think that it's better not to upload a new version to not delay this transition, and just upload a fix for the libav transition. I can try to build it in another computer, but if somebody beats me to it, I will not complain. Cheers. -- Manuel A. Fernandez Montecelo manuel.montez...@gmail.com -- To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#739460: openscenegraph: diff for NMU version 3.2.0~rc1-5.1
On 18.05.2014 09:00, Manuel A. Fernandez Montecelo wrote:
2014-05-18 12:10 GMT+01:00 Reinhard Tartler siret...@tauware.de:
So, can you please remove that change in the NMU, if you want to keep
the NMU at all?
Sure, I've just canceled the NMU.
Thanks.
From my side, I have no objection that the NMU goes ahead if it
contains only the fix for libav. I don't know if Alberto has any
objection or plans to fix this himself, so please wait at least until
20th for his reply.
No problem.
In this case, I'm building openscenegraph with only the libav issue
(#739460) fixed to DELAYED/2-days to give Alberto time to the 20th to
react to this. Updated debdiff is attached to this email.
Best,
Reinhard
diff -Nru openscenegraph-3.2.0~rc1/debian/changelog
openscenegraph-3.2.0~rc1/debian/changelog
--- openscenegraph-3.2.0~rc1/debian/changelog 2014-04-10 15:42:37.0
-0400
+++ openscenegraph-3.2.0~rc1/debian/changelog 2014-05-18 09:24:46.0
-0400
@@ -1,3 +1,11 @@
+openscenegraph (3.2.0~rc1-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add libav10.patch by Anton Khirnov and compile against Libav10
+(Closes: #739460)
+
+ -- Reinhard Tartler siret...@tauware.de Sat, 17 May 2014 16:52:38 -0400
+
openscenegraph (3.2.0~rc1-5) unstable; urgency=medium
* Updated standards to 3.9.5. No changes required.
diff -Nru openscenegraph-3.2.0~rc1/debian/control
openscenegraph-3.2.0~rc1/debian/control
--- openscenegraph-3.2.0~rc1/debian/control 2014-04-10 15:42:09.0
-0400
+++ openscenegraph-3.2.0~rc1/debian/control 2014-05-17 16:55:22.0
-0400
@@ -26,6 +26,7 @@
libavcodec-dev,
libswscale-dev,
libavdevice-dev,
+ libavresample-dev,
libqt4-dev,
libqt4-opengl-dev,
librsvg2-dev,
diff -Nru openscenegraph-3.2.0~rc1/debian/patches/libav10.patch
openscenegraph-3.2.0~rc1/debian/patches/libav10.patch
--- openscenegraph-3.2.0~rc1/debian/patches/libav10.patch 1969-12-31
19:00:00.0 -0500
+++ openscenegraph-3.2.0~rc1/debian/patches/libav10.patch 2014-05-17
16:49:45.0 -0400
@@ -0,0 +1,228 @@
+From: an...@khirnov.net
+To: 739...@bugs.debian.org
+Subject: Re: FTBFS with libav10
+Date: Mon, 03 Mar 2014 07:37:18 +0100
+
+Updated by Reinhard Tartler at Wed Apr 2 21:58:34 EDT 2014: Link against
libavresample
+
+--- a/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
b/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+@@ -12,24 +12,16 @@
+
+ namespace osgFFmpeg {
+
+-static int decode_audio(AVCodecContext *avctx, int16_t *samples,
+- int *frame_size_ptr,
+- const uint8_t *buf, int buf_size)
++static int decode_audio(AVCodecContext *avctx, AVFrame *frame,
++const uint8_t *buf, int buf_size)
+ {
+-#if LIBAVCODEC_VERSION_MAJOR = 53 || (LIBAVCODEC_VERSION_MAJOR==52
LIBAVCODEC_VERSION_MINOR=32)
+-
+-// following code segment copied from ffmpeg's avcodec_decode_audio2()
+-// implementation to avoid warnings about deprecated function usage.
++int got_output;
+ AVPacket avpkt;
+ av_init_packet(avpkt);
+ avpkt.data = const_castuint8_t *(buf);
+ avpkt.size = buf_size;
+
+-return avcodec_decode_audio3(avctx, samples, frame_size_ptr, avpkt);
+-#else
+-// fallback for older versions of ffmpeg that don't have
avcodec_decode_audio3.
+-return avcodec_decode_audio2(avctx, samples, frame_size_ptr, buf,
buf_size);
+-#endif
++return avcodec_decode_audio4(avctx, frame, got_output, avpkt);
+ }
+
+
+@@ -40,12 +32,17 @@ FFmpegDecoderAudio::FFmpegDecoderAudio(P
+ m_context(0),
+ m_packet_data(0),
+ m_bytes_remaining(0),
+-m_audio_buffer((AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2),
++m_audio_buffer((192000 * 3) / 2),
+ m_audio_buf_size(0),
+ m_audio_buf_index(0),
+ m_end_of_stream(false),
+ m_paused(true),
+-m_exit(false)
++m_exit(false),
++avr(NULL),
++resample_format(-1),
++resample_rate(0),
++resample_layout(0),
++frame(NULL)
+ {
+
+ }
+@@ -72,7 +69,7 @@ void FFmpegDecoderAudio::open(AVStream *
+
+ m_frequency = m_context-sample_rate;
+ m_nb_channels = m_context-channels;
+-switch (m_context-sample_fmt)
++switch (av_get_planar_sample_fmt(m_context-sample_fmt))
+ {
+ case AV_SAMPLE_FMT_NONE:
+ throw std::runtime_error(invalid audio format
AV_SAMPLE_FMT_NONE);
+@@ -95,7 +92,7 @@ void FFmpegDecoderAudio::open(AVStream *
+ }
+
+ // Check stream sanity
+-if (m_context-codec_id == CODEC_ID_NONE)
++if (m_context-codec_id == AV_CODEC_ID_NONE)
+ throw std::runtime_error(invalid audio codec);;
+
+ // Find the decoder for the audio stream
+@@ -111,6 +108,10 @@ void FFmpegDecoderAudio::open(AVStream *
+ // Open codec
+ if
Bug#739460: openscenegraph: diff for NMU version 3.2.0~rc1-5.1
Package: openscenegraph
Version: 3.2.0~rc1-5
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for openscenegraph (versioned as 3.2.0~rc1-5.1) and
uploaded it to DELAYED/02. Please feel free to tell me if I
should delay it longer.
Regards,
Reinhard
diff -Nru openscenegraph-3.2.0~rc1/debian/changelog openscenegraph-3.2.0~rc1/debian/changelog
--- openscenegraph-3.2.0~rc1/debian/changelog 2014-04-10 15:42:37.0 -0400
+++ openscenegraph-3.2.0~rc1/debian/changelog 2014-05-17 16:52:39.0 -0400
@@ -1,3 +1,13 @@
+openscenegraph (3.2.0~rc1-5.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Add libav10.patch by Anton Khirnov and compile against Libav10
+(Closes: #739460)
+ * Add Patch for fixing unrecognized shift key release event. Patch
+provided by Rebecca N. Palmer (Closes: #687332)
+
+ -- Reinhard Tartler siret...@tauware.de Sat, 17 May 2014 16:52:38 -0400
+
openscenegraph (3.2.0~rc1-5) unstable; urgency=medium
* Updated standards to 3.9.5. No changes required.
diff -Nru openscenegraph-3.2.0~rc1/debian/control openscenegraph-3.2.0~rc1/debian/control
--- openscenegraph-3.2.0~rc1/debian/control 2014-04-10 15:42:09.0 -0400
+++ openscenegraph-3.2.0~rc1/debian/control 2014-05-17 16:55:22.0 -0400
@@ -26,6 +26,7 @@
libavcodec-dev,
libswscale-dev,
libavdevice-dev,
+ libavresample-dev,
libqt4-dev,
libqt4-opengl-dev,
librsvg2-dev,
diff -Nru openscenegraph-3.2.0~rc1/debian/patches/libav10.patch openscenegraph-3.2.0~rc1/debian/patches/libav10.patch
--- openscenegraph-3.2.0~rc1/debian/patches/libav10.patch 1969-12-31 19:00:00.0 -0500
+++ openscenegraph-3.2.0~rc1/debian/patches/libav10.patch 2014-05-17 16:49:45.0 -0400
@@ -0,0 +1,228 @@
+From: an...@khirnov.net
+To: 739...@bugs.debian.org
+Subject: Re: FTBFS with libav10
+Date: Mon, 03 Mar 2014 07:37:18 +0100
+
+Updated by Reinhard Tartler at Wed Apr 2 21:58:34 EDT 2014: Link against libavresample
+
+--- a/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
b/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoderAudio.cpp
+@@ -12,24 +12,16 @@
+
+ namespace osgFFmpeg {
+
+-static int decode_audio(AVCodecContext *avctx, int16_t *samples,
+- int *frame_size_ptr,
+- const uint8_t *buf, int buf_size)
++static int decode_audio(AVCodecContext *avctx, AVFrame *frame,
++const uint8_t *buf, int buf_size)
+ {
+-#if LIBAVCODEC_VERSION_MAJOR = 53 || (LIBAVCODEC_VERSION_MAJOR==52 LIBAVCODEC_VERSION_MINOR=32)
+-
+-// following code segment copied from ffmpeg's avcodec_decode_audio2()
+-// implementation to avoid warnings about deprecated function usage.
++int got_output;
+ AVPacket avpkt;
+ av_init_packet(avpkt);
+ avpkt.data = const_castuint8_t *(buf);
+ avpkt.size = buf_size;
+
+-return avcodec_decode_audio3(avctx, samples, frame_size_ptr, avpkt);
+-#else
+-// fallback for older versions of ffmpeg that don't have avcodec_decode_audio3.
+-return avcodec_decode_audio2(avctx, samples, frame_size_ptr, buf, buf_size);
+-#endif
++return avcodec_decode_audio4(avctx, frame, got_output, avpkt);
+ }
+
+
+@@ -40,12 +32,17 @@ FFmpegDecoderAudio::FFmpegDecoderAudio(P
+ m_context(0),
+ m_packet_data(0),
+ m_bytes_remaining(0),
+-m_audio_buffer((AVCODEC_MAX_AUDIO_FRAME_SIZE * 3) / 2),
++m_audio_buffer((192000 * 3) / 2),
+ m_audio_buf_size(0),
+ m_audio_buf_index(0),
+ m_end_of_stream(false),
+ m_paused(true),
+-m_exit(false)
++m_exit(false),
++avr(NULL),
++resample_format(-1),
++resample_rate(0),
++resample_layout(0),
++frame(NULL)
+ {
+
+ }
+@@ -72,7 +69,7 @@ void FFmpegDecoderAudio::open(AVStream *
+
+ m_frequency = m_context-sample_rate;
+ m_nb_channels = m_context-channels;
+-switch (m_context-sample_fmt)
++switch (av_get_planar_sample_fmt(m_context-sample_fmt))
+ {
+ case AV_SAMPLE_FMT_NONE:
+ throw std::runtime_error(invalid audio format AV_SAMPLE_FMT_NONE);
+@@ -95,7 +92,7 @@ void FFmpegDecoderAudio::open(AVStream *
+ }
+
+ // Check stream sanity
+-if (m_context-codec_id == CODEC_ID_NONE)
++if (m_context-codec_id == AV_CODEC_ID_NONE)
+ throw std::runtime_error(invalid audio codec);;
+
+ // Find the decoder for the audio stream
+@@ -111,6 +108,10 @@ void FFmpegDecoderAudio::open(AVStream *
+ // Open codec
+ if (avcodec_open2(m_context, p_codec, NULL) 0)
+ throw std::runtime_error(avcodec_open() failed);
++
++ frame = av_frame_alloc();
++ if (!frame)
++throw std::runtime_error(av_frame_alloc() failed);
+ }
+
+ catch (...)
+@@ -323,10 +324,9 @@ size_t FFmpegDecoderAudio::decodeFrame(v
+
+ while (m_bytes_remaining 0)
+
