[SCM] snd/master: Removed patches applied upstream.
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Tue May 17 11:40:45 UTC 2016
The following commit has been merged in the master branch:
commit 054fc6186fd6f8447bb6427cb8ca3c6e7c247825
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Tue May 17 07:17:35 2016 +0200
Removed patches applied upstream.
diff --git a/debian/patches/fix-typos.diff b/debian/patches/fix-typos.diff
deleted file mode 100644
index 6d568c7..0000000
--- a/debian/patches/fix-typos.diff
+++ /dev/null
@@ -1,127 +0,0 @@
-Description: fixing typos
- homogenous -> homogeneous
- [frequency] reponse -> [frequency] response
- .
- to make this patch minimal, only fix typos that are publically
- visible in the binary package (that is: typos in source comments are left
- as-is)
-Author: IOhannes m zmölnig
-Last-Updated: 2016-02-01
-Forwarded: yes
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- snd.orig/lint.scm
-+++ snd/lint.scm
-@@ -2437,7 +2437,7 @@
- (code-constant? (caddr form))
- (not (real? (caddr form)))
- (eq? (cadddr form) #t))
-- (lint-format "~A won't create an homogenous vector" name form)))
-+ (lint-format "~A won't create an homogeneous vector" name form)))
-
- ((reverse list->vector vector->list list->string string->list symbol->string string->symbol number->string)
- ;; not string->number -- no point in copying a number and it's caught below
---- snd.orig/s7.c
-+++ snd/s7.c
-@@ -37113,14 +37113,14 @@
-
- static s7_pointer g_is_float_vector(s7_scheme *sc, s7_pointer args)
- {
-- #define H_is_float_vector "(float-vector? obj) returns #t if obj is an homogenous float vector"
-+ #define H_is_float_vector "(float-vector? obj) returns #t if obj is an homogeneous float vector"
- #define Q_is_float_vector pl_bt
- check_boolean_method(sc, s7_is_float_vector, sc->IS_FLOAT_VECTOR, args);
- }
-
- static s7_pointer g_float_vector(s7_scheme *sc, s7_pointer args)
- {
-- #define H_float_vector "(float-vector ...) returns an homogenous float vector whose elements are the arguments"
-+ #define H_float_vector "(float-vector ...) returns an homogeneous float vector whose elements are the arguments"
- #define Q_float_vector s7_make_circular_signature(sc, 1, 2, sc->IS_FLOAT_VECTOR, sc->IS_REAL)
-
- s7_int len;
-@@ -37148,14 +37148,14 @@
-
- static s7_pointer g_is_int_vector(s7_scheme *sc, s7_pointer args)
- {
-- #define H_is_int_vector "(int-vector? obj) returns #t if obj is an homogenous int vector"
-+ #define H_is_int_vector "(int-vector? obj) returns #t if obj is an homogeneous int vector"
- #define Q_is_int_vector pl_bt
- check_boolean_method(sc, is_int_vector, sc->IS_INT_VECTOR, args);
- }
-
- static s7_pointer g_int_vector(s7_scheme *sc, s7_pointer args)
- {
-- #define H_int_vector "(int-vector ...) returns an homogenous int vector whose elements are the arguments"
-+ #define H_int_vector "(int-vector ...) returns an homogeneous int vector whose elements are the arguments"
- #define Q_int_vector s7_make_circular_signature(sc, 1, 2, sc->IS_INT_VECTOR, sc->IS_INTEGER)
-
- s7_int len;
-@@ -37939,10 +37939,10 @@
-
- static s7_pointer g_make_vector(s7_scheme *sc, s7_pointer args)
- {
-- #define H_make_vector "(make-vector len (value #f) (homogenous #f)) returns a vector of len elements initialized to value. \
-+ #define H_make_vector "(make-vector len (value #f) (homogeneous #f)) returns a vector of len elements initialized to value. \
- To create a multidimensional vector, put the dimension bounds in a list (this is to avoid ambiguities such as \
- (make-vector 1 2) where it's not clear whether the '2' is an initial value or a dimension size). (make-vector '(2 3) 1.0) \
--returns a 2 dimensional vector of 6 total elements, all initialized to 1.0. If homogenous is #t, and value is either an integer \
-+returns a 2 dimensional vector of 6 total elements, all initialized to 1.0. If homogeneous is #t, and value is either an integer \
- or a real, the vector can only hold numbers of that type (s7_int or s7_double)."
- #define Q_make_vector s7_make_signature(sc, 4, sc->IS_VECTOR, s7_make_signature(sc, 2, sc->IS_INTEGER, sc->IS_PAIR), sc->T, sc->IS_BOOLEAN)
-
-@@ -38004,7 +38004,7 @@
- {
- if (s7_is_real(fill)) /* might be gmp with big_real by accident (? see above) */
- result_type = T_FLOAT_VECTOR;
-- else method_or_bust_with_type(sc, fill, sc->MAKE_VECTOR, args, make_string_wrapper(sc, "an integer or a real since 'homogenous' is #t"), 2);
-+ else method_or_bust_with_type(sc, fill, sc->MAKE_VECTOR, args, make_string_wrapper(sc, "an integer or a real since 'homogeneous' is #t"), 2);
- }
- }
- else
---- snd.orig/s7.html
-+++ snd/s7.html
-@@ -1910,10 +1910,10 @@
- </pre>
-
- <p>make-vector also takes an optional fourth argument. If it is #t, and the initial-value
--is either an integer or a real, make-vector produces a homogenous vector, a vector that
-+is either an integer or a real, make-vector produces a homogeneous vector, a vector that
- can only hold elements of the same type as the initial value (either s7_int or s7_double
- internally). Homogenous vectors are mostly useful in conjunction with C code. These
--homogenous vector functions are currently built-in:
-+homogeneous vector functions are currently built-in:
- </p>
-
- <pre class="indented">
-@@ -2122,7 +2122,7 @@
- #2D<em class="bigger">(</em><em class="big">(</em>(0) (0) ((0))<em class="big">)</em> <em class="big">(</em>(0) 0 ((0))<em class="big">)</em><em class="bigger">)</em>
- </pre>
-
--<p>A similar problem afflicts homogenous vectors. We need some reasonable way to express
-+<p>A similar problem afflicts homogeneous vectors. We need some reasonable way to express
- such a vector even when it has more than one dimension. My first thought was <code>#(...)#</code>,
- but that makes <code>(let ((b1 0)) (#(1 2)#b1))</code> ambiguous.
- </p>
---- snd.orig/extsnd.html
-+++ snd/extsnd.html
-@@ -10666,7 +10666,7 @@
- <em class=def id="filtercontrolenvelope">filter-control-envelope</em> snd
- </pre>
-
--<p>The <a class=quiet href="snd.html#filtercontrol">filter</a> (frequency reponse) envelope (a list of breakpoints).
-+<p>The <a class=quiet href="snd.html#filtercontrol">filter</a> (frequency response) envelope (a list of breakpoints).
- </p>
- <div class="spacer"></div>
-
---- snd.orig/snd-help.c
-+++ snd/snd-help.c
-@@ -1693,7 +1693,7 @@
- filter coefficients (read-only currently)\n\
- \n\
- " S_filter_control_envelope " (:optional snd)\n\
-- filter (frequency reponse) envelope\n\
-+ filter (frequency response) envelope\n\
- \n\
- " S_filter_control_in_dB " (:optional snd)\n\
- The filter dB button. If " PROC_TRUE ", the graph is displayed in dB.\n\
diff --git a/debian/patches/hardening.diff b/debian/patches/hardening.diff
deleted file mode 100644
index 64f676a..0000000
--- a/debian/patches/hardening.diff
+++ /dev/null
@@ -1,17 +0,0 @@
-Author: Andreas Beckmann <anbe at debian.org>
-Description: honor CPPFLAGS
- On Debian, we pass certain build-flags for hardening, among them the standard
- preprocessor flags CPPFLAGS.
-Last-Updated: 2016-02-01
-Forwarded: yes
---- snd.orig/makefile.in
-+++ snd/makefile.in
-@@ -3,7 +3,7 @@
- INSTALL = @INSTALL@
- INSTALL_DATA = ${INSTALL} -m 0644
-
--CFLAGS = @CFLAGS@
-+CFLAGS = @CPPFLAGS@ @CFLAGS@
- GTK_CFLAGS = @GTK_CFLAGS@
- XEN_CFLAGS = @XEN_CFLAGS@
- CAIRO_CFLAGS = @CAIRO_CFLAGS@
diff --git a/debian/patches/jack-kfreebsd-hurd.diff b/debian/patches/jack-kfreebsd-hurd.diff
deleted file mode 100644
index e53769f..0000000
--- a/debian/patches/jack-kfreebsd-hurd.diff
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: fix the HAVE_JACK_ON_LINUX macro for kFreeBSD & GNU/Hurd
- On Debian we also have systems that run alternative kernels (FreeBSD and Hurd).
- The user-land system is the same as Linux though (as far as possible), so JACK
- should be treated as if it were on linux.
-Author: IOhannes m zmölnig
-Last-Updated: 2016-02-01
-Forwarded: yes
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- snd.orig/audio.c
-+++ snd/audio.c
-@@ -83,7 +83,12 @@
- /* these pull in stdbool.h apparently, so they have to precede sndlib.h */
- #endif
-
--#define HAVE_JACK_IN_LINUX (MUS_JACK && __linux__)
-+/* using JACK on GNU/linux, GNU/kFreeBSD and GNU/Hurd is all the same */
-+#if (defined __linux__ || (defined __FreeBSD_kernel__ && defined __GLIBC__) || defined __GNU__)
-+# define HAVE_JACK_IN_LINUX MUS_JACK
-+#else
-+# define HAVE_JACK_IN_LINUX 0
-+#endif
-
- #include "_sndlib.h"
- #include "sndlib-strings.h"
diff --git a/debian/patches/manpage_warnings.diff b/debian/patches/manpage_warnings.diff
deleted file mode 100644
index 2eee13c..0000000
--- a/debian/patches/manpage_warnings.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Fix manpages errors/warnings.
- minor typos in groff...
-Author: Alessio Treglia <quadrispro at ubuntu.com>
-Last-Updated: 2016-02-01
-Forwarded: yes
----
- snd.1 | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
---- snd.orig/snd.1
-+++ snd/snd.1
-@@ -17,9 +17,9 @@
- loads oboe.snd into Snd.
-
- .SH OPTIONS
--.IP \-l file
-+.IP "\-l file"
- Load extension language code in file.
--.IP \-p dir
-+.IP "\-p dir"
- Preload sound files found in directory dir.
- .IP \-noinit
- Don't load any initialization files (~/.snd et al).
diff --git a/debian/patches/reproducible.diff b/debian/patches/reproducible.diff
deleted file mode 100644
index eee5276..0000000
--- a/debian/patches/reproducible.diff
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Do not show the build date, as it makes the build un-reproducible
- a reproducible build generates exactly the same binary (provided that all used
- tools/libs/... are identical) when bulid multiple times (potentially on
- multiple machines). embedding the build-date defeats this.
- so if the REPRODUCIBLE_BUILD define is set, this skips the embedding of
- __DATE__.
- .
- see https://wiki.debian.org/ReproducibleBuilds
-Author: IOhannes m zmölnig
-Last-Updated: 2016-02-01
-Forwarded: yes
-
---- snd.orig/snd-help.c
-+++ snd/snd-help.c
-@@ -370,7 +370,7 @@
- ", mpfr: ", mpfr_get_version(),
- ", mpc: ", mpc_get_version(),
- #endif
--#ifdef __DATE__
-+#if (defined(__DATE__)) && (!(defined(REPRODUCIBLE_BUILD)))
- "\n Compiled ", __DATE__, " ", __TIME__,
- #endif
- #ifdef __VERSION__
diff --git a/debian/patches/series b/debian/patches/series
index f375181..44ed449 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1 @@
-hardening.diff
-manpage_warnings.diff
support-kfreebsd-hurd.diff
-jack-kfreebsd-hurd.diff
-reproducible.diff
-fix-typos.diff
diff --git a/debian/patches/support-kfreebsd-hurd.diff b/debian/patches/support-kfreebsd-hurd.diff
index 3286759..332f43d 100644
--- a/debian/patches/support-kfreebsd-hurd.diff
+++ b/debian/patches/support-kfreebsd-hurd.diff
@@ -12,9 +12,9 @@ Forwarded: yes
--- snd.orig/configure.ac
+++ snd/configure.ac
-@@ -657,6 +657,35 @@
- fi
- ;;
+@@ -679,6 +679,35 @@
+ esac
+ ;;
+ *-*-kfreebsd*|*-*-gnu*)
+ LDSO_FLAGS="-shared"
--
snd packaging
More information about the pkg-multimedia-commits
mailing list