alsa-utils: moved to github
alsa-utils: moved to github

git-svn-id: svn://svn.openwrt.org/openwrt/packages@41721 3c298f89-4303-0410-b956-a3cf2f4a3e73

file:a/libs/intltool/Makefile (deleted)
--- a/libs/intltool/Makefile
+++ /dev/null
@@ -1,47 +1,1 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=intltool
-PKG_LIBVER:=0.40
-PKG_VERSION:=$(PKG_LIBVER).6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=@GNOME/intltool/$(PKG_LIBVER)
-PKG_MD5SUM:=69bc0353323112f42ad4f9cf351bc3e5
-
-PKG_HOST_ONLY:=1
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-define Package/intltool
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=set of tools to centralize translation using GNU gettext
-  URL:=http://www.freedesktop.org/wiki/Software/intltool
-  BUILDONLY:=1
-endef
-
-define Package/intltool/description
-  intltool is a set of tools to centralize translation of many different
-  file formats using GNU gettext-compatible PO files.
-endef
-
-define Require/perl-xml-parser
-  perl -e 'use XML::Parser;'
-endef
-
-$(eval $(call Require,perl-xml-parser, \
-	Please install Perl XML::Parser \
-))
-
-$(eval $(call BuildPackage,intltool))
-$(eval $(call HostBuild))
-

--- a/libs/libaudiofile/Makefile
+++ /dev/null
@@ -1,78 +1,1 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=audiofile
-PKG_VERSION:=0.2.7
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:= \
-	http://github.com/downloads/mpruett/audiofile/ \
-	http://www.68k.org/~michael/audiofile/
-PKG_MD5SUM:=a39be317a7b1971b408805dc5e371862
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libaudiofile
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Audio File library
-  URL:=http://www.68k.org/~michael/audiofile/
-endef
-
-define Package/libaudiofile/description
- The audiofile library allows the processing of audio data to and from audio
- files of many common formats (currently AIFF, AIFF-C, WAVE, NeXT/Sun, BICS,
- and raw data).
-endef
-
-CONFIGURE_ARGS+= \
-	--enable-shared \
-	--enable-static \
-	--with-build-cc="$(HOSTCC)" \
-
-TARGET_CFLAGS+= $(FPIC) -std=c99
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(2)/bin
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/bin/audiofile-config \
-		$(2)/bin/
-	$(SED) \
-		's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \
-		$(2)/bin/audiofile-config
-
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/include/{af_vfs,audiofile,aupvlist}.h \
-		$(1)/usr/include/
-
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libaudiofile.{la,a,so*} \
-		$(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/audiofile.pc \
-		$(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libaudiofile/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) \
-		$(PKG_INSTALL_DIR)/usr/lib/libaudiofile.so.* \
-		$(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libaudiofile))
-

--- a/libs/libaudiofile/patches/001-audiofile-config-libdirs.patch
+++ /dev/null
@@ -1,14 +1,1 @@
---- a/audiofile-config.in
-+++ b/audiofile-config.in
-@@ -45,7 +45,9 @@ while test $# -gt 0; do
-       echo $includes
-       ;;
-     --libs)
--      libdirs=-L@libdir@
-+      if test @libdir@ != /usr/libdir ; then
-+        libdirs=-L@libdir@
-+      fi
-       echo $libdirs -laudiofile -lm
-       ;;
-     *)
 

