Skip to content

Commit b340d4e

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

File tree

8 files changed

+12
-2777
lines changed

8 files changed

+12
-2777
lines changed

CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,12 +491,10 @@ if(LINUX)
491491
src/detection/displayserver/linux/wayland/global-output.c
492492
src/detection/displayserver/linux/wayland/zwlr-output.c
493493
src/detection/displayserver/linux/wayland/kde-output.c
494-
src/detection/displayserver/linux/wayland/color-manager.c
495494
src/detection/displayserver/linux/wayland/wlr-output-management-unstable-v1-protocol.c
496495
src/detection/displayserver/linux/wayland/kde-output-device-v2-protocol.c
497496
src/detection/displayserver/linux/wayland/kde-output-order-v1-protocol.c
498497
src/detection/displayserver/linux/wayland/xdg-output-unstable-v1-protocol.c
499-
src/detection/displayserver/linux/wayland/xx-color-management-v4-protocol.c
500498
src/detection/displayserver/linux/wmde.c
501499
src/detection/displayserver/linux/xcb.c
502500
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/color-manager.c

Lines changed: 0 additions & 114 deletions
This file was deleted.

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,

src/detection/displayserver/linux/wayland/wayland.c

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "kde-output-device-v2-client-protocol.h"
1818
#include "kde-output-order-v1-client-protocol.h"
1919
#include "xdg-output-unstable-v1-client-protocol.h"
20-
#include "xx-color-management-v4-client-protocol.h"
2120

2221
#if __FreeBSD__
2322
#include <sys/un.h>
@@ -97,10 +96,6 @@ static void waylandGlobalAddListener(void* data, struct wl_registry* registry, u
9796
{
9897
ffWaylandHandleKdeOutputOrder(wldata, registry, name, version);
9998
}
100-
// else if(ffStrEquals(interface, xx_color_manager_v4_interface.name))
101-
// {
102-
// ffWaylandHandleColorManager(wldata, registry, name, version);
103-
// }
10499
else if((wldata->protocolType == FF_WAYLAND_PROTOCOL_TYPE_GLOBAL || wldata->protocolType == FF_WAYLAND_PROTOCOL_TYPE_NONE) && ffStrEquals(interface, zxdg_output_manager_v1_interface.name))
105100
{
106101
ffWaylandHandleZxdgOutput(wldata, registry, name, version);

src/detection/displayserver/linux/wayland/wayland.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,5 @@ void ffWaylandHandleZwlrOutput(WaylandData* wldata, struct wl_registry* registry
8484
void ffWaylandHandleKdeOutput(WaylandData* wldata, struct wl_registry* registry, uint32_t name, uint32_t version);
8585
void ffWaylandHandleKdeOutputOrder(WaylandData* wldata, struct wl_registry* registry, uint32_t name, uint32_t version);
8686
void ffWaylandHandleZxdgOutput(WaylandData* wldata, struct wl_registry* registry, uint32_t name, uint32_t version);
87-
void ffWaylandHandleColorManager(WaylandData* wldata, struct wl_registry* registry, uint32_t name, uint32_t version);
8887

8988
#endif

0 commit comments

Comments
 (0)