Update bmp and bmp-esound to 0.9.7.1. Basically doing this to fix the

problems with GCC 4 but they seem to not have gone away completely; hence,
disabling optimizations with this compiler.

Enhancements
* New (free) ClearSky skin by Will Reinhart
* New desktop icon
* New GConf schema
* New multi-thread mode for ALSA plugin
* Support for customizable accelerators
* Queue support in Jump to Track
* Partial support for new XMMS 1.2.11 remote control functions
* New translations (Finnish, Georgian, Hindi, Ukrainian, Traditional Chinese)
  and updates

Miscellaneous
* Log file renamed to 'log'
* Minor GUI tweaks

Bugfixes
* Fixed some ALSA playback issues
* Fixed crashes when output plugin returning sound volume for only 1 channel
* Fixed crashes when input plugins do not set title when getting song info
* Fixed infinite recursion in logger
* Fixed bogus values returned by xmms_remote_get_info()
* Fixed general/visualization plugin About dialogs not opening correctly
* Fixed centering of playlist in Playlist Editor
* Fixed incorrect length of 1st track read from .m3u files
* Fixed gcc4 compilation errors
* Fixed 64-bit issues setting/getting ESD volume
* Fixed MimeType value in desktop file
* Fixed text clipping of non-ASCII titles in Playlist Editor

6 files changed, 69 insertions, 37 deletions

diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index e883b8fa8eb..3395e277d4a 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2006/07/06 00:15:14 minskim Exp $
+# $NetBSD: Makefile,v 1.18 2006/07/31 21:43:55 jmmv Exp $
 #
 
 BMP_ENABLE_ENCODERS=	yes
 
 .include "Makefile.common"
 
-PKGREVISION=		5
-
 DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
 .if ${OPSYS} == "Darwin"
@@ -14,6 +12,7 @@ PLIST_SUBST+=	CDAUDIO="@comment "
 .else
 PLIST_SUBST+=	CDAUDIO=""
 .endif
+PRINT_PLIST_AWK+=	/cdaudio/ { print "$${CDAUDIO}" $$0; next }
 
 # XXX Workaround a crash during shutdown that happens when dlclose(3)ing
 # any open plugin.  libstdc++ gets dynamically linked in when the id3lib
@@ -28,3 +27,10 @@ LDFLAGS.NetBSD+=	-lstdc++ -lm
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 
 .include "../../mk/bsd.pkg.mk"
+
+# gcc 4.x generates code that produces background noise during playback.
+# Disabling optimizations when using this compiler solves the problem.
+.if !empty(CC_VERSION:Mgcc-4*)
+CFLAGS+=		-O0
+CXXFLAGS+=		-O0
+.endif
diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common
index e70bb429967..c3eeede2290 100644
--- a/audio/bmp/Makefile.common
+++ b/audio/bmp/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.20 2006/05/31 09:12:18 rillig Exp $
+# $NetBSD: Makefile.common,v 1.21 2006/07/31 21:43:55 jmmv Exp $
 #
 
-DISTNAME=	bmp-0.9.7
+DISTNAME=	bmp-0.9.7.1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=beepmp/}
 
@@ -13,7 +13,7 @@ DISTINFO_FILE=		${.CURDIR}/../../audio/bmp/distinfo
 FILESDIR=		${.CURDIR}/../../audio/xmms/files
 PATCHDIR=		${.CURDIR}/../../audio/bmp/patches
 PATCH_SITES=		http://izb.knu.ac.kr/~bh/diffs/
-PATCHFILES=		${DISTNAME}-ipv6-simple.diff
+PATCHFILES=		bmp-0.9.7-ipv6-simple.diff
 PATCH_DIST_STRIP+=	-p1
 
 GNU_CONFIGURE=		yes
diff --git a/audio/bmp/PLIST b/audio/bmp/PLIST
index 6d9adacc886..6ef47bed50e 100644
--- a/audio/bmp/PLIST
+++ b/audio/bmp/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2006/07/06 00:15:14 minskim Exp $
+@comment $NetBSD: PLIST,v 1.7 2006/07/31 21:43:55 jmmv Exp $
 bin/beep-media-player
 include/bmp/beepctrl.h
 include/bmp/configdb.h
@@ -21,26 +21,23 @@ lib/libbeep.la
 lib/pkgconfig/bmp.pc
 man/man1/beep-media-player.1
 share/applications/bmp.desktop
-share/bmp/Skins/Default/Avs.bmp
-share/bmp/Skins/Default/Balance.bmp
-share/bmp/Skins/Default/Eq_ex.bmp
-share/bmp/Skins/Default/Eqmain.bmp
-share/bmp/Skins/Default/Main.bmp
-share/bmp/Skins/Default/Mb.bmp
-share/bmp/Skins/Default/Monoster.bmp
-share/bmp/Skins/Default/Nums_ex.bmp
-share/bmp/Skins/Default/Pledit.bmp
-share/bmp/Skins/Default/Posbar.bmp
-share/bmp/Skins/Default/Shufrep.bmp
-share/bmp/Skins/Default/Text.bmp
-share/bmp/Skins/Default/Titlebar.bmp
-share/bmp/Skins/Default/Volume.bmp
-share/bmp/Skins/Default/cButtons.bmp
-share/bmp/Skins/Default/pLaypaus.bmp
-share/bmp/Skins/Default/pLedit.txt
-share/bmp/Skins/Default/readme.txt
-share/bmp/Skins/Default/screenshot.bmp
-share/bmp/Skins/Default/vIscolor.txt
+share/bmp/Skins/Default/README
+share/bmp/Skins/Default/balance.bmp
+share/bmp/Skins/Default/cbuttons.bmp
+share/bmp/Skins/Default/eq_ex.bmp
+share/bmp/Skins/Default/eqmain.bmp
+share/bmp/Skins/Default/main.bmp
+share/bmp/Skins/Default/monoster.bmp
+share/bmp/Skins/Default/nums_ex.bmp
+share/bmp/Skins/Default/playpaus.bmp
+share/bmp/Skins/Default/pledit.bmp
+share/bmp/Skins/Default/pledit.txt
+share/bmp/Skins/Default/posbar.bmp
+share/bmp/Skins/Default/shufrep.bmp
+share/bmp/Skins/Default/text.bmp
+share/bmp/Skins/Default/titlebar.bmp
+share/bmp/Skins/Default/viscolor.txt
+share/bmp/Skins/Default/volume.bmp
 share/bmp/glade/addfiles.glade
 share/bmp/glade/prefswin.glade
 share/bmp/images/appearance.png
@@ -48,17 +45,19 @@ share/bmp/images/eq.png
 share/bmp/images/mouse.png
 share/bmp/images/playlist.png
 share/bmp/images/plugins.png
-share/icons/bmp.svg
 share/locale/br/LC_MESSAGES/bmp.mo
 share/locale/cs/LC_MESSAGES/bmp.mo
 share/locale/cy/LC_MESSAGES/bmp.mo
 share/locale/de/LC_MESSAGES/bmp.mo
 share/locale/el/LC_MESSAGES/bmp.mo
 share/locale/es/LC_MESSAGES/bmp.mo
+share/locale/fi/LC_MESSAGES/bmp.mo
 share/locale/fr/LC_MESSAGES/bmp.mo
+share/locale/hi/LC_MESSAGES/bmp.mo
 share/locale/hu/LC_MESSAGES/bmp.mo
 share/locale/it/LC_MESSAGES/bmp.mo
 share/locale/ja/LC_MESSAGES/bmp.mo
+share/locale/ka/LC_MESSAGES/bmp.mo
 share/locale/ko/LC_MESSAGES/bmp.mo
 share/locale/lt/LC_MESSAGES/bmp.mo
 share/locale/mk/LC_MESSAGES/bmp.mo
@@ -69,7 +68,11 @@ share/locale/ro/LC_MESSAGES/bmp.mo
 share/locale/ru/LC_MESSAGES/bmp.mo
 share/locale/sk/LC_MESSAGES/bmp.mo
 share/locale/sv/LC_MESSAGES/bmp.mo
+share/locale/uk/LC_MESSAGES/bmp.mo
 share/locale/zh_CN/LC_MESSAGES/bmp.mo
+share/locale/zh_TW/LC_MESSAGES/bmp.mo
+share/pixmaps/bmp.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @comment in xdg-dirs: @dirrm share/icons
 @dirrm share/bmp/images
 @dirrm share/bmp/glade
diff --git a/audio/bmp/distinfo b/audio/bmp/distinfo
index 8b05b5ae96b..f13007a0585 100644
--- a/audio/bmp/distinfo
+++ b/audio/bmp/distinfo
@@ -1,14 +1,15 @@
-$NetBSD: distinfo,v 1.11 2005/10/19 15:09:37 minskim Exp $
+$NetBSD: distinfo,v 1.12 2006/07/31 21:43:55 jmmv Exp $
 
