piglit-git: build all the tests, even if not on Linux

[Tobias Nygren <tnn%NetBSD.org@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Tue Oct 6 15:11:27 2015 +0200
Changeset:	a9e3d2e48062c8db34105945af84ada79c501dc1

Modified Files:
	piglit-git/Makefile
Added Files:
	piglit-git/distinfo
	piglit-git/patches/patch-CMakeLists.txt
	piglit-git/patches/patch-tests_util_CMakeLists.txt

Log Message:
piglit-git: build all the tests, even if not on Linux

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=a9e3d2e48062c8db34105945af84ada79c501dc1

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 piglit-git/Makefile                                |  2 +-
 piglit-git/distinfo                                |  4 ++
 piglit-git/patches/patch-CMakeLists.txt            | 56 ++++++++++++++++++++++
 piglit-git/patches/patch-tests_util_CMakeLists.txt | 21 ++++++++
 4 files changed, 82 insertions(+), 1 deletion(-)

diffs:
diff --git a/piglit-git/Makefile b/piglit-git/Makefile
index 20bb80b..ebf43af 100644
--- a/piglit-git/Makefile
+++ b/piglit-git/Makefile
@@ -39,9 +39,9 @@ LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/piglit/lib
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/glut/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../wip/waffle/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/piglit-git/distinfo b/piglit-git/distinfo
new file mode 100644
index 0000000..0b91b51
--- /dev/null
+++ b/piglit-git/distinfo
@@ -0,0 +1,4 @@
+$NetBSD$
+
+SHA1 (patch-CMakeLists.txt) = e72c5027f9e81fe12a1df9d916aff0b90f67b6b4
+SHA1 (patch-tests_util_CMakeLists.txt) = 852916a2007950d7745c24dfdfb380945d9718b8
diff --git a/piglit-git/patches/patch-CMakeLists.txt b/piglit-git/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000..2fae2d8
--- /dev/null
+++ b/piglit-git/patches/patch-CMakeLists.txt
@@ -0,0 +1,56 @@
+$NetBSD$
+
+--- CMakeLists.txt.orig	2015-10-06 10:00:00.000000000 +0000
++++ CMakeLists.txt
+@@ -35,11 +35,11 @@ if(X11_FOUND)
+ 	add_definitions(-DPIGLIT_HAS_X11)
+ endif()
+ 
+-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
++#if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
+ 	set(PIGLIT_BUILD_GLES_TESTS_DEFAULT ON)
+-else()
+-	set(PIGLIT_BUILD_GLES_TESTS_DEFAULT OFF)
+-endif()
++#else()
++#	set(PIGLIT_BUILD_GLES_TESTS_DEFAULT OFF)
++#endif()
+ 
+ option(PIGLIT_BUILD_GL_TESTS "Build tests for OpenGL" ON)
+ option(PIGLIT_BUILD_GLES1_TESTS "Build tests for OpenGL ES1" ${PIGLIT_BUILD_GLES_TESTS_DEFAULT})
+@@ -51,11 +51,11 @@ if(PIGLIT_BUILD_GL_TESTS)
+ 	find_package(OpenGL REQUIRED)
+ endif()
+ 
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++#if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ 	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" ON)
+-else()
+-	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
+-endif()
++#else()
++#	option(PIGLIT_USE_WAFFLE "Use Waffle in place of GLUT" OFF)
++#endif()
+ 
+ if(PIGLIT_USE_WAFFLE)
+ 	if (NOT WIN32)
+@@ -130,7 +130,8 @@ if(PIGLIT_BUILD_CL_TESTS)
+ 	find_package(OpenCL REQUIRED)
+ endif(PIGLIT_BUILD_CL_TESTS)
+ 
+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++#IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++IF("Linux" MATCHES "Linux")
+ 	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
+@@ -389,7 +390,8 @@ 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")
++if(PIGLIT_USE_WAFFLE)
+ 	pkg_check_modules(EGL egl)
+ endif()
+ 
diff --git a/piglit-git/patches/patch-tests_util_CMakeLists.txt b/piglit-git/patches/patch-tests_util_CMakeLists.txt
new file mode 100644
index 0000000..3fa0699
--- /dev/null
+++ b/piglit-git/patches/patch-tests_util_CMakeLists.txt
@@ -0,0 +1,21 @@
+$NetBSD$
+
+--- tests/util/CMakeLists.txt.orig	2015-10-06 10:00:01.000000000 +0000
++++ tests/util/CMakeLists.txt
+@@ -109,7 +109,7 @@ else()
+ 	)
+ endif()
+ 
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++#if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ 	# One needs to have at least one hardware driver present, otherwise
+ 	# there is no point compiling just the dispatcher.
+ 	if(PIGLIT_BUILD_DMA_BUF_TESTS)
+@@ -141,6 +141,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ 	if(PIGLIT_HAS_X11)
+ 		list(APPEND UTIL_GL_LIBS ${X11_X11_LIB})
+ 	endif()
+-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++#endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ 
+ piglit_include_target_api()