[SCM] pd-zexy/master: Dropped patches aplied upstream
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Sun Jan 21 22:21:53 UTC 2018
The following commit has been merged in the master branch:
commit 27f54eb2a4611ee3c7bc74e876ba9b30f88686e6
Author: IOhannes m zmölnig <zmoelnig at umlautS.umlaeute.mur.at>
Date: Sun Jan 21 23:05:32 2018 +0100
Dropped patches aplied upstream
diff --git a/debian/patches/reproducible.patch b/debian/patches/reproducible.patch
deleted file mode 100644
index 19ca1e2..0000000
--- a/debian/patches/reproducible.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-Description: make build reproducible
- [multireceive] uses __DATE__/__TIME__ to create a unique send/receive label.
- this obviously break reproducibility.
- instead we now use a unique id generated at runtime.
-Author: IOhannes m zmölnig
-Origin: upstream
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- pd-zexy.orig/src/multireceive.c
-+++ pd-zexy/src/multireceive.c
-@@ -21,6 +21,12 @@
-
- #include "zexy.h"
-
-+#ifdef _WIN32
-+# include <sys/timeb.h>
-+#else
-+# include <sys/time.h>
-+#endif
-+
- /* -------------------------- multireceive ------------------------------ */
-
- static t_class *multireceive_class=NULL;
-@@ -43,6 +49,26 @@
- t_outlet *x_out;
- } t_multireceive;
-
-+
-+static unsigned long long unique(void) {
-+ unsigned long long uid = 0;
-+#ifdef _WIN32
-+ struct _timeb tb;
-+ _ftime(&tb);
-+ uid=(((unsigned long long)tb.time)<<(4*sizeof(uid))) | (unsigned long long)(tb.millitm);
-+#else
-+ struct timeval tv;
-+ struct timezone tz;
-+
-+ gettimeofday(&tv, 0);
-+
-+ /* First get the seconds right */
-+ uid=((unsigned long)tv.tv_sec)<<(4*sizeof(uid)) | tv.tv_usec;
-+#endif
-+ return uid;
-+}
-+
-+
- static void multireceive_any(t_multireceive_proxy *x, t_symbol*s, int argc,
- t_atom*argv)
- {
-@@ -133,6 +159,9 @@
-
- void multireceive_setup(void)
- {
-+ char uniqsym[MAXPDSTRING];
-+ unsigned long long uid=unique();
-+
- multireceive_class = class_new(gensym("multireceive"),
- (t_newmethod)multireceive_new,
- (t_method)multireceive_free,
-@@ -148,9 +177,10 @@
- (t_method)multireceive_add,
- gensym("add"),
- A_SYMBOL, 0);
--
-+ snprintf(uniqsym, MAXPDSTRING-2, "multireceive proxy %0llx", uid);
-+ uniqsym[MAXPDSTRING-1]=0;
- multireceive_proxy_class = class_new(
-- gensym("multireceive proxy "__DATE__""__TIME__""),
-+ gensym(uniqsym),
- 0, 0,
- sizeof(t_multireceive_proxy),
- CLASS_PD | CLASS_NOINLET, 0);
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 038ee28..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-reproducible.patch
--
pd-zexy packaging
More information about the pkg-multimedia-commits
mailing list