Hello community,
here is the log from the commit of package deadbeef-plugin-mpris2 for
openSUSE:Leap:15.2 checked in at 2020-02-19 18:48:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/deadbeef-plugin-mpris2 (Old)
and /work/SRC/openSUSE:Leap:15.2/.deadbeef-plugin-mpris2.new.26092 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "deadbeef-plugin-mpris2"
Wed Feb 19 18:48:53 2020 rev:10 rq:776252 version:1.13
Changes:
--------
---
/work/SRC/openSUSE:Leap:15.2/deadbeef-plugin-mpris2/deadbeef-plugin-mpris2.changes
2020-01-15 14:52:01.417474045 +0100
+++
/work/SRC/openSUSE:Leap:15.2/.deadbeef-plugin-mpris2.new.26092/deadbeef-plugin-mpris2.changes
2020-02-19 18:48:54.395043678 +0100
@@ -1,0 +2,18 @@
+Fri Jan 17 13:44:58 UTC 2020 - Hillwood Yang <[email protected]>
+
+- Update version to 1.13
+ * Fix raise method
+ * Fix missing emit of seeked signal after seek
+ * Include LICENCE file in distribution
+
+-------------------------------------------------------------------
+Sun Apr 28 08:15:07 UTC 2019 - Hillwood Yang <[email protected]>
+
+- Update version to 1.12
+ * Fix double free
+ * Send correct CanSeek
+ * Fix duration for radio streams
+ * Fix pause handling
+ * New features: CanPlay, CanGoPrevious, CanGoNext
+
+-------------------------------------------------------------------
Old:
----
deadbeef-mpris2-plugin-1.10.tar.xz
New:
----
deadbeef-mpris2-plugin-1.13.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ deadbeef-plugin-mpris2.spec ++++++
--- /var/tmp/diff_new_pack.PqbCjC/_old 2020-02-19 18:48:54.683043984 +0100
+++ /var/tmp/diff_new_pack.PqbCjC/_new 2020-02-19 18:48:54.683043984 +0100
@@ -1,8 +1,8 @@
#
# spec file for package deadbeef-plugin-mpris2
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
-# Copyright (c) 2015 Hillwood Yang <[email protected]>
+# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2020 Hillwood Yang <[email protected]>
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -13,18 +13,18 @@
# 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/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
#
%define _name deadbeef-mpris2-plugin
Name: deadbeef-plugin-mpris2
-Version: 1.10
+Version: 1.13
Release: 0
Summary: MPRISv2 plugin for the DeaDBeeF music player
-License: GPL-3.0+
+License: GPL-3.0-or-later
Group: Productivity/Multimedia/Sound/Players
-Url: https://github.com/Serranya/deadbeef-mpris2-plugin
+URL: https://github.com/Serranya/deadbeef-mpris2-plugin
Source:
https://github.com/Serranya/%{_name}/releases/download/v%{version}/%{_name}-%{version}.tar.xz
BuildRequires: autoconf >= 2.69
BuildRequires: automake
@@ -49,9 +49,8 @@
%build
autoreconf -fi
-%configure \
- --disable-static
-make %{?_smp_mflags} V=1
+%configure --disable-static
+%make_build
%install
%make_install
@@ -59,6 +58,8 @@
%files
%defattr(-,root,root)
+%doc README
+%license LICENSE
%{_libdir}/deadbeef/
%changelog
++++++ deadbeef-mpris2-plugin-1.10.tar.xz -> deadbeef-mpris2-plugin-1.13.tar.xz
++++++
++++ 6290 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/LICENSE new/deadbeef-1.13/LICENSE
--- old/deadbeef-1.10/LICENSE 1970-01-01 01:00:00.000000000 +0100
+++ new/deadbeef-1.13/LICENSE 2019-06-07 15:06:50.000000000 +0200
@@ -0,0 +1,339 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/Makefile.am new/deadbeef-1.13/Makefile.am
--- old/deadbeef-1.10/Makefile.am 2016-04-17 10:13:16.000000000 +0200
+++ new/deadbeef-1.13/Makefile.am 2019-06-07 15:06:50.000000000 +0200
@@ -3,6 +3,8 @@
ACLOCAL_AMFLAGS= -I m4
mpris_la_SOURCES=src/mpris.c src/mprisServer.c src/mprisServer.h src/logging.c
src/logging.h src/artwork.h
-mpris_la_CFLAGS=${GIO_DEPS_CFLAGS} ${GTHREAD_DEPS_CFLAGS} ${GLIB_DEPS_CFLAGS}
+mpris_la_CFLAGS=${GIO_DEPS_CFLAGS} ${GIOUNIX_DEPS_CFLAGS}
${GTHREAD_DEPS_CFLAGS} ${GLIB_DEPS_CFLAGS}
mpris_la_LDFLAGS=-module -avoid-version -shared
-mpris_la_LIBADD=${GIO_DEPS_LIBS} ${GTHREAD_DEPS_LIBS} ${GLIB_DEPS_LIBS}
+mpris_la_LIBADD=${GIO_DEPS_LIBS} ${GIOUNIX_DEPS_LIBS} ${GTHREAD_DEPS_LIBS}
${GLIB_DEPS_LIBS}
+
+EXTRA_DIST=LICENSE
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/README new/deadbeef-1.13/README
--- old/deadbeef-1.10/README 2015-10-16 23:51:40.000000000 +0200
+++ new/deadbeef-1.13/README 2019-06-07 15:06:50.000000000 +0200
@@ -27,9 +27,9 @@
- make install
==== For Users ====
-- Grab the tarball from
https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v1.8/deadbeef-mpris2-plugin-1.8.tar.xz
-- tar -xf deadbeef-mpris2-plugin-1.8.tar.xz
-- cd deadbeef-mpris-plugin-1.8
+- Grab the tarball from
https://github.com/Serranya/deadbeef-mpris2-plugin/releases/download/v1.12/deadbeef-mpris2-plugin-1.12.tar.xz
+- tar -xf deadbeef-mpris2-plugin-1.12.tar.xz
+- cd deadbeef-mpris-plugin-1.12
- ./configure
- make install
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/build-aux/ar-lib new/deadbeef-1.13/build-aux/ar-lib
--- old/deadbeef-1.10/build-aux/ar-lib 2016-10-01 09:13:32.000000000 +0200
+++ new/deadbeef-1.13/build-aux/ar-lib 2019-06-07 15:10:19.000000000 +0200
@@ -4,7 +4,7 @@
me=ar-lib
scriptversion=2012-03-01.08; # UTC
-# Copyright (C) 2010-2014 Free Software Foundation, Inc.
+# Copyright (C) 2010-2018 Free Software Foundation, Inc.
# Written by Peter Rosin <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/build-aux/compile new/deadbeef-1.13/build-aux/compile
--- old/deadbeef-1.10/build-aux/compile 2016-10-01 09:13:32.000000000 +0200
+++ new/deadbeef-1.13/build-aux/compile 2019-06-07 15:10:19.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Wrapper for compilers which do not understand '-c -o'.
-scriptversion=2012-10-14.11; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1999-2014 Free Software Foundation, Inc.
+# Copyright (C) 1999-2018 Free Software Foundation, Inc.
# Written by Tom Tromey <[email protected]>.
#
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -255,7 +255,8 @@
echo "compile $scriptversion"
exit $?
;;
- cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \
+ icl | *[/\\]icl | icl.exe | *[/\\]icl.exe )
func_cl_wrapper "$@" # Doesn't return...
;;
esac
@@ -339,9 +340,9 @@
# Local Variables:
# mode: shell-script
# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/build-aux/missing new/deadbeef-1.13/build-aux/missing
--- old/deadbeef-1.10/build-aux/missing 2016-10-01 09:13:32.000000000 +0200
+++ new/deadbeef-1.13/build-aux/missing 2019-06-07 15:10:19.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common wrapper for a few potentially missing GNU programs.
-scriptversion=2013-10-28.13; # UTC
+scriptversion=2018-03-07.03; # UTC
-# Copyright (C) 1996-2014 Free Software Foundation, Inc.
+# Copyright (C) 1996-2018 Free Software Foundation, Inc.
# Originally written by Fran,cois Pinard <[email protected]>, 1996.
# This program is free software; you can redistribute it and/or modify
@@ -17,7 +17,7 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# along with this program. If not, see <https://www.gnu.org/licenses/>.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -101,9 +101,9 @@
exit $st
fi
-perl_URL=http://www.perl.org/
-flex_URL=http://flex.sourceforge.net/
-gnu_software_URL=http://www.gnu.org/software
+perl_URL=https://www.perl.org/
+flex_URL=https://github.com/westes/flex
+gnu_software_URL=https://www.gnu.org/software
program_details ()
{
@@ -207,9 +207,9 @@
exit $st
# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
+# eval: (add-hook 'before-save-hook 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
+# time-stamp-time-zone: "UTC0"
# time-stamp-end: "; # UTC"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/configure.ac new/deadbeef-1.13/configure.ac
--- old/deadbeef-1.10/configure.ac 2016-10-01 09:35:27.000000000 +0200
+++ new/deadbeef-1.13/configure.ac 2019-06-07 15:06:50.000000000 +0200
@@ -1,7 +1,11 @@
dnl Process this file with autoconf to produce a configure script.
+m4_define([plugin_version_major], [1])
+m4_define([plugin_version_minor], [13])
+m4_define([plugin_version], [plugin_version_major.plugin_version_minor])
+
AC_PREREQ([2.69])
-AC_INIT([deadbeef-mpris2-plugin], [1.10], [[email protected]], [DeaDBeeF
MPRIS2 Plugin], [https://github.com/Serranya/deadbeef-mpris2-plugin])
+AC_INIT([deadbeef-mpris2-plugin], [plugin_version], [[email protected]],
[DeaDBeeF MPRIS2 Plugin], [https://github.com/Serranya/deadbeef-mpris2-plugin])
AC_CONFIG_SRCDIR([src/mpris.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -18,10 +22,16 @@
AC_PROG_LIBTOOL
PKG_PROG_PKG_CONFIG
+AC_DEFINE(PLUGIN_VERSION_MAJOR, [plugin_version_major],
+ [Define to the plug-in major version])
+AC_DEFINE(PLUGIN_VERSION_MINOR, [plugin_version_minor],
+ [Define to the plug-in minor version])
+
LT_INIT
PKG_CHECK_MODULES([GLIB_DEPS], [glib-2.0], , AC_MSG_ERROR([glibc-2 is required
for this package]))
PKG_CHECK_MODULES([GIO_DEPS], [gio-2.0], , AC_MSG_ERROR([gio-2 is required for
this package]))
+PKG_CHECK_MODULES([GIOUNIX_DEPS], [gio-unix-2.0], , AC_MSG_ERROR([gio-unix-2
is required for this package]))
PKG_CHECK_MODULES([GTHREAD_DEPS], [gthread-2.0], , AC_MSG_ERROR([gthread-2 is
required for this package]))
AS_IF([test "x$ac_cv_prog_cc_c99" = "xno"], AC_MSG_ERROR([C99 Support is
required]))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/m4/libtool.m4 new/deadbeef-1.13/m4/libtool.m4
--- old/deadbeef-1.10/m4/libtool.m4 2016-10-01 09:13:30.000000000 +0200
+++ new/deadbeef-1.13/m4/libtool.m4 2019-06-07 15:10:15.000000000 +0200
@@ -1,6 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2018 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -219,8 +219,8 @@
ofile=libtool
can_build_shared=yes
-# All known linkers require a '.a' archive for static linking (except MSVC,
-# which needs '.lib').
+# All known linkers require a '.a' archive for static linking (except MSVC and
+# ICC, which need '.lib').
libext=a
with_gnu_ld=$lt_cv_prog_gnu_ld
@@ -1042,8 +1042,8 @@
_LT_EOF
echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
$LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
- echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
- $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+ echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+ $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
$RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
cat > conftest.c << _LT_EOF
@@ -1493,9 +1493,22 @@
m4_defun([_LT_PROG_AR],
[AC_CHECK_TOOLS(AR, [ar], false)
: ${AR=ar}
-: ${AR_FLAGS=cru}
_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+# Use ARFLAGS variable as AR's operation code to sync the variable naming with
+# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have
+# higher priority because thats what people were doing historically (setting
+# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS
+# variable obsoleted/removed.
+
+test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr}
+lt_ar_flags=$AR_FLAGS
+_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)])
+
+# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override
+# by AR_FLAGS because that was never working and AR_FLAGS is about to die.
+_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}],
+ [Flags to create an archive])
AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[lt_cv_ar_at_file=no
@@ -2207,26 +2220,35 @@
striplib=
old_striplib=
AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
- test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
- test -z "$striplib" && striplib="$STRIP --strip-unneeded"
- AC_MSG_RESULT([yes])
+if test -z "$STRIP"; then
+ AC_MSG_RESULT([no])
else
-# FIXME - insert some real tests, host_os isn't really good enough
- case $host_os in
- darwin*)
- if test -n "$STRIP"; then
+ if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+ old_striplib="$STRIP --strip-debug"
+ striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
+ else
+ case $host_os in
+ darwin*)
+ # FIXME - insert some real tests, host_os isn't really good enough
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
- else
+ ;;
+ freebsd*)
+ if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then
+ old_striplib="$STRIP --strip-debug"
+ striplib="$STRIP --strip-unneeded"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ ;;
+ *)
AC_MSG_RESULT([no])
- fi
- ;;
- *)
- AC_MSG_RESULT([no])
- ;;
- esac
+ ;;
+ esac
+ fi
fi
_LT_DECL([], [old_striplib], [1], [Commands to strip libraries])
_LT_DECL([], [striplib], [1])
@@ -2565,8 +2587,8 @@
dynamic_linker='Win32 ld.exe'
;;
- *,cl*)
- # Native MSVC
+ *,cl* | *,icl*)
+ # Native MSVC or ICC
libname_spec='$name'
soname_spec='$libname`echo $release | $SED -e
's/[[.]]/-/g'`$versuffix$shared_ext'
library_names_spec='$libname.dll.lib'
@@ -2622,7 +2644,7 @@
;;
*)
- # Assume MSVC wrapper
+ # Assume MSVC and ICC wrapper
library_names_spec='$libname`echo $release | $SED -e
's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
@@ -4010,7 +4032,7 @@
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
# Fake it for dumpbin and say T for any non-static function,
# D for any global variable and I for any imported variable.
- # Also find C++ and __fastcall symbols from MSVC++,
+ # Also find C++ and __fastcall symbols from MSVC++ or ICC,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
@@ -4919,7 +4941,7 @@
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience |
awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 ==
"W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" }
else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e
'\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$
2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V")
|| (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2
== "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' |
sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e
'\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$
2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W")
|| (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2
== "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print
\$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
@@ -4927,7 +4949,7 @@
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
- cl*)
+ cl* | icl*)
_LT_TAGVAR(exclude_expsyms,
$1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
;;
*)
@@ -4984,15 +5006,15 @@
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # FIXME: the MSVC++ port hasn't been tested in a loooong time
+ # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
+ # Microsoft Visual C++ or Intel C++ Compiler.
if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
interix*)
- # we just hope/assume this is gcc and not c89 (= MSVC++)
+ # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC)
with_gnu_ld=yes
;;
openbsd* | bitrig*)
@@ -5156,6 +5178,7 @@
emximp -o $lib $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o
$output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
;;
interix[[3-9]]*)
@@ -5373,7 +5396,7 @@
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
_LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience |
awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 ==
"W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" }
else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e
'\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$
2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V")
|| (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2
== "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' |
sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e
'\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$
2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W")
|| (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2
== "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print
\$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
@@ -5556,12 +5579,12 @@
cygwin* | mingw* | pw32* | cegcc*)
# When not using gcc, we currently assume that we are using
- # Microsoft Visual C++.
+ # Microsoft Visual C++ or Intel C++ Compiler.
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
case $cc_basename in
- cl*)
- # Native MSVC
+ cl* | icl*)
+ # Native MSVC or ICC
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=yes
@@ -5602,7 +5625,7 @@
fi'
;;
*)
- # Assume MSVC wrapper
+ # Assume MSVC and ICC wrapper
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Tell ltmain to make .lib files, not .a files.
@@ -5861,6 +5884,7 @@
emximp -o $lib $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o
$output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
;;
osf3*)
@@ -6631,8 +6655,8 @@
cygwin* | mingw* | pw32* | cegcc*)
case $GXX,$cc_basename in
- ,cl* | no,cl*)
- # Native MSVC
+ ,cl* | no,cl* | ,icl* | no,icl*)
+ # Native MSVC or ICC
# hardcode_libdir_flag_spec is actually meaningless, as there is
# no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -6730,6 +6754,7 @@
emximp -o $lib $output_objdir/$libname.def'
_LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o
$output_objdir/${libname}_dll.a $output_objdir/$libname.def'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ _LT_TAGVAR(file_list_spec, $1)='@'
;;
dgux*)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/m4/ltoptions.m4 new/deadbeef-1.13/m4/ltoptions.m4
--- old/deadbeef-1.10/m4/ltoptions.m4 2016-10-01 09:13:30.000000000 +0200
+++ new/deadbeef-1.13/m4/ltoptions.m4 2019-06-07 15:10:15.000000000 +0200
@@ -1,6 +1,6 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Copyright (C) 2004-2005, 2007-2009, 2011-2018 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/m4/ltsugar.m4 new/deadbeef-1.13/m4/ltsugar.m4
--- old/deadbeef-1.10/m4/ltsugar.m4 2016-10-01 09:13:30.000000000 +0200
+++ new/deadbeef-1.13/m4/ltsugar.m4 2019-06-07 15:10:15.000000000 +0200
@@ -1,6 +1,6 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Copyright (C) 2004-2005, 2007-2008, 2011-2018 Free Software
# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/m4/ltversion.m4 new/deadbeef-1.13/m4/ltversion.m4
--- old/deadbeef-1.10/m4/ltversion.m4 2016-10-01 09:13:30.000000000 +0200
+++ new/deadbeef-1.13/m4/ltversion.m4 2019-06-07 15:10:15.000000000 +0200
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2018 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 4179 ltversion.m4
+# serial 4221 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.6])
-m4_define([LT_PACKAGE_REVISION], [2.4.6])
+m4_define([LT_PACKAGE_VERSION], [2.4.6.42-b88ce])
+m4_define([LT_PACKAGE_REVISION], [2.4.6.42])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.6'
-macro_revision='2.4.6'
+[macro_version='2.4.6.42-b88ce'
+macro_revision='2.4.6.42'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/m4/lt~obsolete.m4 new/deadbeef-1.13/m4/lt~obsolete.m4
--- old/deadbeef-1.10/m4/lt~obsolete.m4 2016-10-01 09:13:30.000000000 +0200
+++ new/deadbeef-1.13/m4/lt~obsolete.m4 2019-06-07 15:10:15.000000000 +0200
@@ -1,6 +1,6 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2018 Free Software
# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/src/mpris.c new/deadbeef-1.13/src/mpris.c
--- old/deadbeef-1.10/src/mpris.c 2016-05-03 21:51:16.000000000 +0200
+++ new/deadbeef-1.13/src/mpris.c 2019-06-07 15:06:50.000000000 +0200
@@ -56,7 +56,6 @@
//* - Shuffle status *
//***********************
static int handleEvent (uint32_t id, uintptr_t ctx, uint32_t p1, uint32_t p2) {
- static int lastState = -1;
DB_functions_t *deadbeef = mprisData.deadbeef;
switch (id) {
@@ -67,32 +66,25 @@
case DB_EV_TRACKINFOCHANGED:
debug("DB_EV_TRACKINFOCHANGED event received");
emitMetadataChanged(-1, &mprisData);
+ emitCanGoChanged(&mprisData);
+ emitSeeked(deadbeef->streamer_get_playpos());
+ break;
+ case DB_EV_SELCHANGED:
+ case DB_EV_PLAYLISTSWITCHED:
+ emitCanGoChanged(&mprisData);
break;
case DB_EV_SONGSTARTED:
debug("DB_EV_SONGSTARTED event received");
emitMetadataChanged(-1, &mprisData);
- emitPlaybackStatusChanged(lastState =
OUTPUT_STATE_PLAYING);
+ emitPlaybackStatusChanged(OUTPUT_STATE_PLAYING,
&mprisData);
break;
case DB_EV_PAUSED:
debug("DB_EV_PAUSED event received");
- debug("PlayPause toggled... last state %d", lastState);
- switch (lastState) {
- case -1:
- emitPlaybackStatusChanged(lastState =
deadbeef->get_output()->state());
- break;
- case OUTPUT_STATE_PLAYING:
- emitPlaybackStatusChanged(lastState =
OUTPUT_STATE_PAUSED);
- break;
- case OUTPUT_STATE_PAUSED:
- emitPlaybackStatusChanged(lastState =
OUTPUT_STATE_PLAYING);
- break;
- default:
- break;
- }
+ emitPlaybackStatusChanged(p1 ? OUTPUT_STATE_PAUSED :
OUTPUT_STATE_PLAYING, &mprisData);
break;
case DB_EV_STOP:
debug("DB_EV_STOP event received");
- emitPlaybackStatusChanged(OUTPUT_STATE_STOPPED);
+ emitPlaybackStatusChanged(OUTPUT_STATE_STOPPED,
&mprisData);
break;
case DB_EV_VOLUMECHANGED:
debug("DB_EV_VOLUMECHANGED event received");
@@ -124,8 +116,8 @@
.plugin.api_vmajor = DB_API_VERSION_MAJOR,\
.plugin.api_vminor = DB_API_VERSION_MINOR,
.plugin.type = DB_PLUGIN_MISC,
- .plugin.version_major = 1,
- .plugin.version_minor = 8,
+ .plugin.version_major = PLUGIN_VERSION_MAJOR,
+ .plugin.version_minor = PLUGIN_VERSION_MINOR,
.plugin.id = "mpris",
.plugin.name ="MPRISv2 plugin",
.plugin.descr = "Communicate with other applications using D-Bus.",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/src/mprisServer.c new/deadbeef-1.13/src/mprisServer.c
--- old/deadbeef-1.10/src/mprisServer.c 2016-10-01 09:23:50.000000000 +0200
+++ new/deadbeef-1.13/src/mprisServer.c 2019-06-07 15:06:50.000000000 +0200
@@ -86,23 +86,25 @@
int id;
DB_playItem_t *track = NULL;
DB_functions_t *deadbeef = mprisData->deadbeef;
- ddb_playlist_t *pl = deadbeef->plt_get_curr();
+ ddb_playlist_t *pl = NULL;
GVariant *tmp;
GVariantBuilder *builder =
g_variant_builder_new(G_VARIANT_TYPE("a{sv}"));
+ int playlistIndex;
- if (track_id < 0) {
- track = deadbeef->streamer_get_playing_track();
+ track = deadbeef->streamer_get_playing_track();
+ if (track) {
+ pl =
deadbeef->plt_get_for_idx(deadbeef->streamer_get_current_playlist());
id = deadbeef->plt_get_item_idx(pl, track, PL_MAIN);
- } else {
- track = deadbeef->plt_get_item_for_idx(pl, track_id, PL_MAIN);
- id = track_id;
+ playlistIndex = deadbeef->streamer_get_current_playlist();
+ }
+ if (pl) {
+ deadbeef->plt_unref(pl);
}
- deadbeef->plt_unref(pl);
if (track != NULL) {
char buf[500];
int buf_size = sizeof(buf);
- int64_t duration =
(int64_t)deadbeef->pl_get_item_duration(track) * 1000000;
+ int64_t duration = deadbeef->pl_get_item_duration(track) *
1000000;
const char *album = deadbeef->pl_find_meta(track, "album");
const char *albumArtist = deadbeef->pl_find_meta(track,
"albumartist");
if (albumArtist == NULL)
@@ -117,7 +119,6 @@
const char *trackNumber = deadbeef->pl_find_meta(track,
"track");
const char *uri = deadbeef->pl_find_meta(track, ":URI");
const char *genres = deadbeef->pl_find_meta(track, "genre");
- const int playlistIndex = deadbeef->plt_get_curr_idx();
deadbeef->pl_lock();
@@ -126,7 +127,9 @@
g_variant_builder_add(builder, "{sv}", "mpris:trackid",
g_variant_new("o", buf));
debug("get Metadata duration: %" PRId64, duration);
- g_variant_builder_add(builder, "{sv}", "mpris:length",
g_variant_new("x", duration));
+ if (duration > 0) {
+ g_variant_builder_add(builder, "{sv}", "mpris:length",
g_variant_new("x", duration));
+ }
debug("get Metadata album: %s", album);
if (album != NULL) {
@@ -241,6 +244,9 @@
deadbeef->pl_unlock();
deadbeef->pl_item_unref(track);
+ } else {
+ debug("get Metadata trackid:
/org/mpris/MediaPlayer2/TrackList/NoTrack");
+ g_variant_builder_add(builder, "{sv}", "mpris:trackid",
g_variant_new("o", "/org/mpris/MediaPlayer2/TrackList/NoTrack"));
}
tmp = g_variant_builder_end(builder);
g_variant_builder_unref(builder);
@@ -248,6 +254,48 @@
return tmp;
}
+gboolean deadbeef_can_seek(DB_functions_t *deadbeef) {
+ gboolean can_seek = FALSE;
+ DB_output_t *output = deadbeef->get_output();
+ if (output) {
+ DB_playItem_t *track = deadbeef->streamer_get_playing_track();
+ if (track) {
+ can_seek = deadbeef->pl_get_item_duration(track) > 0;
+ deadbeef->pl_item_unref(track);
+ }
+ }
+ return can_seek;
+}
+
+static gboolean deadbeef_hasselectedorplayingtrack(struct MprisData *userData,
int offset) {
+ DB_functions_t *deadbeef = ((struct MprisData *)userData)->deadbeef;
+ ddb_playlist_t *pl = NULL;
+ DB_playItem_t *playing_track = deadbeef->streamer_get_playing_track();
+ int idx;
+ if (playing_track) {
+ pl =
deadbeef->plt_get_for_idx(deadbeef->streamer_get_current_playlist());
+ if (pl) {
+ idx = deadbeef->plt_get_item_idx(pl, playing_track,
PL_MAIN) + offset;
+ }
+ deadbeef->pl_item_unref(playing_track);
+ } else {
+ pl = deadbeef->plt_get_curr();
+ if (pl) {
+ idx = deadbeef->plt_get_cursor(pl, PL_MAIN) + offset;
+ }
+ }
+
+ if (pl) {
+ DB_playItem_t *track = deadbeef->plt_get_item_for_idx(pl, idx,
PL_MAIN);
+ deadbeef->plt_unref(pl);
+ if (track) {
+ deadbeef->pl_item_unref(track);
+ return TRUE;
+ }
+ }
+ return FALSE;
+}
+
static void onRootMethodCallHandler(GDBusConnection *connection, const char
*sender, const char *objectPath,
const char *interfaceName, const char
*methodName, GVariant *parameters,
GDBusMethodInvocation *invocation, void
*userData) {
@@ -258,6 +306,13 @@
g_dbus_method_invocation_return_value(invocation, NULL);
deadbeef->sendmessage(DB_EV_TERMINATE, 0, 0, 0);
} else if (strcmp(methodName, "Raise") == 0) {
+ GDesktopAppInfo *dskapp = g_desktop_app_info_new
("deadbeef.desktop");
+ if (dskapp) {
+ g_app_info_launch ((GAppInfo *) dskapp, NULL, NULL,
NULL);
+ g_object_unref (dskapp);
+ } else {
+ deadbeef->sendmessage (DB_EV_ACTIVATED, 0, 0, 0);
+ }
g_dbus_method_invocation_return_value(invocation, NULL);
} else {
debug("Error! Unsupported method. %s.%s", interfaceName,
methodName);
@@ -275,7 +330,7 @@
if (strcmp(propertyName, "CanQuit") == 0) {
result = g_variant_new_boolean(TRUE);
} else if (strcmp(propertyName, "CanRaise") == 0) {
- result = g_variant_new_boolean(FALSE);
+ result = g_variant_new_boolean(TRUE);
} else if (strcmp(propertyName, "HasTrackList") == 0) {
result = g_variant_new_boolean(FALSE);
} else if (strcmp(propertyName, "Identity") == 0) {
@@ -376,7 +431,6 @@
}
deadbeef->pl_item_unref(track);
- emitSeeked(newPositionInMilliseconds);
}
g_dbus_method_invocation_return_value(invocation, NULL);
} else if (strcmp(methodName, "SetPosition") == 0) {
@@ -388,9 +442,9 @@
DB_playItem_t *track = deadbeef->streamer_get_playing_track();
if (track != NULL) {
- ddb_playlist_t *pl = deadbeef->plt_get_curr();
+ ddb_playlist_t *pl =
deadbeef->plt_get_for_idx(deadbeef->streamer_get_current_playlist());
int playid = deadbeef->plt_get_item_idx(pl, track,
PL_MAIN);
- int playlistIndex = deadbeef->plt_get_curr_idx();
+ int playlistIndex =
deadbeef->streamer_get_current_playlist();
char buf[200];
sprintf(buf, "/DeaDBeeF/%d/%d", playlistIndex, playid);
if (strcmp(buf, trackId) == 0) {
@@ -398,7 +452,6 @@
}
deadbeef->pl_item_unref(track);
deadbeef->plt_unref(pl);
- emitSeeked(deadbeef->streamer_get_playpos() * 1000.0);
}
g_dbus_method_invocation_return_value(invocation, NULL);
} else if (strcmp(methodName, "OpenUri") == 0) {
@@ -448,6 +501,8 @@
result = g_variant_new_string("Stopped");
break;
}
+ } else {
+ result = g_variant_new_string("Stopped");
}
} else if (strcmp(propertyName, "LoopStatus") == 0) {
int loop = deadbeef->conf_get_int("playback.loop",
PLAYBACK_MODE_LOOP_ALL);
@@ -494,15 +549,15 @@
deadbeef->pl_item_unref(track);
}
} else if (strcmp(propertyName, "CanGoNext") == 0) {
- result = g_variant_new_boolean(TRUE);
+ result =
g_variant_new_boolean(deadbeef_hasselectedorplayingtrack(userData, 1));
} else if (strcmp(propertyName, "CanGoPrevious") == 0) {
- result = g_variant_new_boolean(TRUE);
+ result =
g_variant_new_boolean(deadbeef_hasselectedorplayingtrack(userData, -1));
} else if (strcmp(propertyName, "CanPlay") == 0) {
- result = g_variant_new_boolean(TRUE);
+ result =
g_variant_new_boolean(deadbeef_hasselectedorplayingtrack(userData, 0));
} else if (strcmp(propertyName, "CanPause") == 0) {
result = g_variant_new_boolean(TRUE);
} else if (strcmp(propertyName, "CanSeek") == 0) {
- result = g_variant_new_boolean(TRUE);
+ result = g_variant_new_boolean(deadbeef_can_seek(deadbeef));
} else if (strcmp(propertyName, "CanControl") == 0) {
result = g_variant_new_boolean(TRUE);
}
@@ -593,6 +648,7 @@
GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
g_variant_builder_add(builder, "{sv}", "Metadata",
getMetadataForTrack(trackId, userData));
+
GVariant *signal[] = {
g_variant_new_string(PLAYER_INTERFACE),
g_variant_builder_end(builder),
@@ -605,9 +661,29 @@
g_variant_builder_unref(builder);
}
-void emitPlaybackStatusChanged(int status) {
+void emitCanGoChanged(struct MprisData *userData) {
GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
+ g_variant_builder_add(builder, "{sv}", "CanPlay",
g_variant_new_boolean(deadbeef_hasselectedorplayingtrack(userData, 0)));
+ g_variant_builder_add(builder, "{sv}", "CanGoNext",
g_variant_new_boolean(deadbeef_hasselectedorplayingtrack(userData, 1)));
+ g_variant_builder_add(builder, "{sv}", "CanGoPrevious",
g_variant_new_boolean(deadbeef_hasselectedorplayingtrack(userData, -1)));
+
+ GVariant *signal[] = {
+ g_variant_new_string(PLAYER_INTERFACE),
+ g_variant_builder_end(builder),
+ g_variant_new_strv(NULL, 0)
+ };
+
+ g_dbus_connection_emit_signal(globalConnection, NULL, OBJECT_NAME,
PROPERTIES_INTERFACE, "PropertiesChanged",
+ g_variant_new_tuple(signal, 3), NULL);
+
+ g_variant_builder_unref(builder);
+}
+
+void emitPlaybackStatusChanged(int status, struct MprisData *userData) {
+ GVariantBuilder *builder = g_variant_builder_new(G_VARIANT_TYPE_ARRAY);
+ DB_functions_t *deadbeef = ((struct MprisData *)userData)->deadbeef;
+
switch (status) {
case OUTPUT_STATE_PLAYING:
g_variant_builder_add(builder, "{sv}",
"PlaybackStatus", g_variant_new_string("Playing"));
@@ -620,6 +696,10 @@
g_variant_builder_add(builder, "{sv}",
"PlaybackStatus", g_variant_new_string("Stopped"));
break;
}
+
+ g_variant_builder_add(builder, "{sv}", "CanSeek",
g_variant_new_boolean(deadbeef_can_seek(deadbeef)));
+
+
GVariant *signal[] = {
g_variant_new_string(PLAYER_INTERFACE),
g_variant_builder_end(builder),
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude
config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4
--exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh
old/deadbeef-1.10/src/mprisServer.h new/deadbeef-1.13/src/mprisServer.h
--- old/deadbeef-1.10/src/mprisServer.h 2015-10-16 23:51:40.000000000 +0200
+++ new/deadbeef-1.13/src/mprisServer.h 2019-06-07 15:06:50.000000000 +0200
@@ -2,6 +2,7 @@
#define MPRISSERVER_H_
#include <gio/gio.h>
+#include <gio/gdesktopappinfo.h>
#define DDB_API_LEVEL 7
#define DDB_WARN_DEPRECATED 1
@@ -20,8 +21,9 @@
void emitVolumeChanged(float);
void emitSeeked(float);
void emitMetadataChanged(int, struct MprisData*);
-void emitPlaybackStatusChanged(int);
+void emitPlaybackStatusChanged(int, struct MprisData*);
void emitLoopStatusChanged(int);
void emitShuffleStatusChanged(int);
+void emitCanGoChanged(struct MprisData *);
#endif
