Hello community, here is the log from the commit of package praat for openSUSE:Factory checked in at 2020-09-25 16:36:36 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/praat (Old) and /work/SRC/openSUSE:Factory/.praat.new.4249 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "praat" Fri Sep 25 16:36:36 2020 rev:25 rq:837356 version:6.1.22 Changes: -------- --- /work/SRC/openSUSE:Factory/praat/praat.changes 2020-03-24 22:38:19.849264031 +0100 +++ /work/SRC/openSUSE:Factory/.praat.new.4249/praat.changes 2020-09-25 16:37:34.876212383 +0200 @@ -1,0 +2,35 @@ +Fri Sep 25 07:06:49 UTC 2020 - Luigi Baldoni <[email protected]> + +- Update to version 6.1.22 + * Corrected a bug introduced in 6.1.17alpha that could cause + incorrect line spacing in the Picture window, such as in + TableOfReal: Draw as numbers. + version 6.1.21 + * First fully functional version for BigSur. + * Removed a decades-old bug by which an extremum allegedly + computed by cubic interpolation would actually have been + computed by sinc700. + version 6.1.16 + * Record fixed time...: more reliable choice of input device. + version 6.1.15 + * Repaired a bug introduced in 6.0.44 that could cause an + incorrect (namely, totally constant) ClassificationTable. + version 6.1.14 + * Repaired a bug in drawing ranges introduced in 6.1.06. + version 6.1.13a + * Repaired discriminant analysis on i386 processors. + * Scripting: enabled predictability by setting random seeds. + * Automated batch testing on x86_64, i386 and ARMv7 processors. + version 6.1.12 + * All non-GUI tests can be automated from batch. + * Repaired a bug introduced in 6.0 whereby a + KlattGrid-generated Sound would always be peak-scaled. + version 6.1.11 + * Better messages + * Overhauled VowelEditor. + * Repaired crashes after creating a Formant from a Spectrum or + an Excitation. +- Refreshed praat-use_system_libs.patch and + praat-no-return-in-nonvoid.patch + +------------------------------------------------------------------- Old: ---- praat-6.1.10.tar.gz New: ---- praat-6.1.22.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ praat.spec ++++++ --- /var/tmp/diff_new_pack.zRZPsY/_old 2020-09-25 16:37:35.928213317 +0200 +++ /var/tmp/diff_new_pack.zRZPsY/_new 2020-09-25 16:37:35.928213317 +0200 @@ -17,7 +17,7 @@ Name: praat -Version: 6.1.10 +Version: 6.1.22 Release: 0 Summary: Phonetics by computer License: GPL-3.0-or-later @@ -30,19 +30,14 @@ # PATCH-FIX-OPENSUSE praat-no-return-in-nonvoid.patch -- address rpmlint complaint Patch2: praat-no-return-in-nonvoid.patch BuildRequires: ImageMagick -%if 0%{?suse_version} >= 1500 BuildRequires: gcc-c++ -%else -BuildRequires: gcc7 -BuildRequires: gcc7-c++ -%endif BuildRequires: glpk-devel BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(gsl) BuildRequires: pkgconfig(gtk+-2.0) +BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libpulse) -BuildRequires: pkgconfig(portaudio-2.0) %description Praat is an open-software tool for the analysis of speech in phonetics. @@ -58,13 +53,11 @@ %autosetup -p1 %build -test -x "$(type -p gcc-7)" && export CC=gcc-7 -test -x "$(type -p g++-7)" && export CXX=g++-7 LINK=g++-7 cp makefiles/makefile.defs.linux.pulse ./makefile.defs sed -e '/^CFLAGS/s/$/\ %{optflags}/' \ -e '/^CC/s/=/?=/' -e '/^CXX/s/=/?=/' \ -e '/^LINK/s/=/?=/' -i makefile.defs -make %{?_smp_mflags} +%make_build %install mkdir -p %{buildroot}/%{_bindir} \ ++++++ praat-6.1.10.tar.gz -> praat-6.1.22.tar.gz ++++++ /work/SRC/openSUSE:Factory/praat/praat-6.1.10.tar.gz /work/SRC/openSUSE:Factory/.praat.new.4249/praat-6.1.22.tar.gz differ: char 30, line 1 ++++++ praat-no-return-in-nonvoid.patch ++++++ --- /var/tmp/diff_new_pack.zRZPsY/_old 2020-09-25 16:37:35.964213349 +0200 +++ /var/tmp/diff_new_pack.zRZPsY/_new 2020-09-25 16:37:35.964213349 +0200 @@ -1,8 +1,8 @@ -Index: praat-6.0.45/melder/melder_search.cpp +Index: praat-6.1.22/melder/melder_search.cpp =================================================================== ---- praat-6.0.45.orig/melder/melder_search.cpp -+++ praat-6.0.45/melder/melder_search.cpp -@@ -146,7 +146,7 @@ bool Melder_stringMatchesCriterion (cons +--- praat-6.1.22.orig/melder/melder_search.cpp ++++ praat-6.1.22/melder/melder_search.cpp +@@ -145,7 +145,7 @@ bool Melder_stringMatchesCriterion (cons return !! place; } } @@ -11,3 +11,15 @@ } /* End of file melder_search.cpp */ +Index: praat-6.1.22/fon/PitchTierArea.h +=================================================================== +--- praat-6.1.22.orig/fon/PitchTierArea.h ++++ praat-6.1.22/fon/PitchTierArea.h +@@ -33,6 +33,7 @@ Thing_define (PitchTierArea, RealTierAre + return U" st"; + else + Melder_fatal (U"PitchTierArea::v_rightTickUnits: Unknown pitch units: ", (int) our p_units); ++ return NULL; + } + double v_defaultYmin () + override { return 50.0; } ++++++ praat-use_system_libs.patch ++++++ --- /var/tmp/diff_new_pack.zRZPsY/_old 2020-09-25 16:37:35.976213360 +0200 +++ /var/tmp/diff_new_pack.zRZPsY/_new 2020-09-25 16:37:35.976213360 +0200 @@ -1,30 +1,19 @@ From: Luigi Baldoni <[email protected]> -Date: 2017-07-29 13:47:50 +0200 +Date: 2020-09-25 09:46:36 +0200 Subject: Use system libraries when possible Praat includes a number of external libraries that then builds internally. -Some (gsl, glpk and portaudio) can be replaced by system ones, -other like espeak and FLAC are too heavily patched for the program -to be compatible with upstream ones. +Some (gsl, glpk) can be replaced by system ones, other like espeak, +and FLAC are too heavily patched for the program to be compatible +with upstream ones. +Praat also supplies an unstable upstream portaudio version that's +not recommendable for distro inclusion. -Index: praat-6.1.10/fon/SoundRecorder.h +Index: praat-6.1.22/melder/NUMlinprog.cpp =================================================================== ---- praat-6.1.10.orig/fon/SoundRecorder.h -+++ praat-6.1.10/fon/SoundRecorder.h -@@ -25,7 +25,7 @@ - - #include "SoundRecorder_enums.h" - --#include "../external/portaudio/portaudio.h" -+#include <portaudio.h> - #if defined (_WIN32) - #elif defined (macintosh) - #elif defined (linux) -Index: praat-6.1.10/melder/NUMlinprog.cpp -=================================================================== ---- praat-6.1.10.orig/melder/NUMlinprog.cpp -+++ praat-6.1.10/melder/NUMlinprog.cpp +--- praat-6.1.22.orig/melder/NUMlinprog.cpp ++++ praat-6.1.22/melder/NUMlinprog.cpp @@ -17,7 +17,7 @@ */ @@ -34,36 +23,10 @@ struct structNUMlinprog { glp_prob *linearProgram; -Index: praat-6.1.10/dwtools/VowelEditor.cpp -=================================================================== ---- praat-6.1.10.orig/dwtools/VowelEditor.cpp -+++ praat-6.1.10/dwtools/VowelEditor.cpp -@@ -53,7 +53,7 @@ trajectory --> path ???? - - #include "FormantGrid.h" - #include "KlattGrid.h" --#include "../external/portaudio/portaudio.h" -+#include <portaudio.h> - #include "PitchTier_to_PointProcess.h" - #include "PitchTier_to_Sound.h" - #include "PointProcess_and_Sound.h" -Index: praat-6.1.10/melder/melder_audio.cpp -=================================================================== ---- praat-6.1.10.orig/melder/melder_audio.cpp -+++ praat-6.1.10/melder/melder_audio.cpp -@@ -45,7 +45,7 @@ - #include <time.h> - #include "../sys/Gui.h" - #include "../sys/Preferences.h" --#include "../external/portaudio/portaudio.h" -+#include <portaudio.h> - - #ifdef HAVE_PULSEAUDIO - void pulseAudio_initialize (); -Index: praat-6.1.10/melder/NUMspecfunc.cpp +Index: praat-6.1.22/melder/NUMspecfunc.cpp =================================================================== ---- praat-6.1.10.orig/melder/NUMspecfunc.cpp -+++ praat-6.1.10/melder/NUMspecfunc.cpp +--- praat-6.1.22.orig/melder/NUMspecfunc.cpp ++++ praat-6.1.22/melder/NUMspecfunc.cpp @@ -31,10 +31,10 @@ #include "melder.h" #include "../dwsys/NUM2.h" // NUMridders @@ -79,10 +42,10 @@ double NUMlnGamma (double x) { gsl_sf_result result; -Index: praat-6.1.10/melder/melder.cpp +Index: praat-6.1.22/melder/melder.cpp =================================================================== ---- praat-6.1.10.orig/melder/melder.cpp -+++ praat-6.1.10/melder/melder.cpp +--- praat-6.1.22.orig/melder/melder.cpp ++++ praat-6.1.22/melder/melder.cpp @@ -24,7 +24,7 @@ #include "melder_enums.h" @@ -92,53 +55,10 @@ #ifdef macintosh #include <Carbon/Carbon.h> // Gestalt #endif -Index: praat-6.1.10/fon/Sound_audio.cpp -=================================================================== ---- praat-6.1.10.orig/fon/Sound_audio.cpp -+++ praat-6.1.10/fon/Sound_audio.cpp -@@ -26,7 +26,7 @@ - - #include "Sound.h" - #include "Preferences.h" --#include "../external/portaudio/portaudio.h" -+#include <portaudio.h> - - #if defined (macintosh) - #include "macport_on.h" -Index: praat-6.1.10/Makefile -=================================================================== ---- praat-6.1.10.orig/Makefile -+++ praat-6.1.10/Makefile -@@ -14,11 +14,8 @@ include makefile.defs - # Makes the Praat executable in the source directory. - all: - $(MAKE) -C external/clapack -- $(MAKE) -C external/gsl -- $(MAKE) -C external/glpk - $(MAKE) -C external/mp3 - $(MAKE) -C external/flac -- $(MAKE) -C external/portaudio - $(MAKE) -C external/espeak - $(MAKE) -C kar - $(MAKE) -C melder -@@ -40,11 +37,10 @@ all: - fon/libfon.a stat/libstat.a dwsys/libdwsys.a \ - sys/libsys.a melder/libmelder.a kar/libkar.a \ - external/espeak/libespeak.a \ -- external/portaudio/libportaudio.a \ -+ `pkg-config --libs portaudio-2.0` `pkg-config --libs gtk+-2.0` \ - external/flac/libflac.a external/mp3/libmp3.a \ -- external/glpk/libglpk.a \ -+ `pkg-config --libs libpulse` -lglpk `pkg-config --libs gsl` \ - external/clapack/liblapack.a external/clapack/libblas.a \ -- external/gsl/libgsl.a \ - $(LIBS) - - clean: -Index: praat-6.1.10/dwsys/Makefile +Index: praat-6.1.22/dwsys/Makefile =================================================================== ---- praat-6.1.10.orig/dwsys/Makefile -+++ praat-6.1.10/dwsys/Makefile +--- praat-6.1.22.orig/dwsys/Makefile ++++ praat-6.1.22/dwsys/Makefile @@ -4,7 +4,7 @@ include ../makefile.defs @@ -155,35 +75,27 @@ -$(OBJECTS): *.h ../melder/*.h ../stat/*.h ../sys/*.h ../fon/*.h ../external/gsl/*.h ../dwsys/*.h ../kar/*.h +$(OBJECTS): *.h ../melder/*.h ../stat/*.h ../sys/*.h ../fon/*.h /usr/include/gsl/*.h ../dwsys/*.h ../kar/*.h -Index: praat-6.1.10/fon/Makefile +Index: praat-6.1.22/Makefile =================================================================== ---- praat-6.1.10.orig/fon/Makefile -+++ praat-6.1.10/fon/Makefile -@@ -3,7 +3,7 @@ - - include ../makefile.defs - --CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I ../external/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak -+CPPFLAGS = -I ../kar -I ../melder -I ../sys -I ../dwsys -I ../stat -I ../dwtools -I ../LPC -I ../fon -I /usr/include/portaudio -I ../external/flac -I ../external/mp3 -I ../external/espeak - - OBJECTS = Transition.o Distributions_and_Transition.o \ - Function.o Sampled.o SampledXY.o Matrix.o Vector.o Polygon.o PointProcess.o \ -@@ -54,4 +54,4 @@ libfon.a: $(OBJECTS) - $(AR) cq libfon.a $(OBJECTS) - $(RANLIB) libfon.a - --$(OBJECTS): *.h ../external/portaudio/*.h ../kar/*.h ../melder/*.h ../sys/*.h ../dwsys/*.h ../stat/*.h ../dwtools/*.h ../LPC/*.h ../external/flac/*.h ../external/mp3/mp3.h -+$(OBJECTS): *.h ../kar/*.h ../melder/*.h ../sys/*.h ../dwsys/*.h ../stat/*.h ../dwtools/*.h ../LPC/*.h ../external/flac/*.h ../external/mp3/mp3.h -Index: praat-6.1.10/dwtools/Makefile -=================================================================== ---- praat-6.1.10.orig/dwtools/Makefile -+++ praat-6.1.10/dwtools/Makefile -@@ -4,7 +4,7 @@ - - include ../makefile.defs - --CPPFLAGS = -I ../kar -I ../melder -I ../LPC -I ../fon -I ../sys -I ../stat -I ../dwsys -I ../external/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I ../kar -+CPPFLAGS = -I ../kar -I ../melder -I ../LPC -I ../fon -I ../sys -I ../stat -I ../dwsys -I /usr/include/portaudio -I ../external/espeak -I ../external/clapack -I ../EEG -I ../kar +--- praat-6.1.22.orig/Makefile ++++ praat-6.1.22/Makefile +@@ -14,8 +14,6 @@ include makefile.defs + # Makes the Praat executable in the source directory. + all: + $(MAKE) -C external/clapack +- $(MAKE) -C external/gsl +- $(MAKE) -C external/glpk + $(MAKE) -C external/mp3 + $(MAKE) -C external/flac + $(MAKE) -C external/portaudio +@@ -42,9 +40,8 @@ all: + external/espeak/libespeak.a \ + external/portaudio/libportaudio.a \ + external/flac/libflac.a external/mp3/libmp3.a \ +- external/glpk/libglpk.a \ ++ `pkg-config --libs libpulse` -lglpk `pkg-config --libs gsl` \ + external/clapack/libclapack.a \ +- external/gsl/libgsl.a \ + $(LIBS) - OBJECTS = ActivationList.o AffineTransform.o \ - Categories.o CategoriesEditor.o \ + clean:
