Sorry, I just fixed another bug.. now v060
Signed-off-by: Michael Vogt <michu at neophob.com>
----- Forwarded message from [EMAIL PROTECTED] -----
Date: Wed, 23 Apr 2008 14:43:49 +0200
From: [EMAIL PROTECTED]
Reply-To: OpenWrt Development List <[email protected]>
Subject: [OpenWrt-Devel] [PATCH] update bemusedlinuxserver
To: [email protected]
Update Bemusedlinuxserver to latest version.
Signed-off-by: Michael Vogt <michu at neophob.com>
----- End forwarded message -----
Index: files/bemused.conf
===================================================================
--- files/bemused.conf (revision 10911)
+++ files/bemused.conf (working copy)
@@ -3,10 +3,9 @@
# You only need to set up options which have no default and which ware not optinal
# this is a mpd-hack version by [EMAIL PROTECTED]
-# just for information: "xmms" means "mpd"!
# Path to mpd (if mpd is in path only mpd) (default is mpd)
-xmmsdir=/usr/local/bin/mpd
+mpddir=/usr/local/bin/mpd
# channel for what the serial port service is registered (with sdptool look in README) (default 10)
# example:
@@ -31,10 +30,6 @@
# point this directory to the mpd music directory!
mp3dir=/
-# whether to autostart mpd when the server is started (0 (no) or 1 (yes)) (default=1)
-# THIS OPTION IS NOT SUPPORTED!
-# autostartxmms=0
-
# bookmarks file for URLs of net radio stations (optional)
bookmarkfile=/etc/bemused-bookmarks
Index: patches/100-iconv.patch
===================================================================
--- patches/100-iconv.patch (revision 0)
+++ patches/100-iconv.patch (revision 0)
@@ -0,0 +1,13 @@
+--- bemused-mpd-r059/mpdctrl.orig 2008-04-23 11:53:58.000000000 +0200
++++ bemused-mpd-r059/mpdctrl.c 2008-04-23 14:36:34.000000000 +0200
+@@ -160,8 +160,8 @@
+ }
+
+ /* OpenWRT needs a type cast */
+- /* iconv_value = iconv(i, (const char **)&p1, &fromlen, &p2, &tolen); */
+- iconv_value = iconv(i, &p1, &fromlen, &p2, &tolen);
++ iconv_value = iconv(i, (const char **)&p1, &fromlen, &p2, &tolen);
++ /* iconv_value = iconv(i, &p1, &fromlen, &p2, &tolen); */
+ if (iconv_value == (size_t) -1) {
+ error ("ICONV ERROR3: failed to convert string, error: %d\n", errno);
+ return "ICONV ERROR3";
Index: Makefile
===================================================================
--- Makefile (revision 10911)
+++ Makefile (working copy)
@@ -9,12 +9,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=bemused-mpd
-PKG_VERSION:=r047
+PKG_VERSION:=r060
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/382
-PKG_MD5SUM:=f40715812d59d2ab1bd93f96c5e8818b
+PKG_SOURCE_URL:=http://download.origo.ethz.ch/bemused-lnx-mpdhack/513
+PKG_MD5SUM:=08238fef7b00dec19c93d5aa481803c6
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
@@ -24,7 +24,7 @@
define Package/bemusedlinuxserver
SECTION:=utils
CATEGORY:=Utilities
- DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp
+ DEPENDS:=+bluez-libs +glib1 +mpd +libstdcpp +libiconv
TITLE:=Bemused linux server
URL:=http://bemused-lnx-mpdhack.origo.ethz.ch/
endef
@@ -42,8 +42,8 @@
CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CPPFLAGS)" \
LDFLAGS="$(TARGET_LDFLAGS) " \
CPPFLAGS="$(TARGET_CPPFLAGS)" \
- INCL="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include" \
- MYLIBS="-lbluetooth -lglib"
+ INCL="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include -I$(STAGING_DIR)/usr/lib/libiconv/include" \
+ MYLIBS="-lbluetooth -lglib -L$(STAGING_DIR)/usr/lib/libiconv/lib -liconv"
$(STRIP) $(PKG_BUILD_DIR)/bemusedlinuxserver
endef
_______________________________________________
openwrt-devel mailing list
[email protected]
http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
