Control: tags -1 + pending

Dear Maintainer,

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

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-20 20:50:38.000000000 +0200
@@ -1,3 +1,11 @@
+visp (2.8.0-5.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/patches/0007-libav10.patch: Fix build with libav 10. (Closes:
+    #748367)
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Tue, 20 May 2014 20:50:36 +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-20 20:50:32.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-20
+
+--- 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-20 20:42:11.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

Attachment: signature.asc
Description: Digital signature

Reply via email to