[SCM] audacious-plugins/upstream: New upstream version 3.8.2
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Sat Jun 17 16:10:00 UTC 2017
The following commit has been merged in the upstream branch:
commit 5d911895bec79b393b4b47f09fac3a29d8ebb1c1
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Sat Jun 17 17:52:38 2017 +0200
New upstream version 3.8.2
diff --git a/configure b/configure
index b7e9243..b5252dd 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for audacious-plugins 3.8.1.
+# Generated by GNU Autoconf 2.69 for audacious-plugins 3.8.2.
#
#
# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -9,7 +9,7 @@
# This configure script is free software; the Free Software Foundation
# gives unlimited permission to copy, distribute and modify it.
#
-# Copyright (C) 2001-2016 Audacious developers and others
+# Copyright (C) 2001-2017 Audacious developers and others
## -------------------- ##
## M4sh Initialization. ##
## -------------------- ##
@@ -579,8 +579,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='audacious-plugins'
PACKAGE_TARNAME='audacious-plugins'
-PACKAGE_VERSION='3.8.1'
-PACKAGE_STRING='audacious-plugins 3.8.1'
+PACKAGE_VERSION='3.8.2'
+PACKAGE_STRING='audacious-plugins 3.8.2'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''
@@ -1537,7 +1537,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures audacious-plugins 3.8.1 to adapt to many kinds of systems.
+\`configure' configures audacious-plugins 3.8.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1604,7 +1604,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of audacious-plugins 3.8.1:";;
+ short | recursive ) echo "Configuration of audacious-plugins 3.8.2:";;
esac
cat <<\_ACEOF
@@ -1867,14 +1867,14 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-audacious-plugins configure 3.8.1
+audacious-plugins configure 3.8.2
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
gives unlimited permission to copy, distribute and modify it.
-Copyright (C) 2001-2016 Audacious developers and others
+Copyright (C) 2001-2017 Audacious developers and others
_ACEOF
exit
fi
@@ -2355,7 +2355,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by audacious-plugins $as_me 3.8.1, which was
+It was created by audacious-plugins $as_me 3.8.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -14887,7 +14887,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by audacious-plugins $as_me 3.8.1, which was
+This file was extended by audacious-plugins $as_me 3.8.2, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -14953,7 +14953,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-audacious-plugins config.status 3.8.1
+audacious-plugins config.status 3.8.2
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 89dcf7d..57122de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ dnl ***
dnl Initialize
dnl ==========
AC_PREREQ([2.59])
-AC_INIT([audacious-plugins], [3.8.1])
-AC_COPYRIGHT([Copyright (C) 2001-2016 Audacious developers and others])
+AC_INIT([audacious-plugins], [3.8.2])
+AC_COPYRIGHT([Copyright (C) 2001-2017 Audacious developers and others])
AC_DEFINE_UNQUOTED([PACKAGE], "$PACKAGE_NAME", [Name of package])
AC_DEFINE_UNQUOTED([VERSION], "$PACKAGE_VERSION", [Version number of package])
diff --git a/src/console/Spc_Cpu.h b/src/console/Spc_Cpu.h
index 11eb932..75e0f61 100644
--- a/src/console/Spc_Cpu.h
+++ b/src/console/Spc_Cpu.h
@@ -76,8 +76,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */
// TODO: remove non-wrapping versions?
#define SPC_NO_SP_WRAPAROUND 0
-#define SET_SP( v ) (sp = ram + 0x101 + (v))
-#define GET_SP() (sp - 0x101 - ram)
+#define SET_SP( v ) (sp = ram + 0x101 + ((uint8_t) v))
+#define GET_SP() (uint8_t) (sp - 0x101 - ram)
#if SPC_NO_SP_WRAPAROUND
#define PUSH16( v ) (sp -= 2, SET_LE16( sp, v ))
@@ -485,7 +485,7 @@ loop:
case 0xAF: // MOV (X)+,A
WRITE_DP( 0, x, a + no_read_before_write );
- x++;
+ x = (uint8_t) (x + 1);
goto loop;
// 5. 8-BIT LOGIC OPERATION COMMANDS
@@ -808,7 +808,7 @@ loop:
unsigned temp = y * a;
a = (uint8_t) temp;
nz = ((temp >> 1) | temp) & 0x7F;
- y = temp >> 8;
+ y = (uint8_t) (temp >> 8);
nz |= y;
goto loop;
}
@@ -838,6 +838,7 @@ loop:
nz = (uint8_t) a;
a = (uint8_t) a;
+ y = (uint8_t) y;
goto loop;
}
@@ -1004,7 +1005,7 @@ loop:
case 0x7F: // RET1
temp = *sp;
SET_PC( GET_LE16( sp + 1 ) );
- sp += 3;
+ SET_SP( GET_SP() + 3 );
goto set_psw;
case 0x8E: // POP PSW
POP( temp );
diff --git a/src/console/Spc_Dsp.cc b/src/console/Spc_Dsp.cc
index 1786add..a98a83a 100644
--- a/src/console/Spc_Dsp.cc
+++ b/src/console/Spc_Dsp.cc
@@ -641,7 +641,12 @@ void Spc_Dsp::mute_voices( int mask )
void Spc_Dsp::init( void* ram_64k )
{
m.ram = (uint8_t*) ram_64k;
- mute_voices( 0 );
+
+ // [jlindgren 2016/12/16] Calling mute_voices() before load() causes an
+ // unitialized read of m.regs; instead, just set m.mute_mask here, as we
+ // know mute_voices() will be called as part of load() anyway.
+ m.mute_mask = 0; // mute_voices( 0 );
+
disable_surround( false );
set_output( 0, 0 );
reset();
diff --git a/src/ffaudio/ffaudio-core.cc b/src/ffaudio/ffaudio-core.cc
index 4800db1..390160c 100644
--- a/src/ffaudio/ffaudio-core.cc
+++ b/src/ffaudio/ffaudio-core.cc
@@ -99,7 +99,8 @@ struct ScopedContext
struct ScopedPacket : public AVPacket
{
- ScopedPacket () { av_init_packet (this); }
+ ScopedPacket () : AVPacket ()
+ { av_init_packet (this); }
#if CHECK_LIBAVCODEC_VERSION (55, 25, 100, 55, 16, 0)
~ScopedPacket () { av_packet_unref (this); }
@@ -553,8 +554,10 @@ bool FFaudio::play (const char * filename, VFSFile & file)
/* On EOF, send an empty packet to "flush" the decoder */
/* Otherwise, make a mutable (shallow) copy of the real packet */
AVPacket tmp;
- if (eof)
+ if (eof) {
+ tmp = AVPacket ();
av_init_packet (& tmp);
+ }
else
tmp = pkt;
diff --git a/src/search-tool-qt/search-tool-qt.cc b/src/search-tool-qt/search-tool-qt.cc
index aab0cee..fba5335 100644
--- a/src/search-tool-qt/search-tool-qt.cc
+++ b/src/search-tool-qt/search-tool-qt.cc
@@ -754,6 +754,7 @@ void * SearchToolQt::get_qt_widget ()
auto button = new QPushButton (QIcon::fromTheme ("view-refresh"), QString ());
button->setFlat (true);
+ button->setFocusPolicy (Qt::NoFocus);
hbox->addWidget (button);
String uri = get_uri ();
diff --git a/src/statusicon-qt/statusicon.cc b/src/statusicon-qt/statusicon.cc
index f72b874..b0c9244 100644
--- a/src/statusicon-qt/statusicon.cc
+++ b/src/statusicon-qt/statusicon.cc
@@ -108,10 +108,6 @@ bool StatusIcon::init ()
tray = new QSystemTrayIcon (qApp->windowIcon ());
QObject::connect (tray, & QSystemTrayIcon::activated, activate);
menu = audqt::menu_build (items);
- // Very dirty hack to get along with KDE5 SNI implementation
- // which adds Quit action without any permission.
- // See below in activate().
- menu->actions ().last ()->setVisible (false);
tray->setContextMenu (menu);
QObject::connect (menu, & QMenu::aboutToShow, update_menu);
tray->show ();
@@ -158,12 +154,6 @@ void StatusIcon::activate(QSystemTrayIcon::ActivationReason reason)
toggle_aud_ui ();
break;
- case QSystemTrayIcon::Context:
- // It is expected that only KDE5 SNI implementation blocks this activation signal.
- // So getting it means we aren't in KDE and should show the Quit action.
- menu->actions ().last ()->setVisible (true);
- break;
-
case QSystemTrayIcon::MiddleClick:
aud_drct_pause ();
break;
--
Plugins for audacious
More information about the pkg-multimedia-commits
mailing list