Skip to content

Commit 3577e05

Browse files
committed
squash: Fix apt errors and mac deprecation.
1 parent 516ef9f commit 3577e05

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

resources/deb-prepare.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ fi
2525

2626
sudo apt-get install -y \
2727
debhelper \
28-
aptitude \
2928
sbuild \
3029
schroot \
3130
"$DEVTOOLS_PACKAGE" \

resources/sbuildrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ $build_dir = $ENV{'BUILD_DIR'};
44
$run_lintian = 0;
55
$apt_update = 1;
66
$apt_distupgrade = 1;
7-
$build_dep_resolver = 'aptitude';
7+
$build_dep_resolver = 'apt';
88
$mailto = '';
99
$mailprog = '';
1010

src/native/screencapture/CMakeLists.txt

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,15 @@ project(jnscreencapture C)
22

33
set(OS_SOURCES "")
44
set(OS_LIBS "")
5+
set(MACOS_COMPILE_FLAGS "")
56
if (WIN32)
67
set(OS_SOURCES screencapture.rc)
78
elseif (APPLE)
89
set(OS_LIBS "-framework ApplicationServices")
10+
# CGWindowListCreateImage is deprecated/unavailable in macOS 15.0+
11+
# Allow using deprecated APIs until migration to ScreenCaptureKit
12+
# TODO: Migrate to ScreenCaptureKit for macOS 15+ support
13+
set(MACOS_COMPILE_FLAGS "-Wno-deprecated-declarations")
914
elseif (UNIX AND NOT APPLE)
1015
find_package(X11 REQUIRED)
1116
if (NOT X11_FOUND)
@@ -35,6 +40,10 @@ target_include_directories(${PROJECT_NAME} PUBLIC
3540
${CMAKE_BINARY_DIR}/include/
3641
)
3742

43+
if (APPLE)
44+
target_compile_options(${PROJECT_NAME} PRIVATE ${MACOS_COMPILE_FLAGS})
45+
endif ()
46+
3847
if (JITSI_BUILD_DEBIAN)
3948
install(TARGETS ${PROJECT_NAME}
4049
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})

0 commit comments

Comments
 (0)