file:a/libs/libdaemon/Makefile (deleted)
--- a/libs/libdaemon/Makefile
+++ /dev/null
@@ -1,71 +1,1 @@
-#
-# Copyright (C) 2006-2014 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdaemon
-PKG_VERSION:=0.14
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://0pointer.de/lennart/projects/libdaemon/
-PKG_MD5SUM:=509dc27107c21bcd9fbf2f95f5669563
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libdaemon
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A lightweight C library that eases the writing of UNIX daemons
-  URL:=http://0pointer.de/lennart/projects/libdaemon/
-endef
-
-define Package/libdaemon/description
-	libdaemon is a lightweight C library that eases the writing of UNIX daemons.
-	It consists of the following parts:
-	- A wrapper around fork() which does the correct daemonization procedure of a process
-	- A wrapper around syslog() for simpler and compatible log output to Syslog or STDERR
-	- An API for writing PID files
-	- An API for serializing UNIX signals into a pipe for usage with select() or poll()
-	- An API for running subprocesses with STDOUT and STDERR redirected to syslog
-
-	APIs like these are used in most daemon software available. It is not that
-	simple to get it done right and code duplication is not a goal.
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-lynx \
-		, \
-		ac_cv_func_setpgrp_void=yes \
-	)
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libdaemon $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.a $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so* $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libdaemon.pc $(1)/usr/lib/pkgconfig/
-endef
-
-define Package/libdaemon/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libdaemon.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdaemon))
-

--- a/libs/libdaemon/patches/001-daemon_set_verbosity.patch
+++ /dev/null
@@ -1,31 +1,1 @@
-From 013963ba35e8fe8897211c0acf5ee98f9a871fc1 Mon Sep 17 00:00:00 2001
-From: Michael Heimpold <mhei@heimpold.de>
-Date: Fri, 10 Jan 2014 19:38:51 +0100
-Subject: [PATCH] daemon_set_verbosity: fix erroneous error message
 
-When calling this function with a value other than LOG_DEBUG
-the error message was triggered erroneously.
-
-Signed-off-by: Michael Heimpold <mhei@heimpold.de>
----
-
- libdaemon/dlog.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libdaemon/dlog.c b/libdaemon/dlog.c
-index 1cc0566..cc2b918 100644
---- a/libdaemon/dlog.c
-+++ b/libdaemon/dlog.c
-@@ -42,7 +42,7 @@ static int daemon_verbosity_level = LOG_INFO;
- void daemon_set_verbosity(int verbosity_prio) {
- 
-     /* Allow using negative verbosity levels to hide _all_ messages */
--    if (verbosity_prio > 0 && (verbosity_prio & LOG_PRIMASK) != LOG_PRIMASK)
-+    if (verbosity_prio > 0 && (verbosity_prio & LOG_PRIMASK) != verbosity_prio)
-         daemon_log(LOG_ERR, "The value %d is not a valid priority value", verbosity_prio);
- 
-     daemon_verbosity_level = verbosity_prio & LOG_PRIMASK;
--- 
-1.7.10.4
-
-

file:a/libs/libid3tag/Makefile (deleted)
--- a/libs/libid3tag/Makefile
+++ /dev/null
@@ -1,65 +1,1 @@
-#
-# Copyright (C) 2006-2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libid3tag
-PKG_VERSION:=0.15.1b
-PKG_RELEASE:=3
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/mad
-PKG_MD5SUM:=e5808ad997ba32c498803822078748c3
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libid3tag
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+zlib
-  TITLE:=An ID3 tag manipulation library
-  URL:=http://mad.sourceforge.net/
-endef
-
-define Package/libid3tag/description
-	libid3tag is a library for reading and (eventually) writing ID3 tags, both
-	ID3v1 and the various versions of ID3v2.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-CONFIGURE_VARS += CC="$(TARGET_CC) $(TARGET_CFLAGS)"
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--enable-shared \
-		--enable-static \
-		--disable-debugging \
-		--disable-profiling \
-	)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/id3tag.h $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so* $(1)/usr/lib/
-endef
-
-define Package/libid3tag/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libid3tag.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libid3tag))
-

