diff -Nru openscenegraph-3.2.0~rc1/debian/changelog openscenegraph-3.2.0~rc1/debian/changelog --- openscenegraph-3.2.0~rc1/debian/changelog 2013-07-30 12:46:06.000000000 +0000 +++ openscenegraph-3.2.0~rc1/debian/changelog 2013-10-12 15:39:46.000000000 +0000 @@ -1,3 +1,9 @@ +openscenegraph (3.2.0~rc1-1+rpi1) jessie-staging; urgency=low + + * Apply fix from Rebecca N. Palmer for building with libav 9 + + -- Peter Michael Green Sat, 12 Oct 2013 15:34:06 +0000 + openscenegraph (3.2.0~rc1-1) unstable; urgency=low [Alberto Luaces] diff -Nru openscenegraph-3.2.0~rc1/debian/patches/fix-libav9.patch openscenegraph-3.2.0~rc1/debian/patches/fix-libav9.patch --- openscenegraph-3.2.0~rc1/debian/patches/fix-libav9.patch 1970-01-01 00:00:00.000000000 +0000 +++ openscenegraph-3.2.0~rc1/debian/patches/fix-libav9.patch 2013-10-12 15:39:28.000000000 +0000 @@ -0,0 +1,15 @@ +Description: Apply fix from Rebecca N. Palmer for building with libav 9 +Author: Peter Michael Green +Bug-Debian: http://bugs.debian.org/708140 + +--- openscenegraph-3.2.0~rc1.orig/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp ++++ openscenegraph-3.2.0~rc1/OpenSceneGraph/src/osgPlugins/ffmpeg/FFmpegDecoder.cpp +@@ -279,7 +279,7 @@ bool FFmpegDecoder::readNextPacketNormal + int error = av_read_frame(m_format_context.get(), &packet); + if (error < 0) + { +- if (error == AVERROR_EOF || url_feof(m_format_context.get()->pb)) ++ if (error == AVERROR_EOF || (m_format_context.get()->pb->eof_reached)) + end_of_stream = true; + else { + OSG_FATAL << "av_read_frame() returned " << AvStrError(error) << std::endl; diff -Nru openscenegraph-3.2.0~rc1/debian/patches/series openscenegraph-3.2.0~rc1/debian/patches/series --- openscenegraph-3.2.0~rc1/debian/patches/series 2013-07-30 12:40:32.000000000 +0000 +++ openscenegraph-3.2.0~rc1/debian/patches/series 2013-10-12 15:37:29.000000000 +0000 @@ -1,3 +1,4 @@ override-soversions.patch disable-zip-plugin-with-embedded-zlib.patch check__FreeBSD_kernel__ +fix-libav9.patch