add common functions for the new config file format

[openwrt.git] / openwrt / package / gmediaserver / Makefile

diff --git a/openwrt/package/gmediaserver/Makefile b/openwrt/package/gmediaserver/Makefile
index c5c1936..bbadfb1 100644 (file)
--- a/openwrt/package/gmediaserver/Makefile
+++ b/openwrt/package/gmediaserver/Makefile
@@ -3,9 +3,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmediaserver
-PKG_VERSION:=0.7.0
+PKG_VERSION:=0.9.0
 PKG_RELEASE:=1
-PKG_MD5SUM:=08d3d0274ff7b37b135d6f21b47cb3c5
+PKG_MD5SUM:=93de0f8dcbc1353a0d0dd5b5ab4b3142
 
 PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -14,8 +14,6 @@ PKG_CAT:=zcat
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
 
-BR2_PACKAGE_GMEDIASERVER=m
-
 include $(TOPDIR)/package/rules.mk
 
 $(eval $(call PKG_template,GMEDIASERVER,gmediaserver,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -27,6 +25,7 @@ $(PKG_BUILD_DIR)/.configured:
                CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
                LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
                LIBS=" -lixml -lthreadutil -lupnp -luClibc++ -lz" \
+               am_cv_func_iconv=no \
                ./configure \
                        --target=$(GNU_TARGET_NAME) \
                        --host=$(GNU_TARGET_NAME) \
@@ -50,6 +49,7 @@ $(PKG_BUILD_DIR)/.configured:
                        --enable-shared \
                        --disable-static \
                        --disable-rpath \
+                       --with-gnu-ld \
                        --with-id3lib="$(STAGING_DIR)/usr" \
                        --with-libupnp="$(STAGING_DIR)/usr" \
        )
@@ -69,7 +69,7 @@ $(IPKG_GMEDIASERVER):
        install -m0755 -d $(IDIR_GMEDIASERVER)/etc/init.d
        install -m0755 ./files/gmediaserver.init $(IDIR_GMEDIASERVER)/etc/init.d/gmediaserver
        install -m0755 -d $(IDIR_GMEDIASERVER)/usr/sbin
-       cp -fpR $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/
        $(RSTRIP) $(IDIR_GMEDIASERVER)
        $(IPKG_BUILD) $(IDIR_GMEDIASERVER) $(PACKAGE_DIR)