Mercurial > audlegacy-plugins
changeset 579:22a80841acd0 trunk
[svn] - added audacious osd in configure.ac
| author | giacomo |
|---|---|
| date | Tue, 30 Jan 2007 08:24:40 -0800 |
| parents | 550c9e382cf8 |
| children | 2419d6928017 |
| files | ChangeLog configure.ac mk/rules.mk.in src/aosd/Makefile |
| diffstat | 4 files changed, 105 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Jan 30 08:04:43 2007 -0800 +++ b/ChangeLog Tue Jan 30 08:24:40 2007 -0800 @@ -1,3 +1,70 @@ +2007-01-30 16:04:43 +0000 Giacomo Lozito <james@develia.org> + revision [1242] + - splitted GTK_CFLAGS in GTK_CFLAGS, GLIB_CFLAGS and PANGO_CFLAGS, splitted GTK_LIBS in GTK_LIBS, GLIB_LIBS, PANGO_LIBS + trunk/configure.ac | 16 +++++++++++++--- + trunk/mk/rules.mk.in | 2 ++ + trunk/src/CoreAudio/Makefile | 4 ++-- + trunk/src/OSS/Makefile | 4 ++-- + trunk/src/aac/src/Makefile | 4 ++-- + trunk/src/adplug/Makefile | 6 +++--- + trunk/src/alac/Makefile | 3 ++- + trunk/src/alarm/Makefile | 4 ++-- + trunk/src/alsa/Makefile | 4 ++-- + trunk/src/amidi-plug/Makefile | 4 ++-- + trunk/src/aosd/Makefile | 4 ++-- + trunk/src/arts/Makefile | 4 ++-- + trunk/src/audiocompress/Makefile | 4 ++-- + trunk/src/blur_scope/Makefile | 4 ++-- + trunk/src/cdaudio/Makefile | 3 ++- + trunk/src/console/Makefile | 6 +++--- + trunk/src/cue/Makefile | 4 ++-- + trunk/src/curl/Makefile | 4 ++-- + trunk/src/disk_writer/Makefile | 4 ++-- + trunk/src/echo_plugin/Makefile | 4 ++-- + trunk/src/esd/Makefile | 4 ++-- + trunk/src/evdev-plug/Makefile | 4 ++-- + trunk/src/flac112/Makefile | 4 ++-- + trunk/src/flac113/Makefile | 4 ++-- + trunk/src/jack/Makefile | 4 ++-- + trunk/src/ladspa/Makefile | 4 ++-- + trunk/src/lirc/Makefile | 4 ++-- + trunk/src/m3u/Makefile | 4 ++-- + trunk/src/metronom/Makefile | 3 ++- + trunk/src/mms/Makefile | 4 ++-- + trunk/src/modplug/Makefile | 6 +++--- + trunk/src/modplug/archive/Makefile | 2 +- + trunk/src/modplug/gui/Makefile | 4 ++-- + trunk/src/mpg123/Makefile | 6 +++--- + trunk/src/musepack/Makefile | 4 ++-- + trunk/src/paranormal/Makefile | 4 ++-- + trunk/src/pls/Makefile | 4 ++-- + trunk/src/projectm/Makefile | 4 ++-- + trunk/src/pulse_audio/Makefile | 4 ++-- + trunk/src/rocklight/Makefile | 4 ++-- + trunk/src/rovascope/Makefile | 4 ++-- + trunk/src/scrobbler/Makefile | 4 ++-- + trunk/src/sexypsf/Makefile | 3 ++- + trunk/src/sid/Makefile | 6 +++--- + trunk/src/song_change/Makefile | 4 ++-- + trunk/src/spectrum/Makefile | 4 ++-- + trunk/src/statusicon/Makefile | 4 ++-- + trunk/src/stdio/Makefile | 4 ++-- + trunk/src/stereo_plugin/Makefile | 4 ++-- + trunk/src/sun/Makefile | 4 ++-- + trunk/src/timidity/libtimidity/Makefile | 2 +- + trunk/src/timidity/src/Makefile | 4 ++-- + trunk/src/tonegen/Makefile | 3 ++- + trunk/src/tta/Makefile | 6 +++--- + trunk/src/voice_removal/Makefile | 4 ++-- + trunk/src/vorbis/Makefile | 4 ++-- + trunk/src/wav/Makefile | 4 ++-- + trunk/src/wavpack/Makefile | 4 ++-- + trunk/src/wma/Makefile | 4 ++-- + trunk/src/wma/libffwma/Makefile | 2 +- + trunk/src/xspf/Makefile | 4 ++-- + 61 files changed, 136 insertions(+), 119 deletions(-) + + 2007-01-30 02:35:59 +0000 Yoshiki Yazawa <yaz@cc.rim.or.jp> revision [1240] - don't percent encode urls beginning with http:// or https:// for now.
--- a/configure.ac Tue Jan 30 08:04:43 2007 -0800 +++ b/configure.ac Tue Jan 30 08:24:40 2007 -0800 @@ -395,6 +395,37 @@ GENERAL_PLUGINS="$GENERAL_PLUGINS statusicon" fi +dnl *** Audacious OSD plugin (pangocairo-based) + +AC_ARG_ENABLE(aosd, + [ --disable-aosd disable X11 Audacious OSD plugin (default=enabled)], + [enable_aosd=$enableval], + [enable_aosd="yes"] +) + +if test "x$enable_aosd" = "xyes"; then + have_aosd="yes" + PKG_CHECK_MODULES(PANGO,[pango >= 1.14.7],, + [have_aosd="no" + AC_MSG_RESULT([*** pango >= 1.14.7 is required for Audacious OSD plugin ***])] + ) + PKG_CHECK_MODULES(CAIRO,[cairo >= 1.2.6],, + [have_aosd="no" + AC_MSG_RESULT([*** cairo >= 1.2.6 is required for Audacious OSD plugin ***])] + ) + PKG_CHECK_MODULES(PANGOCAIRO,[pangocairo >= 1.14.7],, + [have_aosd="no" + AC_MSG_RESULT([*** pangocairo >= 1.14.7 is required for Audacious OSD plugin ***])] + ) +else + AC_MSG_RESULT([*** Audacious OSD plugin disabled per user request ***]) + have_aosd="yes" +fi + +if test "x$have_aosd" = "xyes"; then + GENERAL_PLUGINS="$GENERAL_PLUGINS aosd" +fi + dnl *** AdPlug requirement (libbinio) AC_ARG_ENABLE(adplug, @@ -1208,6 +1239,7 @@ echo " Alarm: yes" echo " Song Change: yes" echo " Status Icon: $have_statusicon" +echo " Audacious OSD: $have_aosd" echo " Control via event device (evdev-plug): $have_evdevplug" echo " LIRC: $have_lirc" echo " AudioScrobbler Client: $scrobbler"
--- a/mk/rules.mk.in Tue Jan 30 08:04:43 2007 -0800 +++ b/mk/rules.mk.in Tue Jan 30 08:24:40 2007 -0800 @@ -82,6 +82,8 @@ BUILDERS_INCLUDES ?= @BUILDERS_INCLUDES@ BUILDERS_LDFLAGS ?= @BUILDERS_LDFLAGS@ BUILD_INCLUDED_LIBINTL ?= @BUILD_INCLUDED_LIBINTL@ +CAIRO_CFLAGS ?= @CAIRO_CFLAGS@ +CAIRO_LIBS ?= @CAIRO_LIBS@ CATOBJEXT ?= @CATOBJEXT@ CC = @CC@ CCAS ?= @CCAS@ @@ -236,6 +238,8 @@ PACKAGE_VERSION ?= @PACKAGE_VERSION@ PANGO_CFLAGS ?= @PANGO_CFLAGS@ PANGO_LIBS ?= @PANGO_LIBS@ +PANGOCAIRO_CFLAGS ?= @PANGOCAIRO_CFLAGS@ +PANGOCAIRO_LIBS ?= @PANGOCAIRO_LIBS@ PATH_SEPARATOR ?= @PATH_SEPARATOR@ PC_REQUIRES ?= @PC_REQUIRES@ PKG_CONFIG ?= @PKG_CONFIG@
--- a/src/aosd/Makefile Tue Jan 30 08:04:43 2007 -0800 +++ b/src/aosd/Makefile Tue Jan 30 08:24:40 2007 -0800 @@ -7,12 +7,12 @@ LIBDIR = $(plugindir)/$(GENERAL_PLUGIN_DIR) -LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) +LIBADD = $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(CAIRO_LIBS) $(PANGOCAIRO_LIBS) SOURCES = aosd.c aosd_osd.c aosd_style.c aosd_ui.c aosd_cfg.c ghosd.c ghosd-text.c ghosd-main.c OBJECTS = ${SOURCES:.c=.o} -CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) \ +CFLAGS += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(CAIRO_CFLAGS) $(PANGOCAIRO_CFLAGS) \ -I../../intl -I../.. -I.. include ../../mk/objective.mk