Bug#456098: openmovieeditor: diff for NMU version 0.0.20080102-2.1
tags 456098 + patch
thanks
Hi,
Attached is the diff for my openmovieeditor 0.0.20080102-2.1 NMU.
Cheers,
Moritz
diff -u openmovieeditor-0.0.20080102/config.guess openmovieeditor-0.0.20080102/config.guess
--- openmovieeditor-0.0.20080102/config.guess
+++ openmovieeditor-0.0.20080102/config.guess
@@ -1,10 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-07-22'
+timestamp='2008-01-23'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -56,8 +56,8 @@
GNU config.guess ($timestamp)
Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -532,7 +532,7 @@
echo rs6000-ibm-aix3.2
fi
exit ;;
- *:AIX:*:[45])
+ *:AIX:*:[456])
IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
IBM_ARCH=rs6000
@@ -799,6 +799,9 @@
EM64T | authenticamd)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
+ IA64)
+ echo ia64-unknown-interix${UNAME_RELEASE}
+ exit ;;
esac ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
echo i${UNAME_MACHINE}-pc-mks
@@ -833,7 +836,14 @@
echo ${UNAME_MACHINE}-pc-minix
exit ;;
arm*:Linux:*:*)
- echo ${UNAME_MACHINE}-unknown-linux-gnu
+ eval $set_cc_for_build
+ if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
+ | grep -q __ARM_EABI__
+ then
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ else
+ echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+ fi
exit ;;
avr32*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -954,8 +964,8 @@
x86_64:Linux:*:*)
echo x86_64-unknown-linux-gnu
exit ;;
- xtensa:Linux:*:*)
- echo xtensa-unknown-linux-gnu
+ xtensa*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
i*86:Linux:*:*)
# The BFD linker knows what the default object file format is, so
@@ -1474,9 +1484,9 @@
the operating system you are using. It is advised that you
download the most up to date version of the config scripts from
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
and
- http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
+ http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
If the version you run ($0) is already up to date, please
send the following data and any information you think might be
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,10 @@
+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 <jmm@debian.org> 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
diff -u openmovieeditor-0.0.20080102/config.sub openmovieeditor-0.0.20080102/config.sub
--- openmovieeditor-0.0.20080102/config.sub
+++ openmovieeditor-0.0.20080102/config.sub
@@ -1,10 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
-# Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
+# Free Software Foundation, Inc.
-timestamp='2007-06-28'
+timestamp='2008-01-16'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -72,8 +72,8 @@
version="\
GNU config.sub ($timestamp)
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
+Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -369,10 +369,14 @@
| v850-* | v850e-* | vax-* \
| we32k-* \
| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
- | xstormy16-* | xtensa-* \
+ | xstormy16-* | xtensa*-* \
| ymp-* \
| z8k-*)
;;
+ # Recognize the basic CPU types without company name, with glob match.
+ xtensa*)
+ basic_machine=$basic_machine-unknown
+ ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -443,6 +447,14 @@
basic_machine=ns32k-sequent
os=-dynix
;;
+ blackfin)
+ basic_machine=bfin-unknown
+ os=-linux
+ ;;
+ blackfin-*)
+ basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
c90)
basic_machine=c90-cray
os=-unicos
@@ -668,6 +680,14 @@
basic_machine=m68k-isi
os=-sysv
;;
+ m68knommu)
+ basic_machine=m68k-unknown
+ os=-linux
+ ;;
+ m68knommu-*)
+ basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
m88k-omron*)
basic_machine=m88k-omron
;;
@@ -813,6 +833,14 @@
basic_machine=i860-intel
os=-osf
;;
+ parisc)
+ basic_machine=hppa-unknown
+ os=-linux
+ ;;
+ parisc-*)
+ basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
+ os=-linux
+ ;;
pbd)
basic_machine=sparc-tti
;;
@@ -1021,6 +1049,10 @@
basic_machine=tic6x-unknown
os=-coff
;;
+ tile*)
+ basic_machine=tile-unknown
+ os=-linux-gnu
+ ;;
tx39)
basic_machine=mipstx39-unknown
;;
only in patch2:
unchanged:
--- openmovieeditor-0.0.20080102.orig/debian/patches/00list
+++ openmovieeditor-0.0.20080102/debian/patches/00list
@@ -0,0 +1 @@
+02_gcc4.3.dpatch
only in patch2:
unchanged:
--- 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 <FL/filename.H>
+
++#include <cstring>
++
+ namespace nle
+ {
+
+--- a/src/AudioFileQT.cxx
++++ b/src/AudioFileQT.cxx
+@@ -22,6 +22,8 @@
+ #include "AudioFileQT.H"
+ #include "ErrorDialog/IErrorHandler.H"
+
++#include <cstdlib>
++
+
+ namespace nle
+ {
+--- a/src/FilmStripFactory.cxx
++++ b/src/FilmStripFactory.cxx
+@@ -25,6 +25,8 @@
+ #include "IVideoFile.H"
+ #include "FilmStrip.H"
+
++#include <cstring>
++
+
+ namespace nle
+ {
+--- a/src/FolderBrowser.cxx
++++ b/src/FolderBrowser.cxx
+@@ -21,6 +21,7 @@
+
+ #include <cstdlib>
+ #include <iostream>
++#include <cstring>
+
+ namespace nle
+ {
+--- a/src/JackPlaybackCore.cxx
++++ b/src/JackPlaybackCore.cxx
+@@ -39,6 +39,9 @@
+ #include "ErrorDialog/IErrorHandler.H"
+ #include <iostream>
+
++#include <cstdlib>
++#include <cstring>
++
+ #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 <iostream>
++#include <cstring>
+
+
+ NodeFilterFrei0rFactoryPlugin::NodeFilterFrei0rFactoryPlugin( std::string filename )
+--- a/src/PortAudioPlaybackCore.cxx
++++ b/src/PortAudioPlaybackCore.cxx
+@@ -38,6 +38,8 @@
+ #include "ErrorDialog/IErrorHandler.H"
+ #include <iostream>
+
++#include <cstdlib>
++
+ #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 <FL/filename.H>
++#include <cstring>
+ namespace nle
+ {
+
+--- a/src/VideoThumbnails.cxx
++++ b/src/VideoThumbnails.cxx
+@@ -25,6 +25,8 @@
+ #include "VideoFileFactory.H"
+ #include "ImageClip.H"
+
++#include <cstring>
++
+ namespace nle
+ {
+
+--- a/src/fl_font_browser.cpp
++++ b/src/fl_font_browser.cpp
+@@ -28,6 +28,8 @@
+
+
+ #include "fl_font_browser.h"
++#include <cstdlib>
++#include <cstring>
+ using namespace std;
+
+ void Fl_Font_Browser::callback(void (*cb)(Fl_Widget *, void *), void *d )
only in patch2:
unchanged:
--- 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 <FL/filename.H>
+
++#include <cstring>
++
+ namespace nle
+ {
+
+--- a/src/AudioFileQT.cxx
++++ b/src/AudioFileQT.cxx
+@@ -22,6 +22,8 @@
+ #include "AudioFileQT.H"
+ #include "ErrorDialog/IErrorHandler.H"
+
++#include <cstdlib>
++
+
+ namespace nle
+ {
+--- a/src/FilmStripFactory.cxx
++++ b/src/FilmStripFactory.cxx
+@@ -25,6 +25,8 @@
+ #include "IVideoFile.H"
+ #include "FilmStrip.H"
+
++#include <cstring>
++
+
+ namespace nle
+ {
+--- a/src/FolderBrowser.cxx
++++ b/src/FolderBrowser.cxx
+@@ -21,6 +21,7 @@
+
+ #include <cstdlib>
+ #include <iostream>
++#include <cstring>
+
+ namespace nle
+ {
+--- a/src/JackPlaybackCore.cxx
++++ b/src/JackPlaybackCore.cxx
+@@ -39,6 +39,9 @@
+ #include "ErrorDialog/IErrorHandler.H"
+ #include <iostream>
+
++#include <cstdlib>
++#include <cstring>
++
+ #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 <iostream>
++#include <cstring>
+
+
+ NodeFilterFrei0rFactoryPlugin::NodeFilterFrei0rFactoryPlugin( std::string filename )
+--- a/src/PortAudioPlaybackCore.cxx
++++ b/src/PortAudioPlaybackCore.cxx
+@@ -38,6 +38,8 @@
+ #include "ErrorDialog/IErrorHandler.H"
+ #include <iostream>
+
++#include <cstdlib>
++
+ #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 <FL/filename.H>
++#include <cstring>
+ namespace nle
+ {
+
+--- a/src/VideoThumbnails.cxx
++++ b/src/VideoThumbnails.cxx
+@@ -25,6 +25,8 @@
+ #include "VideoFileFactory.H"
+ #include "ImageClip.H"
+
++#include <cstring>
++
+ namespace nle
+ {
+
+--- a/src/fl_font_browser.cpp
++++ b/src/fl_font_browser.cpp
+@@ -28,6 +28,8 @@
+
+
+ #include "fl_font_browser.h"
++#include <cstdlib>
++#include <cstring>
+ using namespace std;
+
+ void Fl_Font_Browser::callback(void (*cb)(Fl_Widget *, void *), void *d )
Reply to: