Hello community,
here is the log from the commit of package praat for openSUSE:Factory checked
in at 2017-07-30 11:27:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/praat (Old)
and /work/SRC/openSUSE:Factory/.praat.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "praat"
Sun Jul 30 11:27:32 2017 rev:5 rq:513022 version:6.0.30
Changes:
--------
--- /work/SRC/openSUSE:Factory/praat/praat.changes 2017-07-25
11:40:58.959375002 +0200
+++ /work/SRC/openSUSE:Factory/.praat.new/praat.changes 2017-07-30
11:27:44.590320227 +0200
@@ -1,0 +2,6 @@
+Sat Jul 29 13:52:09 UTC 2017 - aloi...@gmx.com
+
+- Added praat-use_system_libs.patch to use system libs when
+ possible
+
+-------------------------------------------------------------------
New:
----
praat-use_system_libs.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ praat.spec ++++++
--- /var/tmp/diff_new_pack.XBQEv6/_old 2017-07-30 11:27:45.454198329 +0200
+++ /var/tmp/diff_new_pack.XBQEv6/_new 2017-07-30 11:27:45.454198329 +0200
@@ -27,12 +27,17 @@
Source3: %{name}.changes
# PATCH-FIX-OPENSUSE praat-6.0.30-no-return-in-nonvoid.patch
Patch0: praat-6.0.30-no-return-in-nonvoid.patch
+# PATCH-FIX-OPENSUSE praat-use_system_libs.patch -- replace some embedded libs
with system ones
+Patch1: praat-use_system_libs.patch
BuildRequires: ImageMagick
BuildRequires: gcc-c++ >= 4.8
+BuildRequires: glpk-devel
BuildRequires: pkg-config
BuildRequires: pkgconfig(alsa)
+BuildRequires: pkgconfig(gsl)
BuildRequires: pkgconfig(gtk+-2.0)
BuildRequires: pkgconfig(libpulse)
+BuildRequires: pkgconfig(portaudio-2.0)
%description
Praat is an open-software tool for the analysis of speech in phonetics.
@@ -47,6 +52,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# fix builddate info
# Remove build time references so build-compare can do its work
FAKE_BUILDTIME=$(LC_ALL=C date -u -r %{SOURCE3} '+%%H:%%M')
++++++ praat-use_system_libs.patch ++++++
From: Luigi Baldoni <aloi...@gmx.com>
Date: 2017-07-29 13:47:50 +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.
Index: praat-6.0.30/dwtools/VowelEditor.cpp
===================================================================
--- praat-6.0.30.orig/dwtools/VowelEditor.cpp
+++ praat-6.0.30/dwtools/VowelEditor.cpp
@@ -55,7 +55,7 @@ trajectory --> path ????
#include "FormantGrid.h"
#include "KlattGrid.h"
-#include "../external/portaudio/portaudio.h"
+#include <portaudio.h>
#include "praat.h"
#include "PitchTier_to_PointProcess.h"
#include "PitchTier_to_Sound.h"
Index: praat-6.0.30/fon/SoundRecorder.h
===================================================================
--- praat-6.0.30.orig/fon/SoundRecorder.h
+++ praat-6.0.30/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.0.30/num/NUMlinprog.cpp
===================================================================
--- praat-6.0.30.orig/num/NUMlinprog.cpp
+++ praat-6.0.30/num/NUMlinprog.cpp
@@ -17,7 +17,7 @@
*/
#include "NUM.h"
-#include "../external/glpk/glpk.h"
+#include <glpk.h>
#define my me ->
Index: praat-6.0.30/sys/melder_audio.cpp
===================================================================
--- praat-6.0.30.orig/sys/melder_audio.cpp
+++ praat-6.0.30/sys/melder_audio.cpp
@@ -49,7 +49,7 @@
#include <time.h>
#define my me ->
-#include "../external/portaudio/portaudio.h"
+#include <portaudio.h>
#ifdef HAVE_PULSEAUDIO
void pulseAudio_initialize ();
Index: praat-6.0.30/fon/Sound_audio.cpp
===================================================================
--- praat-6.0.30.orig/fon/Sound_audio.cpp
+++ praat-6.0.30/fon/Sound_audio.cpp
@@ -28,7 +28,7 @@
#include "Preferences.h"
-#include "../external/portaudio/portaudio.h"
+#include <portaudio.h>
#if defined (macintosh)
#include "macport_on.h"
Index: praat-6.0.30/dwsys/Makefile
===================================================================
--- praat-6.0.30.orig/dwsys/Makefile
+++ praat-6.0.30/dwsys/Makefile
@@ -3,7 +3,7 @@
include ../makefile.defs
-CPPFLAGS = -I ../stat -I ../num -I ../sys -I ../external/gsl -I ../kar
+CPPFLAGS = -I ../stat -I ../num -I ../sys -I /usr/include/gsl -I ../kar
all: libdwsys.a
@@ -30,5 +30,5 @@ libdwsys.a: $(OBJECTS) NUMmachar.o
$(AR) cq libdwsys.a $(OBJECTS)
$(RANLIB) libdwsys.a
-$(OBJECTS): *.h ../stat/*.h ../num/NUM.h ../sys/*.h ../external/gsl/*.h
../dwsys/*.h ../kar/*.h
+$(OBJECTS): *.h ../stat/*.h ../num/NUM.h ../sys/*.h /usr/include/gsl/*.h
../dwsys/*.h ../kar/*.h
Index: praat-6.0.30/makefile
===================================================================
--- praat-6.0.30.orig/makefile
+++ praat-6.0.30/makefile
@@ -13,11 +13,8 @@ include makefile.defs
# Makes the Praat executable in the source directory.
all:
- $(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 num
@@ -39,9 +36,9 @@ all:
LPC/libLPC.a dwtools/libdwtools.a \
fon/libfon.a stat/libstat.a dwsys/libdwsys.a \
sys/libsys.a num/libnum.a kar/libkar.a \
- external/espeak/libespeak.a external/portaudio/libportaudio.a \
- external/flac/libflac.a external/mp3/libmp3.a \
- external/glpk/libglpk.a external/gsl/libgsl.a \
+ external/espeak/libespeak.a `pkg-config --libs portaudio-2.0` \
+ `pkg-config --libs gtk+-2.0` external/flac/libflac.a
external/mp3/libmp3.a \
+ `pkg-config --libs libpulse` -lglpk `pkg-config --libs gsl` \
$(LIBS)
clean:
Index: praat-6.0.30/contrib/ola/Makefile
===================================================================
--- praat-6.0.30.orig/contrib/ola/Makefile
+++ praat-6.0.30/contrib/ola/Makefile
@@ -4,7 +4,7 @@
include ../../makefile.defs
-CPPFLAGS = -I ../../sys -I ../../kar -I ../../FFNet -I ../../dwtools -I
../../fon -I ../../dwsys -I ../../stat -I ../../num -I ../../external/gsl
-D_DEBUG -D_REENTRANT
+CPPFLAGS = -I ../../sys -I ../../kar -I ../../FFNet -I ../../dwtools -I
../../fon -I ../../dwsys -I ../../stat -I ../../num -I /usr/include/gsl
-D_DEBUG -D_REENTRANT
OBJECTS = KNN.o \
KNN_threads.o Pattern_to_Categories_cluster.o KNN_prune.o FeatureWeights.o
praat_contrib_Ola_KNN.o manual_KNN.o
@@ -23,4 +23,4 @@ libOla.a: $(OBJECTS)
$(AR) cq libOla.a $(OBJECTS)
$(RANLIB) libOla.a
-$(OBJECTS): *.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h
../../dwsys/*.h ../../stat/*.h ../../num/*.h ../../external/gsl/*.h
+$(OBJECTS): *.h ../../sys/*.h ../../FFNet/*.h ../../dwtools/*.h ../../fon/*.h
../../dwsys/*.h ../../stat/*.h ../../num/*.h /usr/include/gsl/*.h
