From 725611a466f2edf12f809d22339b22223af4afe7 Mon Sep 17 00:00:00 2001 From: nbd Date: Sat, 7 Oct 2006 11:57:20 +0000 Subject: move old kamikaze out of trunk - will put buildroot-ng in there as soon as all the developers are ready git-svn-id: svn://svn.openwrt.org/openwrt/trunk@4944 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/gmediaserver/Config.in | 13 --- openwrt/package/gmediaserver/Makefile | 75 --------------- .../gmediaserver/files/gmediaserver.default | 1 - .../package/gmediaserver/files/gmediaserver.init | 21 ---- .../gmediaserver/ipkg/gmediaserver.conffiles | 1 - .../package/gmediaserver/ipkg/gmediaserver.control | 5 - .../package/gmediaserver/patches/no_iconv.patch | 107 --------------------- 7 files changed, 223 deletions(-) delete mode 100644 openwrt/package/gmediaserver/Config.in delete mode 100644 openwrt/package/gmediaserver/Makefile delete mode 100644 openwrt/package/gmediaserver/files/gmediaserver.default delete mode 100644 openwrt/package/gmediaserver/files/gmediaserver.init delete mode 100644 openwrt/package/gmediaserver/ipkg/gmediaserver.conffiles delete mode 100644 openwrt/package/gmediaserver/ipkg/gmediaserver.control delete mode 100644 openwrt/package/gmediaserver/patches/no_iconv.patch (limited to 'openwrt/package/gmediaserver') diff --git a/openwrt/package/gmediaserver/Config.in b/openwrt/package/gmediaserver/Config.in deleted file mode 100644 index e9b6ed504..000000000 --- a/openwrt/package/gmediaserver/Config.in +++ /dev/null @@ -1,13 +0,0 @@ -config BR2_PACKAGE_GMEDIASERVER - prompt "gmediaserver...................... An UPnP music media server" - tristate - default m if CONFIG_DEVEL - select BR2_PACKAGE_ID3LIB - select BR2_PACKAGE_LIBUPNP - help - An UPnP music media server. - - http://www.nongnu.org/gmediaserver/ - - Depends: id3lib, libupnp - diff --git a/openwrt/package/gmediaserver/Makefile b/openwrt/package/gmediaserver/Makefile deleted file mode 100644 index bbadfb112..000000000 --- a/openwrt/package/gmediaserver/Makefile +++ /dev/null @@ -1,75 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gmediaserver -PKG_VERSION:=0.9.0 -PKG_RELEASE:=1 -PKG_MD5SUM:=93de0f8dcbc1353a0d0dd5b5ab4b3142 - -PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,GMEDIASERVER,gmediaserver,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - (cd $(PKG_BUILD_DIR); rm -rf config.{cache,status} ; \ - $(TARGET_CONFIGURE_OPTS) \ - CFLAGS="$(TARGET_CFLAGS)" \ - 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) \ - --build=$(GNU_HOST_NAME) \ - --program-prefix="" \ - --program-suffix="" \ - --prefix=/usr \ - --exec-prefix=/usr \ - --bindir=/usr/bin \ - --datadir=/usr/share \ - --includedir=/usr/include \ - --infodir=/usr/share/info \ - --libdir=/usr/lib \ - --libexecdir=/usr/lib \ - --localstatedir=/var \ - --mandir=/usr/share/man \ - --sbindir=/usr/sbin \ - --sysconfdir=/etc \ - $(DISABLE_LARGEFILE) \ - $(DISABLE_NLS) \ - --enable-shared \ - --disable-static \ - --disable-rpath \ - --with-gnu-ld \ - --with-id3lib="$(STAGING_DIR)/usr" \ - --with-libupnp="$(STAGING_DIR)/usr" \ - ) - touch $@ - -$(PKG_BUILD_DIR)/.built: - rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install - touch $@ - -$(IPKG_GMEDIASERVER): - install -m0755 -d $(IDIR_GMEDIASERVER)/etc/default - install -m0644 ./files/gmediaserver.default $(IDIR_GMEDIASERVER)/etc/default/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) $(PKG_INSTALL_DIR)/usr/bin/gmediaserver $(IDIR_GMEDIASERVER)/usr/sbin/ - $(RSTRIP) $(IDIR_GMEDIASERVER) - $(IPKG_BUILD) $(IDIR_GMEDIASERVER) $(PACKAGE_DIR) - diff --git a/openwrt/package/gmediaserver/files/gmediaserver.default b/openwrt/package/gmediaserver/files/gmediaserver.default deleted file mode 100644 index d130f912d..000000000 --- a/openwrt/package/gmediaserver/files/gmediaserver.default +++ /dev/null @@ -1 +0,0 @@ -OPTIONS="--background --interface=br0 --pid-file=$PID_F" diff --git a/openwrt/package/gmediaserver/files/gmediaserver.init b/openwrt/package/gmediaserver/files/gmediaserver.init deleted file mode 100644 index 1582b37cc..000000000 --- a/openwrt/package/gmediaserver/files/gmediaserver.init +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -BIN=gmediaserver -DEFAULT=/etc/default/$BIN -RUN_D=/var/run -PID_F=$RUN_D/$BIN.pid -[ -f $DEFAULT ] && . $DEFAULT - -case $1 in - start) - $BIN $OPTIONS - ;; - stop) - [ -f $PID_F ] && kill $(cat $PID_F) - ;; - *) - echo "usage: $0 (start|stop)" - exit 1 -esac - -exit $? diff --git a/openwrt/package/gmediaserver/ipkg/gmediaserver.conffiles b/openwrt/package/gmediaserver/ipkg/gmediaserver.conffiles deleted file mode 100644 index d915334a3..000000000 --- a/openwrt/package/gmediaserver/ipkg/gmediaserver.conffiles +++ /dev/null @@ -1 +0,0 @@ -/etc/default/gmediaserver diff --git a/openwrt/package/gmediaserver/ipkg/gmediaserver.control b/openwrt/package/gmediaserver/ipkg/gmediaserver.control deleted file mode 100644 index 6ba003f5a..000000000 --- a/openwrt/package/gmediaserver/ipkg/gmediaserver.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: gmediaserver -Priority: optional -Section: net -Depends: id3lib, libupnp -Description: An UPnP music media server. diff --git a/openwrt/package/gmediaserver/patches/no_iconv.patch b/openwrt/package/gmediaserver/patches/no_iconv.patch deleted file mode 100644 index 2e6121171..000000000 --- a/openwrt/package/gmediaserver/patches/no_iconv.patch +++ /dev/null @@ -1,107 +0,0 @@ -diff -ruN gmediaserver-0.8.0-old/src/main.c gmediaserver-0.8.0-new/src/main.c ---- gmediaserver-0.8.0-old/src/main.c 2005-09-10 09:26:00.000000000 +0200 -+++ gmediaserver-0.8.0-new/src/main.c 2005-09-17 20:48:01.000000000 +0200 -@@ -32,8 +32,10 @@ - #include /* Gnulib, C99 */ - #include /* ? */ - #include /* ? */ -+#ifdef HAVE_ICONV - #include /* Gnulib, POSIX */ - #include "iconvme.h" /* Gnulib */ -+#endif - #ifdef HAVE_NL_LANGINFO - #include - #endif -@@ -71,8 +73,10 @@ - #ifdef HAVE_ID3LIB - { "disable-id3", no_argument, NULL, OPT_DISABLE_ID3 }, - #endif -+#ifdef HAVE_ICONV - { "in-charset", required_argument, NULL, OPT_IN_CHARSET }, - { "device-charset", required_argument, NULL, OPT_DEVICE_CHARSET }, -+#endif - { "friendly-name", required_argument, NULL, OPT_FRIENDLY_NAME }, - { "pid-file", required_argument, NULL, OPT_PIDFILE }, - { "profile", required_argument, NULL, OPT_PROFILE, }, -@@ -90,15 +94,21 @@ - { NULL, 0, NULL, 0 } - }; - -+#ifdef HAVE_ICONV - iconv_t charset_convert = (iconv_t) -1; -+#endif - const char version_etc_copyright[] = "Copyright (C) 2005 Oskar Liljeblad."; - - char * - convert_string(const char *str) - { -+#ifdef HAVE_ICONV - if (charset_convert == (iconv_t) -1) - return xstrdup(str); - return iconv_alloc(charset_convert, str); -+#else -+ return xstrdup(str); -+#endif - } - - static void -@@ -140,13 +150,17 @@ - char *logfilename = NULL; - char *timestamp_format = NULL; - uint32_t expire_time; -+#ifdef HAVE_ICONV - char *in_charset = NULL; - char *device_charset = NULL; -+#endif - - set_program_name(argv[0]); - -+#ifdef LOCALE - if (setlocale(LC_ALL, "") == NULL) - warn(_("cannot set locale: %s\n"), errstr); -+#endif - #ifdef ENABLE_NLS - if (bindtextdomain(PACKAGE, LOCALEDIR) == NULL) - warn(_("cannot bind message domain: %s\n"), errstr); -@@ -174,12 +188,14 @@ - id3_enabled = false; - break; - #endif -+#ifdef HAVE_ICONV - case OPT_IN_CHARSET: - in_charset = optarg; - break; - case OPT_DEVICE_CHARSET: - device_charset = optarg; - break; -+#endif - case OPT_FRIENDLY_NAME: - if (optarg[0] == '\0') - die(_("friendly name cannot be empty\n")); -@@ -320,6 +336,7 @@ - - init_logging(logfilename, timestamp_format); - -+#ifdef HAVE_ICONV - if (device_charset != NULL) { - if (in_charset == NULL) { - #ifdef HAVE_NL_LANGINFO -@@ -336,6 +353,7 @@ - if (charset_convert == (iconv_t) -1) - die(_("cannot create character set convertor\nTry using another value for --in-charset or --device-charset\n")); - } -+#endif - - /* We could write pid before initiating logging too. - */ -@@ -409,8 +427,10 @@ - if (pidfilename != NULL) - unlink(pidfilename); /* ignore errors */ - -+#ifdef HAVE_ICONV - if (charset_convert != (iconv_t) -1) - iconv_close(charset_convert); /* ignore errors (only EINVAL) */ -+#endif - - finish_logging(true); - -- cgit v1.2.3