[vlc-commits] contrib: remove speexdsp includedir patch

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <le.businessman at gmail.com> | Fri Jun 27 03:20:20 2014 -0400| [e4a23cc5b196c547b2e72bf6259d434bee9ef4e8] | committer: Jean-Baptiste Kempf

contrib: remove speexdsp includedir patch

No longer needed due to upstream change.

(cherry picked from commit 8a9ac878b21ede8a65efdf71c6f5cc5b8fa3a88b)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=e4a23cc5b196c547b2e72bf6259d434bee9ef4e8
---

 contrib/src/speexdsp/includedir.patch |   10 ----------
 contrib/src/speexdsp/rules.mak        |    1 -
 2 files changed, 11 deletions(-)

diff --git a/contrib/src/speexdsp/includedir.patch b/contrib/src/speexdsp/includedir.patch
deleted file mode 100644
index 23456e3..0000000
--- a/contrib/src/speexdsp/includedir.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- speexdsp/include/speex/Makefile.am.orig	2013-12-08 11:50:39.859569265 +0100
-+++ speexdsp/include/speex/Makefile.am	2013-12-08 11:50:48.535568900 +0100
-@@ -2,6 +2,7 @@
- #AUTOMAKE_OPTIONS = no-dependencies
- 
- nodist_pkginclude_HEADERS = speexdsp_config_types.h
-+pkgincludedir=$(includedir)/speex
- 
- pkginclude_HEADERS = speex_echo.h speex_jitter.h speex_preprocess.h speex_resampler.h \
- 	speexdsp_types.h
diff --git a/contrib/src/speexdsp/rules.mak b/contrib/src/speexdsp/rules.mak
index 2244813..ddb4850 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -21,7 +21,6 @@ speexdsp: speexdsp-$(SPEEXDSP_VERSION).tar.gz .sum-speexdsp
 	mkdir -p $@-git
 	$(ZCAT) "$<" | (cd $@-git && tar xv --strip-components=1)
 	$(APPLY) $(SRC)/speexdsp/neon.patch
-	$(APPLY) $(SRC)/speexdsp/includedir.patch
 	$(MOVE)
 
 SPEEXDSP_CONF := --enable-resample-full-sinc-table