diff --git a/submodules/OpusBinding/Sources/opusfile/internal.h b/submodules/OpusBinding/Sources/opusfile/internal.h index b1109deb90..1d21ca6faf 100644 --- a/submodules/OpusBinding/Sources/opusfile/internal.h +++ b/submodules/OpusBinding/Sources/opusfile/internal.h @@ -29,7 +29,7 @@ # endif # include -# include "opusfile.h" +# include "opusfile/opusfile.h" typedef struct OggOpusLink OggOpusLink; diff --git a/submodules/OpusBinding/Sources/opusfile/opusfile.c b/submodules/OpusBinding/Sources/opusfile/opusfile.c index 392ddb29ea..58383ca6dd 100644 --- a/submodules/OpusBinding/Sources/opusfile/opusfile.c +++ b/submodules/OpusBinding/Sources/opusfile/opusfile.c @@ -26,7 +26,7 @@ #include #include -#include "opusfile.h" +#include "opusfile/opusfile.h" /*This implementation is largely based off of libvorbisfile. All of the Ogg bits work roughly the same, though I have made some diff --git a/submodules/TelegramCallsUI/BUILD b/submodules/TelegramCallsUI/BUILD index ea7eb8b5e9..072d8dc935 100644 --- a/submodules/TelegramCallsUI/BUILD +++ b/submodules/TelegramCallsUI/BUILD @@ -94,7 +94,7 @@ swift_library( "//submodules/TextFormat:TextFormat", "//submodules/Markdown:Markdown", "//submodules/ChatTitleActivityNode:ChatTitleActivityNode", - "//third-party/libyuv:LibYuvBinding", + "//third-party/LibYuvBinding", "//submodules/ComponentFlow:ComponentFlow", "//submodules/Components/LottieAnimationComponent:LottieAnimationComponent", "//submodules/Components/ActivityIndicatorComponent:ActivityIndicatorComponent", diff --git a/submodules/TgVoipWebrtc/BUILD b/submodules/TgVoipWebrtc/BUILD index cc4e5f2bd9..9c00d1572c 100644 --- a/submodules/TgVoipWebrtc/BUILD +++ b/submodules/TgVoipWebrtc/BUILD @@ -146,7 +146,6 @@ objc_library( "-Ithird-party/webrtc/webrtc/sdk/objc/components/renderer/metal", "-Ithird-party/webrtc/webrtc/sdk/objc/components/renderer/opengl", "-Ithird-party/webrtc/webrtc/sdk/objc/components/video_codec", - "-Ithird-party/libyuv/third_party/libyuv/include", "-Ithird-party/libyuv", "-Ithird-party/webrtc/webrtc/sdk/objc/api/video_codec", "-Ithird-party/webrtc/absl", diff --git a/third-party/LibYuvBinding/BUILD b/third-party/LibYuvBinding/BUILD new file mode 100644 index 0000000000..f0bcee5267 --- /dev/null +++ b/third-party/LibYuvBinding/BUILD @@ -0,0 +1,26 @@ + +objc_library( + name = "LibYuvBinding", + enable_modules = True, + module_name = "LibYuvBinding", + srcs = glob([ + "Sources/**/*.m", + "Sources/**/*.c", + "Sources/**/*.h", + ], allow_empty=True), + hdrs = glob([ + "PublicHeaders/**/*.h", + ]), + includes = [ + "PublicHeaders", + ], + deps = [ + "//third-party/libyuv", + ], + sdk_frameworks = [ + "Foundation", + ], + visibility = [ + "//visibility:public", + ], +) diff --git a/third-party/libyuv/LibYuvBinding/PublicHeaders/LibYuvBinding/LibYuvBinding.h b/third-party/LibYuvBinding/PublicHeaders/LibYuvBinding/LibYuvBinding.h similarity index 100% rename from third-party/libyuv/LibYuvBinding/PublicHeaders/LibYuvBinding/LibYuvBinding.h rename to third-party/LibYuvBinding/PublicHeaders/LibYuvBinding/LibYuvBinding.h diff --git a/third-party/libyuv/LibYuvBinding/Sources/LibYuvBinding.m b/third-party/LibYuvBinding/Sources/LibYuvBinding.m similarity index 100% rename from third-party/libyuv/LibYuvBinding/Sources/LibYuvBinding.m rename to third-party/LibYuvBinding/Sources/LibYuvBinding.m diff --git a/third-party/libyuv/BUILD b/third-party/libyuv/BUILD index 279d052531..402dc97822 100644 --- a/third-party/libyuv/BUILD +++ b/third-party/libyuv/BUILD @@ -29,7 +29,7 @@ arch_specific_cflags = select({ cc_library( name = "libyuv", - srcs = [ "third_party/libyuv/" + path for path in [ + hdrs = [ "third_party/libyuv/" + path for path in [ # Headers "include/libyuv.h", "include/libyuv/basic_types.h", @@ -55,7 +55,8 @@ cc_library( "include/libyuv/scale.h", "include/libyuv/version.h", "include/libyuv/video_common.h", - + ]], + srcs = [ "third_party/libyuv/" + path for path in [ # Source Files "source/compare.cc", "source/compare_common.cc", @@ -102,40 +103,11 @@ cc_library( "source/scale_neon.cc", "source/scale_neon64.cc", ]], + includes = [ + "third_party/libyuv/include", + ], copts = [ "-ffp-contract=fast", - "-Ithird-party/libyuv/third_party/libyuv/include", ] + arch_specific_cflags + optimization_flags, visibility = ["//visibility:public"], ) - - -objc_library( - name = "LibYuvBinding", - enable_modules = True, - module_name = "LibYuvBinding", - srcs = glob([ - "LibYuvBinding/Sources/**/*.m", - "LibYuvBinding/Sources/**/*.c", - "LibYuvBinding/Sources/**/*.h", - ], allow_empty=True), - hdrs = glob([ - "LibYuvBinding/PublicHeaders/**/*.h", - ]), - includes = [ - "LibYuvBinding/PublicHeaders", - ], - copts = [ - "-Ithird-party/libyuv/third_party/libyuv/include", - ], - deps = [ - ":libyuv", - ], - sdk_frameworks = [ - "Foundation", - ], - visibility = [ - "//visibility:public", - ], -) - diff --git a/third-party/opusfile/BUILD b/third-party/opusfile/BUILD index 4e210060c4..0e62d353df 100644 --- a/third-party/opusfile/BUILD +++ b/third-party/opusfile/BUILD @@ -13,9 +13,6 @@ objc_library( includes = [ "include", ], - copts = [ - "-Ithird-party/opusfile/include/opusfile", - ], deps = [ "//third-party/ogg:ogg", "//third-party/opus:opus", diff --git a/third-party/opusfile/Sources/internal.h b/third-party/opusfile/Sources/internal.h index 0c2d2bb309..19f69a2e85 100644 --- a/third-party/opusfile/Sources/internal.h +++ b/third-party/opusfile/Sources/internal.h @@ -29,7 +29,7 @@ # endif # include -# include +# include typedef struct OggOpusLink OggOpusLink; diff --git a/third-party/opusfile/Sources/opusfile.c b/third-party/opusfile/Sources/opusfile.c index 642c78478b..19f9e08c94 100644 --- a/third-party/opusfile/Sources/opusfile.c +++ b/third-party/opusfile/Sources/opusfile.c @@ -26,7 +26,7 @@ #include #include -#include "opusfile.h" +#include "opusfile/opusfile.h" /*This implementation is largely based off of libvorbisfile. All of the Ogg bits work roughly the same, though I have made some diff --git a/third-party/webrtc/BUILD b/third-party/webrtc/BUILD index b4bc15e093..ad80d7abab 100644 --- a/third-party/webrtc/BUILD +++ b/third-party/webrtc/BUILD @@ -3063,7 +3063,6 @@ objc_library( "-Ithird-party/webrtc/webrtc/sdk/objc", "-Ithird-party/webrtc/webrtc/sdk/objc/base", "-Ithird-party/libyuv", - "-Ithird-party/libyuv/third_party/libyuv/include", "-Ithird-party/webrtc/absl", "-DBSD=1", "-DUSE_KISS_FFT", @@ -3131,7 +3130,6 @@ objc_library( "-Ithird-party/webrtc/webrtc/sdk/objc", "-Ithird-party/webrtc/webrtc/sdk/objc/base", "-Ithird-party/libyuv", - "-Ithird-party/libyuv/third_party/libyuv/include", "-Ithird-party/webrtc/absl", "-DBSD=1", "-DUSE_KISS_FFT", @@ -3196,7 +3194,6 @@ objc_library( "-Ithird-party/webrtc/libsrtp/third_party/libsrtp/crypto/include", "-Ithird-party/webrtc/webrtc/", "-Ithird-party/libyuv", - "-Ithird-party/libyuv/third_party/libyuv/include", "-Ithird-party/webrtc/absl", "-DBSD=1", "-DUSE_KISS_FFT",