Update piglit to a newer snapshot and switch to python3.
Fixes -fno-common build.
Tested with the "quick" tests on a broadwell machine with Mesa 20.0.8.
Index: Makefile
===================================================================
RCS file: /cvs/ports/graphics/piglit/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile 16 Nov 2020 05:17:33 -0000 1.13
+++ Makefile 30 Jan 2021 03:12:40 -0000
@@ -3,12 +3,11 @@
COMMENT = automated OpenGL and OpenCL testsuite
ONLY_FOR_ARCHS = amd64 i386
-DISTNAME = piglit-20190208
-REVISION = 6
+DISTNAME = piglit-20210128
GH_ACCOUNT = mesa3d
GH_PROJECT = piglit
-GH_COMMIT = 5d4935e2378a5f3b950bfcbcb6c396ad7e882952
+GH_COMMIT = 83173d9536c9f5e1571efe5933d210466ec255b8
CATEGORIES = graphics
@@ -26,19 +25,26 @@ COMPILER = base-clang ports-gcc base-gc
MODULES = devel/cmake \
lang/python
-MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
-
-RUN_DEPENDS = devel/py-six \
- devel/py-subprocess32 \
- math/py-numpy \
- www/py-mako
-BUILD_DEPENDS = ${RUN_DEPENDS}
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+MODPY_ADJ_FILES = tests/glslparsertest/glsl2/gen_builtin_test.py \
+ tests/oglconform.py \
+ tests/vulkan.py \
+ framework/replay/backends/renderdoc/renderdoc_dump_images.py \
+ tests/glslparsertest/glsl2/gen_builtin_test.py \
+ replayer/replayer.py \
+ piglit
+
+RUN_DEPENDS = devel/py-six${MODPY_FLAVOR} \
+ math/py-numpy${MODPY_FLAVOR} \
+ www/py-mako${MODPY_FLAVOR}
+BUILD_DEPENDS = ${RUN_DEPENDS} \
+ graphics/vulkan-headers
LIB_DEPENDS = graphics/waffle \
- graphics/png
+ graphics/png \
+ graphics/vulkan-loader
CONFIGURE_ARGS = -DPIGLIT_BUILD_CL_TESTS:BOOL=OFF \
- -DCMAKE_POLICY_DEFAULT_CMP0056:STRING=NEW \
-DHAVE_LIBCACA:BOOL=FALSE
CONFIGURE_ENV = CPPFLAGS="-I${X11BASE}/include" \
LDFLAGS="-L${X11BASE}/lib"
Index: distinfo
===================================================================
RCS file: /cvs/ports/graphics/piglit/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 12 Feb 2019 02:26:40 -0000 1.2
+++ distinfo 30 Jan 2021 03:12:40 -0000
@@ -1,2 +1,2 @@
-SHA256 (piglit-20190208-5d4935e2.tar.gz) = sLAu4XQXw9VTYrLfOnWxW9mo07M5L+evoGM1QQY2zbI=
-SIZE (piglit-20190208-5d4935e2.tar.gz) = 24208156
+SHA256 (piglit-20210128-83173d95.tar.gz) = ZBMyCxuX7+bElStP4AfIzh6em/9Lceeqk/+f7Qq4PrY=
+SIZE (piglit-20210128-83173d95.tar.gz) = 24504653
Index: patches/patch-CMakeLists_txt
===================================================================
RCS file: /cvs/ports/graphics/piglit/patches/patch-CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt 12 Feb 2019 02:26:40 -0000 1.2
+++ patches/patch-CMakeLists_txt 30 Jan 2021 03:12:40 -0000
@@ -6,7 +6,7 @@ include same flags for OpenBSD
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
-@@ -37,7 +37,7 @@ if(X11_FOUND)
+@@ -35,7 +35,7 @@ if(X11_FOUND)
add_definitions(-DPIGLIT_HAS_X11)
endif()
@@ -15,7 +15,7 @@ Index: CMakeLists.txt
set(PIGLIT_BUILD_GLES_TESTS_DEFAULT ON)
else()
set(PIGLIT_BUILD_GLES_TESTS_DEFAULT OFF)
-@@ -53,7 +53,7 @@ if(PIGLIT_BUILD_GL_TESTS)
+@@ -51,7 +51,7 @@ if(PIGLIT_BUILD_GL_TESTS)
find_package(OpenGL REQUIRED)
endif()
@@ -24,8 +24,8 @@ Index: CMakeLists.txt
option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" ON)
else()
option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
-@@ -132,7 +132,7 @@ if(PIGLIT_BUILD_CL_TESTS)
- find_package(OpenCL REQUIRED)
+@@ -130,7 +130,7 @@ if(PIGLIT_BUILD_CL_TESTS)
+ find_package(OpenCL 1.2 REQUIRED)
endif(PIGLIT_BUILD_CL_TESTS)
-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
@@ -33,7 +33,19 @@ Index: CMakeLists.txt
if(X11_FOUND AND OPENGL_gl_LIBRARY)
# Assume the system has GLX. In the future, systems may exist
# with libGL and libX11 but no GLX, but that world hasn't
-@@ -386,7 +386,7 @@ endif()
+@@ -169,6 +169,11 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ pkg_check_modules(XCB_DRI2 QUIET xcb-dri2)
+ pkg_check_modules(GLPROTO QUIET glproto)
+ pkg_check_modules(LIBVULKAN QUIET vulkan)
++
++ if (LIBVULKAN_FOUND)
++ include_directories(${LIBVULKAN_INCLUDE_DIRS})
++ endif()
++
+ ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
+ if (PIGLIT_USE_WAFFLE)
+ set(PIGLIT_HAS_WGL True)
+@@ -380,7 +385,7 @@ endif()
check_c_source_compiles(
"
@@ -42,12 +54,12 @@ Index: CMakeLists.txt
#include <time.h>
int main() { return clock_gettime(CLOCK_MONOTONIC, NULL); }
"
-@@ -430,7 +430,7 @@ if(HAVE_LIBCACA)
+@@ -424,7 +429,7 @@ if(HAVE_LIBCACA)
endif(HAVE_LIBCACA)
endif(GBM_FOUND)
-if(PIGLIT_USE_WAFFLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+if(PIGLIT_USE_WAFFLE AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "OpenBSD")
- pkg_check_modules(EGL egl>=11.0)
+ pkg_check_modules(EGL egl)
endif()
Index: patches/patch-piglit
===================================================================
RCS file: patches/patch-piglit
diff -N patches/patch-piglit
--- patches/patch-piglit 14 Jan 2018 21:49:14 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$OpenBSD: patch-piglit,v 1.1.1.1 2018/01/14 21:49:14 sthen Exp $
-
-from FreeBSD; set to python2
-
-Index: piglit
---- piglit.orig
-+++ piglit
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python3
-+#!/usr/bin/env python2
-
- # Copyright (c) 2014 Intel Corporation
-
Index: patches/patch-tests_egl_egl-configless-context_c
===================================================================
RCS file: patches/patch-tests_egl_egl-configless-context_c
diff -N patches/patch-tests_egl_egl-configless-context_c
--- patches/patch-tests_egl_egl-configless-context_c 26 Aug 2020 03:23:40 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,29 +0,0 @@
-$OpenBSD: patch-tests_egl_egl-configless-context_c,v 1.1 2020/08/26 03:23:40 jsg Exp $
-
-s/EGL_NO_CONFIG_MESA/EGL_NO_CONFIG_KHR/
-1fe351e533a1c8b88551b06e6d76e5c2bf8228bc
-
-Index: tests/egl/egl-configless-context.c
---- tests/egl/egl-configless-context.c.orig
-+++ tests/egl/egl-configless-context.c
-@@ -37,11 +37,6 @@
- #include "piglit-util-gl.h"
- #include "piglit-util-egl.h"
-
--#ifndef EGL_MESA_configless_context
--#define EGL_MESA_configless_context 1
--#define EGL_NO_CONFIG_MESA ((EGLConfig)0)
--
No comments:
Post a Comment