file:a/libs/libmms/Makefile (deleted)
--- a/libs/libmms/Makefile
+++ /dev/null
@@ -1,66 +1,1 @@
-#
-# Copyright (C) 2010-2011 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libmms
-PKG_VERSION:=0.6
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=@SF/libmms
-PKG_MD5SUM:=650ad04a4c8bd79246390b81b29680b6
-
-PKG_LICENSE:=LGPLv2.1
-PKG_LICENSE_FILES:=COPYING.LIB
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/libmms
-  SECTION:=libs
-  CATEGORY:=Libraries
-  DEPENDS:=+glib2
-  TITLE:=MMS stream protocol library
-  URL:=http://libmms.sourceforge.net
-endef
-
-define Package/libmms/description
-	LibMMS is a common library for parsing mms:// and mmsh:// type network streams.
-	These are commonly used to stream Windows Media Video content over the web.
-	LibMMS itself is only for receiving MMS stream,
-	it doesn't handle sending at all.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-define Build/Configure
-	(cd $(PKG_BUILD_DIR); ./autogen.sh );
-	$(call Build/Configure/Default)
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/libmms $(1)/usr/include/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmms.{a,so*} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
-	$(INSTALL_DATA) \
-		$(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \
-		$(1)/usr/lib/pkgconfig
-endef
-
-define Package/libmms/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libmms.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libmms))
-

