[SCM] sndobj/master: Refresh patches
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Mon Nov 28 20:21:45 UTC 2016
The following commit has been merged in the master branch:
commit a0eced983964fea71d803881902c896420492c42
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Mon Nov 28 01:18:27 2016 +0100
Refresh patches
diff --git a/debian/patches/01_shlib.patch b/debian/patches/01_shlib.patch
index 7a14801..de92299 100644
--- a/debian/patches/01_shlib.patch
+++ b/debian/patches/01_shlib.patch
@@ -4,9 +4,9 @@ Description: Fix library's soname and install it properly.
SConstruct | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
---- SndObj-2.6.6.orig/SConstruct
-+++ SndObj-2.6.6/SConstruct
-@@ -80,13 +80,14 @@ opt.AddOptions(
+--- a/SConstruct
++++ b/SConstruct
+@@ -83,13 +83,14 @@
('customLIBPATH','',''),
('customSHLINKFLAGS','',''),
('customSWIGFLAGS','',''),
@@ -22,7 +22,7 @@ Description: Fix library's soname and install it properly.
print "SndObj Library version is " + version
customCPPPATH = env['customCPPPATH']
-@@ -268,7 +269,7 @@ cffisndobj = env.Clone()
+@@ -282,7 +283,7 @@
examples = env.Clone()
if getPlatform() == 'linux':
@@ -31,7 +31,7 @@ Description: Fix library's soname and install it properly.
######################################################################
#
# sources
-@@ -349,9 +350,10 @@ if getPlatform() != 'win':
+@@ -365,9 +366,10 @@
env.Append(LINKFLAGS=['-install_name', env['install_name']])
sndobjlib = env.SharedLibrary(env['install_name'], sources)
else:
diff --git a/debian/patches/03-gcc43.patch b/debian/patches/03-gcc43.patch
index c0ace5c..64143fb 100644
--- a/debian/patches/03-gcc43.patch
+++ b/debian/patches/03-gcc43.patch
@@ -14,8 +14,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
src/SndRead.cpp | 2 ++
11 files changed, 20 insertions(+)
---- SndObj-2.6.6.orig/src/AdSyn.cpp
-+++ SndObj-2.6.6/src/AdSyn.cpp
+--- a/src/AdSyn.cpp
++++ b/src/AdSyn.cpp
@@ -22,6 +22,8 @@
#include "AdSyn.h"
@@ -25,8 +25,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
AdSyn::AdSyn(){
}
---- SndObj-2.6.6.orig/src/FFT.cpp
-+++ SndObj-2.6.6/src/FFT.cpp
+--- a/src/FFT.cpp
++++ b/src/FFT.cpp
@@ -27,6 +27,8 @@
/////////////////////////////////////////////////
#include "FFT.h"
@@ -36,8 +36,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
FFT::FFT(){
m_table = 0;
---- SndObj-2.6.6.orig/src/IFAdd.cpp
-+++ SndObj-2.6.6/src/IFAdd.cpp
+--- a/src/IFAdd.cpp
++++ b/src/IFAdd.cpp
@@ -22,6 +22,8 @@
#include "IFAdd.h"
@@ -47,8 +47,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
IFAdd::IFAdd(){
}
---- SndObj-2.6.6.orig/src/IFFT.cpp
-+++ SndObj-2.6.6/src/IFFT.cpp
+--- a/src/IFFT.cpp
++++ b/src/IFFT.cpp
@@ -27,6 +27,7 @@
/////////////////////////////////////////////////
#include "IFFT.h"
@@ -57,8 +57,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
IFFT::IFFT(){
---- SndObj-2.6.6.orig/src/PVA.cpp
-+++ SndObj-2.6.6/src/PVA.cpp
+--- a/src/PVA.cpp
++++ b/src/PVA.cpp
@@ -27,6 +27,8 @@
/////////////////////////////////////////////////
#include "PVA.h"
@@ -68,8 +68,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
PVA::PVA(){
m_rotcount = 0;
m_phases = new float[m_halfsize];
---- SndObj-2.6.6.orig/src/PVRead.cpp
-+++ SndObj-2.6.6/src/PVRead.cpp
+--- a/src/PVRead.cpp
++++ b/src/PVRead.cpp
@@ -22,6 +22,8 @@
#include "PVRead.h"
@@ -79,8 +79,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
PVRead::PVRead(){
m_ioinput = 0;
---- SndObj-2.6.6.orig/src/PVS.cpp
-+++ SndObj-2.6.6/src/PVS.cpp
+--- a/src/PVS.cpp
++++ b/src/PVS.cpp
@@ -28,6 +28,7 @@
/////////////////////////////////////////////////
#include "PVS.h"
@@ -89,8 +89,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
PVS::PVS(){
m_rotcount = m_vecsize;
---- SndObj-2.6.6.orig/src/ReSyn.cpp
-+++ SndObj-2.6.6/src/ReSyn.cpp
+--- a/src/ReSyn.cpp
++++ b/src/ReSyn.cpp
@@ -24,6 +24,8 @@
#include "ReSyn.h"
#include "IFGram.h"
@@ -100,8 +100,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
ReSyn::ReSyn(){
AddMsg("pitch", 31);
AddMsg("timescale", 32);
---- SndObj-2.6.6.orig/src/SinSyn.cpp
-+++ SndObj-2.6.6/src/SinSyn.cpp
+--- a/src/SinSyn.cpp
++++ b/src/SinSyn.cpp
@@ -22,6 +22,8 @@
#include "SinSyn.h"
@@ -111,8 +111,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
SinSyn::SinSyn(){
m_factor = m_vecsize/m_sr;
---- SndObj-2.6.6.orig/src/SndRead.cpp
-+++ SndObj-2.6.6/src/SndRead.cpp
+--- a/src/SndRead.cpp
++++ b/src/SndRead.cpp
@@ -24,6 +24,8 @@
#include "SndWave.h"
#include "SndAiff.h"
@@ -122,8 +122,8 @@ Description: Add missing #include <cstring> to prevent FTBFS with GCC 4.3.
SndRead::SndRead(){
m_pitch = 1.f;
---- SndObj-2.6.6.orig/src/SinAnal.cpp
-+++ SndObj-2.6.6/src/SinAnal.cpp
+--- a/src/SinAnal.cpp
++++ b/src/SinAnal.cpp
@@ -22,6 +22,8 @@
#include "SinAnal.h"
diff --git a/debian/patches/04-gcc44.patch b/debian/patches/04-gcc44.patch
index 33fcab5..65be9b2 100644
--- a/debian/patches/04-gcc44.patch
+++ b/debian/patches/04-gcc44.patch
@@ -5,13 +5,13 @@ Description: Add missing #include to prevent FTBFS with GCC 4.4.
src/SndJackIO.cpp | 1 +
2 files changed, 3 insertions(+)
---- SndObj-2.6.6.orig/src/SndJackIO.cpp
-+++ SndObj-2.6.6/src/SndJackIO.cpp
+--- a/src/SndJackIO.cpp
++++ b/src/SndJackIO.cpp
@@ -25,6 +25,7 @@
#ifdef JACK
+#include <cstdio>
#include <unistd.h>
+ #include <stdio.h>
#include "SndJackIO.h"
-
diff --git a/debian/patches/05-gcc6.patch b/debian/patches/05-gcc6.patch
index 71ade7f..67629ff 100644
--- a/debian/patches/05-gcc6.patch
+++ b/debian/patches/05-gcc6.patch
@@ -7,8 +7,8 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
src/SndWaveX.h | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---- SndObj-2.6.6.orig/src/SndWaveX.h
-+++ SndObj-2.6.6/src/SndWaveX.h
+--- a/src/SndWaveX.h
++++ b/src/SndWaveX.h
@@ -66,10 +66,10 @@
#ifndef WIN
struct GUID
--
sndobj packaging
More information about the pkg-multimedia-commits
mailing list