From 36f770af778d78b096d26ffeb2a11060b34a8601 Mon Sep 17 00:00:00 2001 From: Duilio Protti Date: Fri, 12 Feb 2016 16:25:56 -0300 Subject: [PATCH] Update to Audacious 3.5 (which have splitted D-BUS remote control functionality into a new separate library Audclient) --- README.md | 5 +++-- configure.ac | 12 ++++++++---- src/Makefile.am | 4 ++-- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 4e60464..2fee60a 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,8 @@ playing sound. Requirements ------------ -- Audacious >= 3.1 (http://audacious-media-player.org/) +- Audacious >= 3.5 (http://audacious-media-player.org/) +- Audclient >= 3.5 (Audacious D-BUS remote control library) - SDL >= 1.0.6 - Glib >= 2.8 - Gtk+ >= 2.8 @@ -92,7 +93,7 @@ Authors ------- - Julien Carme (c) 2000 Original author -- Duilio Protti (C) 2004 - 2013 Actual maintainer +- Duilio Protti (C) 2004 - Present : Current maintainer - John Lightsey (C) 2004 Portability fixes and GPL License compliance - Jean Delvare (C) 2004 Some nice patches - Will Tatam (C) 2004 Online source RPMs diff --git a/configure.ac b/configure.ac index 7b28f3c..4047e20 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ ## Process this file with autoconf to produce a configure script. AC_PREREQ(2.61) -AC_INIT([Infinity plugin],[0.8.0beta1],[dprotti@users.sourceforge.net],[infinity-plugin-4-audacious]) +AC_INIT([Infinity plugin],[0.8.0beta2],[dprotti@users.sourceforge.net],[infinity-plugin-4-audacious]) AM_INIT_AUTOMAKE([1.9.0 dist-bzip2]) INF_MSG_MMX_NOT_ALLOWED=" @@ -81,10 +81,14 @@ PKG_CHECK_MODULES(DBUSGLIB1, dbus-glib-1 >= 0.92,,) AC_SUBST(DBUSGLIB1) AC_SUBST(DBUSGLIB1) -PKG_CHECK_MODULES(AUDACIOUS, audacious >= 3.1,,) +PKG_CHECK_MODULES(AUDACIOUS, audacious >= 3.5,,) AC_SUBST(AUDACIOUS_LIBS) AC_SUBST(AUDACIOUS_CFLAGS) +PKG_CHECK_MODULES(AUDCLIENT, audclient >= 3.5,,) +AC_SUBST(AUDCLIENT_LIBS) +AC_SUBST(AUDCLIENT_CFLAGS) + AC_PATH_PROG(SDL_CONFIG, [sdl-config], [no]) if test x$SDL_CONFIG = xno ; then AC_MSG_ERROR([ @@ -224,9 +228,9 @@ AC_CONFIG_FILES([Makefile AC_OUTPUT echo " -========================================================= +============================================================== Infinity Plugin for the Audacious Player -- version $VERSION -========================================================= +============================================================== Install path : ${libdir} Compiler : ${CC} diff --git a/src/Makefile.am b/src/Makefile.am index f1207e6..5754a74 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -10,11 +10,11 @@ infinity_datadir = @datadir@ localedir = $(infinity_datadir)/locale DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@ -AM_CFLAGS = @CFLAGS@ @AUDACIOUS_CFLAGS@ @SDL_CFLAGS@ @GTK_CFLAGS@\ +AM_CFLAGS = @CFLAGS@ @AUDACIOUS_CFLAGS@ @AUDCLIENT_CFLAGS@ @SDL_CFLAGS@ @GTK_CFLAGS@\ @GLIB_CFLAGS@ @DBUSGLIB1_CFLAGS@ $(INF_CFLAGS_EXTRA) libinfinite_la_LDFLAGS = -export-dynamic -avoid-version -libinfinite_la_LIBADD = @AUDACIOUS_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @DBUSGLIB1_LIBS@ +libinfinite_la_LIBADD = @AUDACIOUS_LIBS@ @AUDCLIENT_LIBS@ @SDL_LIBS@ @GTK_LIBS@ @GLIB_LIBS@ @DBUSGLIB1_LIBS@ libinfinite_la_SOURCES = \ main.c \ renderer.c renderer.h\