Hi,
to fix the FTBFS, I had to add 2 patches.
03_fit_FTBFS_with_gavl_1.0.1 fixes a change in libgavl headers files
04_fix_ffmpeg_headers adapts openmovieeeditor to ffmpeg header locations
and API changes
I also needed to add libswscale as build dependency to get rid of a call
to a deprecated function (see bug #487642).
At least, I made some changes in several files in debian directory, to
get rid of some lintian warnings/error.
I attach the whole dediff also
Thanks,
Fabrice
#! /bin/sh /usr/share/dpatch/dpatch-run
## 03_fix_FTBFS_with_gavl_1.0.1.dpatch by Fabrice Coutadeur
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix FTBFS with gavl >= 1.0.1-1 (duplicate definition)
@DPATCH@
--- openmovieeditor-0.0.20080102.orig/src/VideoEffectClip.H
+++ openmovieeditor-0.0.20080102/src/VideoEffectClip.H
@@ -27,8 +27,6 @@
#include "IVideoReader.H"
#include <gavl/gavl.h>
-typedef struct gavl_video_converter_s gavl_video_converter_t;
-typedef struct gavl_video_frame_s gavl_video_frame_t;
namespace nle
{
#! /bin/sh /usr/share/dpatch/dpatch-run
## 04_fix_ffmpeg_headers.dpatch by Fabrice Coutadeur
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fix location of ffmpeg headers
@DPATCH@
--- openmovieeditor-0.0.20080102.orig/src/nle_main.cxx
+++ openmovieeditor-0.0.20080102/src/nle_main.cxx
@@ -31,7 +31,7 @@
#ifdef AVCODEC
extern "C" {
- #include <ffmpeg/avformat.h>
+ #include <libavformat/avformat.h>
}
#endif
--- openmovieeditor-0.0.20080102.orig/src/VideoFileFfmpeg.H
+++ openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H
@@ -23,10 +23,10 @@
#ifdef AVCODEC
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
#ifdef SWSCALE
- #include <ffmpeg/swscale.h>
+ #include <libswscale/swscale.h>
#endif /* SWSCALE */
}
--- openmovieeditor-0.0.20080102.orig/src/AudioFileFfmpeg.H
+++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H
@@ -24,8 +24,8 @@
#ifdef AVCODEC
extern "C" {
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
+#include <libavcodec/avcodec.h>
+#include <libavformat/avformat.h>
}
#include "global_includes.H"
--- openmovieeditor-0.0.20080102.orig/src/AudioFileFfmpeg.cxx
+++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx
@@ -132,7 +132,7 @@
uint8_t *ptr = m_packet.data;
int data_size;
while ( ptr != NULL && ret >= 0 &&
m_packet.stream_index == m_audioStream && len > 0 ) {
- ret = avcodec_decode_audio( m_codecContext,
m_tmpBuffer, &data_size, ptr, len );
+ ret = avcodec_decode_audio2( m_codecContext,
m_tmpBuffer, &data_size, ptr, len );
if ( ret < 0 ) {
ret = 0;
break;
diff -u openmovieeditor-0.0.20080102/debian/watch
openmovieeditor-0.0.20080102/debian/watch
--- openmovieeditor-0.0.20080102/debian/watch
+++ openmovieeditor-0.0.20080102/debian/watch
@@ -3 +3 @@
-http://heanet.dl.sourceforge.net/o/op/openmovieeditor/openmovieeditor-(0\.0\..*)\.tar.gz
debian uupdate
+http://sf.net/openmovieeditor/openmovieeditor-(0\.0\..*)\.tar.gz debian
uupdate
diff -u openmovieeditor-0.0.20080102/debian/rules
openmovieeditor-0.0.20080102/debian/rules
--- openmovieeditor-0.0.20080102/debian/rules
+++ openmovieeditor-0.0.20080102/debian/rules
@@ -49,7 +49,7 @@
rm -f build-stamp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
+ [ ! -f Makefile ] || $(MAKE) distclean
ifneq "$(wildcard /usr/share/misc/config.sub)" ""
cp -f /usr/share/misc/config.sub config.sub
endif
diff -u openmovieeditor-0.0.20080102/debian/control
openmovieeditor-0.0.20080102/debian/control
--- openmovieeditor-0.0.20080102/debian/control
+++ openmovieeditor-0.0.20080102/debian/control
@@ -1,12 +1,13 @@
Source: openmovieeditor
Section: graphics
Priority: optional
-Maintainer: Debian Multimedia Team <debian-multime...@lists.debian.org>
+Maintainer: Ubuntu MOTU Developers <ubuntu-m...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Multimedia Team
<debian-multime...@lists.debian.org>
Uploaders: Free Ekanayaka <fr...@debian.org>
Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch,
libfltk1.1-dev, libquicktime-dev, libavcodec-dev, libavformat-dev,
- libsndfile-dev, xlibmesa-gl-dev, libgavl-dev (>= 0.2.3-2),
- libsamplerate0-dev, libjack-dev, libmpeg3-dev
+ libsndfile-dev, libgl1-mesa-dev, libgavl-dev (>= 1.0.1),
+ libsamplerate0-dev, libjack-dev, libmpeg3-dev, libswscale-dev
Standards-Version: 3.7.2
Package: openmovieeditor
diff -u openmovieeditor-0.0.20080102/debian/changelog
openmovieeditor-0.0.20080102/debian/changelog
--- openmovieeditor-0.0.20080102/debian/changelog
+++ openmovieeditor-0.0.20080102/debian/changelog
@@ -1,3 +1,19 @@
+openmovieeditor (0.0.20080102-2.1ubuntu1) jaunty; urgency=low
+
+ * Fix FTBFS because of new version of libgavl (LP: #318967)
+ - patch 03_fix_FTBFS_with_gavl_1.0.1: fix VideoEffectClip.H because of
+ duplicate definition of gavl_video_converter_t and gavl_video_frame_t
+ * patch 04_fix_ffmpeg_headers: fix location of avformat.h, avcodec.h and
+ swscale.h headers
+ * debian/control:
+ - Bumped minimum version of libgavl-dev to 1.0.1-1
+ - Replaced xlibmesa-gl-dev with libgl1-mesa-dev in build depends
+ - Added libswscale-dev in build depends
+ * debian/watch: fixed to make use of sourceforge redirector
+ * debian/rules: fixed debian-rules-ignores-make-clean-error
+
+ -- Fabrice Coutadeur <coutade...@gmail.com> Tue, 20 Jan 2009 05:00:33 +0100
+
openmovieeditor (0.0.20080102-2.1build1.1) intrepid-proposed; urgency=low
* Rebuild to take into account unstripped versions of libavcodec libs
diff -u openmovieeditor-0.0.20080102/debian/patches/00list
openmovieeditor-0.0.20080102/debian/patches/00list
--- openmovieeditor-0.0.20080102/debian/patches/00list
+++ openmovieeditor-0.0.20080102/debian/patches/00list
@@ -1,0 +2,2 @@
+03_fix_FTBFS_with_gavl_1.0.1.dpatch
+04_fix_ffmpeg_headers.dpatch
only in patch2:
unchanged:
---
openmovieeditor-0.0.20080102.orig/debian/patches/03_fix_FTBFS_with_gavl_1.0.1.dpatch
+++
openmovieeditor-0.0.20080102/debian/patches/03_fix_FTBFS_with_gavl_1.0.1.dpatch
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 03_fix_FTBFS_with_gavl_1.0.1.dpatch by Fabrice Coutadeur
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS with gavl >= 1.0.1-1 (duplicate definition)
+
+...@dpatch@
+--- openmovieeditor-0.0.20080102.orig/src/VideoEffectClip.H
++++ openmovieeditor-0.0.20080102/src/VideoEffectClip.H
+@@ -27,8 +27,6 @@
+ #include "IVideoReader.H"
+ #include <gavl/gavl.h>
+
+-typedef struct gavl_video_converter_s gavl_video_converter_t;
+-typedef struct gavl_video_frame_s gavl_video_frame_t;
+ namespace nle
+ {
+
only in patch2:
unchanged:
---
openmovieeditor-0.0.20080102.orig/debian/patches/04_fix_ffmpeg_headers.dpatch
+++ openmovieeditor-0.0.20080102/debian/patches/04_fix_ffmpeg_headers.dpatch
@@ -0,0 +1,58 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 04_fix_ffmpeg_headers.dpatch by Fabrice Coutadeur
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix location of ffmpeg headers
+
+...@dpatch@
+--- openmovieeditor-0.0.20080102.orig/src/nle_main.cxx
++++ openmovieeditor-0.0.20080102/src/nle_main.cxx
+@@ -31,7 +31,7 @@
+
+ #ifdef AVCODEC
+ extern "C" {
+- #include <ffmpeg/avformat.h>
++ #include <libavformat/avformat.h>
+ }
+ #endif
+
+--- openmovieeditor-0.0.20080102.orig/src/VideoFileFfmpeg.H
++++ openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H
+@@ -23,10 +23,10 @@
+ #ifdef AVCODEC
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ #ifdef SWSCALE
+- #include <ffmpeg/swscale.h>
++ #include <libswscale/swscale.h>
+ #endif /* SWSCALE */
+ }
+
+--- openmovieeditor-0.0.20080102.orig/src/AudioFileFfmpeg.H
++++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H
+@@ -24,8 +24,8 @@
+ #ifdef AVCODEC
+
+ extern "C" {
+-#include <ffmpeg/avcodec.h>
+-#include <ffmpeg/avformat.h>
++#include <libavcodec/avcodec.h>
++#include <libavformat/avformat.h>
+ }
+
+ #include "global_includes.H"
+--- openmovieeditor-0.0.20080102.orig/src/AudioFileFfmpeg.cxx
++++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx
+@@ -132,7 +132,7 @@
+ uint8_t *ptr = m_packet.data;
+ int data_size;
+ while ( ptr != NULL && ret >= 0 &&
m_packet.stream_index == m_audioStream && len > 0 ) {
+- ret = avcodec_decode_audio( m_codecContext,
m_tmpBuffer, &data_size, ptr, len );
++ ret = avcodec_decode_audio2( m_codecContext,
m_tmpBuffer, &data_size, ptr, len );
+ if ( ret < 0 ) {
+ ret = 0;
+ break;
