Skip to content

Commit a05e1e8

Browse files
hartworkhartwork
authored
Merge pull request #235 from Libvisual/fix-ci-regarding-clang-16
Fix CI regarding installation of Clang 16 + start covering Clang 17
2 parents 150707c + 4245282 commit a05e1e8

File tree

3 files changed

+42
-38
lines changed

3 files changed

+42
-38
lines changed

‎.github/workflows/linux.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,10 @@ jobs:
3333
- cc: clang-16
3434
cxx: clang++-16
3535
clang_major_version: 16
36+
clang_repo_suffix: -16
37+
- cc: clang-17
38+
cxx: clang++-17
39+
clang_major_version: 17
3640
clang_repo_suffix:
3741
steps:
3842
- name: Add Clang/LLVM repositories

‎libvisual/tools/lv-tool/display/sdl_driver.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,24 +33,24 @@
3333
namespace {
3434

3535
SDL_GLattr const sdl_gl_attribute_map[] = {
36-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_NONE
37-
SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE
38-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_LEVEL
39-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_RGBA
40-
SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER
41-
SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO
42-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS
43-
SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE
44-
SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE
45-
SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE
46-
SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE
47-
SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE
48-
SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE
49-
SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
50-
SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
51-
SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
52-
SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
53-
SDL_GLattr (-1) // VISUAL_GL_ATTRIBUTE_LAST
36+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_NONE
37+
SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE
38+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_LEVEL
39+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_RGBA
40+
SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER
41+
SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO
42+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS
43+
SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE
44+
SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE
45+
SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE
46+
SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE
47+
SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE
48+
SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE
49+
SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
50+
SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
51+
SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
52+
SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
53+
static_cast<SDL_GLattr> (-1) // VISUAL_GL_ATTRIBUTE_LAST
5454
};
5555

5656
void get_nearest_resolution (int& width, int& height);
@@ -117,7 +117,7 @@ namespace {
117117
for (unsigned int i = VISUAL_GL_ATTRIBUTE_NONE; i < VISUAL_GL_ATTRIBUTE_LAST; i++) {
118118
SDL_GLattr sdl_attribute = sdl_gl_attribute_map[vidoptions->gl_attrs[i].attribute];
119119

120-
if (sdl_attribute < 0) {
120+
if (sdl_attribute == static_cast<SDL_GLattr> (-1)) {
121121
continue;
122122
}
123123

‎libvisual/tools/lv-tool/display/stdout_sdl_driver.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,24 +44,24 @@
4444
namespace {
4545

4646
SDL_GLattr const sdl_gl_attribute_map[] = {
47-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_NONE
48-
SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE
49-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_LEVEL
50-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_RGBA
51-
SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER
52-
SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO
53-
SDL_GLattr (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS
54-
SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE
55-
SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE
56-
SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE
57-
SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE
58-
SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE
59-
SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE
60-
SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
61-
SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
62-
SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
63-
SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
64-
SDL_GLattr (-1) // VISUAL_GL_ATTRIBUTE_LAST
47+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_NONE
48+
SDL_GL_BUFFER_SIZE, // VISUAL_GL_ATTRIBUTE_BUFFER_SIZE
49+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_LEVEL
50+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_RGBA
51+
SDL_GL_DOUBLEBUFFER, // VISUAL_GL_ATTRIBUTE_DOUBLEBUFFER
52+
SDL_GL_STEREO, // VISUAL_GL_ATTRIBUTE_STEREO
53+
static_cast<SDL_GLattr> (-1), // VISUAL_GL_ATTRIBUTE_AUX_BUFFERS
54+
SDL_GL_RED_SIZE, // VISUAL_GL_ATTRIBUTE_RED_SIZE
55+
SDL_GL_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_GREEN_SIZE
56+
SDL_GL_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_BLUE_SIZE
57+
SDL_GL_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ALPHA_SIZE
58+
SDL_GL_DEPTH_SIZE, // VISUAL_GL_ATTRIBUTE_DEPTH_SIZE
59+
SDL_GL_STENCIL_SIZE, // VISUAL_GL_ATTRIBUTE_STENCIL_SIZE
60+
SDL_GL_ACCUM_RED_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
61+
SDL_GL_ACCUM_GREEN_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
62+
SDL_GL_ACCUM_BLUE_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
63+
SDL_GL_ACCUM_ALPHA_SIZE, // VISUAL_GL_ATTRIBUTE_ACCUM_RED_SIZE
64+
static_cast<SDL_GLattr> (-1) // VISUAL_GL_ATTRIBUTE_LAST
6565
};
6666

6767
void get_nearest_resolution (int& width, int& height);
@@ -131,7 +131,7 @@ namespace {
131131
SDL_GLattr sdl_attribute =
132132
sdl_gl_attribute_map[vidoptions->gl_attrs[i].attribute];
133133

134-
if (sdl_attribute < 0) {
134+
if (sdl_attribute == static_cast<SDL_GLattr> (-1)) {
135135
continue;
136136
}
137137

0 commit comments

Comments
 (0)