--- a/libs/libmms/patches/00-remove_iconv_dependency.patch
+++ /dev/null
@@ -1,102 +1,1 @@
-diff -burN libmms-0.6.original/src/mms.c libmms-0.6.modified/src/mms.c
---- libmms-0.6.original/src/mms.c	2010-05-31 12:13:04.000000000 +0200
-+++ libmms-0.6.modified/src/mms.c	2012-06-25 12:44:06.000000000 +0200
-@@ -40,7 +40,6 @@
- #include <errno.h>
- #include <stdlib.h>
- #include <time.h>
--#include <iconv.h>
- 
- /********** logging **********/
- #define lprintf(...) if (getenv("LIBMMS_DEBUG")) fprintf(stderr, __VA_ARGS__)
-@@ -447,17 +446,21 @@
-   return 1;
- }
- 
--static int string_utf16(iconv_t url_conv, char *dest, char *src, int dest_len)
-+static int string_utf16(char *dest, char *src, int dest_len)
- {
-   char *ip = src, *op = dest;
-   size_t ip_len = strlen(src);
--  size_t op_len = dest_len - 2; /* reserve 2 bytes for 0 termination */
- 
--  if (iconv(url_conv, &ip, &ip_len, &op, &op_len) == (size_t)-1) {
-+  if (2 * ip_len + 2 > dest_len) {
-     lprintf("mms: Error converting uri to unicode: %s\n", strerror(errno));
-     return 0;
-   }
-   
-+  while (ip_len--) {
-+    *op++ = *ip++;
-+    *op++ = 0x00;
-+  }
-+  
-   /* 0 terminate the string */
-   *op++ = 0;
-   *op++ = 0;
-@@ -1012,7 +1015,6 @@
-  */
- /* FIXME: got somewhat broken during xine_stream_t->(void*) conversion */
- mms_t *mms_connect (mms_io_t *io, void *data, const char *url, int bandwidth) {
--  iconv_t url_conv = (iconv_t)-1;
-   mms_t  *this;
-   int     res;
-   uint32_t openid;
-@@ -1071,12 +1073,6 @@
-     goto fail;
-   }
-   
--  url_conv = iconv_open("UTF-16LE", "UTF-8");
--  if (url_conv == (iconv_t)-1) {
--    lprintf("mms: could not get iconv handle to convert url to unicode\n");
--    goto fail;
--  }
--
-   /*
-    * let the negotiations begin...
-    */
-@@ -1088,7 +1084,7 @@
-   mms_gen_guid(this->guid);
-   sprintf(this->str, "NSPlayer/7.0.0.1956; {%s}; Host: %s", this->guid,
-           this->host);
--  res = string_utf16(url_conv, this->scmd_body + command_buffer.pos, this->str,
-+  res = string_utf16(this->scmd_body + command_buffer.pos, this->str,
-                      CMD_BODY_LEN - command_buffer.pos);
-   if(!res)
-     goto fail;
-@@ -1117,7 +1113,7 @@
-   mms_buffer_put_32 (&command_buffer, 0x00000000);
-   mms_buffer_put_32 (&command_buffer, 0x00989680);
-   mms_buffer_put_32 (&command_buffer, 0x00000002);
--  res = string_utf16(url_conv, this->scmd_body + command_buffer.pos,
-+  res = string_utf16(this->scmd_body + command_buffer.pos,
-                      "\\\\192.168.0.129\\TCP\\1037",
-                      CMD_BODY_LEN - command_buffer.pos);
-   if(!res)
-@@ -1156,7 +1152,7 @@
-     mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */
-     mms_buffer_put_32 (&command_buffer, 0x00000000); /* ?? */
- 
--    res = string_utf16(url_conv, this->scmd_body + command_buffer.pos,
-+    res = string_utf16(this->scmd_body + command_buffer.pos,
-                        this->uri, CMD_BODY_LEN - command_buffer.pos);
-     if(!res)
-       goto fail;
-@@ -1266,7 +1262,6 @@
-     }
-   }
- 
--  iconv_close(url_conv);
-   lprintf("mms: connect: passed\n");
-  
-   return this;
-@@ -1280,8 +1275,6 @@
-     gnet_uri_delete(this->guri);
-   if (this->uri)
-     free(this->uri);
--  if (url_conv != (iconv_t)-1)
--    iconv_close(url_conv);
- 
-   free (this);
-   return NULL;
 

file:a/libs/libvorbis/Makefile (deleted)
--- a/libs/libvorbis/Makefile
+++ /dev/null
@@ -1,65 +1,1 @@
-#
-# Copyright (C) 2008-2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libvorbis
-PKG_VERSION:=1.3.3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=http://downloads.xiph.org/releases/vorbis/
-PKG_MD5SUM:=71b649d3e08e63ece16649df906ce8b9
-
-PKG_LICENSE:=BSD-3c
-PKG_LICENSE_FILES:=COPYING
-
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libvorbis
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=libvorbis
-  URL:=http://xiph.org/vorbis/
-  DEPENDS:=+libogg
-endef
-
-define Package/libvorbis/description
-Vorbis is a general purpose audio and music encoding format
-contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
-MPEG audio layer 3. Unlike the MPEG sponsored formats (and other
-proprietary formats such as RealAudio G2 and Windows' flavor of the
-month), the Vorbis CODEC specification belongs to the public domain.
-All the technical details are published and documented, and any
-software entity may make full use of the format without license
-fee, royalty or patent concerns.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-oggtest \
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include/vorbis/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/vorbis/* $(1)/usr/include/vorbis/
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/
-	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/
-	$(INSTALL_DIR) $(1)/usr/share/aclocal/
-	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/share/aclocal/* $(1)/usr/share/aclocal/
-endef
-
-define Package/libvorbis/install
-	$(INSTALL_DIR) $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libvorbis))
-

--- a/multimedia/shairport/Makefile
+++ /dev/null
@@ -1,58 +1,1 @@
-#
-# Copyright (C) 2013 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=shairport
-PKG_VERSION:=2014-05-08
-PKG_RELEASE:=$(PKG_SOURCE_VERSION)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git://github.com/abrasive/shairport.git
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=078b21043cdcef6ffad7452db27f036770b23b0c
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/shairport
-  SECTION:=multimedia
-  CATEGORY:=Multimedia
-  DEPENDS:=+libpthread +avahi-utils +libopenssl +libao +libavahi-client \
-	+alsa-utils
-  TITLE:=ShairPort AirPort Express emulator
-endef
-
-define Package/shairport/description
-  This program emulates an AirPort Express for the purpose of streaming
-  music from iTunes and compatible iPods. It implements a server for the
-  Apple RAOP protocol.
-  ShairPort does not support AirPlay v2 (video and photo streaming).
-
-  It supports multiple simultaneous streams, if your audio output chain
-  (as detected by libao) does so.
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-LIBS:=-lao -lm -lcrypto -lpthread -lavahi-common -lavahi-client -lasound
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \
-	LDFLAGS="$(TARGET_LDFLAGS) $(LIBS)"
-
-define Package/shairport/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/shairport $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/init.d/
-	$(INSTALL_BIN) files/shairport.init $(1)/etc/init.d/shairport
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) files/shairport.config $(1)/etc/config/shairport
-endef
-
-$(eval $(call BuildPackage,shairport))
-

--- a/multimedia/shairport/files/shairport.config
+++ /dev/null
@@ -1,12 +1,1 @@
-config shairport
-	option name 'AirPort'
-	option password ''
-	option port '5002'
-	option buffer '256'
-	option log '/var/log/shairport'
-	option cmd_start ''
-	option cmd_stop ''
-	option cmd_wait '0'
-	option audio_output ''
-	option mdns ''
 

--- a/multimedia/shairport/files/shairport.init
+++ /dev/null
@@ -1,54 +1,1 @@
-#!/bin/sh /etc/rc.common
-# Copyright (C) 2013-2014 OpenWrt.org
 
-START=50
-USE_PROCD=1
-
-config_shairport() {
-	local cfg="$1"
-
-	local cfg_name
-	local cfg_password
-	local cfg_port
-	local cfg_buffer
-	local cfg_log
-	local cfg_cmd_start
-	local cfg_cmd_stop
-	local cfg_cmd_wait
-	local cfg_audio_output
-	local cfg_mdns
-
-	config_get cfg_name $cfg 'name' 'AirPort'
-	config_get cfg_password $cfg 'password' ''
-	config_get cfg_port $cfg 'port' '5002'
-	config_get cfg_buffer $cfg 'buffer' '256'
-	config_get cfg_log $cfg 'log' '/var/log/shairport'
-	config_get cfg_cmd_start $cfg 'cmd_start' ''
-	config_get cfg_cmd_stop $cfg 'cmd_stop' ''
-	config_get_bool cfg_cmd_wait $cfg 'cmd_wait' '0'
-	config_get cfg_audio_output $cfg 'audio_output' ''
-	config_get cfg_mdns $cfg 'mdns' ''
-
-	procd_open_instance
-
-	procd_set_param command /usr/sbin/shairport
-	procd_append_param command -a "$cfg_name"
-	[ ! -z "$cfg_password" ] && procd_append_param command -k "$cfg_password"
-	procd_append_param command -p $cfg_port
-	procd_append_param command -b $cfg_buffer
-	procd_append_param command -l $cfg_log
-	[ ! -z "$cfg_cmd_start" ] && procd_append_param command -B "$cfg_cmd_start"
-	[ ! -z "$cfg_cmd_stop" ] && procd_append_param command -E "$cfg_cmd_stop"
-	[ "$cfg_cmd_wait" -eq 1 ] && procd_append_param command -w
-	[ ! -z "$cfg_audio_output" ] && procd_append_param command -o "$cfg_audio_output"
-	[ ! -z "$cfg_mdns" ] && procd_append_param command -m "$cfg_mdns"
-
-	procd_set_param respawn
-	procd_close_instance
-}
-
-start_service() {
-	config_load shairport
-	config_foreach config_shairport shairport
-}
-

--- a/multimedia/shairport/patches/001-disable_pulseaudio.patch
+++ /dev/null
@@ -1,12 +1,1 @@
---- a/configure
-+++ b/configure
-@@ -59,7 +59,7 @@ do_pkg_config()
- 
- do_pkg_config OpenSSL       openssl
- do_pkg_config libao         ao              CONFIG_AO
--do_pkg_config PulseAudio    libpulse-simple CONFIG_PULSE
-+#do_pkg_config PulseAudio    libpulse-simple CONFIG_PULSE
- do_pkg_config ALSA          alsa            CONFIG_ALSA
- do_pkg_config Avahi\ client avahi-client    CONFIG_AVAHI
- 
 

--- a/utils/alsa-utils/Makefile
+++ /dev/null
@@ -1,93 +1,1 @@
-#
-# Copyright (C) 2006-2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=alsa-utils
-PKG_VERSION:=1.0.27.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=ftp://ftp.alsa-project.org/pub/utils/ \
-		http://alsa.cybermirror.org/utils/
-PKG_MD5SUM:=b65e9a04181bd7c9db7667a4566f8dc3
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/alsa-utils
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+alsa-lib +libncurses +libpthread
-  TITLE:=ALSA (Advanced Linux Sound Architecture) utilities
-  URL:=http://www.alsa-project.org/
-endef
-
-define Package/alsa-utils-seq
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:=+alsa-lib +libpthread
-  TITLE:=ALSA sequencer utilities
-  URL:=http://www.alsa-project.org/
-endef
-
-define Package/alsa-utils-tests
-  $(call Package/alsa-utils/Default)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=ALSA utilities test data (adds ~1.3M to image)
-  DEPENDS:=+alsa-lib +libpthread
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default, \
-		--disable-rpath \
-		--disable-alsatest \
-		--disable-xmlto \
-		, \
-		ac_cv_prog_ncurses5_config=no \
-		ac_cv_prog_ncursesw5_config=no \
-	)
-endef
-
-define Package/alsa-utils/install
-	$(INSTALL_DIR) $(1)/usr/{s,}bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amixer $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/alsamixer $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aplay $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/arecord $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/alsactl $(1)/usr/sbin/
-
-	$(INSTALL_DIR) $(1)/usr/share/alsa/init
-	$(INSTALL_DATA) \
-	    $(PKG_INSTALL_DIR)/usr/share/alsa/init/* \
-	    $(1)/usr/share/alsa/init/
-endef
-
-define Package/alsa-utils-seq/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aconnect $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/amidi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aplaymidi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/arecordmidi $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aseqdump $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aseqnet $(1)/usr/bin/
-endef
-
-define Package/alsa-utils-tests/install
-	$(INSTALL_DIR) $(1)/usr/{s,}bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/speaker-test $(1)/usr/bin/
-	$(INSTALL_DIR) $(1)/usr/share/sounds/alsa
-	$(INSTALL_DATA) \
-	    $(PKG_INSTALL_DIR)/usr/share/sounds/alsa/* \
-	    $(1)/usr/share/sounds/alsa/
-endef
-
-$(eval $(call BuildPackage,alsa-utils))
-$(eval $(call BuildPackage,alsa-utils-seq))
-$(eval $(call BuildPackage,alsa-utils-tests))
-

--- a/utils/alsa-utils/patches/100-uClibc-compat.patch
+++ /dev/null
@@ -1,24 +1,1 @@
---- a/alsamixer/volume_mapping.c
-+++ b/alsamixer/volume_mapping.c
-@@ -114,9 +114,9 @@ static double get_normalized_volume(snd_
- 	if (use_linear_dB_scale(min, max))
- 		return (value - min) / (double)(max - min);
- 
--	normalized = exp10((value - max) / 6000.0);
-+	normalized = pow(10, (value - max) / 6000.0);
- 	if (min != SND_CTL_TLV_DB_GAIN_MUTE) {
--		min_norm = exp10((min - max) / 6000.0);
-+		min_norm = pow(10, (min - max) / 6000.0);
- 		normalized = (normalized - min_norm) / (1 - min_norm);
- 	}
- 
-@@ -149,7 +149,7 @@ static int set_normalized_volume(snd_mix
- 	}
- 
- 	if (min != SND_CTL_TLV_DB_GAIN_MUTE) {
--		min_norm = exp10((min - max) / 6000.0);
-+		min_norm = pow(10, (min - max) / 6000.0);
- 		volume = volume * (1 - min_norm) + min_norm;
- 	}
- 	value = lrint_dir(6000.0 * log10(volume), dir) + max;
 

comments