opus: Move public headers to match system install

modules/opus/SCsub

@@ -201,6 +201,7 @@ if (env['builtin_opus'] != 'no'):
     thirdparty_include_paths = [
         "",
         "celt",
+        "opus",
         "silk",
         "silk/fixed",
         "silk/float",

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 {
 

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')

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