--- openmovieeditor-0.0.20080102.orig/openmovieeditor_gcc-4.3.diff +++ openmovieeditor-0.0.20080102/openmovieeditor_gcc-4.3.diff @@ -0,0 +1,108 @@ +--- a/src/AudioFileFactory.cxx ++++ b/src/AudioFileFactory.cxx +@@ -25,6 +25,8 @@ + #include "Resampler.H" + #include + ++#include ++ + namespace nle + { + +--- a/src/AudioFileQT.cxx ++++ b/src/AudioFileQT.cxx +@@ -22,6 +22,8 @@ + #include "AudioFileQT.H" + #include "ErrorDialog/IErrorHandler.H" + ++#include ++ + + namespace nle + { +--- a/src/FilmStripFactory.cxx ++++ b/src/FilmStripFactory.cxx +@@ -25,6 +25,8 @@ + #include "IVideoFile.H" + #include "FilmStrip.H" + ++#include ++ + + namespace nle + { +--- a/src/FolderBrowser.cxx ++++ b/src/FolderBrowser.cxx +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + namespace nle + { +--- a/src/JackPlaybackCore.cxx ++++ b/src/JackPlaybackCore.cxx +@@ -39,6 +39,9 @@ + #include "ErrorDialog/IErrorHandler.H" + #include + ++#include ++#include ++ + #define VIDEO_DRIFT_LIMIT 2 //Calculate this based on frame size + #define FRAMES 4096 + +--- a/src/NodeFilterFrei0rFactoryPlugin.cxx ++++ b/src/NodeFilterFrei0rFactoryPlugin.cxx +@@ -3,6 +3,7 @@ + #include "NodeFilterFrei0rFactoryPlugin.H" + #include "Frei0rNode.H" + #include ++#include + + + NodeFilterFrei0rFactoryPlugin::NodeFilterFrei0rFactoryPlugin( std::string filename ) +--- a/src/PortAudioPlaybackCore.cxx ++++ b/src/PortAudioPlaybackCore.cxx +@@ -38,6 +38,8 @@ + #include "ErrorDialog/IErrorHandler.H" + #include + ++#include ++ + #define VIDEO_DRIFT_LIMIT (2 * 1200) //Calculate this based on frame size + #define FRAMES 4096 + +--- a/src/VideoFileFactory.cxx ++++ b/src/VideoFileFactory.cxx +@@ -22,6 +22,7 @@ + #include "VideoFileFactory.H" + #include "VideoFileMpeg3.H" + #include ++#include + namespace nle + { + +--- a/src/VideoThumbnails.cxx ++++ b/src/VideoThumbnails.cxx +@@ -25,6 +25,8 @@ + #include "VideoFileFactory.H" + #include "ImageClip.H" + ++#include ++ + namespace nle + { + +--- a/src/fl_font_browser.cpp ++++ b/src/fl_font_browser.cpp +@@ -28,6 +28,8 @@ + + + #include "fl_font_browser.h" ++#include ++#include + using namespace std; + + void Fl_Font_Browser::callback(void (*cb)(Fl_Widget *, void *), void *d ) --- openmovieeditor-0.0.20080102.orig/debian/menu +++ openmovieeditor-0.0.20080102/debian/menu @@ -0,0 +1,3 @@ +?package(openmovieeditor):needs="X11" section="Apps/Sound" \ + title="openmovieeditor" command="/usr/bin/openmovieeditor" \ + icon="/usr/share/pixmaps/openmovieeditor.png" --- openmovieeditor-0.0.20080102.orig/debian/install +++ openmovieeditor-0.0.20080102/debian/install @@ -0,0 +1,2 @@ +debian/openmovieeditor.desktop usr/share/applications +icons/openmovieeditor.png usr/share/pixmaps --- openmovieeditor-0.0.20080102.orig/debian/control +++ openmovieeditor-0.0.20080102/debian/control @@ -0,0 +1,19 @@ +Source: openmovieeditor +Section: graphics +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian Multimedia Team +Uploaders: Free Ekanayaka +Build-Depends: debhelper (>= 4.0.0), autotools-dev, dpatch, + libfltk1.1-dev, libquicktime-dev, libavcodec-dev, libavformat-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 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: a simple non-linear video editor + Open Movie Editor is designed to be a simple tool, that provides + basic movie making capabilities. It aims to be powerful enough + for the amateur movie artist, yet easy to use. --- openmovieeditor-0.0.20080102.orig/debian/changelog +++ openmovieeditor-0.0.20080102/debian/changelog @@ -0,0 +1,96 @@ +openmovieeditor (0.0.20080102-2.2ubuntu2) karmic; urgency=low + + * No-change rebuild to pick up new ffmpeg shlibs file. + + -- Stefan Potyra Fri, 28 Aug 2009 23:07:46 +0200 + +openmovieeditor (0.0.20080102-2.2ubuntu1) karmic; urgency=low + + * Update debian/patches/05_gcc-4.4.dpatch patch to fix FTBFS in karmic + due to GCC 4.4 transition. + + -- Alessio Treglia Thu, 11 Jun 2009 18:35:22 +0200 + +openmovieeditor (0.0.20080102-2.2) unstable; urgency=low + + * Non-maintainer upload. + * 03_gavl_ftbfs.dpatch. Fix duplicate definitions. (Closes: #512444). + + 04_ffmpeg_headers.dpatch. Fix location of ffmpeg headers. + + Thanks to Fabrice Coutadeur for both patches! + * 05_gcc4.4.dpatch - Build with gcc4.4. (Closes: #505082). + + Thanks to Martin Michlmayr for the patch! + * Bump libgavl-dev build-dep version to >= 1.0.1. + * Move xlibmesa-gl-dev build-dep to libgl1-mesa-dev. + * Add libswscale-dev build-dep for swscale functions. + * Copy in config.{sub,guess} on configure. rm them on clean. + * Make clean not ignore errors. + * Fix watch file. (Use sourceforge redirector). + + -- Barry deFreese Mon, 09 Mar 2009 14:35:16 -0400 + +openmovieeditor (0.0.20080102-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Fix GCC 4.3 compatibility, patch by Cyril Brulebois (Closes: #456098) + + -- Moritz Muehlenhoff Sat, 22 Mar 2008 00:25:13 +0100 + +openmovieeditor (0.0.20080102-2) unstable; urgency=low + + * Added libmpeg3-dev to build-dependences, as suggested upstream + + -- Free Ekanayaka Thu, 10 Jan 2008 09:49:16 +0000 + +openmovieeditor (0.0.20080102-1) unstable; urgency=low + + * New upstream release (Closes: #456098) + * Drop 01_gcc4.3 patch + + -- Free Ekanayaka Wed, 9 Jan 2008 10:36:45 +0000 + +openmovieeditor (0.0.20061221-4) unstable; urgency=low + + * fix FTBFS (missing cstdlib) (Closes: #436356) + + -- Joost Yervante Damad Mon, 03 Sep 2007 13:36:15 +0200 + +openmovieeditor (0.0.20061221-3) unstable; urgency=low + + * Fix FTBS with gcc-4.3 (Closes: #417460) + + -- Joost Yervante Damad Sat, 12 May 2007 17:54:27 +0200 + +openmovieeditor (0.0.20061221-2) unstable; urgency=low + + * Included copyright information about sl, portaudio and tinyxml + * Second upload to debian, let's try again (Closes: #374088) + + -- Free Ekanayaka Wed, 28 Feb 2007 11:59:54 +0100 + +openmovieeditor (0.0.20061221-1) unstable; urgency=low + + * New upstream release + * First upload to debian (Closes: #374088) + * Added .desktop file and icon file + + -- Free Ekanayaka Tue, 16 Jan 2007 17:29:39 +0100 + +openmovieeditor (0.0.20060901-1) unstable; urgency=low + + * New upstream release + * Added build dependency non libsamplerate0-dev and libjack-dev + + -- Free Ekanayaka Mon, 2 Oct 2006 15:45:27 +0200 + +openmovieeditor (0.0.20060504-1) unstable; urgency=low + + * New upstream release + + -- Free Ekanayaka Sat, 17 Jun 2006 10:53:34 +0200 + +openmovieeditor (0.0.20060430-1) unstable; urgency=low + + * Draft package built at LAC 2006 + + -- Free Ekanayaka Sun, 30 Apr 2006 11:22:36 +0200 + --- openmovieeditor-0.0.20080102.orig/debian/rules +++ openmovieeditor-0.0.20080102/debian/rules @@ -0,0 +1,111 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +include /usr/share/dpatch/dpatch.make + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + + +CFLAGS = -Wall -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +config.status: patch configure + dh_testdir + # Add here commands to configure the package. +ifneq "$(wildcard /usr/share/misc/config.sub)" "" + cp -f /usr/share/misc/config.sub config.sub +endif +ifneq "$(wildcard /usr/share/misc/config.guess)" "" + cp -f /usr/share/misc/config.guess config.guess +endif + + CFLAGS="$(CFLAGS) -Wl,-z,defs" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info + + +build: build-stamp + +build-stamp: config.status + dh_testdir + + # Add here commands to compile the package. + $(MAKE) + #docbook-to-man debian/openmovieeditor.sgml > openmovieeditor.1 + + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean + + rm -f config.guess config.sub + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/openmovieeditor. + $(MAKE) install DESTDIR=$(CURDIR)/debian/openmovieeditor + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs + dh_installdocs + dh_installexamples + dh_install + dh_installmenu +# dh_installdebconf +# dh_installlogrotate +# dh_installemacsen +# dh_installpam +# dh_installmime +# dh_installinit +# dh_installcron +# dh_installinfo + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms +# dh_perl +# dh_python +# dh_makeshlibs + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install --- openmovieeditor-0.0.20080102.orig/debian/docs +++ openmovieeditor-0.0.20080102/debian/docs @@ -0,0 +1,3 @@ +NEWS +README +TODO --- openmovieeditor-0.0.20080102.orig/debian/watch +++ openmovieeditor-0.0.20080102/debian/watch @@ -0,0 +1,3 @@ +# Site Directory Pattern Version Script +version=3 +http://sf.net/openmovieeditor/openmovieeditor-(0\.0\..*)\.tar.gz debian uupdate --- openmovieeditor-0.0.20080102.orig/debian/copyright +++ openmovieeditor-0.0.20080102/debian/copyright @@ -0,0 +1,98 @@ +This package was debianized by Free Ekanayaka on +Sun, 30 Apr 2006 11:22:36 +0200. + +It was downloaded from http://propirate.net/oracle/zipfiles/openmovieeditor-0.0.20060430.tar.gz + +Copyright Holder of the openmovieeditor code: + +Richard Spindler . + +License: + + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +Furthermore the upstream tarballs bundles other three external +projects: + +/* +* sl - a small and efficient linked list library +* +* Copyright (C) 2003,2004,2005 Stig Brautaset +* +* This program is free software; you can redistribute it and/or modify +* it under the terms of the GNU General Public License as published by +* the Free Software Foundation; either version 2 of the License, or +* (at your option) any later version. +*/ + +/* +* PortAudio - Portable audio I/O - shared library +* +* Copyright (c) 1999-2000 Ross Bencina and Phil Burk +* +* Permission is hereby granted, free of charge, to any person obtaining +* a copy of this software and associated documentation files +* (the "Software"), to deal in the Software without restriction, +* including without limitation the rights to use, copy, modify, merge, +* publish, distribute, sublicense, and/or sell copies of the Software, +* and to permit persons to whom the Software is furnished to do so, +* subject to the following conditions: +* +* The above copyright notice and this permission notice shall be +* included in all copies or substantial portions of the Software. +* +* Any person wishing to distribute modifications to the Software is +* requested to send the modifications to the original developer so that +* they can be incorporated into the canonical version. +* +* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR +* ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +* +*/ + +/* +* TinyXml - s a simple, small, C++ XML parser +* +* Original code (2.0 and earlier )copyright (c) 2000-2002 Lee Thomason +* (www.grinninglizard.com) +* +* This software is provided 'as-is', without any express or implied +* warranty. In no event will the authors be held liable for any +* damages arising from the use of this software. +* +* Permission is granted to anyone to use this software for any +* purpose, including commercial applications, and to alter it and +* redistribute it freely, subject to the following restrictions: +* +* 1. The origin of this software must not be misrepresented; you must +* not claim that you wrote the original software. If you use this +* software in a product, an acknowledgment in the product documentation +* would be appreciated but is not required. +* +* 2. Altered source versions must be plainly marked as such, and +* must not be misrepresented as being the original software. +* +* 3. This notice may not be removed or altered from any source +* distribution. +* +*/ --- openmovieeditor-0.0.20080102.orig/debian/compat +++ openmovieeditor-0.0.20080102/debian/compat @@ -0,0 +1 @@ +4 --- openmovieeditor-0.0.20080102.orig/debian/openmovieeditor.desktop +++ openmovieeditor-0.0.20080102/debian/openmovieeditor.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Open Movie Editor +Comment=Simple non-linear video edito +Exec=openmovieeditor +Icon=/usr/share/pixmaps/openmovieeditor.png +Terminal=false +Type=Application +Categories=Application;AudioVideo --- openmovieeditor-0.0.20080102.orig/debian/patches/01_gcc4.3.dpatch +++ openmovieeditor-0.0.20080102/debian/patches/01_gcc4.3.dpatch @@ -0,0 +1,49 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_gcc4.3.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix gcc-4.3 FTBFS + +@DPATCH@ + +--- old/src/FolderBrowser.cxx 2006-10-25 23:38:18.000000000 +0200 ++++ new/src/FolderBrowser.cxx 2007-05-12 17:37:24.000000000 +0200 +@@ -19,6 +19,7 @@ + #include + #include "FolderBrowser.H" + ++#include + #include + + namespace nle +--- old/src/Frei0rFactory.cxx 2006-11-21 18:21:18.000000000 +0100 ++++ new/src/Frei0rFactory.cxx 2007-05-12 17:39:24.000000000 +0200 +@@ -21,6 +21,8 @@ + #include + #include + ++#include ++ + #include + + #include "sl/sl.h" +--- old/src/MediaBrowser.cxx 2006-11-22 19:43:11.000000000 +0100 ++++ new/src/MediaBrowser.cxx 2007-05-12 17:38:59.000000000 +0200 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + + #include + #include +--- old/src/helper.cxx 2006-12-17 21:14:05.000000000 +0530 ++++ new/src/helper.cxx 2007-08-22 14:32:04.000000000 +0530 +@@ -20,6 +20,7 @@ + #include "config.h" + + #include ++#include + #include + #include + #include --- openmovieeditor-0.0.20080102.orig/debian/patches/00list +++ openmovieeditor-0.0.20080102/debian/patches/00list @@ -0,0 +1,4 @@ +02_gcc4.3.dpatch +03_gavl_ftbfs.dpatch +04_ffmpeg_headers.dpatch +05_gcc-4.4.dpatch --- openmovieeditor-0.0.20080102.orig/debian/patches/03_gavl_ftbfs.dpatch +++ openmovieeditor-0.0.20080102/debian/patches/03_gavl_ftbfs.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 03_gavl_ftbfs.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@ +diff -urNad openmovieeditor-0.0.20080102~/src/VideoEffectClip.H openmovieeditor-0.0.20080102/src/VideoEffectClip.H +--- openmovieeditor-0.0.20080102~/src/VideoEffectClip.H 2007-11-11 12:12:59.000000000 -0500 ++++ openmovieeditor-0.0.20080102/src/VideoEffectClip.H 2009-03-09 14:40:54.000000000 -0400 +@@ -27,8 +27,6 @@ + #include "IVideoReader.H" + #include + +-typedef struct gavl_video_converter_s gavl_video_converter_t; +-typedef struct gavl_video_frame_s gavl_video_frame_t; + namespace nle + { + --- openmovieeditor-0.0.20080102.orig/debian/patches/02_gcc4.3.dpatch +++ openmovieeditor-0.0.20080102/debian/patches/02_gcc4.3.dpatch @@ -0,0 +1,115 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 02_gcc4.3.dpatch by Cyril Brulebois +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix gcc-4.3 FTBFS + +@DPATCH@ +--- a/src/AudioFileFactory.cxx ++++ b/src/AudioFileFactory.cxx +@@ -25,6 +25,8 @@ + #include "Resampler.H" + #include + ++#include ++ + namespace nle + { + +--- a/src/AudioFileQT.cxx ++++ b/src/AudioFileQT.cxx +@@ -22,6 +22,8 @@ + #include "AudioFileQT.H" + #include "ErrorDialog/IErrorHandler.H" + ++#include ++ + + namespace nle + { +--- a/src/FilmStripFactory.cxx ++++ b/src/FilmStripFactory.cxx +@@ -25,6 +25,8 @@ + #include "IVideoFile.H" + #include "FilmStrip.H" + ++#include ++ + + namespace nle + { +--- a/src/FolderBrowser.cxx ++++ b/src/FolderBrowser.cxx +@@ -21,6 +21,7 @@ + + #include + #include ++#include + + namespace nle + { +--- a/src/JackPlaybackCore.cxx ++++ b/src/JackPlaybackCore.cxx +@@ -39,6 +39,9 @@ + #include "ErrorDialog/IErrorHandler.H" + #include + ++#include ++#include ++ + #define VIDEO_DRIFT_LIMIT 2 //Calculate this based on frame size + #define FRAMES 4096 + +--- a/src/NodeFilterFrei0rFactoryPlugin.cxx ++++ b/src/NodeFilterFrei0rFactoryPlugin.cxx +@@ -3,6 +3,7 @@ + #include "NodeFilterFrei0rFactoryPlugin.H" + #include "Frei0rNode.H" + #include ++#include + + + NodeFilterFrei0rFactoryPlugin::NodeFilterFrei0rFactoryPlugin( std::string filename ) +--- a/src/PortAudioPlaybackCore.cxx ++++ b/src/PortAudioPlaybackCore.cxx +@@ -38,6 +38,8 @@ + #include "ErrorDialog/IErrorHandler.H" + #include + ++#include ++ + #define VIDEO_DRIFT_LIMIT (2 * 1200) //Calculate this based on frame size + #define FRAMES 4096 + +--- a/src/VideoFileFactory.cxx ++++ b/src/VideoFileFactory.cxx +@@ -22,6 +22,7 @@ + #include "VideoFileFactory.H" + #include "VideoFileMpeg3.H" + #include ++#include + namespace nle + { + +--- a/src/VideoThumbnails.cxx ++++ b/src/VideoThumbnails.cxx +@@ -25,6 +25,8 @@ + #include "VideoFileFactory.H" + #include "ImageClip.H" + ++#include ++ + namespace nle + { + +--- a/src/fl_font_browser.cpp ++++ b/src/fl_font_browser.cpp +@@ -28,6 +28,8 @@ + + + #include "fl_font_browser.h" ++#include ++#include + using namespace std; + + void Fl_Font_Browser::callback(void (*cb)(Fl_Widget *, void *), void *d ) --- openmovieeditor-0.0.20080102.orig/debian/patches/05_gcc-4.4.dpatch +++ openmovieeditor-0.0.20080102/debian/patches/05_gcc-4.4.dpatch @@ -0,0 +1,78 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 05_gcc-4.4.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Add includes to build with gcc-4.4 + +@DPATCH@ +diff -urNad openmovieeditor-0.0.20080102~/src/AddCommand.cxx openmovieeditor-0.0.20080102/src/AddCommand.cxx +--- openmovieeditor-0.0.20080102~/src/AddCommand.cxx 2007-05-30 18:51:38.000000000 +0200 ++++ openmovieeditor-0.0.20080102/src/AddCommand.cxx 2009-06-11 18:34:09.044152258 +0200 +@@ -23,6 +23,8 @@ + #include "Timeline.H" + #include "VideoTrack.H" + ++#include ++ + namespace nle + { + +diff -urNad openmovieeditor-0.0.20080102~/src/DiskCache.H openmovieeditor-0.0.20080102/src/DiskCache.H +--- openmovieeditor-0.0.20080102~/src/DiskCache.H 2007-05-30 18:51:37.000000000 +0200 ++++ openmovieeditor-0.0.20080102/src/DiskCache.H 2009-06-11 18:34:09.048169319 +0200 +@@ -20,6 +20,8 @@ + #ifndef _DISK_CACHE_H_ + #define _DISK_CACHE_H_ + ++#include ++ + #include "global_includes.H" + namespace nle + { +diff -urNad openmovieeditor-0.0.20080102~/src/JackPlaybackCore.cxx openmovieeditor-0.0.20080102/src/JackPlaybackCore.cxx +--- openmovieeditor-0.0.20080102~/src/JackPlaybackCore.cxx 2009-06-11 18:34:08.371150092 +0200 ++++ openmovieeditor-0.0.20080102/src/JackPlaybackCore.cxx 2009-06-11 18:34:09.060188234 +0200 +@@ -39,6 +39,7 @@ + #include "ErrorDialog/IErrorHandler.H" + #include + ++#include + #include + #include + +diff -urNad openmovieeditor-0.0.20080102~/src/MediaBrowser.cxx openmovieeditor-0.0.20080102/src/MediaBrowser.cxx +--- openmovieeditor-0.0.20080102~/src/MediaBrowser.cxx 2007-10-08 20:15:59.000000000 +0200 ++++ openmovieeditor-0.0.20080102/src/MediaBrowser.cxx 2009-06-11 18:34:09.060188234 +0200 +@@ -19,6 +19,7 @@ + + #include + #include ++#include + #include + + #include +diff -urNad openmovieeditor-0.0.20080102~/src/WaveForm.H openmovieeditor-0.0.20080102/src/WaveForm.H +--- openmovieeditor-0.0.20080102~/src/WaveForm.H 2007-05-30 18:51:37.000000000 +0200 ++++ openmovieeditor-0.0.20080102/src/WaveForm.H 2009-06-11 18:34:09.064162762 +0200 +@@ -20,6 +20,8 @@ + #include "global_includes.H" + #include "IdleHandler.H" + ++#include ++ + namespace nle + { + +diff -urNad openmovieeditor-0.0.20080102~/src/fl_font_browser.cpp openmovieeditor-0.0.20080102/src/fl_font_browser.cpp +--- openmovieeditor-0.0.20080102~/src/fl_font_browser.cpp 2009-06-11 18:34:08.371150092 +0200 ++++ openmovieeditor-0.0.20080102/src/fl_font_browser.cpp 2009-06-11 18:35:05.231138845 +0200 +@@ -27,7 +27,8 @@ + ////////////////////////////////////////////////////////////////////// + + +-#include "fl_font_browser.h" ++#include "fl_font_browser.h" ++#include + #include + #include + using namespace std; --- openmovieeditor-0.0.20080102.orig/debian/patches/04_ffmpeg_headers.dpatch +++ openmovieeditor-0.0.20080102/debian/patches/04_ffmpeg_headers.dpatch @@ -0,0 +1,62 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 04_ffmpeg_headers.dpatch by Fabrice Coutadeur +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix location of ffmpeg headers + +@DPATCH@ +diff -urNad openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.H openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H +--- openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.H 2007-05-31 15:29:52.000000000 -0400 ++++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.H 2009-03-09 14:45:10.000000000 -0400 +@@ -24,8 +24,8 @@ + #ifdef AVCODEC + + extern "C" { +-#include +-#include ++#include ++#include + } + + #include "global_includes.H" +diff -urNad openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.cxx openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx +--- openmovieeditor-0.0.20080102~/src/AudioFileFfmpeg.cxx 2007-10-18 05:53:59.000000000 -0400 ++++ openmovieeditor-0.0.20080102/src/AudioFileFfmpeg.cxx 2009-03-09 14:45:55.000000000 -0400 +@@ -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 -urNad openmovieeditor-0.0.20080102~/src/VideoFileFfmpeg.H openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H +--- openmovieeditor-0.0.20080102~/src/VideoFileFfmpeg.H 2007-09-14 07:51:56.000000000 -0400 ++++ openmovieeditor-0.0.20080102/src/VideoFileFfmpeg.H 2009-03-09 14:44:21.000000000 -0400 +@@ -23,10 +23,10 @@ + #ifdef AVCODEC + + extern "C" { +-#include +-#include ++#include ++#include + #ifdef SWSCALE +- #include ++ #include + #endif /* SWSCALE */ + } + +diff -urNad openmovieeditor-0.0.20080102~/src/nle_main.cxx openmovieeditor-0.0.20080102/src/nle_main.cxx +--- openmovieeditor-0.0.20080102~/src/nle_main.cxx 2007-12-23 10:20:05.000000000 -0500 ++++ openmovieeditor-0.0.20080102/src/nle_main.cxx 2009-03-09 14:43:24.000000000 -0400 +@@ -31,7 +31,7 @@ + + #ifdef AVCODEC + extern "C" { +- #include ++ #include + } + #endif +