Hello community, here is the log from the commit of package cava for openSUSE:Factory checked in at 2017-04-07 14:20:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cava (Old) and /work/SRC/openSUSE:Factory/.cava.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cava" Fri Apr 7 14:20:41 2017 rev:1 rq:483255 version:0.4.2 Changes: -------- New Changes file: --- /dev/null 2017-03-01 00:40:19.279048016 +0100 +++ /work/SRC/openSUSE:Factory/.cava.new/cava.changes 2017-04-07 14:20:43.131178448 +0200 @@ -0,0 +1,51 @@ +------------------------------------------------------------------- +Tue Mar 28 22:59:34 UTC 2017 - [email protected] + +- Add cava-font.patch: + Install cava.psf to have nice output on TTYs. + +------------------------------------------------------------------- +Tue Mar 28 21:06:56 UTC 2017 - [email protected] + +- Add cava-remove-nested-functions.patch: + Remove nested functions to prevent OBS executable stack warning. + +------------------------------------------------------------------- +Wed Mar 22 15:13:10 UTC 2017 - [email protected] + +- Get rid of unnecessary passing of prefix + +------------------------------------------------------------------- +Thu Mar 16 19:51:21 UTC 2017 - [email protected] + +- It needs libiniparser from version 4 onwards + +------------------------------------------------------------------- +Thu Mar 16 19:32:49 UTC 2017 - [email protected] + +- Update to 0.4.2: + * added auto pulseaudio source mode + * pulsaudio is now default + * cava is now cavamp + * pushing 'r' now reloads audio + * Added console title + * added pulseadio support + * added confg script + * removed commanline argumets + * added optional config path + * added autosens feature + * added setting of bar width, bar spacing and frequency bandwidth to config file. + * autodetection of alsa loopback interface +- Use proper group +- Update description + +------------------------------------------------------------------- +Tue Jul 28 08:38:11 UTC 2015 - [email protected] + +- Honor optflags + +------------------------------------------------------------------- +Tue Jul 28 07:38:47 UTC 2015 - [email protected] + +- Creating initial package for version 0.3.2 + New: ---- 0.4.2.tar.gz cava-font.patch cava-remove-nested-functions.patch cava.changes cava.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cava.spec ++++++ # # spec file for package cava # # Copyright (c) 2017 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # Name: cava Version: 0.4.2 Release: 0 Summary: Console-based Audio Visualizer for Alsa License: MIT Group: Productivity/Multimedia/Sound/Visualization Url: https://github.com/karlstav/cava Source: https://github.com/karlstav/%{name}/archive/%{version}.tar.gz # FIX-UPSTREAM: See https://github.com/karlstav/cava/issues/142 Patch0: cava-remove-nested-functions.patch # FIX-UPSTREAM: https://github.com/karlstav/cava/issues/147 Patch1: cava-font.patch BuildRequires: alsa-devel BuildRequires: fftw3-devel # Use system ini parser instead of building own lib BuildRequires: libiniparser-devel >= 4.0 BuildRequires: libpulse-devel BuildRequires: libtool BuildRequires: ncurses-devel # Installing the psf in a directory that comes from kbd Requires: kbd BuildRoot: %{_tmppath}/%{name}-%{version}-build %description C.A.V.A. is a bar spectrum audio visualizer for the Linux terminal using ALSA, pulseaudio or fifo buffer for input. %prep %setup -q %patch0 -p1 %patch1 -p1 ./autogen.sh FONT_DIR="%{_datadir}/kbd/consolefonts" %configure %build make %{?_smp_mflags} %install %make_install %files %defattr(-,root,root) %doc README.md LICENSE %{_bindir}/cava %dir %{_datadir}/kbd/ %dir %{_datadir}/kbd/consolefonts/ %{_datadir}/kbd/consolefonts/cava.psf %changelog ++++++ cava-font.patch ++++++ diff -urEbwB cava-0.4.2/configure.ac cava-0.4.2.new/configure.ac --- cava-0.4.2/configure.ac 2016-09-16 16:08:40.000000000 +0200 +++ cava-0.4.2.new/configure.ac 2017-03-29 00:29:04.670111604 +0200 @@ -149,6 +149,14 @@ CPPFLAGS="$CPPFLAGS -DLEGACYINIPARSER" ]) +dnl ############################ +dnl Set font directory +dnl ############################ +DEFAULT_FONT_DIR="/usr/share/kbd/consolefonts" +AC_ARG_VAR(FONT_DIR, [Directory where the font will be installed.]) +if test -z "$FONT_DIR" ; then + FONT_DIR="$DEFAULT_FONT_DIR" +fi diff -urEbwB cava-0.4.2/Makefile.am cava-0.4.2.new/Makefile.am --- cava-0.4.2/Makefile.am 2016-09-16 16:08:40.000000000 +0200 +++ cava-0.4.2.new/Makefile.am 2017-03-29 00:30:46.733904650 +0200 @@ -16,6 +16,9 @@ -D_POSIX_SOURCE -D _POSIX_C_SOURCE=200809L cava_CFLAGS = -std=c99 -Wall -Wextra -Wno-unused-result -Wno-maybe-uninitialized +cava_font_dir = @FONT_DIR@ +cava_font__DATA = cava.psf + if !SYSTEM_LIBINIPARSER cava_SOURCES += iniparser/libiniparser.la cava_LDADD += -Liniparser/.libs ++++++ cava-remove-nested-functions.patch ++++++ >From 5a7fcce5c9d0a9ba83e7e47cac872469bfbdf7c9 Mon Sep 17 00:00:00 2001 From: karlstav <[email protected]> Date: Tue, 28 Mar 2017 21:44:31 +0200 Subject: [PATCH] remove nested functions to fix #142 nested functions in pulse.c where removed, but pa_mainloop had to be declared globaly in order to close loop after finding default sink name this might cause more problems in the future. --- input/pulse.c | 95 ++++++++++++++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 46 deletions(-) diff --git a/input/pulse.c b/input/pulse.c index 016c20d..0bc3af7 100644 --- a/input/pulse.c +++ b/input/pulse.c @@ -7,62 +7,65 @@ #include <pulse/pulseaudio.h> #define BUFSIZE 1024 -void getPulseDefaultSink(void* data) { +pa_mainloop *m_pulseaudio_mainloop; - struct audio_data *audio = (struct audio_data *)data; - pa_mainloop_api *mainloop_api; - pa_context *pulseaudio_context; - pa_mainloop *m_pulseaudio_mainloop; - int ret; +void cb(__attribute__((unused)) pa_context *pulseaudio_context, const pa_server_info *i, void *userdata){ + //getting default sink name + struct audio_data *audio = (struct audio_data *)userdata; + audio->source = malloc(sizeof(char) * 1024); - void cb(__attribute__((unused)) pa_context *pulseaudio_context,const pa_server_info *i,__attribute__((unused)) void *userdata){ + strcpy(audio->source,i->default_sink_name); - //getting default sink name - audio->source = malloc(sizeof(char) * 1024); - strcpy(audio->source,i->default_sink_name); + //appending .monitor suufix + audio->source = strcat(audio->source, ".monitor"); - //appending .monitor suufix - audio->source = strcat(audio->source, ".monitor"); + //quiting mainloop + pa_mainloop_quit(m_pulseaudio_mainloop, 0); +} - //quiting mainloop - pa_mainloop_quit(m_pulseaudio_mainloop, 0); - } +void pulseaudio_context_state_callback(pa_context *pulseaudio_context, + void *userdata) { - void pulseaudio_context_state_callback(__attribute__((unused)) pa_context *c, - void *userdata) { - - //make sure loop is ready - switch (pa_context_get_state(pulseaudio_context)) - { - case PA_CONTEXT_UNCONNECTED: - //printf("UNCONNECTED\n"); - break; - case PA_CONTEXT_CONNECTING: - //printf("CONNECTING\n"); - break; - case PA_CONTEXT_AUTHORIZING: - //printf("AUTHORIZING\n"); - break; - case PA_CONTEXT_SETTING_NAME: - //printf("ETTING_NAM\n"); - break; - case PA_CONTEXT_READY://extract default sink name - //printf("READY\n"); - pa_operation_unref(pa_context_get_server_info( - pulseaudio_context, cb, userdata)); - break; - case PA_CONTEXT_FAILED: - //printf("FAILED\n"); - break; - case PA_CONTEXT_TERMINATED: - //printf("TERMINATED\n"); - break; - } + //make sure loop is ready + switch (pa_context_get_state(pulseaudio_context)) + { + case PA_CONTEXT_UNCONNECTED: + //printf("UNCONNECTED\n"); + break; + case PA_CONTEXT_CONNECTING: + //printf("CONNECTING\n"); + break; + case PA_CONTEXT_AUTHORIZING: + //printf("AUTHORIZING\n"); + break; + case PA_CONTEXT_SETTING_NAME: + //printf("SETTING_NAME\n"); + break; + case PA_CONTEXT_READY://extract default sink name + //printf("READY\n"); + pa_operation_unref(pa_context_get_server_info( + pulseaudio_context, cb, userdata)); + break; + case PA_CONTEXT_FAILED: + //printf("FAILED\n"); + break; + case PA_CONTEXT_TERMINATED: + //printf("TERMINATED\n"); + pa_mainloop_quit(m_pulseaudio_mainloop, 0); + break; } +} + + +void getPulseDefaultSink(void* data) { + struct audio_data *audio = (struct audio_data *)data; + pa_mainloop_api *mainloop_api; + pa_context *pulseaudio_context; + int ret; // Create a mainloop API and connection to the default server m_pulseaudio_mainloop = pa_mainloop_new(); @@ -78,7 +81,7 @@ void getPulseDefaultSink(void* data) { //This function defines a callback so the server will tell us its state. pa_context_set_state_callback(pulseaudio_context, pulseaudio_context_state_callback, - NULL); + (void*)audio); //starting a mainloop to get default sink if (pa_mainloop_run(m_pulseaudio_mainloop, &ret) < 0)
