Control: tags -1 + patch On 2015-12-13 18:54:25, Sebastian Ramacher wrote: > Source: imms > Version: 3.1.0~svn301-3.1 > Severity: important > > imms FTBFS against audacious-dev 3.6.2-1 (currently in NEW): > | checking for audacious... no > | checking for dbus_glib... yes > | checking audacious/plugin.h usability... no > | checking audacious/plugin.h presence... no > | checking for audacious/plugin.h... no > | configure: error: Not building audacious plugin > | make: *** [configure-stamp] Error 1 > | debian/rules:38: recipe for target 'configure-stamp' failed > | dpkg-buildpackage: error: debian/rules build gave error exit status 2 > > For the full build log see > https://people.debian.org/~sramacher/logs/imms_3.1.0~svn301-3.1_amd64-20151213-1845.log
The new upstream maintainer included a patch to port imms to Audacious 3.6+ [1]. See the attached debdiff for details. Cheers [1] https://github.com/martingkelly/imms/commit/f4c1da73bf6463f17669faf73c64898b69253d08 -- Sebastian Ramacher
diff -Nru imms-3.1.0~svn301/debian/changelog imms-3.1.0~svn301/debian/changelog --- imms-3.1.0~svn301/debian/changelog 2014-09-10 10:55:51.000000000 +0200 +++ imms-3.1.0~svn301/debian/changelog 2015-12-15 01:35:10.000000000 +0100 @@ -1,3 +1,12 @@ +imms (3.1.0~svn301-3.2) UNRELEASED; urgency=medium + + * Non-maintainer upload. + * debian/control: Tighten audacious-dev in Build-Depends to (>= 3.6). + * debian/patches/audacious-3.6.patch: Upstream patch to port imms to + Audacious 3.6+ (Closes: #807843) + + -- Sebastian Ramacher <[email protected]> Tue, 15 Dec 2015 01:33:55 +0100 + imms (3.1.0~svn301-3.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru imms-3.1.0~svn301/debian/control imms-3.1.0~svn301/debian/control --- imms-3.1.0~svn301/debian/control 2014-09-10 10:52:55.000000000 +0200 +++ imms-3.1.0~svn301/debian/control 2015-12-15 01:31:47.000000000 +0100 @@ -4,7 +4,7 @@ Maintainer: Artur R. Czechowski <[email protected]> Standards-Version: 3.9.4 Homepage: http://imms.luminal.org/ -Build-Depends: debhelper (>> 5.0.0), audacious-dev (>= 3.5), libsqlite3-dev (>=3.2.2), libpcre3-dev (>=4.3), libtag1-dev, libvorbis-dev (>=1.0), libfftw3-dev, libglib2.0-dev, zlib1g-dev, libxss-dev, libtorch3-dev, libglade2-dev, autoconf, automake, xsltproc, docbook-xsl, libaudclient-dev +Build-Depends: debhelper (>> 5.0.0), audacious-dev (>= 3.6), libsqlite3-dev (>=3.2.2), libpcre3-dev (>=4.3), libtag1-dev, libvorbis-dev (>=1.0), libfftw3-dev, libglib2.0-dev, zlib1g-dev, libxss-dev, libtorch3-dev, libglade2-dev, autoconf, automake, xsltproc, docbook-xsl, libaudclient-dev Package: imms-common Architecture: any diff -Nru imms-3.1.0~svn301/debian/patches/audacious-3.6.patch imms-3.1.0~svn301/debian/patches/audacious-3.6.patch --- imms-3.1.0~svn301/debian/patches/audacious-3.6.patch 1970-01-01 01:00:00.000000000 +0100 +++ imms-3.1.0~svn301/debian/patches/audacious-3.6.patch 2015-12-15 01:33:37.000000000 +0100 @@ -0,0 +1,338 @@ +Description: Port to Audacious 3.6+ +Origin: upstream, + https://github.com/martingkelly/imms/commit/f4c1da73bf6463f17669faf73c64898b69253d08 +Bug-Debian: https://bugs.debian.org/807843 +Last-Update: 2015-12-15 + +--- imms-3.1.0~svn301.orig/clients/audacious/audplugin.cc ++++ imms-3.1.0~svn301/clients/audacious/audplugin.cc +@@ -24,56 +24,77 @@ + #include <iostream> + #include <time.h> + +-extern "C" { +-#include <audacious/plugin.h> +-#include <audacious/audctrl.h> +-#include <audacious/drct.h> + #include <libaudcore/audstrings.h> +-#include <audacious/playlist.h> +-#include <audacious/misc.h> +-} ++#include <libaudcore/drct.h> ++#include <libaudcore/mainloop.h> ++#include <libaudcore/playlist.h> ++#include <libaudcore/plugin.h> ++#include <libaudcore/runtime.h> + + #include "immsconf.h" +-#include "cplugin.h" + #include "immsutil.h" + #include "clientstub.h" + ++#define USE_XIDLE true ++ + using std::string; +-using std::cerr; +-using std::endl; ++ ++class IMMSPlugin : public GeneralPlugin ++{ ++public: ++ static const char about[]; ++ ++ static constexpr PluginInfo info = { ++ "IMMS", ++ nullptr, ++ about ++ }; ++ ++ constexpr IMMSPlugin() : GeneralPlugin(info, false) {} ++ ++ bool init(); ++ void cleanup(); ++}; ++ ++IMMSPlugin aud_plugin_instance; ++ ++const char IMMSPlugin::about[] = ++ "Intelligent Multimedia Management System\n\n" ++ "IMMS is an intelligent playlist plugin for Audacious that tracks your " ++ "listening patterns and dynamically adapts to your taste.\n\n" ++ "It is incredibly unobtrusive and easy to use as it requires no direct " ++ "user interaction.\n\n" ++ "For more information please visit:\n" ++ "http://www.luminal.org/wiki/index.php/IMMS\n\n"; ++ "Written by Michael \"mag\" Grigoriev <[email protected]>"; + + // Local vars ++static QueuedFunc timer; ++ + int cur_plpos, next_plpos = -1, pl_length = -1, + last_plpos = -1, last_song_length = -1; + int good_length = 0, song_length = 0, +- busy = 0, just_enqueued = 0, ending = 0; +-bool shuffle = true, select_pending = false, xidle_val = false; ++ just_enqueued = 0, ending = 0; ++bool shuffle = true, select_pending = false; + + string cur_path = "", last_path = ""; + ++static void do_checks(void *); ++ + // Wrapper that frees memory + string imms_get_playlist_item(int at) + { +- if (at > pl_length - 1) +- return ""; +- char* uri = 0; +- while (!uri) uri = aud_playlist_entry_get_filename(aud_playlist_get_active (), at); +- string result = uri; +- if(uri) str_unref(uri); +- +- gchar* realfn = g_filename_from_uri(result.c_str(), NULL, NULL); +- char* decoded = g_filename_to_utf8(realfn ? realfn : result.c_str(), +- -1, NULL, NULL, NULL); +- if (decoded) result = decoded; +- free(realfn); +- free(decoded); +- return result; ++ int pl = aud_playlist_get_playing(); ++ String uri = aud_playlist_entry_get_filename(pl, at); ++ StringBuf fn = uri ? uri_to_filename(uri, false) : StringBuf(); ++ return fn ? string(fn) : ""; + } + + static void player_reset_selection() + { +- gint playlist = aud_playlist_get_active(); +- aud_playlist_queue_delete (playlist, aud_playlist_queue_find_entry(playlist, next_plpos), 1); ++ int pl = aud_playlist_get_playing(); ++ int qp = aud_playlist_queue_find_entry(pl, next_plpos); ++ aud_playlist_queue_delete(pl, qp, 1); + next_plpos = -1; + } + +@@ -101,7 +122,8 @@ struct FilterOps + static void set_next(int next) + { + next_plpos = next; +- aud_playlist_queue_insert(aud_playlist_get_active (), -1, next_plpos); ++ int pl = aud_playlist_get_playing(); ++ aud_playlist_queue_insert(pl, -1, next_plpos); + select_pending = false; + just_enqueued = 2; + } +@@ -115,28 +137,22 @@ struct FilterOps + } + static int get_length() + { +- return aud_playlist_entry_count(aud_playlist_get_active()); ++ int pl = aud_playlist_get_playing(); ++ return aud_playlist_entry_count(pl); + } +-}; ++}; + +-void imms_setup(int use_xidle) ++bool IMMSPlugin::init() + { +- xidle_val = use_xidle; +- if (imms) +- imms->setup(use_xidle); ++ imms = new XMMSClient(); ++ imms->setup(USE_XIDLE); ++ timer.start(200, do_checks, nullptr); ++ return true; + } + +-void imms_init() +-{ +- if (!imms) +- { +- imms = new XMMSClient(); +- busy = 0; +- } +-} +- +-void imms_cleanup(void) ++void IMMSPlugin::cleanup() + { ++ timer.stop(); + delete imms; + imms = 0; + } +@@ -162,10 +178,10 @@ static void do_song_change() + next_plpos = (cur_plpos + 1) % pl_length; + } + +-static void check_playlist() ++static void check_playlist(int pl) + { + // update playlist length +- int new_pl_length = aud_playlist_entry_count(aud_playlist_get_active()); ++ int new_pl_length = aud_playlist_entry_count(pl); + if (new_pl_length != pl_length) + { + pl_length = new_pl_length; +@@ -182,19 +198,20 @@ static void check_time() + ? ending < 10 : -(ending > 0); + } + +-void do_checks() ++static void do_checks(void *) + { +- check_playlist(); ++ int pl = aud_playlist_get_playing(); ++ check_playlist(pl); + + if (imms->check_connection()) + { + select_pending = false; +- imms->setup(xidle_val); +- imms->playlist_changed(pl_length = +- aud_playlist_entry_count(aud_playlist_get_active())); ++ imms->setup(USE_XIDLE); ++ pl_length = aud_playlist_entry_count(pl); ++ imms->playlist_changed(pl_length); + if (aud_drct_get_playing()) + { +- last_plpos = cur_plpos = aud_playlist_get_position(aud_playlist_get_active()); ++ last_plpos = cur_plpos = aud_playlist_get_position(pl); + last_path = cur_path = imms_get_playlist_item(cur_plpos); + imms->start_song(cur_plpos, cur_path); + } +@@ -204,10 +221,11 @@ void do_checks() + if (!aud_drct_get_playing()) + return; + +- cur_plpos = aud_playlist_get_position(aud_playlist_get_active()); +- ++ cur_plpos = aud_playlist_get_position(pl); ++ + // check if xmms is reporting the song length correctly +- song_length = aud_playlist_entry_get_length(aud_playlist_get_active(), cur_plpos, FALSE); ++ Tuple tu = aud_playlist_entry_get_tuple(pl, cur_plpos); ++ song_length = tu.get_int(Tuple::Length); + if (song_length > 1000) + good_length++; + +@@ -223,15 +241,15 @@ void do_checks() + if (last_path != cur_path) + { + do_song_change(); +- gint playlist = aud_playlist_get_active(); +- aud_playlist_queue_delete(playlist, aud_playlist_queue_find_entry(playlist, next_plpos), 1); ++ int qp = aud_playlist_queue_find_entry(pl, next_plpos); ++ aud_playlist_queue_delete(pl, qp, 1); + return; + } + } + + check_time(); + +- bool newshuffle = aud_get_bool(NULL, "shuffle"); ++ bool newshuffle = aud_get_bool(nullptr, "shuffle"); + if (!newshuffle && shuffle) + player_reset_selection(); + shuffle = newshuffle; +@@ -239,19 +257,9 @@ void do_checks() + if (!shuffle) + return; + +- int qlength = aud_playlist_queue_count(aud_playlist_get_active()); ++ int qlength = aud_playlist_queue_count(pl); + if (qlength > 1) + player_reset_selection(); + else if (!qlength) + enqueue_next(); + } +- +-void imms_poll() +-{ +- if (busy) +- return; +- +- ++busy; +- do_checks(); +- --busy; +-} +--- imms-3.1.0~svn301.orig/clients/audacious/rules.mk ++++ imms-3.1.0~svn301/clients/audacious/rules.mk +@@ -16,22 +16,12 @@ + # along with this program; if not, write to the Free Software + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + # +-libaudaciousimms.so: audplugindef.o audplugin.o audaciousinterface.o clientstubbase.o libimmscore.a +-libaudaciousimms-LIBS = $(AUDACIOUSLDFLAGS) ++libaudaciousimms.so: audplugin.o clientstubbase.o libimmscore.a ++libaudaciousimms-LIBS = $(AUDACIOUSLDFLAGS) $(GLIB2LDFLAGS) + +-audaciousinterface-CPPFLAGS=$(AUDACIOUSCPPFLAGS) +-audplugindef-CPPFLAGS=$(AUDACIOUSCPPFLAGS) +-audplugin-CPPFLAGS=$(AUDACIOUSCPPFLAGS) ++audplugin-CPPFLAGS=$(AUDACIOUSCPPFLAGS) $(GLIB2CPPFLAGS) + +-audaciousinterface.o: bmpinterface.c +- $(call compile, $(CC), $<, $@, $($*-CFLAGS) $(CFLAGS) $($*-CPPFLAGS) $(CPPFLAGS)) +- +-AUDACIOUSDESTDIR="" +-ifeq ($(shell id -u), 0) +- AUDACIOUSDESTDIR=`pkg-config --variable=general_plugin_dir audacious` +-else +- AUDACIOUSDESTDIR=${HOME}/.audacious/Plugins/General +-endif ++AUDACIOUSDESTDIR=`pkg-config --variable=plugin_dir audacious` + + libaudaciousimms.so_install: libaudaciousimms.so +- ${INSTALL} -D $^ $(AUDACIOUSDESTDIR)/libaudaciousimms.so ++ ${INSTALL} -D $^ $(AUDACIOUSDESTDIR)/General/libaudaciousimms.so +--- imms-3.1.0~svn301.orig/configure.ac ++++ imms-3.1.0~svn301/configure.ac +@@ -356,33 +356,7 @@ else + fi + fi + +-PKG_CHECK_MODULES(audacious, [audacious >= 2.4 gtk+-3.0], [], [with_audacious=no]) +-PKG_CHECK_MODULES(dbus_glib, [dbus-glib-1 >= 0.70], [], [with_audacious=no]) +- +-LIBS="$audacious_LIBS $dbus_glib_LIBS" +-CPPFLAGS="$audacious_CFLAGS $dbus_glib_CFLAGS" +- +-AC_CHECK_HEADERS(audacious/plugin.h,, [with_audacious=no]) +- +-if test "$with_audacious" != "no"; then +- AC_LANG_PUSH(C) +-dnl AC_CHECK_HEADERS(gtk/gtk.h,, [with_audacious=no]) +- AC_CHECK_HEADERS(audacious/drct.h,, [with_audacious=no]) +- AC_MSG_CHECKING([for aud_playlist_queue_insert in -laudcore]) +- AC_TRY_LINK([#include <audacious/drct.h> +- #include <audacious/plugin.h> +- #include <audacious/dbus.h> +- #include <audacious/playlist.h> +- +- AUD_GENERAL_PLUGIN();], +- [aud_playlist_queue_insert(aud_playlist_get_active(),-1,0)], +- [AC_MSG_RESULT(yes)], +- [with_audacious="no" +- AC_MSG_RESULT(no)]); +- AC_DEFINE(AUDACIOUS, 1, [Define for Audacious 2.5 support]) +- audacious_CFLAGS="$audacious_CFLAGS -DAUDACIOUS" +- AC_LANG_POP(C) +-fi ++PKG_CHECK_MODULES(audacious, [audacious >= 3.6], [], [with_audacious=no]) + + if test "$with_audacious" = "no"; then + AC_MSG_ERROR([Not building audacious plugin]) +--- imms-3.1.0~svn301.orig/vars.mk.in ++++ imms-3.1.0~svn301/vars.mk.in +@@ -48,8 +48,8 @@ CXXFLAGS=@CXXFLAGS@ -fno-rtti + GLIB2LDFLAGS=`pkg-config glib-2.0 --libs` + GLIB1LDFLAGS=`pkg-config glib --libs` + +-AUDACIOUSCPPFLAGS=@audacious_CFLAGS@ @dbus_glib_CFLAGS@ -I../clients/xmms/ +-AUDACIOUSLDFLAGS=@audacious_LIBS@ @dbus_glib_LIBS@ ++AUDACIOUSCPPFLAGS=@audacious_CFLAGS@ -std=c++11 ++AUDACIOUSLDFLAGS=@audacious_LIBS@ + + LDFLAGS=-L. @LIBS@ @LDFLAGS@ + diff -Nru imms-3.1.0~svn301/debian/patches/series imms-3.1.0~svn301/debian/patches/series --- imms-3.1.0~svn301/debian/patches/series 2013-08-27 21:41:17.000000000 +0200 +++ imms-3.1.0~svn301/debian/patches/series 2015-12-15 01:32:10.000000000 +0100 @@ -4,3 +4,4 @@ local-version.patch sox-deprecated-options.patch hardening-flags.patch +audacious-3.6.patch
signature.asc
Description: PGP signature
