cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Explicitly add LDFLAGS="-L${X11BASE}/lib" to unbreak all configure

Browse Source 
tests after libgbm is picked up.  rsadowski@ and I can't figure out
why this path isn't taken from pkg-config.  The broken configure
checks caused all kinds of fallout.
This commit is contained in:
naddy 2019-11-10 16:47:24 +00:00
parent b76784517b
commit 3fac03b4ef
3 changed files with 4 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
graphics/piglit/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.9 2019/07/14 00:39:37 naddy Exp $
# $OpenBSD: Makefile,v 1.10 2019/11/10 16:47:24 naddy Exp $
COMMENT = automated OpenGL and OpenCL testsuite
ONLY_FOR_ARCHS = amd64 i386
DISTNAME = piglit-20190208
REVISION = 2
REVISION = 3
GH_ACCOUNT = mesa3d
GH_PROJECT = piglit
@ -40,7 +40,8 @@ LIB_DEPENDS = graphics/waffle \
CONFIGURE_ARGS = -DPIGLIT_BUILD_CL_TESTS:BOOL=OFF \
-DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
-DHAVE_LIBCACA:BOOL=FALSE
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include"
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
NO_TEST = Yes

17
graphics/piglit/patches/patch-tests_spec_ext_framebuffer_multisample_draw-buffers-common_cpp
View File

@ -1,17 +0,0 @@
$OpenBSD: patch-tests_spec_ext_framebuffer_multisample_draw-buffers-common_cpp,v 1.1 2018/11/03 09:54:55 espie Exp $
Prevent narrowing errors under C++11
Index: tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
--- tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp.orig
+++ tests/spec/ext_framebuffer_multisample/draw-buffers-common.cpp
@@ -353,8 +353,8 @@ draw_pattern(bool sample_alpha_to_coverage,
float vertices[4][2] = {
{ 0.0f, 0.0f + i * (pattern_height / num_rects) },
{ 0.0f, (i + 1.0f) * (pattern_height / num_rects) },
- { pattern_width, (i + 1.0f) * (pattern_height / num_rects) },
- { pattern_width, 0.0f + i * (pattern_height / num_rects) } };
+ { static_cast<float>(pattern_width), (i + 1.0f) * (pattern_height / num_rects) },
+ { static_cast<float>(pattern_width), 0.0f + i * (pattern_height / num_rects) } };
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE,
sizeof(vertices[0]),

22
graphics/piglit/patches/patch-tests_util_piglit-test-pattern_cpp
View File

@ -1,22 +0,0 @@
$OpenBSD: patch-tests_util_piglit-test-pattern_cpp,v 1.1 2018/11/03 09:54:55 espie Exp $
Index: tests/util/piglit-test-pattern.cpp
--- tests/util/piglit-test-pattern.cpp.orig
+++ tests/util/piglit-test-pattern.cpp
@@ -653,12 +653,14 @@ ColorGradientSunburst::draw_with_scale_and_offset(cons
{
switch (out_type) {
case GL_INT: {
- int clear_color[4] = { offset, offset, offset, offset };
+ int ioffset = static_cast<int>(offset);
+ int clear_color[4] = { ioffset, ioffset, ioffset, ioffset };
glClearBufferiv(GL_COLOR, 0, clear_color);
break;
}
case GL_UNSIGNED_INT: {
- unsigned clear_color[4] = { offset, offset, offset, offset };
+ unsigned uoffset = static_cast<unsigned>(offset);
+ unsigned clear_color[4] = { uoffset, uoffset, uoffset, uoffset };
glClearBufferuiv(GL_COLOR, 0, clear_color);
break;
}