debian/0000755000000000000000000000000012122647135007171 5ustar debian/patches/0000755000000000000000000000000012122650036010612 5ustar debian/patches/volume-control-fix.patch0000644000000000000000000000376111476221555015426 0ustar Description: Do not assume that the volume control has a left channel (fixes muting of playback on launch). Author: Benjamin Drung Bug: http://bugs.xmms2.xmms.se/view.php?id=1883 Bug-Ubuntu: https://bug.launchpad.net/bugs/292822 diff --git a/gxmms2src/gxmms2.c b/gxmms2src/gxmms2.c index a257fc1..b60a789 100644 --- a/gxmms2src/gxmms2.c +++ b/gxmms2src/gxmms2.c @@ -108,25 +108,41 @@ static void change_volume(gint volume_change, gint initial_volume) xmms2ctrl_volume_set(connection, volume); } -static int bc_handle_volume_change(xmmsv_t *val, void *userdata) +static void bc_handle_volume_change_channel(const char *key, + xmmsv_t *value, + void *user_data) { gint32 volume; gchar buf[64]; - xmmsv_dict_entry_get_int(val, "left", &volume); - wejpvolume_set_volume(WEJPVOLUME(wv), volume); - snprintf(buf, 63, "Volume: %d %%", volume); - wejpscroller_shortmessage_show(WEJPSCROLLER(scroller), buf, 50); + if(xmmsv_get_type(value) == XMMSV_TYPE_INT32) { + volume = *(int32_t*)value; + wejpvolume_set_volume(WEJPVOLUME(wv), volume); + snprintf(buf, 63, "Volume: %d %%", volume); + wejpscroller_shortmessage_show(WEJPSCROLLER(scroller), buf, 50); + } +} + +static int bc_handle_volume_change(xmmsv_t *val, void *userdata) +{ + xmmsv_dict_foreach(val, bc_handle_volume_change_channel, NULL); return FALSE; } -static int n_volume_init(xmmsv_t *val, void *userdata) +static void n_volume_init_channel(const char *key, xmmsv_t *value, void *user_data) { gint32 volume; - xmmsv_dict_entry_get_int(val, "left", &volume); - wejpvolume_set_volume(WEJPVOLUME(wv), volume); - change_volume(0, volume); + if(xmmsv_get_type(value) == XMMSV_TYPE_INT32) { + volume = *(int32_t*)value; + wejpvolume_set_volume(WEJPVOLUME(wv), volume); + change_volume(0, volume); + } +} + +static int n_volume_init(xmmsv_t *val, void *userdata) +{ + xmmsv_dict_foreach(val, n_volume_init_channel, NULL); return FALSE; } debian/patches/cppflags.patch0000644000000000000000000000050412122650036013431 0ustar Description: Add CPPFLAGS (for hardening). Author: Benjamin Drung --- a/Makefile +++ b/Makefile @@ -46,7 +46,7 @@ rm -f $(OBJS) $(KRELLOBJS) core *.so* *.bak *~ gxmms2 %.o: %.c - $(CC) $(CFLAGS) -c -o $@ $< + $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $< install: install_gxmms2 install_gkrellxmms2 debian/patches/link-x11.patch0000644000000000000000000000154311476221555013215 0ustar Description: Link against X11, because gxmms2src/eggtrayicon.c uses X11 functions. This fixes the FTBFS with binutils-gold. Author: Benjamin Drung Bug-Debian: http://bugs.debian.org/554764 --- gxmms2-0.7.1.orig/Makefile +++ gxmms2-0.7.1/Makefile @@ -10,10 +10,12 @@ GTK_CFLAGS=$(shell pkg-config gtk+-2.0 - GTK_LIB=$(shell pkg-config gtk+-2.0 --libs) XMMS2_CFLAGS=$(shell pkg-config xmms2-client xmms2-client-glib --cflags) XMMS2_LIB=$(shell pkg-config xmms2-client xmms2-client-glib --libs) +X11_CFLAGS=$(shell pkg-config x11 --cflags) +X11_LIB=$(shell pkg-config x11 --libs) CFLAGS ?= -O2 -CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) -I. $(CFLAGS) -LIBS = $(GTK_LIB) $(XMMS2_LIB) +CFLAGS := -Wall -fPIC $(GTK_CFLAGS) $(XMMS2_CFLAGS) $(X11_CFLAGS) -I. $(CFLAGS) +LIBS = $(GTK_LIB) $(XMMS2_LIB) $(X11_LIB) KRELLLFLAGS=-shared debian/patches/series0000644000000000000000000000006712122647773012050 0ustar volume-control-fix.patch link-x11.patch cppflags.patch debian/copyright0000644000000000000000000000245612122646750011135 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: gxmms2 Upstream-Contact: Johannes Heimansberg Source: http://wejp.k.vu/projects/xmms2/ Files: * Copyright: 2005-2010, Johannes Heimansberg License: GPL-2 This package 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; version 2. . This package 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 package; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. . On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-2' file. Files: debian/* Copyright: 2006-2008, Florian Ragwitz 2009-2013, Benjamin Drung License: GPL-2+ On Debian systems the full text of the GNU General Public License can be found in the `/usr/share/common-licenses/GPL-2' file. debian/gbp.conf0000644000000000000000000000006511476221555010616 0ustar [DEFAULT] pristine-tar = True [git-dch] meta = True debian/control0000644000000000000000000000250712122646611010576 0ustar Source: gxmms2 Section: sound Priority: optional Maintainer: Florian Ragwitz Uploaders: Anders Waldenborg , Benjamin Drung Build-Depends: debhelper (>= 9), gkrellm, libgtk2.0-dev, libx11-dev, libxmmsclient-glib-dev (>= 0.7DrNo), pkg-config Standards-Version: 3.9.4 Vcs-Git: git://anonscm.debian.org/pkg-xmms2/gxmms2 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xmms2/gxmms2.git Homepage: http://wejp.k.vu/projects/xmms2/gxmms2 Package: gxmms2 Architecture: any Depends: xmms2-icon, ${misc:Depends}, ${shlibs:Depends} Recommends: xmms2 Description: XMMS2 client for the GNOME desktop gxmms2 is a GTK2-based XMMS2 client, written in C. Its main window is small and simple. It includes a playlist editor with a medialib search and an artist browser and a file information dialog. Package: gkrellxmms2 Recommends: xmms2 Architecture: any Depends: gkrellm, ${misc:Depends}, ${shlibs:Depends} Description: GKrellM plugin to control xmms2 gkrellxmms2 is a plugin for GKrellM2, written in C, to control the XMMS2 audio player. It supports basic controls such as play, pause, skip etc. and it has an integrated playlist editor with a media library search and browser. debian/gxmms2.install0000644000000000000000000000025611476221555012006 0ustar debian/gxmms2.1 usr/share/man/man1 debian/gxmms2.desktop usr/share/applications usr/bin/gxmms2 usr/share/gxmms2/README usr/share/doc/gxmms2/ usr/share/gxmms2/gxmms2_mini.xpm debian/source/0000755000000000000000000000000011476221555010476 5ustar debian/source/format0000644000000000000000000000001411476221555011704 0ustar 3.0 (quilt) debian/rules0000755000000000000000000000036712122646522010256 0ustar #!/usr/bin/make -f # Do not link against unused libraries (make dpkg-shlibdeps happy). LDFLAGS := -Wl,--as-needed %: dh $@ --parallel override_dh_auto_install: make install PREFIX=$(CURDIR)/debian/tmp/usr KRELLPREFIX=$(CURDIR)/debian/tmp/usr debian/compat0000644000000000000000000000000212122646575010376 0ustar 9 debian/gkrellxmms2.install0000644000000000000000000000014011476221555013030 0ustar usr/lib/gkrellm2/plugins/gkrellxmms2.so usr/share/gkrellxmms2/README usr/share/doc/gkrellxmms2/ debian/changelog0000644000000000000000000000704012122647125011043 0ustar gxmms2 (0.7.1-3) unstable; urgency=low * Update my email address. * Use canonical URLs for Vcs fields. * Bump Standards-Version to 3.9.4 (no changes needed). * Switch to debhelper 9 and enable hardening. * Update machine-readable copyright Format to 1.0. -- Benjamin Drung Thu, 21 Mar 2013 19:15:09 +0100 gxmms2 (0.7.1-2) unstable; urgency=low * Link against X11, because gxmms2src/eggtrayicon.c uses X11 functions. This fixes the FTBFS with binutils-gold. (Closes: #554764) -- Benjamin Drung Fri, 03 Dec 2010 17:52:02 +0100 gxmms2 (0.7.1-1) unstable; urgency=low * New upstream release. * Drop DrNo.patch and version-string.patch. * Bump Standard-Version to 3.9.1 (no changes required). * Update debian/copyright. * Fix pointer dereference to not sets the initial volume. (Closes: #546594) -- Benjamin Drung Mon, 13 Sep 2010 02:32:18 +0200 gxmms2 (0.7.0+git20090608-3) unstable; urgency=low * Add DrNo.patch for compatibility to xmms2 0.7DrNo. * Drop topgit and use DEP-3 header for patches. * Switch to dpkg-source 3.0 (quilt) format. * Bump Standards-Version to 3.8.4 (no changes required). * Switch to dh 7. * Recommend xmms2. -- Benjamin Drung Fri, 26 Feb 2010 01:55:29 +0100 gxmms2 (0.7.0+git20090608-2) unstable; urgency=low * Update debian/watch file. * debian/copyright: Correct "Format:" to "Format-Specification:". * Add debian/README.source. * Bump Standards-Version to 3.8.3 (no changes required). * Allow uploads done by Debian Maintainers. -- Benjamin Drung Sat, 12 Sep 2009 11:03:29 +0200 gxmms2 (0.7.0+git20090608-1) unstable; urgency=high * New upstream snapshot. + Compatible to xmms2 0.6DrMattDestruction (Closes: #529751, #529283, #533980, LP: #394938). * debian/control: + split Build-Depends line + added myself to uploaders * Added debian/gxmms2.desktop and add xmms2-icon to Depends (Closes: #411116). * Bump Standard-Version to 3.8.2, no changes needed. * Switch to cdbs and debhelper 7. * Use Topgit and quilt to manage patches. * gxmms2src/gxmms2.c: Do not assume that the volume control has a left channel (fixes muting of playback on launch). * Add debian/watch file. * Update debian/copyright to use the format described in DEP 5. * Extend gxmms2 package description. * Wrote manual page for gxmms2. -- Benjamin Drung Wed, 05 Aug 2009 15:13:05 +0200 gxmms2 (0.7.0-2) unstable; urgency=low * Be compatible with xmms2 DrLecter. + Cherry-pick 791f33: Updated to be compatible with the latest XMMS2 API change. + Also fixes some compiletime warnings. + Build-Depend on DrL. * Bump Standards-Version to 3.8.0 (no changes). -- Florian Ragwitz Thu, 10 Jul 2008 15:44:24 +0200 gxmms2 (0.7.0-1) unstable; urgency=low [ Anders Waldenborg ] * New upstream release. * Add Vcs-* fields. * Add myself to uploaders. [ Florian Ragwitz ] * Don't ignore errors on make clean. * Remove dependency to libxmmsclient-dev as libxmmsclient-glib-dev already pulls that in. * Update Standards-Version to 3.7.3 (no changes). * Add the Homepage field. -- Florian Ragwitz Wed, 27 Feb 2008 09:50:54 +0100 gxmms2 (0.6.4-1) unstable; urgency=low * New upstream release. -- Florian Ragwitz Wed, 4 Oct 2006 21:35:23 +0200 gxmms2 (0.6.3-1) unstable; urgency=low * Initial release. -- Florian Ragwitz Wed, 23 Aug 2006 22:35:22 +0200 debian/gxmms2.desktop0000644000000000000000000000030311476221555012002 0ustar [Desktop Entry] Name=gxmms2 GenericName=Audio Player Comment=Play music Comment[de]=Musik abspielen Categories=GTK;AudioVideo;Audio;Player; Exec=gxmms2 Icon=xmms2 Terminal=false Type=Application debian/watch0000644000000000000000000000011011476221555010217 0ustar version=3 http://wejp.k.vu/projects/xmms2/gxmms2 .*gxmms2-(.*)\.tar\.gz debian/gxmms2.10000644000000000000000000000421011476221555010472 0ustar .\" Copyright (C) 2009 Benjamin Drung .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: .\" 1. Redistributions of source code must retain the above copyright .\" notice, this list of conditions and the following disclaimer .\" in this position and unchanged. .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. .\" 3. The name of the author may not be used to endorse or promote products .\" derived from this software without specific prior written permission .\" .\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR .\" IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES .\" OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. .\" IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, .\" INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT .\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, .\" DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY .\" THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .TH GXMMS2 1 "2009-07-06" .SH NAME gxmms2 \- XMMS2 client for the GNOME desktop .SH SYNOPSIS .B gxmms2 .RI [ gtk-options ] .SH DESCRIPTION .B gxmms2 is a GTK2-based XMMS2 client, written in C. Its main window is small and simple. It includes a playlist editor with a medialib search and an artist browser and a file information dialog. .SH OPTIONS There are only the gtk-options available. .SH SEE ALSO .BR gtk-options (7), .BR xmms2 (1), http://xmms2.xmms.org. .SH AUTHORS gxmms2 was written by Johannes Heimansberg . .PP This manual page was written by Benjamin Drung , for the Debian project (and may be used by others).