Skip to content

Commit 7c55969

Browse files
committed
adapt 36200
1 parent 60707a0 commit 7c55969

File tree

1,835 files changed

+358428
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,835 files changed

+358428
-20
lines changed

CMakeLists.txt

+3-19
Original file line numberDiff line numberDiff line change
@@ -71,17 +71,9 @@ if(APPLE)
7171
"${CMAKE_SOURCE_DIR}/deps/mac/include/QtWidgets"
7272
"${CMAKE_SOURCE_DIR}/deps/libyuv/include")
7373

74-
find_library(AGORAAIDENOISEEXTENSION AgoraAIDenoiseExtension "${CMAKE_SOURCE_DIR}/deps/mac/libs")
75-
find_library(AGORACORE AgoraCore "${CMAKE_SOURCE_DIR}/deps/mac/libs")
76-
find_library(AGORAFDKAAC Agorafdkaac "${CMAKE_SOURCE_DIR}/deps/mac/libs")
77-
find_library(AGORAFFMPEG Agoraffmpeg "${CMAKE_SOURCE_DIR}/deps/mac/libs")
78-
find_library(AGORARTCKIT AgoraRtcKit "${CMAKE_SOURCE_DIR}/deps/mac/libs")
79-
find_library(AGORASOUNDTOUCH AgoraSoundTouch "${CMAKE_SOURCE_DIR}/deps/mac/libs")
80-
find_library(AV1 av1 "${CMAKE_SOURCE_DIR}/deps/mac/libs")
74+
find_library(AGORAFFMPEG Agoraffmpeg "${CMAKE_SOURCE_DIR}/deps/mac_3.6.200/libs")
75+
find_library(AGORARTCKIT AgoraRtcKit "${CMAKE_SOURCE_DIR}/deps/mac_3.6.200/libs")
8176
find_library(YUV yuv "${CMAKE_SOURCE_DIR}/deps/mac/libs")
82-
find_library(AVSE AgoraVideoSegmentationExtension "${CMAKE_SOURCE_DIR}/deps/mac/libs")
83-
find_library(JND AgoraJNDExtension "${CMAKE_SOURCE_DIR}/deps/mac/libs")
84-
find_library(ADV1E AgoraDav1dExtension "${CMAKE_SOURCE_DIR}/deps/mac/libs")
8577

8678

8779
find_library(obs-frontend-api obs-frontend-api "${CMAKE_SOURCE_DIR}/deps/mac/libs")
@@ -108,22 +100,14 @@ endif()
108100
if(APPLE)
109101
target_link_libraries(agora-tool-ui
110102
libobs
111-
${AGORAAIDENOISEEXTENSION}
112-
${AGORACORE}
113-
${AGORAFDKAAC}
114103
${AGORAFFMPEG}
115104
${AGORARTCKIT}
116-
${AGORASOUNDTOUCH}
117-
${AV1}
118-
${AVSE}
119-
${JND}
120-
${ADV1E}
121105
${YUV}
122106
${obs-frontend-api}
123107
${QT5CORE}
124108
${QT5GUI}
125109
${QT5WIDGETS}
126-
${CURL}
110+
${CURL}
127111
)
128112
endif()
129113

deps/mac/include/QtCore/5.15.2/QtCore/private/cp949codetbl_p.h

