[gentoo-commits] repo/gentoo:master commit in: media-sound/cvoicecontrol/files/, media-sound/cvoicecontrol/

[David Seifert]

commit:     61e8a007fd7e45537965ba515faca3611806bb94
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 16:53:42 2020 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 16:53:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61e8a007

media-sound/cvoicecontrol: Fix building under -fno-common

Closes: https://bugs.gentoo.org/706970
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: David Seifert <soap <AT> gentoo.org>

 .../cvoicecontrol-0.9_alpha-r1.ebuild              |  19 +--
 .../files/cvoicecontrol-0.9_alpha-automake.patch   |  33 ++++
 .../files/cvoicecontrol-0.9_alpha-gentoo-2.patch   | 180 +++++++++++++++++++--
 3 files changed, 210 insertions(+), 22 deletions(-)

diff --git a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
index 0b0363c94bc..a1d1238c92c 100644
--- a/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
+++ b/media-sound/cvoicecontrol/cvoicecontrol-0.9_alpha-r1.ebuild
@@ -14,27 +14,20 @@ SRC_URI="http://www.kiecza.net/daniel/linux/${MY_P}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc sparc x86"
-IUSE=""
 
 S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gentoo-2.patch"
-	"${FILESDIR}/${P}-tinfo.patch" #647166
+	"${FILESDIR}"/${P}-gentoo-2.patch
+	"${FILESDIR}"/${P}-tinfo.patch #64716
+	# Handle documentation with HTML_DOCS instead
+	"${FILESDIR}"/${P}-automake.patch
 )
 
 src_prepare() {
 	default
-	# Handle documentation with dohtml instead.
-	sed \
-		-e "s:SUBDIRS = docs:#SUBDIRS = docs:" \
-		-i cvoicecontrol/Makefile.am || die
-
-	eautoreconf #647166
-
-	sed \
-		-e "s/install-data-am: install-data-local/install-data-am:/" \
-		-i Makefile.in || die
+	mv configure.{in,ac} || die
+	eautoreconf
 }
 
 src_install() {

diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch
new file mode 100644
index 00000000000..e2d73cbc984
--- /dev/null
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-automake.patch
@@ -0,0 +1,33 @@
+--- a/cvoicecontrol/Makefile.am
++++ b/cvoicecontrol/Makefile.am
+@@ -11,7 +11,7 @@
+ model_editor_SOURCES = audio.c configuration.c keypressed.c mixer.c model.c ncurses_tools.c preprocess.c realfftf.c model_editor.c
+ model_editor_LDADD   = -lm ${LIBNCURSES}
+ 
+-SUBDIRS = docs
++#SUBDIRS = docs
+ 
+ EXTRA_DIST = audio.c audio.h bb_queue.c bb_queue.h configuration.c configuration.h keypressed.c keypressed.h microphone_config.c microphone_config.h mixer.c mixer.h model.c model.h model_editor.c model_editor.h ncurses_tools.c ncurses_tools.h preprocess.c preprocess.h queue.h realfftf.c realfftf.h score.c score.h semaphore.c semaphore.h cvoicecontrol.c cvoicecontrol.h
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -8,19 +8,3 @@
+ 
+ ####### kdevelop will overwrite this part!!! (end)############
+ AUTOMAKE_OPTIONS = foreign
+-
+-install-data-local:
+-	$(mkinstalldirs) $(prefix)/share/doc/cvoicecontrol
+-	$(INSTALL_DATA) AUTHORS $(prefix)/share/doc/cvoicecontrol/AUTHORS
+-	$(INSTALL_DATA) FAQ     $(prefix)/share/doc/cvoicecontrol/FAQ    
+-	$(INSTALL_DATA) BUGS    $(prefix)/share/doc/cvoicecontrol/BUGS   
+-	$(INSTALL_DATA) README  $(prefix)/share/doc/cvoicecontrol/README 
+-	$(INSTALL_DATA) COPYING $(prefix)/share/doc/cvoicecontrol/COPYING
+-
+-uninstall-local:
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/AUTHORS
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/FAQ    
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/BUGS   
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/README 
+-	-rm -f $(prefix)/share/doc/cvoicecontrol/COPYING
+-	rmdir $(prefix)/share/doc/cvoicecontrol

diff --git a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
index 7e1ae985b18..2316e92ba96 100644
--- a/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
+++ b/media-sound/cvoicecontrol/files/cvoicecontrol-0.9_alpha-gentoo-2.patch
@@ -1,6 +1,40 @@
-diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c
---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c	2002-09-05 19:09:06.000000000 +0300
-+++ cvoicecontrol-0.9alpha/cvoicecontrol/cvoicecontrol.c	2007-07-29 23:35:33.000000000 +0300
+--- a/cvoicecontrol/audio.c
++++ b/cvoicecontrol/audio.c
+@@ -32,6 +32,10 @@
+ 
+ int is_open = 0;
+ 
++int   fd_audio;
++char *dev_audio;
++signed short rec_level, stop_level, silence_level;
++
+ /********************************************************************************
+  * set name of audio device
+  ********************************************************************************/
+--- a/cvoicecontrol/audio.h
++++ b/cvoicecontrol/audio.h
+@@ -31,8 +31,8 @@
+ #define CONSECUTIVE_SPEECH_BLOCKS_THRESHOLD    3
+ #define CONSECUTIVE_NONSPEECH_BLOCKS_THRESHOLD 5
+ 
+-int   fd_audio;
+-char *dev_audio;
++extern int   fd_audio;
++extern char *dev_audio;
+ 
+ /********************************************************************************
+  * For now, microphone input level is used to start and stop recording
+@@ -43,7 +43,7 @@
+  * silence_level  average micro level of silence
+  ********************************************************************************/
+ 
+-signed short rec_level, stop_level, silence_level;
++extern signed short rec_level, stop_level, silence_level;
+ 
+ typedef struct
+ {
+--- a/cvoicecontrol/cvoicecontrol.c
++++ b/cvoicecontrol/cvoicecontrol.c
 @@ -38,6 +38,8 @@
  #include<sys/select.h>
  #endif
@@ -10,9 +44,62 @@ diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/cvoicecontrol.c cvoicecontrol
  #include "cvoicecontrol.h"
  
  #include "model.h"
-diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c
---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c	2000-02-19 14:08:47.000000000 +0200
-+++ cvoicecontrol-0.9alpha/cvoicecontrol/microphone_config.c	2007-07-29 23:36:08.000000000 +0300
+@@ -53,6 +55,10 @@
+ #include "mixer.h"
+ #include "preprocess.h"
+ 
++int adjust_window_width;
++int sloppy_corner;
++float float_max;
++
+ Model *model; /***** speaker model */
+ 
+ Queue queue1; /***** thread-safe queue used to hand data from 'recording' to 'preprocessing' */
+@@ -341,7 +347,7 @@
+  * calculate euklidian distance of two feature vectors
+  ********************************************************************************/
+ 
+-inline float euklid_distance(float *a, float *b)
++float euklid_distance(float *a, float *b)
+ {
+   float result = 0; /***** resulting distance */
+   int i;
+--- a/cvoicecontrol/cvoicecontrol.h
++++ b/cvoicecontrol/cvoicecontrol.h
+@@ -66,7 +66,7 @@
+  *
+  *       Legend:  w = adjust_window_width
+  */
+-int adjust_window_width;
++extern int adjust_window_width;
+ 
+ /*
+  * strictly speaking, time-alignment in the DTW matrix starts
+@@ -87,19 +87,19 @@
+  *
+  *    Legend: x = distance value,  o = (infinity)
+  */
+-int sloppy_corner;
++extern int sloppy_corner;
+ 
+ /*****
+   time alignment scores must stay below this value
+   otherwise the according samples are ignored in
+   the further evaluation process
+   *****/
+-float score_threshold;
++extern float score_threshold;
+ 
+ /*****
+   a (very high) float value that is considered "infinity"
+   *****/
+-float float_max;
++extern float float_max;
+ 
+ /***** these macros are used in the DTW warping function
+   to calculate the maximum/minimum of two or three
+--- a/cvoicecontrol/microphone_config.c
++++ b/cvoicecontrol/microphone_config.c
 @@ -1099,8 +1099,6 @@
        free(command);
      }
@@ -22,9 +109,84 @@ diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/microphone_config.c cvoicecon
    }
    else /***** couldn't retrieve home directory -> store results in /tmp/ */
    {
-diff -ur cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c
---- cvoicecontrol-0.9alpha.orig/cvoicecontrol/semaphore.c	2000-02-12 18:05:24.000000000 +0200
-+++ cvoicecontrol-0.9alpha/cvoicecontrol/semaphore.c	2007-07-29 23:34:38.000000000 +0300
+--- a/cvoicecontrol/mixer.c
++++ b/cvoicecontrol/mixer.c
+@@ -30,6 +30,9 @@
+ 
+ char *dev_mixer = NULL;
+ 
++int mic_level;
++int igain_level;
++
+ /********************************************************************************
+  * set mixer device name
+  ********************************************************************************/
+--- a/cvoicecontrol/mixer.h
++++ b/cvoicecontrol/mixer.h
+@@ -37,7 +37,7 @@
+ #define MIXER_ERR -1
+ #define MIXER_OK  1
+ 
+-int mic_level;
+-int igain_level;
++extern int mic_level;
++extern int igain_level;
+ 
+ #endif
+--- a/cvoicecontrol/preprocess.c
++++ b/cvoicecontrol/preprocess.c
+@@ -23,6 +23,13 @@
+ 
+ int i,j; /***** counter variables */
+ 
++int   filter_banks[17];
++float power_spec[POWER_SPEC_SIZE];
++float hamming_window[HAMMING_SIZE];
++int   do_mean_sub;
++float channel_mean[FEAT_VEC_SIZE];
++float score_threshold;
++
+ /********************************************************************************
+  * initialize preprocessing s tuff
+  ********************************************************************************/
+--- a/cvoicecontrol/preprocess.h
++++ b/cvoicecontrol/preprocess.h
+@@ -51,12 +51,12 @@
+ /*****
+   used for reduction of short-time spectrum to mel scale coefficients
+   *****/
+-int   filter_banks[17];
++extern int   filter_banks[17];
+ 
+ /*****
+   contains the power spectrum
+   *****/
+-float power_spec[POWER_SPEC_SIZE];
++extern float power_spec[POWER_SPEC_SIZE];
+ 
+ /********************************************************************************
+  * Hamming window width = 16ms ! (256 Frames)
+@@ -68,15 +68,15 @@
+  * to reduce the number of artefacts in the power spectrum
+  ********************************************************************************/
+ 
+-float hamming_window[HAMMING_SIZE];
++extern float hamming_window[HAMMING_SIZE];
+ 
+ /*****
+   The characteristics of the recording channel
+   This is substracted from each feature vector to reduce
+   channel effects
+   *****/
+-int   do_mean_sub;
+-float channel_mean[FEAT_VEC_SIZE];
++extern int   do_mean_sub;
++extern float channel_mean[FEAT_VEC_SIZE];
+ 
+ 
+ int  initPreprocess();
+--- a/cvoicecontrol/semaphore.c
++++ b/cvoicecontrol/semaphore.c
 @@ -26,6 +26,7 @@
  ****************************************************************************/