From 93fd35200f96b1d4a36b931e722812f4e15fa2be Mon Sep 17 00:00:00 2001
From: Daniel Engberg <daniel.engberg.lists@pyret.net>
Date: Wed, 12 Jul 2017 00:22:34 +0200
Subject: [PATCH] sound/sox: Reduce dependencies

Reduce dependencies and remove not used functionality linked in using external libs.

libsndfile: Unusual file formats
libpng: Only used to generate spectrograms
Clean up configure arguments
libid3tag doesn't fall into the BUILD_PATENTED category as far as I can tell.

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Ted Hess <thess@kitschensync.net>
---
 sound/sox/Makefile | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/sound/sox/Makefile b/sound/sox/Makefile
index 11402f8e4..34aa32ed1 100644
--- a/sound/sox/Makefile
+++ b/sound/sox/Makefile
@@ -1,7 +1,4 @@
 #
-# Copyright (C) 2008 David Cooper <dave@kupesoft.com>
-# Copyright (C) 2006-2017 OpenWrt
-#
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
@@ -10,11 +7,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sox
 PKG_VERSION:=14.4.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=@SF/sox
-PKG_MD5SUM:=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c
+PKG_HASH:=81a6956d4330e75b5827316e44ae381e6f1e8928003c6aa45896da9041ea149c
 
 PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=LGPL-2.1 GPL-2.0
@@ -31,9 +28,8 @@ TARGET_LDFLAGS+= \
 define Package/sox
   SECTION:=sound
   CATEGORY:=Sound
-  DEPENDS:=+BUILD_PATENTED:lame-lib +BUILD_PATENTED:libmad +BUILD_PATENTED:libid3tag \
-		+libvorbis +libvorbisidec +alsa-lib +libsndfile +libflac \
-		+libmagic +libpng
+  DEPENDS:=+lame-lib +libmad +libid3tag +libmagic \
+		+libvorbis +alsa-lib +libflac
   TITLE:=Sox is a general purpose sound converter/player/recorder
   URL:=http://sox.sourceforge.net/
 endef
@@ -46,23 +42,17 @@ define Package/sox/description
 	several unix-style platforms.
 endef
 
-define Build/Configure
-	$(call Build/Configure/Default, \
+CONFIGURE_ARGS += \
 		--without-oss \
 		--without-ao \
 		--with-alsa \
 		--without-libltdl \
-		--with-ogg \
 		--with-flac \
-		--without-amr-wb \
-		--without-amr-nb \
-		--without-samplerate \
 		--without-ladspa \
-		--$(if $(CONFIG_BUILD_PATENTED),with-mad,without-mad) \
-		--$(if $(CONFIG_BUILD_PATENTED),with-lame,without-lame) \
-		--$(if $(CONFIG_BUILD_PATENTED),with-id3tag,without-id3tag) \
-	)
-endef
+		--without-png \
+		--without-sndfile \
+		--with-lame \
+		--with-id3tag
 
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include