Bug#748053: vtk6: diff for NMU version 6.0.0-7.1

[Sebastian Ramacher]

Hi Anton

On 2014-05-18 07:33:42, Anton Gladky wrote:
> Hi Sebastian,
> 
> thanks a lot for the patch. As I told you before
> I have managed uploading a newer vtk6 version (6.1.0),
> which builds fine againse libav10.

Sorry, seems like I didn't get a mail about that. Anyway, 6.1.0 FTBFS
all over the place: https://buildd.debian.org/status/package.php?p=vtk6.
Could you please take a look it?

> Could you please cancel your NMU? Or I think one can
> simply wait till it will be rejected.

Sure, canceled.

Cheers
-- 
Sebastian Ramacher


signature.asc
Description: Digital signature

Bug#748053: vtk6: diff for NMU version 6.0.0-7.1

[Anton Gladky]

Hi Sebastian,

thanks a lot for the patch. As I told you before
I have managed uploading a newer vtk6 version (6.1.0),
which builds fine againse libav10.

Could you please cancel your NMU? Or I think one can
simply wait till it will be rejected.

Best regards

Anton


2014-05-17 18:14 GMT+02:00 Sebastian Ramacher :
> Control: tags -1 + pending
>
> Dear maintainer,
>
> to move forward with the libav10 transition, I've prepared an NMU for
> vtk6 (versioned as 6.0.0-7.1) and uploaded it to DELAYED/2. Please feel
> free to tell me if I should delay it longer.
>
> Cheers
> --
> Sebastian Ramacher
>
> --
> debian-science-maintainers mailing list
> debian-science-maintain...@lists.alioth.debian.org
> http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-science-maintainers


-- 
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#748053: vtk6: diff for NMU version 6.0.0-7.1

[Sebastian Ramacher]

Control: tags -1 + pending

Dear maintainer,

to move forward with the libav10 transition, I've prepared an NMU for
vtk6 (versioned as 6.0.0-7.1) and uploaded it to DELAYED/2. Please feel
free to tell me if I should delay it longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru vtk6-6.0.0/debian/changelog vtk6-6.0.0/debian/changelog
--- vtk6-6.0.0/debian/changelog	2014-05-09 20:27:08.0 +0200
+++ vtk6-6.0.0/debian/changelog	2014-05-17 17:16:44.0 +0200
@@ -1,3 +1,13 @@
+vtk6 (6.0.0-7.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/fix_libav10.patch: Make it actually build against libav10.
+(Closes: #748053)
+  * debian/control: Bump B-D on libavcodec-dev to >= 6:9 to make sure
+AVCodecID and AV_CODEC_* constants are available.
+
+ -- Sebastian Ramacher   Sat, 17 May 2014 17:16:28 +0200
+
 vtk6 (6.0.0-7) unstable; urgency=medium
 
   * [9796292] Add some more entries in Depends section of libvtk6-dev.
diff -Nru vtk6-6.0.0/debian/control vtk6-6.0.0/debian/control
--- vtk6-6.0.0/debian/control	2014-04-23 21:34:33.0 +0200
+++ vtk6-6.0.0/debian/control	2014-05-14 19:12:32.0 +0200
@@ -16,7 +16,7 @@
  graphviz,
  hdf5-tools,
  javahelper,
- libavcodec-dev,
+ libavcodec-dev (>= 6:9),
  libavformat-dev,
  libavutil-dev,
  libboost-all-dev,
diff -Nru vtk6-6.0.0/debian/patches/fix_libav10.patch vtk6-6.0.0/debian/patches/fix_libav10.patch
--- vtk6-6.0.0/debian/patches/fix_libav10.patch	2014-03-13 14:38:44.0 +0100
+++ vtk6-6.0.0/debian/patches/fix_libav10.patch	2014-05-14 19:12:04.0 +0200
@@ -6,19 +6,7 @@
 
 --- a/IO/FFMPEG/vtkFFMPEGWriter.cxx
 +++ b/IO/FFMPEG/vtkFFMPEGWriter.cxx
-@@ -38,6 +38,11 @@
- 
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
- 
-+#ifndef VTK_FFMPEG_AVCODECID
-+#define AV_CODEC_ID_MJPEG CODEC_ID_MJPEG
-+#define AV_CODEC_ID_RAWVIDEO CODEC_ID_RAWVIDEO
-+#endif
-+
- //---
- class vtkFFMPEGWriterInternal
- {
-@@ -143,11 +148,11 @@
+@@ -143,11 +143,11 @@
if (this->Writer->GetCompression())
  {
  //choose a codec that is easily playable on windows
@@ -32,3 +20,12 @@
  }
  
//assign the format to the context
+@@ -170,7 +170,7 @@
+ 
+   //Set up the codec.
+   AVCodecContext *c = this->avStream->codec;
+-  c->codec_id = (CodecID)this->avOutputFormat->video_codec;
++  c->codec_id = (AVCodecID)this->avOutputFormat->video_codec;
+ #ifdef VTK_FFMPEG_HAS_OLD_HEADER
+   c->codec_type = CODEC_TYPE_VIDEO;
+ #else


signature.asc
Description: Digital signature