Skip to content

Commit 25eb324

Browse files
committed
CI: fix build
1 parent 878e516 commit 25eb324

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,6 @@ if(LINUX)
496496
src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c
497497
src/detection/displayserver/linux/wayland/kde-output-order-v1-protocol.c
498498
src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-protocol.c
499-
src/detection/displayserver/linux/wayland/xx-color-management-v4-protocol.c
500499
src/detection/displayserver/linux/wmde.c
501500
src/detection/displayserver/linux/xcb.c
502501
src/detection/displayserver/linux/xlib.c

src/detection/cpu/cpu_bsd.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@
22
#include "common/sysctl.h"
33

44
#include <sys/param.h>
5-
#include <sys/cpuset.h>
5+
#if __has_include(<sys/cpuset.h>)
6+
#include <sys/cpuset.h>
7+
#define FF_HAVE_CPUSET 1
8+
#endif
69

710
static const char* detectCpuTemp(double* current)
811
{
@@ -63,7 +66,7 @@ const char* ffDetectCPUImpl(const FFCPUOptions* options, FFCPUResult* cpu)
6366
}
6467
}
6568

66-
#if __x86_64__ || __i386__
69+
#if FF_HAVE_CPUSET && (__x86_64__ || __i386__)
6770
// Bind current process to the first two cores, which is *usually* a performance core
6871
cpuset_t currentCPU;
6972
CPU_ZERO(&currentCPU);

src/detection/displayserver/linux/wayland/kde-output-device-v2-client-protocol.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
#include <stdint.h>
77
#include <stddef.h>
8-
#include "wayland-client.h"
8+
#include <wayland-util.h>
99

1010
#ifdef __cplusplus
1111
extern "C" {
@@ -556,7 +556,7 @@ struct kde_output_device_v2_listener {
556556
/**
557557
* describes when auto rotate is used
558558
*
559-
*
559+
*
560560
* @since 4
561561
*/
562562
void (*auto_rotate_policy)(void *data,
@@ -565,7 +565,7 @@ struct kde_output_device_v2_listener {
565565
/**
566566
* describes when auto rotate is used
567567
*
568-
*
568+
*
569569
* @since 5
570570
*/
571571
void (*icc_profile_path)(void *data,
@@ -574,7 +574,7 @@ struct kde_output_device_v2_listener {
574574
/**
575575
* metadata about the screen's brightness limits
576576
*
577-
*
577+
*
578578
* @param max_peak_brightness in nits
579579
* @param max_frame_average_brightness in nits
580580
* @param min_brightness in 0.0001 nits
@@ -588,7 +588,7 @@ struct kde_output_device_v2_listener {
588588
/**
589589
* overrides for the screen's brightness limits
590590
*
591-
*
591+
*
592592
* @param max_peak_brightness -1 for no override, positive values are the brightness in nits
593593
* @param max_average_brightness -1 for no override, positive values are the brightness in nits
594594
* @param min_brightness -1 for no override, positive values are the brightness in 0.0001 nits
@@ -614,7 +614,7 @@ struct kde_output_device_v2_listener {
614614
/**
615615
* describes which source the compositor uses for the color profile on an output
616616
*
617-
*
617+
*
618618
* @since 7
619619
*/
620620
void (*color_profile_source)(void *data,
@@ -638,7 +638,7 @@ struct kde_output_device_v2_listener {
638638
/**
639639
* the preferred color/power tradeoff
640640
*
641-
*
641+
*
642642
* @since 10
643643
*/
644644
void (*color_power_tradeoff)(void *data,

0 commit comments

Comments
 (0)