[vlc-commits] contrib: speexdsp: install headers in include/speex, where we expect them

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sun Dec  8 11:53:58 2013 +0100| [b036441cf6ac5fa6956f72d73766877d3df38b72] | committer: Rafaël Carré

contrib: speexdsp: install headers in include/speex, where we expect them

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

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

diff --git a/contrib/src/speexdsp/includedir.patch b/contrib/src/speexdsp/includedir.patch
new file mode 100644
index 0000000..23456e3
--- /dev/null
+++ b/contrib/src/speexdsp/includedir.patch
@@ -0,0 +1,10 @@
+--- 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 d2de109..7f19c0b 100644
--- a/contrib/src/speexdsp/rules.mak
+++ b/contrib/src/speexdsp/rules.mak
@@ -21,6 +21,7 @@ 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