[SCM] csound/master: Introduce CS_PACKAGE_DATE macro

[fsateler at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit fdc9ff227721f549a2098a51538c66fd573a76a0
Author: Felipe Sateler <fsateler at debian.org>
Date:   Mon Nov 30 10:13:58 2015 -0300

    Introduce CS_PACKAGE_DATE macro

diff --git a/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch b/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch
new file mode 100644
index 0000000..ec3ecbd
--- /dev/null
+++ b/debian/patches/Introduce-CS_PACKAGE_DATE-macro.patch
@@ -0,0 +1,104 @@
+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/series b/debian/patches/series
index def6616..86c666e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 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

-- 
csound packaging