+648
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
/****************************************************************************
2+
**
3+
** Copyright (C) 2017 Intel Corporation.
4+
** Contact: https://www.qt.io/licensing/
5+
**
6+
** This file is part of the QtCore module of the Qt Toolkit.
7+
**
8+
** $QT_BEGIN_LICENSE:LGPL$
9+
** Commercial License Usage
10+
** Licensees holding valid commercial Qt licenses may use this file in
11+
** accordance with the commercial license agreement provided with the
12+
** Software or, alternatively, in accordance with the terms contained in
13+
** a written agreement between you and The Qt Company. For licensing terms
14+
** and conditions see https://www.qt.io/terms-conditions. For further
15+
** information use the contact form at https://www.qt.io/contact-us.
16+
**
17+
** GNU Lesser General Public License Usage
18+
** Alternatively, this file may be used under the terms of the GNU Lesser
19+
** General Public License version 3 as published by the Free Software
20+
** Foundation and appearing in the file LICENSE.LGPL3 included in the
21+
** packaging of this file. Please review the following information to
22+
** ensure the GNU Lesser General Public License version 3 requirements
23+
** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
24+
**
25+
** GNU General Public License Usage
26+
** Alternatively, this file may be used under the terms of the GNU
27+
** General Public License version 2.0 or (at your option) the GNU General
28+
** Public license version 3 or any later version approved by the KDE Free
29+
** Qt Foundation. The licenses are as published by the Free Software
30+
** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
31+
** included in the packaging of this file. Please review the following
32+
** information to ensure the GNU General Public License requirements will
33+
** be met: https://www.gnu.org/licenses/gpl-2.0.html and
34+
** https://www.gnu.org/licenses/gpl-3.0.html.
35+
**
36+
** $QT_END_LICENSE$
37+
**
38+
****************************************************************************/
39+
40+
#ifndef MINIMUMLINUX_P_H
41+
#define MINIMUMLINUX_P_H
42+
43+
//
44+
// W A R N I N G
45+
// -------------
46+
//
47+
// This file is not part of the Qt API. It exists purely as an
48+
// implementation detail. This header file may change from version to
49+
// version without notice, or even be removed.
50+
//
51+
// We mean it.
52+
//
53+
54+
// EXTRA WARNING
55+
// -------------
56+
//
57+
// This file must also be valid assembler source.
58+
//
59+
60+
#include "private/qglobal_p.h"
61+
62+
QT_BEGIN_NAMESPACE
63+
64+
/* Minimum Linux kernel version:
65+
* We require the following features in Qt (unconditional, no fallback):
66+
* Feature Added in version Macro
67+
* - inotify_init1 before 2.6.12-rc12
68+
* - futex(2) before 2.6.12-rc12
69+
* - FUTEX_WAKE_OP 2.6.14 FUTEX_OP
70+
* - linkat(2) 2.6.17 O_TMPFILE && QT_CONFIG(linkat)
71+
* - FUTEX_PRIVATE_FLAG 2.6.22
72+
* - O_CLOEXEC 2.6.23
73+
* - eventfd 2.6.23
74+
* - pipe2 & dup3 2.6.27
75+
* - accept4 2.6.28
76+
* - renameat2 3.16 QT_CONFIG(renameat2)
77+
* - getrandom 3.17 QT_CONFIG(getentropy)
78+
* - statx 4.11 QT_CONFIG(statx)
79+
*/
80+
81+
#if QT_CONFIG(statx) && !QT_CONFIG(glibc)
82+
// if using glibc, the statx() function in sysdeps/unix/sysv/linux/statx.c
83+
// falls back to stat() for us.
84+
// (Using QT_CONFIG(glibc) instead of __GLIBC__ because the macros aren't
85+
// defined in assembler mode)
86+
# define MINLINUX_MAJOR 4
87+
# define MINLINUX_MINOR 11
88+
# define MINLINUX_PATCH 0
89+
#elif QT_CONFIG(getentropy)
90+
# define MINLINUX_MAJOR 3
91+
# define MINLINUX_MINOR 17
92+
# define MINLINUX_PATCH 0
93+
#elif QT_CONFIG(renameat2)
94+
# define MINLINUX_MAJOR 3
95+
# define MINLINUX_MINOR 16
96+
# define MINLINUX_PATCH 0
97+
#else
98+
# define MINLINUX_MAJOR 2
99+
# define MINLINUX_MINOR 6
100+
# define MINLINUX_PATCH 28
101+
#endif
102+
103+
#define MINIMUM_LINUX_VERSION QT_VERSION_CHECK(MINLINUX_MAJOR, MINLINUX_MINOR, MINLINUX_PATCH)
104+
105+
QT_END_NAMESPACE
106+
107+
#endif // MINIMUMLINUX_P_H

0 commit comments

Comments
 (0)