[SCM] snd/master: Refreshed debian/patches
umlaeute at users.alioth.debian.org
umlaeute at users.alioth.debian.org
Mon Jan 25 11:18:43 UTC 2016
The following commit has been merged in the master branch:
commit 0b3c2aa6c11c851479eebbee13fd41de95bb3738
Author: IOhannes m zmölnig <zmoelnig at umlautQ.umlaeute.mur.at>
Date: Mon Jan 25 11:51:35 2016 +0100
Refreshed debian/patches
removed those applied upstream;
strip ordering prefix
diff --git a/debian/patches/00-makefile.diff b/debian/patches/00-makefile.diff
deleted file mode 100644
index 11476b7..0000000
--- a/debian/patches/00-makefile.diff
+++ /dev/null
@@ -1,52 +0,0 @@
-Description: Use ${DESTDIR} as path for install target.
-Origin: Debian.
-Last-Update: 2009-09-28
-Reviewed-by: Alessio Treglia <quadrispro at ubuntu.com>
----
- makefile.in | 28 ++++++++++++++--------------
- 1 file changed, 14 insertions(+), 14 deletions(-)
-
---- snd.orig/makefile.in
-+++ snd/makefile.in
-@@ -182,13 +182,13 @@ audinfo: $(SNDLIB_HEADERS) $(S7_HEADERS)
- $(CC) $(LDFLAGS) $(CFLAGS) headers.o io.o audio.o sound.o audinfo.o -o audinfo $(JACK_LIBS) $(AUDIO_LIB) $(LIBS)
-
- install: snd
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${bindir}
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
-- $(INSTALL) snd ${bindir}/snd
-- $(INSTALL_DATA) ${top_srcdir}/snd.1 ${mandir}/man1
-- (cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done)
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${bindir}
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}/man1
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${pkgdatadir}
-+ $(INSTALL) snd ${DESTDIR}/${bindir}/snd
-+ $(INSTALL_DATA) ${top_srcdir}/snd.1 ${DESTDIR}/${mandir}/man1
-+ (cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${DESTDIR}/${pkgdatadir}/$${f}; done)
-
- uninstall:
- rm -f ${bindir}/snd
-@@ -196,13 +196,13 @@ uninstall:
- for f in ${SND_SCRIPTS}; do rm -f ${pkgdatadir}/$${f}; done
-
- install-strip: snd
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${bindir}
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${mandir}/man1
-- ${SHELL} ${top_srcdir}/mkinstalldirs ${pkgdatadir}
-- $(INSTALL) -s snd ${bindir}/snd
-- $(INSTALL_DATA) ${top_srcdir}/snd.1 ${mandir}/man1
-- (cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${pkgdatadir}/$${f}; done)
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${bindir}
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${mandir}/man1
-+ ${SHELL} ${top_srcdir}/mkinstalldirs ${DESTDIR}/${pkgdatadir}
-+ $(INSTALL) -s snd ${DESTDIR}/${bindir}/snd
-+ $(INSTALL_DATA) ${top_srcdir}/snd.1 ${DESTDIR}/${mandir}/man1
-+ (cd ${top_srcdir} && for f in ${SND_SCRIPTS}; do ${INSTALL_DATA} ${top_srcdir}/$${f} ${DESTDIR}/${pkgdatadir}/$${f}; done)
-
- Makefile: Makefile.in config.status
- ./config.status
diff --git a/debian/patches/06-hurd.diff b/debian/patches/06-hurd.diff
deleted file mode 100644
index bfdf17e..0000000
--- a/debian/patches/06-hurd.diff
+++ /dev/null
@@ -1,45 +0,0 @@
----
- configure.ac | 25 +++++++++++++++++++++++++
- 1 file changed, 25 insertions(+)
-
-Index: snd-11.7/configure.ac
-===================================================================
---- snd-11.7.orig/configure.ac
-+++ snd-11.7/configure.ac
-@@ -1684,6 +1684,36 @@ case "$host" in
- ;;
- esac
- ;;
-+ *-*-gnu*)
-+ LDSO_FLAGS="-shared"
-+ LIBS="$LIBS -lm"
-+ if test "$ac_cv_header_dlfcn_h" = yes ; then
-+ LDFLAGS="$LDFLAGS -ldl"
-+ fi
-+ if test "$GCC" = yes ; then
-+ SO_FLAGS="-fPIC $SO_FLAGS"
-+ fi
-+
-+ AUDIO_SYSTEM=OSS
-+
-+ if test "$with_jack" = yes ; then
-+ if test "$with_oss" != yes ; then
-+ AUDIO_SYSTEM=JACK
-+ fi
-+ fi
-+
-+ case $AUDIO_SYSTEM in
-+ JACK)
-+ AC_DEFINE(HAVE_JACK_IN_LINUX)
-+ AC_DEFINE(HAVE_OSS)
-+ AUDIO_LIB="-lsamplerate"
-+ ;;
-+ OSS)
-+ AC_DEFINE(HAVE_OSS)
-+ AUDIO_SYSTEM=OSS
-+ ;;
-+ esac
-+ ;;
- *-*-sunos4*)
- AC_DEFINE(MUS_SUN)
- LIBS="$LIBS -lm"
diff --git a/debian/patches/07-link-order.diff b/debian/patches/07-link-order.diff
deleted file mode 100644
index 4df6ae7..0000000
--- a/debian/patches/07-link-order.diff
+++ /dev/null
@@ -1,53 +0,0 @@
-Description: Pass -ldl in LIBS, not LDFLAGS
-Author: Colin Watson <cjwatson at debian.org>
-Forwarded: no
-Last-Update: 2013-05-08
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -1579,7 +1579,7 @@
- LDSO_FLAGS="-shared"
- LIBS="$LIBS -lm"
- if test "$ac_cv_header_dlfcn_h" = yes ; then
-- LDFLAGS="$LDFLAGS -ldl"
-+ LIBS="$LIBS -ldl"
- fi
- if test "$GCC" = yes ; then
- SO_FLAGS="-fPIC $SO_FLAGS"
-@@ -1658,7 +1658,7 @@
- LDSO_FLAGS="-shared"
- LIBS="$LIBS -lm"
- if test "$ac_cv_header_dlfcn_h" = yes ; then
-- LDFLAGS="$LDFLAGS -ldl"
-+ LIBS="$LIBS -ldl"
- fi
- if test "$GCC" = yes ; then
- SO_FLAGS="-fPIC $SO_FLAGS"
-@@ -1688,7 +1688,7 @@
- LDSO_FLAGS="-shared"
- LIBS="$LIBS -lm"
- if test "$ac_cv_header_dlfcn_h" = yes ; then
-- LDFLAGS="$LDFLAGS -ldl"
-+ LIBS="$LIBS -ldl"
- fi
- if test "$GCC" = yes ; then
- SO_FLAGS="-fPIC $SO_FLAGS"
-@@ -2146,14 +2146,14 @@
- if test "$ac_snd_have_extension_language" = no ; then
- if test "$ac_snd_have_gui" = no ; then
- if test "$ac_cv_header_dlfcn_h" = yes ; then
-- LDFLAGS="$LDFLAGS -ldl"
-+ LIBS="$LIBS -ldl"
- fi
- AC_MSG_WARN([Snd needs either an extension language (s7, Fth, or Ruby), or a graphics toolkit (Gtk or Motif), or preferably both. As currently configured, this version of Snd is useless.])
- fi
- fi
-
- if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_snd_have_gui" = no && test "$ac_cv_header_dlfcn_h" = yes ; then
-- LDFLAGS="$LDFLAGS -ldl"
-+ LIBS="$LIBS -ldl"
- fi
-
- AC_SUBST(CFLAGS)
diff --git a/debian/patches/08-link-dl-harder.diff b/debian/patches/08-link-dl-harder.diff
deleted file mode 100644
index d38bbc6..0000000
--- a/debian/patches/08-link-dl-harder.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Link with -ldl in more cases
- Duplicate -ldl isn't a problem, but missing -ldl may be. (For example,
- with_audio is set to the empty string in the PulseAudio build pass, not
- "no".)
-Author: Colin Watson <cjwatson at debian.org>
-Forwarded: no
-Last-Update: 2013-05-08
-
-Index: b/configure.ac
-===================================================================
---- a/configure.ac
-+++ b/configure.ac
-@@ -2152,7 +2152,7 @@
- fi
- fi
-
--if test "$ac_snd_have_extension_language" = yes && test "$with_audio" = no && test "$ac_snd_have_gui" = no && test "$ac_cv_header_dlfcn_h" = yes ; then
-+if test "$ac_snd_have_extension_language" = yes && test "$ac_cv_header_dlfcn_h" = yes ; then
- LIBS="$LIBS -ldl"
- fi
-
diff --git a/debian/patches/04-gcc_warnings.diff b/debian/patches/gcc_warnings.diff
similarity index 75%
rename from debian/patches/04-gcc_warnings.diff
rename to debian/patches/gcc_warnings.diff
index ee2f4d3..c3bfdc1 100644
--- a/debian/patches/04-gcc_warnings.diff
+++ b/debian/patches/gcc_warnings.diff
@@ -6,14 +6,14 @@ Description: Add missing function prototypes to avoid compiler warnings.
--- snd.orig/s7.c
+++ snd/s7.c
-@@ -1041,6 +1041,10 @@ static s7_pointer vector_copy(s7_scheme
-
-
+@@ -1058,6 +1058,10 @@
+ #define NUM_SAFE_LISTS 16
+ #define INITIAL_AUTOLOAD_NAMES_SIZE 4
+s7_pointer copy_big_integer(s7_scheme *sc, s7_pointer obj);
+s7_pointer copy_big_ratio(s7_scheme *sc, s7_pointer obj);
+s7_pointer copy_big_real(s7_scheme *sc, s7_pointer obj);
+s7_pointer copy_big_complex(s7_scheme *sc, s7_pointer obj);
- /* -------------------------------- constants -------------------------------- */
+ static s7_pointer prepackaged_type_names[NUM_TYPES];
diff --git a/debian/patches/01-hardening.diff b/debian/patches/hardening.diff
similarity index 81%
rename from debian/patches/01-hardening.diff
rename to debian/patches/hardening.diff
index 4165fc8..b8ac8d1 100644
--- a/debian/patches/01-hardening.diff
+++ b/debian/patches/hardening.diff
@@ -1,9 +1,9 @@
Author: Andreas Beckmann <anbe at debian.org>
Description: honor CPPFLAGS which contain hardening flags
---- a/makefile.in
-+++ b/makefile.in
-@@ -6,7 +6,7 @@ SHELL = @SHELL@
+--- snd.orig/makefile.in
++++ snd/makefile.in
+@@ -3,7 +3,7 @@
INSTALL = @INSTALL@
INSTALL_DATA = ${INSTALL} -m 0644
diff --git a/debian/patches/03-manpage_warnings.diff b/debian/patches/manpage_warnings.diff
similarity index 81%
rename from debian/patches/03-manpage_warnings.diff
rename to debian/patches/manpage_warnings.diff
index 512a36b..ddaa2c6 100644
--- a/debian/patches/03-manpage_warnings.diff
+++ b/debian/patches/manpage_warnings.diff
@@ -6,7 +6,7 @@ Author: Alessio Treglia <quadrispro at ubuntu.com>
--- snd.orig/snd.1
+++ snd/snd.1
-@@ -19,9 +19,9 @@ snd oboe.snd
+@@ -17,9 +17,9 @@
loads oboe.snd into Snd.
.SH OPTIONS
@@ -16,5 +16,5 @@ Author: Alessio Treglia <quadrispro at ubuntu.com>
-.IP \-p dir
+.IP "\-p dir"
Preload sound files found in directory dir.
- .IP \-noglob
- Don't load any global configuration files.
+ .IP \-noinit
+ Don't load any initialization files (~/.snd et al).
diff --git a/debian/patches/09-do-not-show-the-build-date.diff b/debian/patches/reproducible.diff
similarity index 60%
rename from debian/patches/09-do-not-show-the-build-date.diff
rename to debian/patches/reproducible.diff
index a86ad8c..5f595a5 100644
--- a/debian/patches/09-do-not-show-the-build-date.diff
+++ b/debian/patches/reproducible.diff
@@ -1,11 +1,11 @@
From: Santiago Vila <sanvila at debian.org>
Subject: Do not show the build date, as it makes the build not to be reproducible
---- snd-11.7.orig/snd-help.c
-+++ snd-11.7/snd-help.c
-@@ -429,7 +429,7 @@ char *version_info(void)
- #if SND_AS_WIDGET
- _("\n compiled as a widget"),
+--- 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 0
diff --git a/debian/patches/series b/debian/patches/series
index 9065402..1fbccc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
-00-makefile.diff
-01-hardening.diff
-03-manpage_warnings.diff
-04-gcc_warnings.diff
-05-kfreebsd.diff
-06-hurd.diff
-07-link-order.diff
-08-link-dl-harder.diff
-09-do-not-show-the-build-date.diff
+hardening.diff
+manpage_warnings.diff
+gcc_warnings.diff
+support-kfreebsd-hurd.diff
+reproducible.diff
diff --git a/debian/patches/05-kfreebsd.diff b/debian/patches/support-kfreebsd-hurd.diff
similarity index 82%
rename from debian/patches/05-kfreebsd.diff
rename to debian/patches/support-kfreebsd-hurd.diff
index 0ab2433..5ef3edf 100644
--- a/debian/patches/05-kfreebsd.diff
+++ b/debian/patches/support-kfreebsd-hurd.diff
@@ -1,3 +1,4 @@
+Description: support for kFreeBSD and the Hurd
Origin: Debian
Bug: http://bugs.debian.org/566779
---
@@ -6,15 +7,15 @@ Bug: http://bugs.debian.org/566779
--- snd.orig/configure.ac
+++ snd/configure.ac
-@@ -1654,6 +1654,36 @@ case "$host" in
- ;;
- esac
- ;;
-+ *-*-kfreebsd*)
+@@ -657,6 +657,38 @@
+ fi
+ ;;
+
++ *-*-kfreebsd*|*-*-gnu*)
+ LDSO_FLAGS="-shared"
+ LIBS="$LIBS -lm"
+ if test "$ac_cv_header_dlfcn_h" = yes ; then
-+ LDFLAGS="$LDFLAGS -ldl"
++ LIBS="$LIBS -ldl"
+ fi
+ if test "$GCC" = yes ; then
+ SO_FLAGS="-fPIC $SO_FLAGS"
@@ -40,6 +41,8 @@ Bug: http://bugs.debian.org/566779
+ ;;
+ esac
+ ;;
- *-*-sunos4*)
- AC_DEFINE(MUS_SUN)
- LIBS="$LIBS -lm"
++
++
+ *-*-sunos4*)
+ LIBS="$LIBS -lm"
+ ;;
--
snd packaging
More information about the pkg-multimedia-commits
mailing list