From 078b5fbe857eaa4738f990d86cd987ad13d9c2c4 Mon Sep 17 00:00:00 2001
From: juhosg <juhosg@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Sun, 20 Oct 2013 15:58:20 +0000
Subject: [PATCH] packages: libshout: update libshout to 2.3.1, refresh patches

Udate package libshout to 2.3.1 and refresh patches.

Signed-off-by: Dirk Neukirchen <dirkneukirchen@web.de>
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

git-svn-id: svn://svn.openwrt.org/openwrt/packages@38474 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 libs/libshout/Makefile                             |  6 +++---
 libs/libshout/patches/120-vorbis-c.patch           | 10 ++++------
 .../patches/140-no_example_doc_win32.patch         | 14 +++++---------
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/libs/libshout/Makefile b/libs/libshout/Makefile
index 5a11d2526..af12afad4 100644
--- a/libs/libshout/Makefile
+++ b/libs/libshout/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libshout
-PKG_VERSION:=2.2.2
-PKG_RELEASE:=2
+PKG_VERSION:=2.3.1
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/libshout/
-PKG_MD5SUM:=4f75fc9901c724b712c371c9a1e782d3
+PKG_MD5SUM:=11765b2592e7ea623ccd93d3f8df172c
 
 PKG_FIXUP:=autoreconf
 PKG_INSTALL:=1
diff --git a/libs/libshout/patches/120-vorbis-c.patch b/libs/libshout/patches/120-vorbis-c.patch
index ab5bcee4e..a9e41f93a 100644
--- a/libs/libshout/patches/120-vorbis-c.patch
+++ b/libs/libshout/patches/120-vorbis-c.patch
@@ -1,10 +1,8 @@
-Index: libshout-2.2.2/src/vorbis.c
-===================================================================
---- libshout-2.2.2.orig/src/vorbis.c	2008-02-12 12:30:14.000000000 +0100
-+++ libshout-2.2.2/src/vorbis.c	2008-02-12 12:30:14.000000000 +0100
-@@ -27,7 +27,7 @@
- #include <inttypes.h>
+--- a/src/vorbis.c
++++ b/src/vorbis.c
+@@ -28,7 +28,7 @@
  #endif
+ #include <stdlib.h>
  
 -#include <vorbis/codec.h>
 +#include <tremor/ivorbiscodec.h>
diff --git a/libs/libshout/patches/140-no_example_doc_win32.patch b/libs/libshout/patches/140-no_example_doc_win32.patch
index 329a1b3ac..9e8b5a357 100644
--- a/libs/libshout/patches/140-no_example_doc_win32.patch
+++ b/libs/libshout/patches/140-no_example_doc_win32.patch
@@ -1,19 +1,15 @@
-Index: libshout-2.2.2/Makefile.in
-===================================================================
---- libshout-2.2.2.orig/Makefile.in	2008-02-12 12:30:14.000000000 +0100
-+++ libshout-2.2.2/Makefile.in	2008-02-12 12:30:15.000000000 +0100
-@@ -246,14 +246,14 @@
- target_alias = @target_alias@
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -288,12 +288,12 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  AUTOMAKE_OPTIONS = 1.6 foreign
  ACLOCAL_AMFLAGS = -I m4
 -SUBDIRS = include src examples debian doc win32
 +SUBDIRS = include src debian
- EXTRA_DIST = INSTALL m4/shout.m4 m4/ac_config_libconfig_in.m4 m4/acx_pthread.m4 \
+ EXTRA_DIST = INSTALL m4/shout.m4 m4/acx_pthread.m4 \
  	m4/ogg.m4 m4/vorbis.m4 m4/xiph_compiler.m4 m4/xiph_net.m4 \
  	m4/xiph_types.m4
  
- DISTCLEANFILES = shout-config.in
- docdir = $(datadir)/doc/$(PACKAGE)
 -doc_DATA = COPYING NEWS README examples/example.c examples/nonblocking.c
 +doc_DATA = COPYING NEWS README
  m4datadir = $(datadir)/aclocal