fix build

[maya <mayarash%mail.tau.ac.il@localhost>]

Module Name:	pkgsrc-wip
Committed By:	maya <mayarash%mail.tau.ac.il@localhost>
Pushed By:	coypu
Date:		Mon Feb 27 05:19:29 2017 +0200
Changeset:	68a0391d6f76ce0bb66610fa38e5f45e8f238ea0

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

Log Message:
fix build

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

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

diffstat:
 piglit-git/Makefile                                |  1 +
 piglit-git/distinfo                                |  4 ++--
 piglit-git/patches/patch-CMakeLists.txt            | 13 ++++++-------
 piglit-git/patches/patch-tests_util_CMakeLists.txt | 12 ++++++------
 4 files changed, 15 insertions(+), 15 deletions(-)

diffs:
diff --git a/piglit-git/Makefile b/piglit-git/Makefile
index ebf43af06b..67571acd99 100644
--- a/piglit-git/Makefile
+++ b/piglit-git/Makefile
@@ -40,6 +40,7 @@ LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib/piglit/lib
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/MesaLib/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../graphics/glu/buildlink3.mk"
 .include "../../wip/waffle/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libX11/buildlink3.mk"
diff --git a/piglit-git/distinfo b/piglit-git/distinfo
index 0b91b51231..f15080acdd 100644
--- a/piglit-git/distinfo
+++ b/piglit-git/distinfo
@@ -1,4 +1,4 @@
 $NetBSD$
 
-SHA1 (patch-CMakeLists.txt) = e72c5027f9e81fe12a1df9d916aff0b90f67b6b4
-SHA1 (patch-tests_util_CMakeLists.txt) = 852916a2007950d7745c24dfdfb380945d9718b8
+SHA1 (patch-CMakeLists.txt) = 3732172e4b4b7d3a1eeb5adeb18029d5c4483474
+SHA1 (patch-tests_util_CMakeLists.txt) = 54bbdc390aa034513b174bc382325832150b6b09
diff --git a/piglit-git/patches/patch-CMakeLists.txt b/piglit-git/patches/patch-CMakeLists.txt
index 2fae2d867a..4a99bf9cc2 100644
--- a/piglit-git/patches/patch-CMakeLists.txt
+++ b/piglit-git/patches/patch-CMakeLists.txt
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- CMakeLists.txt.orig	2015-10-06 10:00:00.000000000 +0000
+--- CMakeLists.txt.orig	2017-02-27 02:30:49.000000000 +0000
 +++ CMakeLists.txt
-@@ -35,11 +35,11 @@ if(X11_FOUND)
+@@ -33,11 +33,11 @@ if(X11_FOUND)
  	add_definitions(-DPIGLIT_HAS_X11)
  endif()
  
@@ -18,7 +18,7 @@ $NetBSD$
  
  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)
+@@ -49,11 +49,11 @@ if(PIGLIT_BUILD_GL_TESTS)
  	find_package(OpenGL REQUIRED)
  endif()
  
@@ -34,7 +34,7 @@ $NetBSD$
  
  if(PIGLIT_USE_WAFFLE)
  	if (NOT WIN32)
-@@ -130,7 +130,8 @@ if(PIGLIT_BUILD_CL_TESTS)
+@@ -128,7 +128,8 @@ if(PIGLIT_BUILD_CL_TESTS)
  	find_package(OpenCL REQUIRED)
  endif(PIGLIT_BUILD_CL_TESTS)
  
@@ -44,13 +44,12 @@ $NetBSD$
  	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)
+@@ -418,7 +419,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")
 +if(PIGLIT_USE_WAFFLE)
- 	pkg_check_modules(EGL egl)
+ 	pkg_check_modules(EGL egl>=11.0)
  endif()
  
diff --git a/piglit-git/patches/patch-tests_util_CMakeLists.txt b/piglit-git/patches/patch-tests_util_CMakeLists.txt
index 3fa0699a0d..c9969c6b88 100644
--- a/piglit-git/patches/patch-tests_util_CMakeLists.txt
+++ b/piglit-git/patches/patch-tests_util_CMakeLists.txt
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- tests/util/CMakeLists.txt.orig	2015-10-06 10:00:01.000000000 +0000
+--- tests/util/CMakeLists.txt.orig	2017-02-27 02:30:50.000000000 +0000
 +++ tests/util/CMakeLists.txt
-@@ -109,7 +109,7 @@ else()
+@@ -119,7 +119,7 @@ else()
  	)
  endif()
  
@@ -11,10 +11,10 @@ $NetBSD$
  	# 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()
+@@ -158,6 +158,6 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ 		list(APPEND UTIL_GL_LIBS ${WAYLAND_LIBRARIES})
+         endif()
+ 
 -endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
 +#endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")