diff -u paraview-3.2.3/debian/control paraview-3.2.3/debian/control --- paraview-3.2.3/debian/control +++ paraview-3.2.3/debian/control @@ -1,9 +1,10 @@ Source: paraview Section: science Priority: extra -Maintainer: Debian Scientific Computing Team +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Scientific Computing Team Uploaders: Christophe Prud'homme , Ondrej Certik -Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), libopenmpi-dev, libhdf5-openmpi-dev, ffmpeg, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, python-dev, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot +Build-Depends: cdbs (>= 0.4.51), debhelper (>= 5), autotools-dev, quilt (>= 0.46-4), cmake (>= 2.4.8), libqt4-dev (>= 4.3.3-2), libopenmpi-dev, libhdf5-openmpi-dev, ffmpeg, libavformat-dev (>= 0.svn20080206), libavutil-dev, libavcodec-dev, libswscale-dev, python-dev, chrpath, libglu1-mesa-dev, libxt-dev, libxext-dev, doxygen, graphviz, gnuplot Standards-Version: 3.8.0 XS-DM-Upload-Allowed: yes Homepage: http://www.paraview.org/ diff -u paraview-3.2.3/debian/changelog paraview-3.2.3/debian/changelog --- paraview-3.2.3/debian/changelog +++ paraview-3.2.3/debian/changelog @@ -1,3 +1,12 @@ +paraview (3.2.3-5ubuntu1) jaunty; urgency=low + + * Merge from debian unstable, remaining changes (LP: #329244): + - debian/patches/ubuntu-use-ffmpeg-swscaler: use swscaler from ffmpeg, + rather than img_convert. + - Add libswscale-dev to Build-Depends. + + -- Nick Ellery Fri, 13 Feb 2009 14:47:19 -0800 + paraview (3.2.3-5) unstable; urgency=low * Rebuild paraview to fix a missing symbol problem (Closes: #513060) @@ -6,6 +15,14 @@ -- Ondrej Certik Sat, 31 Jan 2009 19:31:55 +0100 +paraview (3.2.3-4ubuntu1) jaunty; urgency=low + + * Rebuild for libavcodec51 -> libavcodec52 transition. + * Add a patch that uses swscaler from ffmpeg, rather than img_convert. + - Add libswscale-dev to Build-Depends. + + -- Steve Kowalik Sun, 04 Jan 2009 01:20:57 +1100 + paraview (3.2.3-4) unstable; urgency=low [ Christophe Prud'homme ] @@ -91,0 +109 @@ + diff -u paraview-3.2.3/debian/patches/series paraview-3.2.3/debian/patches/series --- paraview-3.2.3/debian/patches/series +++ paraview-3.2.3/debian/patches/series @@ -7,0 +8 @@ +ubuntu-use-ffmpeg-swscaler only in patch2: unchanged: --- paraview-3.2.3.orig/debian/patches/ubuntu-use-ffmpeg-swscaler +++ paraview-3.2.3/debian/patches/ubuntu-use-ffmpeg-swscaler @@ -0,0 +1,99 @@ +Index: paraview-3.2.3/VTK/IO/vtkFFMPEGWriter.cxx +=================================================================== +--- paraview-3.2.3.orig/VTK/IO/vtkFFMPEGWriter.cxx 2009-01-02 01:56:27.000000000 +1100 ++++ paraview-3.2.3/VTK/IO/vtkFFMPEGWriter.cxx 2009-01-02 01:56:27.000000000 +1100 +@@ -20,7 +20,8 @@ + #include "vtkErrorCode.h" + + extern "C" { +-#include ++#include ++#include + } + + //--------------------------------------------------------------------------- +@@ -244,6 +245,7 @@ + //--------------------------------------------------------------------------- + int vtkFFMPEGWriterInternal::Write(vtkImageData *id) + { ++ static struct SwsContext *img_convert_ctx; + id->Update(); + + AVCodecContext *cc = this->avStream->codec; +@@ -259,10 +261,19 @@ + memcpy((void*)dest, (void*)src, cc->width*3); + } + ++ img_convert_ctx = sws_getContext(cc->width, cc->height, PIX_FMT_RGB24, ++ cc->width, cc->height, cc->pix_fmt, ++ SWS_BICUBIC, NULL, NULL, NULL); ++ if (img_convert_ctx == NULL) { ++ cerr << "Problem creating conversion context." << endl; ++ return 0; ++ } + //convert that to YUV for input to the codec +- img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt, +- (AVPicture *)this->rgbInput, PIX_FMT_RGB24, +- cc->width, cc->height); ++ sws_scale(img_convert_ctx, this->rgbInput->data, this->rgbInput->linesize, ++ 0, cc->height, this->yuvOutput->data, this->yuvOutput->linesize); ++ //img_convert((AVPicture *)this->yuvOutput, cc->pix_fmt, ++ // (AVPicture *)this->rgbInput, PIX_FMT_RGB24, ++ // cc->width, cc->height); + + //run the encoder + int toAdd = avcodec_encode_video(cc, +Index: paraview-3.2.3/VTK/CMake/FindFFMPEG.cmake +=================================================================== +--- paraview-3.2.3.orig/VTK/CMake/FindFFMPEG.cmake 2009-01-02 01:57:38.000000000 +1100 ++++ paraview-3.2.3/VTK/CMake/FindFFMPEG.cmake 2009-01-02 01:59:31.000000000 +1100 +@@ -31,6 +31,11 @@ + /usr/lib + ) + ++FIND_LIBRARY(FFMPEG_swscale_LIBRARY swscale ++ /usr/local/lib ++ /usr/lib ++) ++ + FIND_LIBRARY(FFMPEG_vorbis_LIBRARY vorbis + /usr/local/lib + /usr/lib +@@ -71,6 +76,7 @@ + IF(FFMPEG_avformat_LIBRARY) + IF(FFMPEG_avcodec_LIBRARY) + IF(FFMPEG_avutil_LIBRARY) ++ IF(FFMPEG_swscale_LIBRARY) + SET( FFMPEG_FOUND "YES" ) + SET( FFMPEG_BASIC_LIBRARIES + ${FFMPEG_avcodec_LIBRARY} +@@ -86,6 +92,7 @@ + ${FFMPEG_dts_LIBRARY} + ${FFMPEG_gsm_LIBRARY} + ${FFMPEG_z_LIBRARY}) ++ ENDIF(FFMPEG_swscale_LIBRARY) + ENDIF(FFMPEG_avutil_LIBRARY) + ENDIF(FFMPEG_avcodec_LIBRARY) + ENDIF(FFMPEG_avformat_LIBRARY) +@@ -96,6 +103,7 @@ + FFMPEG_avformat_LIBRARY + FFMPEG_avcodec_LIBRARY + FFMPEG_avutil_LIBRARY ++ FFMPEG_swscale_LIBRARY + FFMPEG_vorbis_LIBRARY + FFMPEG_dc1394_LIBRARY + FFMPEG_vorbisenc_LIBRARY +Index: paraview-3.2.3/VTK/IO/CMakeLists.txt +=================================================================== +--- paraview-3.2.3.orig/VTK/IO/CMakeLists.txt 2009-01-02 01:56:37.000000000 +1100 ++++ paraview-3.2.3/VTK/IO/CMakeLists.txt 2009-01-02 01:57:16.000000000 +1100 +@@ -233,7 +233,8 @@ + SET(KIT_LIBS ${KIT_LIBS} + ${FFMPEG_avcodec_LIBRARY} + ${FFMPEG_avformat_LIBRARY} +- ${FFMPEG_avutil_LIBRARY}) ++ ${FFMPEG_avutil_LIBRARY} ++ ${FFMPEG_swscale_LIBRARY}) + ENDIF (VTK_USE_FFMPEG_ENCODER) + + #-----------------------------------------------------------------------------