Accepting request 714718 from home:StefanBruens:branches:multimedia:apps

- Update to version 19.5 (no changelog provided)
- Remove snd-drop-date-time.diff, no longer required
- Drop snd-fix-no-return.diff, fixed upstream
- Reenable all archs, but without jack for anything but x86/ppc
  (32 and 64 bit), as it uses inline assembly

OBS-URL: https://build.opensuse.org/request/show/714718
OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/snd?expand=0&rev=38

snd-17.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:429ba039c8e275fc254ee215490153065c152eb5ed238042e02fc7ed15b91e10
-size 15071335

snd-19.5.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3e64c904c14b5a042796d2dca77cfd63f2ac178e209317dca855443ebd8f666a
+size 15422014

snd-drop-date-time.diff

@@ -1,16 +0,0 @@
----
- snd-help.c |    3 ---
- 1 file changed, 3 deletions(-)
-
---- a/snd-help.c
-+++ b/snd-help.c
-@@ -370,9 +370,6 @@ char *version_info(void)
- 	      ", mpfr: ", mpfr_get_version(), 
- 	      ", mpc: ",  mpc_get_version(),
- #endif
--#if (defined(__DATE__)) && (!(defined(REPRODUCIBLE_BUILD)))
--	  "\n    Compiled ", __DATE__, " ", __TIME__,
--#endif
- #ifdef __VERSION__
-   #ifndef __cplusplus
- 	  "\n    C: ",

snd-fix-no-return.diff

@@ -1,25 +0,0 @@
----
- snd-chn.c |    1 +
- snd-xen.c |    1 +
- 2 files changed, 2 insertions(+)
-
---- a/snd-chn.c
-+++ b/snd-chn.c
-@@ -3163,6 +3163,7 @@ static bool make_gl_spectrogram(chan_inf
- #if USE_MOTIF
-   return(XtAppPending(main_app(ss)) == 0); /* return true if there are no pending events to force current buffer to be displayed */
- #endif
-+  return true;
- }
- #endif
- /* HAVE_GL */
---- a/snd-xen.c
-+++ b/snd-xen.c
-@@ -2688,6 +2688,7 @@ static Xen g_snd_gl_context(void)
- {
- #if USE_GTK
-   /* return(Xen_list_2(C_string_to_Xen_symbol("GLContext"), Xen_wrap_C_pointer(ss->cx))); */
-+  return XEN_FALSE;
- #else
- #if USE_MOTIF
-   return(Xen_list_2(C_string_to_Xen_symbol("GLXContext"), Xen_wrap_C_pointer(ss->cx)));

snd.changes

@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Thu Jul 11 18:08:30 UTC 2019 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Update to version 19.5 (no changelog provided)
+- Remove snd-drop-date-time.diff, no longer required
+- Drop snd-fix-no-return.diff, fixed upstream
+- Reenable all archs, but without jack for anything but x86/ppc
+  (32 and 64 bit), as it uses inline assembly
+
 -------------------------------------------------------------------
 Tue Apr 10 23:22:58 UTC 2018 - jengelh@inai.de
 

snd.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package snd
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,9 +12,15 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
+%ifarch %ix86 x86_64 %ppc ppc64 ppc64le
+# The jack support has some inline assembly, but only for x86/ppc
+%bcond_without jack
+%else
+%bcond_with jack
+%endif
 
 Name:           snd
 BuildRequires:  alsa-devel
@@ -31,17 +37,14 @@ BuildRequires:  update-desktop-files
 Summary:        Sound File Editor
 License:        LGPL-2.1-or-later
 Group:          Productivity/Multimedia/Sound/Editors and Convertors
-Version:        17.1
+Version:        19.5
 Release:        0
 Requires:       ladspa
 Source:         ftp://ccrma-ftp.stanford.edu/pub/Lisp/snd-%{version}.tar.gz
 Source1:        snd.desktop
 Source2:        snd.png
-Patch1:         snd-fix-no-return.diff
-Patch2:         snd-drop-date-time.diff
 Url:            https://ccrma.stanford.edu/software/snd/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-ExclusiveArch:  %ix86 x86_64 %ppc ppc64 ppc64le
 
 %description
 Snd is a sound editor modelled loosely after Emacs and an old,
@@ -52,8 +55,6 @@ and extended using guile and guile-gtk.
 %prep
 %setup -q
 find -name "*~" -type f -print -delete
-%patch1 -p1
-%patch2 -p1
 find -name "*.png" -type f -exec chmod 0644 "{}" "+"
 
 %build
@@ -66,7 +67,8 @@ find -name "*.png" -type f -exec chmod 0644 "{}" "+"
 	    --with-ladspa \
 	    --with-static-xm \
 	    --with-gl \
-	    --with-jack
+            %{?with_jack:--with-jack} \
+
 # feel free to improve following change and please notify upstream
 sed -i "s:\(^LIBS =.*\):\1 -lX11 -ldl:" makefile
 make %{?_smp_mflags}
@@ -86,8 +88,8 @@ mkdir -p %{buildroot}/%{_datadir}/pixmaps
 cp %{SOURCE2} %{buildroot}/%{_datadir}/pixmaps
 
 %files
-%defattr(-, root, root)
+%license COPYING
-%doc COPYING *.Snd *.html pix
+%doc *.Snd *.html pix
 %{_mandir}/man?/*
 %{_bindir}/*
 %{_libdir}/snd