-SHA1 (bmp-0.9.7.tar.gz) = a60ac337efb00f6a50ce019e8a07370a4df040c2
-RMD160 (bmp-0.9.7.tar.gz) = afaae64a0ec55857849108f1d06dadd2adc3a1de
-Size (bmp-0.9.7.tar.gz) = 1974397 bytes
 SHA1 (bmp-0.9.7-ipv6-simple.diff) = d80943d504eeb06d96c2ca73ecc80a89b77e7c77
 RMD160 (bmp-0.9.7-ipv6-simple.diff) = 96072b98f774ed8614818664d0fe173ea5a3e4e5
 Size (bmp-0.9.7-ipv6-simple.diff) = 8660 bytes
+SHA1 (bmp-0.9.7.1.tar.gz) = ab6444b9a35a8bb8e920a781e72d963a3fb60547
+RMD160 (bmp-0.9.7.1.tar.gz) = 9288083918913ca97ab8883d616159055931ade7
+Size (bmp-0.9.7.1.tar.gz) = 2056564 bytes
+SHA1 (patch-aa) = fbaa61ef68857c12b4506180a9d8d290dbf6615f
 SHA1 (patch-an) = da55750c5ee50acfd25e695813bfc025c4fc7b5f
 SHA1 (patch-ao) = c24712090587ff622d7b9df68757c984a057c6c2
 SHA1 (patch-ap) = 76d750aa820e9710d2520d3cec067d91346dc5aa
-SHA1 (patch-aq) = 842f76201b891b94da7385a895b3a721441cbd34
+SHA1 (patch-aq) = 56f42dbd772304f9205b519b2654487b9a45091b
 SHA1 (patch-ar) = 037d02b72cee6b2fdd24f9d41c28ec1220dcdf67
 SHA1 (patch-as) = dc1d9dc2100664c1ab4448234239d45741907604
diff --git a/audio/bmp/patches/patch-aa b/audio/bmp/patches/patch-aa
new file mode 100644
index 00000000000..ec61dbb7aca
--- /dev/null
+++ b/audio/bmp/patches/patch-aa
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2006/07/31 21:43:55 jmmv Exp $
+
+--- beep/softvolume.c.orig	2004-06-20 20:48:54.000000000 +0200
++++ beep/softvolume.c
+@@ -117,7 +117,7 @@ soft_volume_set(SoftVolumeConfig * c, gi
+  *
+  **************************************************************************/
+ 
+-G_INLINE_FUNC void
++inline void
+ effect_16bit(gint max, gint min, guint length, gint16 * sdata,
+              SoftVolumeConfig * c)
+ {
+@@ -139,7 +139,7 @@ effect_16bit(gint max, gint min, guint l
+  *
+  **************************************************************************/
+ 
+-G_INLINE_FUNC void
++inline void
+ effect_8bit(gint max, gint min, guint length, gint8 * sdata,
+             SoftVolumeConfig * c)
+ {
diff --git a/audio/bmp/patches/patch-aq b/audio/bmp/patches/patch-aq
index 232333b9781..e2902ffe48e 100644
--- a/audio/bmp/patches/patch-aq
+++ b/audio/bmp/patches/patch-aq
@@ -1,13 +1,13 @@
-$NetBSD: patch-aq,v 1.3 2004/12/25 15:22:37 jmmv Exp $
+$NetBSD: patch-aq,v 1.4 2006/07/31 21:43:55 jmmv Exp $
 
---- Output/OSS/Makefile.in.orig	2004-12-11 21:22:35.000000000 +0100
+--- Output/OSS/Makefile.in.orig	2005-10-22 12:45:02.000000000 +0200
 +++ Output/OSS/Makefile.in
-@@ -305,7 +305,7 @@ soundcard.h
+@@ -295,7 +295,7 @@ soundcard.h
  EXTRA_DIST = $(osssources)
  lib_LTLIBRARIES = $(ossltlibs)
  libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
 -libOSS_la_LIBADD = @GTK_LIBS@
 +libOSS_la_LIBADD = @GTK_LIBS@ $(LIBOSSAUDIO)
  libOSS_la_SOURCES = $(ossbuildsources)
- INCLUDES = @GTK_CFLAGS@ @GCONF_CFLAGS@ -I$(top_builddir)/intl -I$(top_srcdir)
+ INCLUDES = $(GTK_CFLAGS) -I$(top_builddir)/intl -I$(top_srcdir)
  all: all-am