mirror of
https://github.com/Llewellynvdm/conky.git
synced 2024-12-25 12:10:03 +00:00
clean up audacious legacy code; adjust ebuilds
git-svn-id: https://conky.svn.sourceforge.net/svnroot/conky/trunk/conky1@989 7f574dfc-610e-0410-a909-a81674777703
This commit is contained in:
parent
3048e239d2
commit
238fa198f0
8
README
8
README
@ -43,10 +43,10 @@ COMPILING
|
||||
|
||||
./configure --prefix=/usr --mandir=/usr/share/man --in-
|
||||
fodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --local-
|
||||
statedir=/var/lib --disable-own-window --enable-audacious --enable-bmpx
|
||||
--disable-hddtemp --disable-mpd --enable-xmms2 --disable-portmon --dis-
|
||||
able-network --enable-debug --disable-x11 --disable-double-buffer
|
||||
--disable-xdamage --disable-xft
|
||||
statedir=/var/lib --disable-own-window --enable-audacious[=yes|no|lega-
|
||||
cy] --enable-bmpx --disable-hddtemp --disable-mpd --enable-xmms2 --dis-
|
||||
able-portmon --disable-network --enable-debug --disable-x11 --dis-
|
||||
able-double-buffer --disable-xdamage --disable-xft
|
||||
|
||||
make
|
||||
|
||||
|
@ -25,7 +25,7 @@ DEPEND_COMMON="
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXft
|
||||
truetype? ( >=media-libs/freetype-2 )
|
||||
audacious? ( >=media-sound/audacious-0.1 )
|
||||
audacious? ( <media-sound/audacious-1.4.0 )
|
||||
bmpx? ( media-sound/bmpx
|
||||
>=sys-apps/dbus-0.35
|
||||
)
|
||||
|
@ -25,7 +25,7 @@ DEPEND_COMMON="
|
||||
x11-libs/libXdamage
|
||||
x11-libs/libXft
|
||||
truetype? ( >=media-libs/freetype-2 )
|
||||
audacious? ( >=media-sound/audacious-0.1 )
|
||||
audacious? ( >=media-sound/audacious-1.4.0 )
|
||||
bmpx? ( media-sound/bmpx
|
||||
>=sys-apps/dbus-0.35
|
||||
)
|
||||
|
@ -112,7 +112,7 @@ AC_ARG_ENABLE([audacious],
|
||||
[enable audacious player support @<:@default=no@:>@]),
|
||||
[want_audacious="$enableval"], [want_audacious=no])
|
||||
|
||||
AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes)
|
||||
AM_CONDITIONAL(BUILD_AUDACIOUS, test x$want_audacious = xyes -o x$want_audacious = xlegacy)
|
||||
if test x$want_audacious = xyes; then
|
||||
PKG_CHECK_MODULES([AUDACIOUS], [audacious >= 1.4.0 dbus-glib-1 glib-2.0 gobject-2.0])
|
||||
CFLAGS="$CFLAGS $AUDACIOUS_CFLAGS"
|
||||
|
@ -44,7 +44,7 @@ Example to compile and run Conky with all optional components (note that some co
|
||||
.TP
|
||||
\fB\*(T<\fBsh autogen.sh\fR\*(T>\fR \*(T<\fB# Only required if building from Svn\fR\*(T>
|
||||
.TP
|
||||
\fB\*(T<\fB\&./configure \fR\*(T>\fR\*(T<\fB\-\-prefix=/usr \-\-mandir=/usr/share/man \-\-infodir=/usr/share/info \-\-datadir=/usr/share \-\-sysconfdir=/etc \-\-localstatedir=/var/lib \-\-disable\-own\-window \-\-enable\-audacious \-\-enable\-bmpx \-\-disable\-hddtemp \-\-disable\-mpd \-\-enable\-xmms2 \-\-disable\-portmon \-\-disable\-network \-\-enable\-debug \-\-disable\-x11 \-\-disable\-double\-buffer \-\-disable\-xdamage \-\-disable\-xft\fR\*(T>
|
||||
\fB\*(T<\fB\&./configure \fR\*(T>\fR\*(T<\fB\-\-prefix=/usr \-\-mandir=/usr/share/man \-\-infodir=/usr/share/info \-\-datadir=/usr/share \-\-sysconfdir=/etc \-\-localstatedir=/var/lib \-\-disable\-own\-window \-\-enable\-audacious[=yes|no|legacy] \-\-enable\-bmpx \-\-disable\-hddtemp \-\-disable\-mpd \-\-enable\-xmms2 \-\-disable\-portmon \-\-disable\-network \-\-enable\-debug \-\-disable\-x11 \-\-disable\-double\-buffer \-\-disable\-xdamage \-\-disable\-xft\fR\*(T>
|
||||
.TP
|
||||
\fB\*(T<\fBmake\fR\*(T>\fR
|
||||
.TP
|
||||
|
@ -79,7 +79,7 @@
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
<term>
|
||||
<command><option>./configure </option></command><option>--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --disable-own-window --enable-audacious --enable-bmpx --disable-hddtemp --disable-mpd --enable-xmms2 --disable-portmon --disable-network --enable-debug --disable-x11 --disable-double-buffer --disable-xdamage --disable-xft</option>
|
||||
<command><option>./configure </option></command><option>--prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --datadir=/usr/share --sysconfdir=/etc --localstatedir=/var/lib --disable-own-window --enable-audacious[=yes|no|legacy] --enable-bmpx --disable-hddtemp --disable-mpd --enable-xmms2 --disable-portmon --disable-network --enable-debug --disable-x11 --disable-double-buffer --disable-xdamage --disable-xft</option>
|
||||
</term>
|
||||
</varlistentry>
|
||||
<varlistentry>
|
||||
|
@ -22,6 +22,10 @@
|
||||
*
|
||||
*/
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
|
||||
@ -32,16 +36,16 @@
|
||||
#include <audacious/dbus.h>
|
||||
#else
|
||||
#include <audacious/beepctrl.h>
|
||||
#define audacious_remote_is_running(x) xmms_remote_is_running(x)
|
||||
#define audacious_remote_is_paused(x) xmms_remote_is_paused(x)
|
||||
#define audacious_remote_is_playing(x) xmms_remote_is_playing(x)
|
||||
#define audacious_remote_get_playlist_pos(x) xmms_remote_get_playlist_pos(x)
|
||||
#define audacious_remote_get_playlist_title(x) xmms_remote_get_playlist_title(x)
|
||||
#define audacious_remote_get_playlist_time(x) xmms_remote_get_playlist_time(x)
|
||||
#define audacious_remote_get_output_time(x) xmms_remote_get_output_time(x)
|
||||
#define audacious_remote_get_info(x) xmms_remote_get_info(x)
|
||||
#define audacious_remote_get_playlist_file(x) xmms_remote_get_playlist_file(x)
|
||||
#define audacious_remote_get_playlist_length(x) xmms_remote_get_playlist_length(x)
|
||||
#define audacious_remote_is_running(x) xmms_remote_is_running(x)
|
||||
#define audacious_remote_is_paused(x) xmms_remote_is_paused(x)
|
||||
#define audacious_remote_is_playing(x) xmms_remote_is_playing(x)
|
||||
#define audacious_remote_get_playlist_pos(x) xmms_remote_get_playlist_pos(x)
|
||||
#define audacious_remote_get_playlist_title(x,y) xmms_remote_get_playlist_title(x,y)
|
||||
#define audacious_remote_get_playlist_time(x,y) xmms_remote_get_playlist_time(x,y)
|
||||
#define audacious_remote_get_output_time(x) xmms_remote_get_output_time(x)
|
||||
#define audacious_remote_get_info(w,x,y,z) xmms_remote_get_info(w,x,y,z)
|
||||
#define audacious_remote_get_playlist_file(x,y) xmms_remote_get_playlist_file(x,y)
|
||||
#define audacious_remote_get_playlist_length(x) xmms_remote_get_playlist_length(x)
|
||||
#endif
|
||||
|
||||
#include "config.h"
|
||||
|
Loading…
Reference in New Issue
Block a user