Control: tags -1 + patch On 2014-05-16 17:18:30, Sebastian Ramacher wrote: > visp fails to build against libav10: > | cd /«PKGBUILDDIR»/obj-x86_64-linux-gnu/src && /usr/lib/ccache/c++ > -DBOOST_ALL_NO_LIB -DUNIX -Dvisp_EXPORTS -g -O2 -fstack-protector > --param=ssp-buffer-size=4 -Wformat -Werror=format-security > -D_FORTIFY_SOURCE=2 -Wall -Wextra -fvisibility=hidden -fopenmp -isystem > /usr/include/gtk-2.0 -fPIC -I/usr/include/opencv > -I/«PKGBUILDDIR»/obj-x86_64-linux-gnu/include -I/usr/include/OGRE > -I/usr/include/ois -I/usr/include/libxml2 -I/usr/include/gtk-2.0 > -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include > -I/usr/include/pango-1.0 -I/usr/include/atk-1.0 > -I/usr/lib/x86_64-linux-gnu/gtk-2.0/include -I/usr/include/cairo > -I/usr/include/gdk-pixbuf-2.0 -o > CMakeFiles/visp.dir/visual-feature/vpFeatureDisplay.cpp.o -c > /«PKGBUILDDIR»/src/visual-feature/vpFeatureDisplay.cpp > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp: In member function 'bool > vpFFMPEG::openStream(const char*, vpFFMPEG::vpFFMPEGColorType)': > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:144:56: error: 'AVStream' has no > member named 'r_frame_rate' > | std::cout << "rate: " << pFormatCtx->streams[i]->r_frame_rate.num << > " " << pFormatCtx->streams[i]->r_frame_rate.den << std::endl; > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:144:107: error: 'AVStream' has no > member named 'r_frame_rate' > | std::cout << "rate: " << pFormatCtx->streams[i]->r_frame_rate.num << > " " << pFormatCtx->streams[i]->r_frame_rate.den << std::endl; > | > ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:145:50: error: 'AVStream' has no > member named 'r_frame_rate' > | framerate_stream = pFormatCtx->streams[i]->r_frame_rate.num; > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:146:51: error: 'AVStream' has no > member named 'r_frame_rate' > | framerate_stream /= pFormatCtx->streams[i]->r_frame_rate.den; > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:173:14: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrame = avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:173:34: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrame = avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:177:17: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrameRGB=avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:177:37: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrameRGB=avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:187:18: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrameGRAY=avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:187:38: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrameGRAY=avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp: In member function 'bool > vpFFMPEG::openEncoder(const char*, unsigned int, unsigned int, AVCodecID)': > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:678:12: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrame = avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:678:32: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrame = avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:679:15: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrameRGB = avcodec_alloc_frame(); > | ^ > | /«PKGBUILDDIR»/src/video/vpFFMPEG.cpp:679:35: warning: 'AVFrame* > avcodec_alloc_frame()' is deprecated (declared at > /usr/include/libavcodec/avcodec.h:3114) [-Wdeprecated-declarations] > | pFrameRGB = avcodec_alloc_frame(); > | ^ > | make[3]: *** [src/CMakeFiles/visp.dir/video/vpFFMPEG.cpp.o] Error 1
The attached patch should be enough to fix this issue. Cheers -- Sebastian Ramacher
diff -Nru visp-2.8.0/debian/changelog visp-2.8.0/debian/changelog --- visp-2.8.0/debian/changelog 2014-02-20 03:30:00.000000000 +0100 +++ visp-2.8.0/debian/changelog 2014-05-17 22:15:18.000000000 +0200 @@ -1,3 +1,11 @@ +visp (2.8.0-5.1) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/patches/0007-libav10.patch: Fix build with libav 10. (Closes: + #748367) + + -- Sebastian Ramacher <sramac...@debian.org> Sat, 17 May 2014 22:03:40 +0200 + visp (2.8.0-5) unstable; urgency=medium * Add patches to fix CMake issues with GTK and libusb (Closes: #738391). diff -Nru visp-2.8.0/debian/patches/0007-libav10.patch visp-2.8.0/debian/patches/0007-libav10.patch --- visp-2.8.0/debian/patches/0007-libav10.patch 1970-01-01 01:00:00.000000000 +0100 +++ visp-2.8.0/debian/patches/0007-libav10.patch 2014-05-17 22:14:17.000000000 +0200 @@ -0,0 +1,20 @@ +Description: Fix build with libav 10 +Author: Sebastian Ramacher <sramac...@debian.org> +Bug-Debian: http://bugs.debian.org/748367 +Last-Update: 2014-05-17 + +--- visp-2.8.0.orig/src/video/vpFFMPEG.cpp ++++ visp-2.8.0/src/video/vpFFMPEG.cpp +@@ -141,9 +141,9 @@ bool vpFFMPEG::openStream(const char *fi + #endif + { + videoStream = i; +- std::cout << "rate: " << pFormatCtx->streams[i]->r_frame_rate.num << " " << pFormatCtx->streams[i]->r_frame_rate.den << std::endl; +- framerate_stream = pFormatCtx->streams[i]->r_frame_rate.num; +- framerate_stream /= pFormatCtx->streams[i]->r_frame_rate.den; ++ std::cout << "rate: " << pFormatCtx->streams[i]->avg_frame_rate.num << " " << pFormatCtx->streams[i]->avg_frame_rate.den << std::endl; ++ framerate_stream = pFormatCtx->streams[i]->avg_frame_rate.num; ++ framerate_stream /= pFormatCtx->streams[i]->avg_frame_rate.den; + found_codec= true; + break; + } diff -Nru visp-2.8.0/debian/patches/series visp-2.8.0/debian/patches/series --- visp-2.8.0/debian/patches/series 2014-02-20 03:23:56.000000000 +0100 +++ visp-2.8.0/debian/patches/series 2014-05-17 22:13:27.000000000 +0200 @@ -4,3 +4,4 @@ 0004-visp-config-should-rely-on-pkg-config-information.patch 0005-Fix-warnings-in-FindMyGTK2.cmake.patch 0006-Fix-libusb-CMake-macro-detection.patch +0007-libav10.patch
signature.asc
Description: Digital signature
