From 611a94e3a673a61b51746366366c698c66ef0195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= <rverschelde@gmail.com>
Date: Thu, 3 Nov 2016 21:10:34 +0100
Subject: [PATCH] opus: Move public headers to match system install

---
 modules/opus/SCsub                            | 1 +
 modules/opus/audio_stream_opus.h              | 2 +-
 modules/webm/SCsub                            | 2 +-
 thirdparty/README.md                          | 2 +-
 thirdparty/opus/{ => opus}/opus.h             | 0
 thirdparty/opus/{ => opus}/opus_custom.h      | 0
 thirdparty/opus/{ => opus}/opus_defines.h     | 0
 thirdparty/opus/{ => opus}/opus_multistream.h | 0
 thirdparty/opus/{ => opus}/opus_types.h       | 0
 thirdparty/opus/{ => opus}/opusfile.h         | 0
 10 files changed, 4 insertions(+), 3 deletions(-)
 rename thirdparty/opus/{ => opus}/opus.h (100%)
 rename thirdparty/opus/{ => opus}/opus_custom.h (100%)
 rename thirdparty/opus/{ => opus}/opus_defines.h (100%)
 rename thirdparty/opus/{ => opus}/opus_multistream.h (100%)
 rename thirdparty/opus/{ => opus}/opus_types.h (100%)
 rename thirdparty/opus/{ => opus}/opusfile.h (100%)

diff --git a/modules/opus/SCsub b/modules/opus/SCsub
index 491380c826d..4d3053c7ecf 100644
--- a/modules/opus/SCsub
+++ b/modules/opus/SCsub
@@ -201,6 +201,7 @@ if (env['builtin_opus'] != 'no'):
     thirdparty_include_paths = [
         "",
         "celt",
+        "opus",
         "silk",
         "silk/fixed",
         "silk/float",
diff --git a/modules/opus/audio_stream_opus.h b/modules/opus/audio_stream_opus.h
index 4da66fe1672..abf0b5c150e 100644
--- a/modules/opus/audio_stream_opus.h
+++ b/modules/opus/audio_stream_opus.h
@@ -36,7 +36,7 @@
 #include "os/file_access.h"
 #include "scene/resources/audio_stream.h"
 
-#include <opusfile.h>
+#include <opus/opusfile.h>
 
 class AudioStreamPlaybackOpus : public AudioStreamPlayback {
 
diff --git a/modules/webm/SCsub b/modules/webm/SCsub
index e417fc0cbf6..889f5e83aab 100644
--- a/modules/webm/SCsub
+++ b/modules/webm/SCsub
@@ -24,7 +24,7 @@ if (env['builtin_libogg'] != 'no'):
 if (env['builtin_libvorbis'] != 'no'):
     env_webm.Append(CPPPATH=["#thirdparty/libvorbis"])
 if (env['builtin_opus'] != 'no'):
-    env_webm.Append(CPPPATH=["#thirdparty"])
+    env_webm.Append(CPPPATH=["#thirdparty/opus"])
 
 if (env['builtin_libvpx'] != 'no'):
     Export('env_webm')
diff --git a/thirdparty/README.md b/thirdparty/README.md
index f61812c71ab..a1445a7a9a1 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -158,7 +158,7 @@ Files extracted from upstream source:
 
 - all .c and .h files in src/ (both opus and opusfile),
   except `opus_demo.c`
-- all .h files in include/ (both opus and opusfile)
+- all .h files in include/ (both opus and opusfile) as opus/
 - COPYING
 
 
diff --git a/thirdparty/opus/opus.h b/thirdparty/opus/opus/opus.h
similarity index 100%
rename from thirdparty/opus/opus.h
rename to thirdparty/opus/opus/opus.h
diff --git a/thirdparty/opus/opus_custom.h b/thirdparty/opus/opus/opus_custom.h
similarity index 100%
rename from thirdparty/opus/opus_custom.h
rename to thirdparty/opus/opus/opus_custom.h
diff --git a/thirdparty/opus/opus_defines.h b/thirdparty/opus/opus/opus_defines.h
similarity index 100%
rename from thirdparty/opus/opus_defines.h
rename to thirdparty/opus/opus/opus_defines.h
diff --git a/thirdparty/opus/opus_multistream.h b/thirdparty/opus/opus/opus_multistream.h
similarity index 100%
rename from thirdparty/opus/opus_multistream.h
rename to thirdparty/opus/opus/opus_multistream.h
diff --git a/thirdparty/opus/opus_types.h b/thirdparty/opus/opus/opus_types.h
similarity index 100%
rename from thirdparty/opus/opus_types.h
rename to thirdparty/opus/opus/opus_types.h
diff --git a/thirdparty/opus/opusfile.h b/thirdparty/opus/opus/opusfile.h
similarity index 100%
rename from thirdparty/opus/opusfile.h
rename to thirdparty/opus/opus/opusfile.h