[SCM] traverso/master: Patch applied upstream.
mira-guest at users.alioth.debian.org
mira-guest at users.alioth.debian.org
Tue Jul 15 12:47:35 UTC 2014
The following commit has been merged in the master branch:
commit c08e1f7e5e1cb506f2b6e652b517dcf7d900240e
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date: Tue Jul 15 14:38:20 2014 +0200
Patch applied upstream.
diff --git a/debian/patches/01-gcc44_ftbfs.patch b/debian/patches/01-gcc44_ftbfs.patch
deleted file mode 100644
index 45b5dd9..0000000
--- a/debian/patches/01-gcc44_ftbfs.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-Description: Add missing #include for gcc 4.4.
-Author: Stefano Zacchiroli <zack at debian.org>
-Origin: Debian, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=505390#14
-Forwarded: https://savannah.nongnu.org/bugs/index.php?36079
-Bug-Debian: http://bugs.debian.org/505390
---- traverso-0.49.0~rc1.orig/src/core/ViewPort.cpp
-+++ traverso-0.49.0~rc1/src/core/ViewPort.cpp
-@@ -39,6 +39,8 @@ Foundation, Inc., 51 Franklin St, Fifth
-
- #include "Import.h"
-
-+#include <cstdio>
-+
- // Always put me below _all_ includes, this is needed
- // in case we run with memory leak detection enabled!
- #include "Debugger.h"
---- traverso-0.49.0~rc1.orig/src/core/Export.cpp
-+++ traverso-0.49.0~rc1/src/core/Export.cpp
-@@ -23,6 +23,8 @@
- #include "Export.h"
- #include "Project.h"
-
-+#include <cstdio>
-+
- // Always put me below _all_ includes, this is needed
- // in case we run with memory leak detection enabled!
- #include "Debugger.h"
---- traverso-0.49.0~rc1.orig/src/audiofileio/decode/ResampleAudioReader.cpp
-+++ traverso-0.49.0~rc1/src/audiofileio/decode/ResampleAudioReader.cpp
-@@ -22,6 +22,8 @@ Foundation, Inc., 51 Franklin St, Fifth
- #include "ResampleAudioReader.h"
- #include <QString>
-
-+#include <cstdio>
-+
- #define OVERFLOW_SIZE 512
-
- // Always put me below _all_ includes, this is needed
---- traverso-0.49.0~rc1.orig/src/audiofileio/encode/WPAudioWriter.cpp
-+++ traverso-0.49.0~rc1/src/audiofileio/encode/WPAudioWriter.cpp
-@@ -24,6 +24,8 @@ Foundation, Inc., 51 Franklin St, Fifth
- #include <QString>
- #include "Utils.h"
-
-+#include <cstdio>
-+
- // Always put me below _all_ includes, this is needed
- // in case we run with memory leak detection enabled!
- #include "Debugger.h"
---- traverso-0.49.0~rc1.orig/src/traverso/Main.cpp
-+++ traverso-0.49.0~rc1/src/traverso/Main.cpp
-@@ -19,6 +19,7 @@ Foundation, Inc., 51 Franklin St, Fifth
-
- */
-
-+#include <cstdio>
- #include <signal.h>
- #include <stdlib.h>
-
---- traverso-0.49.0~rc1.orig/src/common/RingBuffer.cpp
-+++ traverso-0.49.0~rc1/src/common/RingBuffer.cpp
-@@ -25,6 +25,7 @@
- This is safe for the case of one read thread and one write thread.
- */
-
-+#include <cstdio>
- #include <stdlib.h>
- #include <string.h>
- #ifdef USE_MLOCK
---- traverso-0.49.0~rc1.orig/src/commands/CommandGroup.cpp
-+++ traverso-0.49.0~rc1/src/commands/CommandGroup.cpp
-@@ -22,6 +22,8 @@ $Id: CommandGroup.cpp,v 1.6 2007/04/30 1
-
- #include "CommandGroup.h"
-
-+#include <cstdio>
-+
- // Always put me below _all_ includes, this is needed
- // in case we run with memory leak detection enabled!
- #include "Debugger.h"
diff --git a/debian/patches/02-binutils_gold.patch b/debian/patches/02-binutils_gold.patch
deleted file mode 100644
index ffbbbd3..0000000
--- a/debian/patches/02-binutils_gold.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Append -ldl to linker's flags to prevent FTBFS with binutils-gold.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: https://savannah.nongnu.org/bugs/index.php?36080
----
- src/traverso/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
---- traverso.orig/src/traverso/CMakeLists.txt
-+++ traverso/src/traverso/CMakeLists.txt
-@@ -307,6 +307,10 @@ TARGET_LINK_LIBRARIES(traverso
- )
- ENDIF(HAVE_JACK)
-
-+TARGET_LINK_LIBRARIES(traverso
-+ dl
-+)
-+
- IF(USE_PCH)
- ADD_DEPENDENCIES(traverso precompiled_headers)
- ENDIF(USE_PCH)
diff --git a/debian/patches/03-find_slv2.patch b/debian/patches/03-find_slv2.patch
deleted file mode 100644
index 5ca3006..0000000
--- a/debian/patches/03-find_slv2.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: SLV installs package configuration as slv.pc and not libslv.pc.
- Force the use of -I/usr/include/rasqal, otherwise FTBFS.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: https://savannah.nongnu.org/bugs/index.php?36081
----
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
---- traverso.orig/CMakeLists.txt
-+++ traverso/CMakeLists.txt
-@@ -198,8 +198,9 @@ IF(WANT_LV2)
- # MESSAGE(FATAL_ERROR "lv2 support requested, but slv2 development headers could not be found!\nPlease install the slv2 development package (Usually called libslv2-dev), remove CMakeCache.txt and run cmake again")
- # ENDIF(NOT HAVE_SLV2_H)
-
-- PKG_CHECK_MODULES(SLV2 libslv2>=${MINIMAL_SLV2_VERSION})
-+ PKG_CHECK_MODULES(SLV2 slv2>=${MINIMAL_SLV2_VERSION})
- IF (SLV2_FOUND)
-+ INCLUDE_DIRECTORIES(/usr/include/redland /usr/include/rasqal)
- MESSAGE("-- slv2 Library Found OK")
- SET(HAVE_SYSTEM_SLV2 TRUE)
- ENDIF(SLV2_FOUND)
diff --git a/debian/patches/04-find_raptor2.patch b/debian/patches/04-find_raptor2.patch
deleted file mode 100644
index a6e207c..0000000
--- a/debian/patches/04-find_raptor2.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Force buildsystem to point to correct location of raptor2's
- header files.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: https://savannah.nongnu.org/bugs/index.php?36082
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=618142
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
---- traverso.orig/CMakeLists.txt
-+++ traverso/CMakeLists.txt
-@@ -341,6 +341,7 @@ ADD_CUSTOM_TARGET(uninstall "${CMAKE_COM
- #Set up include dirs with all found packages
- INCLUDE_DIRECTORIES(
- ${CMAKE_SOURCE_DIR}/src/common
-+/usr/include/raptor2
- ${QT_INCLUDE_DIR}
- ${QT_QTCORE_INCLUDE_DIR}
- )
diff --git a/debian/patches/05-gcc47-ftbfs.patch b/debian/patches/05-gcc47-ftbfs.patch
deleted file mode 100644
index f0b47db..0000000
--- a/debian/patches/05-gcc47-ftbfs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Fix build failure with GCC 4.7.
-Author: Cyril Brulebois <kibi at debian.org>
-Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667398
-Forwarded: no
----
- src/core/FileHelpers.cpp | 1 +
- src/traverso/Main.cpp | 1 +
- 2 files changed, 2 insertions(+)
-
---- traverso.orig/src/core/FileHelpers.cpp
-+++ traverso/src/core/FileHelpers.cpp
-@@ -28,6 +28,7 @@ $Id: FileHelpers.cpp,v 1.10 2007/11/05 1
- #include <Utils.h>
- #include <QObject>
- #include <QFile>
-+#include <unistd.h>
-
- #include "Debugger.h"
-
---- traverso.orig/src/traverso/Main.cpp
-+++ traverso/src/traverso/Main.cpp
-@@ -32,6 +32,7 @@ Foundation, Inc., 51 Franklin St, Fifth
- #include "Main.h"
- #include "../config.h"
- #include <cstdlib>
-+#include <unistd.h>
-
- // Always put me below _all_ includes, this is needed
- // in case we run with memory leak detection enabled!
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 9249184..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,5 +0,0 @@
-01-gcc44_ftbfs.patch
-02-binutils_gold.patch
-03-find_slv2.patch
-04-find_raptor2.patch
-05-gcc47-ftbfs.patch
--
traverso packaging
More information about the pkg-multimedia-commits
mailing list