[SCM] csound/master: Update patches for new upstream version
fsateler at users.alioth.debian.org
fsateler at users.alioth.debian.org
Sun Jul 3 19:02:29 UTC 2016
The following commit has been merged in the master branch:
commit 64df2963909a3be33b4a781a997768fd30f07518
Author: Felipe Sateler <fsateler at debian.org>
Date: Fri May 20 20:54:21 2016 -0400
Update patches for new upstream version
Dropped:
- Disable-html-timestamps.patch
- Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
- Introduce-CS_PACKAGE_DATE-macro.patch
Dropped because better fix applied upstream:
- debian-specific/apidoc-dotpath.patch
- debian-specific/avoid-nonfree-scansyn-plugin.diff
Refreshed:
- debian-specific/lua-link.diff
Gbp-Dch: Full
diff --git a/debian/patches/Disable-html-timestamps.patch b/debian/patches/Disable-html-timestamps.patch
deleted file mode 100644
index d7214b7..0000000
--- a/debian/patches/Disable-html-timestamps.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Thu, 3 Dec 2015 20:46:35 -0300
-Subject: Disable html timestamps
-
----
- doc/Doxyfile | 2 +-
- doc/Doxyfile-CsoundAC | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/doc/Doxyfile b/doc/Doxyfile
-index bd56156..0b32a08 100644
---- a/doc/Doxyfile
-+++ b/doc/Doxyfile
-@@ -974,7 +974,7 @@ HTML_COLORSTYLE_GAMMA = 80
- # page will contain the date and time when the page was generated. Setting
- # this to NO can help when comparing the output of multiple runs.
-
--HTML_TIMESTAMP = YES
-+HTML_TIMESTAMP = NO
-
- # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
- # documentation will contain sections that can be hidden and shown after the
-diff --git a/doc/Doxyfile-CsoundAC b/doc/Doxyfile-CsoundAC
-index d49576c..3b409b4 100644
---- a/doc/Doxyfile-CsoundAC
-+++ b/doc/Doxyfile-CsoundAC
-@@ -836,7 +836,7 @@ HTML_STYLESHEET =
- # page will contain the date and time when the page was generated. Setting
- # this to NO can help when comparing the output of multiple runs.
-
--HTML_TIMESTAMP = YES
-+HTML_TIMESTAMP = NO
-
- # If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
- # files or namespaces will be aligned in HTML using tables. If set to
diff --git a/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch b/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
deleted file mode 100644
index 1c21cab..0000000
--- a/debian/patches/Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Felipe Sateler <fsateler at debian.org>
-Date: Wed, 13 May 2015 21:43:09 -0300
-Subject: Do not pass a null pointer to strdup. Fixes #466
-
----
- frontends/csladspa/csladspa.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/frontends/csladspa/csladspa.cpp b/frontends/csladspa/csladspa.cpp
-index f6beff6..a37212c 100644
---- a/frontends/csladspa/csladspa.cpp
-+++ b/frontends/csladspa/csladspa.cpp
-@@ -427,7 +427,9 @@ unsigned int CountCSD(char **csdnames)
- #ifdef MACOSX
- src = strdup("/Library/Audio/Plug-Ins/LADSPA");
- #else
-- src = strdup(getenv("LADSPA_PATH"));
-+ src = getenv("LADSPA_PATH");
-+ if (src)
-+ src = strdup(src);
- #endif
-
- if (src) {
diff --git a/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch b/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch
deleted file mode 100644
index ec3ecbd..0000000
--- a/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-From: Felipe Sateler <fsateler at gmail.com>
-Date: Mon, 30 Nov 2015 09:40:27 -0300
-Subject: Introduce CS_PACKAGE_DATE macro
-
-Defaults to __DATE__ if not set. This can be overriden, in order to set
-a deterministic date on it, and thus one step closer to binary
-reproducibility.
-
-Fixes: #561
----
- Engine/musmon.c | 8 ++++----
- Top/csound.c | 8 ++++----
- frontends/CsoundVST/CsoundVstFltk.cpp | 4 ++--
- include/version.h | 4 ++++
- 4 files changed, 14 insertions(+), 10 deletions(-)
-
-diff --git a/Engine/musmon.c b/Engine/musmon.c
-index 9691de9..2e7b0d4 100644
---- a/Engine/musmon.c
-+++ b/Engine/musmon.c
-@@ -173,18 +173,18 @@ int musmon(CSOUND *csound)
- #ifdef USE_DOUBLE
- #ifdef BETA
- csound->Message(csound, Str("--Csound version %s beta (double samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #else
- csound->Message(csound, Str("--Csound version %s (double samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #endif
- #else
- #ifdef BETA
- csound->Message(csound, Str("--Csound version %s beta (float samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #else
- csound->Message(csound, Str("--Csound version %s (float samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #endif
- #endif
- /* initialise search path cache */
-diff --git a/Top/csound.c b/Top/csound.c
-index 20950e7..4772816 100644
---- a/Top/csound.c
-+++ b/Top/csound.c
-@@ -3163,18 +3163,18 @@ PUBLIC void csoundReset(CSOUND *csound)
- #ifndef USE_DOUBLE
- #ifdef BETA
- csound->Message(csound, Str("Csound version %s beta (float samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #else
- csound->Message(csound, Str("Csound version %s (float samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #endif
- #else
- #ifdef BETA
- csound->Message(csound, Str("Csound version %s beta (double samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #else
- csound->Message(csound, Str("Csound version %s (double samples) %s\n"),
-- CS_PACKAGE_VERSION, __DATE__);
-+ CS_PACKAGE_VERSION, CS_PACKAGE_DATE);
- #endif
- #endif
- {
-diff --git a/frontends/CsoundVST/CsoundVstFltk.cpp b/frontends/CsoundVST/CsoundVstFltk.cpp
-index 2712c4a..1459522 100644
---- a/frontends/CsoundVST/CsoundVstFltk.cpp
-+++ b/frontends/CsoundVST/CsoundVstFltk.cpp
-@@ -35,13 +35,13 @@ static std::string about = "CSOUND AND CSOUND VST\n"
- "Version "
- CS_PACKAGE_VERSION
- " beta "
-- __DATE__
-+ CS_PACKAGE_DATE
- "\n"
- #else
- "Version "
- CS_PACKAGE_VERSION
- " "
-- __DATE__
-+ CS_PACKAGE_DATE
- "\n"
- #endif
- "\n"
-diff --git a/include/version.h b/include/version.h
-index 00ba087..3ff5d53 100644
---- a/include/version.h
-+++ b/include/version.h
-@@ -49,5 +49,9 @@
- #define CS_APISUBVER 0 /* for minor changes that will still allow
- compatiblity with older hosts */
-
-+#ifndef CS_PACKAGE_DATE
-+#define CS_PACKAGE_DATE __DATE__
-+#endif
-+
- #endif /* CSOUND_VERSION_H */
-
diff --git a/debian/patches/debian-specific/apidoc-dotpath.patch b/debian/patches/debian-specific/apidoc-dotpath.patch
deleted file mode 100644
index ae7fe37..0000000
--- a/debian/patches/debian-specific/apidoc-dotpath.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Felipe Sateler <fsateler at gmail.com>
-Date: Mon, 30 Nov 2015 10:02:13 -0300
-Subject: Leave dotpath blank in doxygen config
-
----
- doc/Doxyfile | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/doc/Doxyfile b/doc/Doxyfile
-index 83aa6ca..bd56156 100644
---- a/doc/Doxyfile
-+++ b/doc/Doxyfile
-@@ -1807,7 +1807,7 @@ INTERACTIVE_SVG = NO
- # The tag DOT_PATH can be used to specify the path where the dot tool can be
- # found. If left blank, it is assumed the dot tool can be found in the path.
-
--DOT_PATH = D:\utah\opt\ATT\Graphviz\bin
-+DOT_PATH =
-
- # The DOTFILE_DIRS tag can be used to specify one or more directories that
- # contain dot files that are included in the documentation (see the
diff --git a/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff b/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff
deleted file mode 100644
index f60c3b4..0000000
--- a/debian/patches/debian-specific/avoid-nonfree-scansyn-plugin.diff
+++ /dev/null
@@ -1,27 +0,0 @@
-From: Felipe Sateler <fsateler at gmail.com>
-Date: Mon, 30 Nov 2015 10:02:13 -0300
-Subject: Avoid non-free scansyn plugin
-
-The scanned synthesis opcodes are not DFSG-free, so we delete them from
-the upstream sources. They need to be removed from SConstruct as well
-to prevent build failures. We don't remove them at the same time as the
-opcodes themselves to keep repacking of the source minimal.
----
- Opcodes/CMakeLists.txt | 4 ----
- 1 file changed, 4 deletions(-)
-
-diff --git a/Opcodes/CMakeLists.txt b/Opcodes/CMakeLists.txt
-index 7aea9a1..85e8b57 100644
---- a/Opcodes/CMakeLists.txt
-+++ b/Opcodes/CMakeLists.txt
-@@ -101,10 +101,6 @@ if(BUILD_PLATEREV_OPCODES)
- make_plugin(platerev platerev.c m)
- endif()
-
--set(scansyn_SRCS
-- scansyn.c scansynx.c)
--make_plugin(scansyn "${scansyn_SRCS}" m)
--
- if(UNIX)
- make_plugin(control control.c)
- endif()
diff --git a/debian/patches/debian-specific/lua-link.diff b/debian/patches/debian-specific/lua-link.diff
index c87427d..27bfa1e 100644
--- a/debian/patches/debian-specific/lua-link.diff
+++ b/debian/patches/debian-specific/lua-link.diff
@@ -14,10 +14,10 @@ else it will fail to load. Use the correct library name.
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/frontends/CsoundAC/CMakeLists.txt b/frontends/CsoundAC/CMakeLists.txt
-index dbf5bfb..54bd824 100644
+index 3ff5647..2405327 100644
--- a/frontends/CsoundAC/CMakeLists.txt
+++ b/frontends/CsoundAC/CMakeLists.txt
-@@ -152,10 +152,10 @@ if(BUILD_CSOUND_AC)
+@@ -155,10 +155,10 @@ if(BUILD_CSOUND_AC)
PROPERTIES CPLUSPLUS ON
SWIG_MODULE_NAME luaCsoundAC)
SWIG_ADD_MODULE(luaCsoundAC lua luaCsoundAC.i)
@@ -31,10 +31,10 @@ index dbf5bfb..54bd824 100644
diff --git a/interfaces/CMakeLists.txt b/interfaces/CMakeLists.txt
-index ba813db..30896a3 100644
+index 83c0864..54d71dc 100644
--- a/interfaces/CMakeLists.txt
+++ b/interfaces/CMakeLists.txt
-@@ -162,7 +162,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
+@@ -183,7 +183,7 @@ if(BUILD_PYTHON_INTERFACE OR BUILD_JAVA_INTERFACE OR BUILD_LUA_INTERFACE)
endif()
if(BUILD_LUA_INTERFACE)
diff --git a/debian/patches/series b/debian/patches/series
index 4bfae71..540bb9c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-Do-not-pass-a-null-pointer-to-strdup.-Fixes-466.patch
-Introduce-CS_PACKAGE_DATE-macro.patch
-debian-specific/avoid-nonfree-scansyn-plugin.diff
debian-specific/lua-link.diff
-debian-specific/apidoc-dotpath.patch
-Disable-html-timestamps.patch
--
csound packaging
More information about the pkg-multimedia-commits
mailing list