pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
piglit-git: Dust off.
Module Name: pkgsrc-wip
Committed By: Taylor R Campbell <riastradh%NetBSD.org@localhost>
Pushed By: riastradh
Date: Sat Mar 8 16:02:56 2025 +0000
Changeset: 8b1b5ea999e141e3fac7ca659eabfbc9534a2e87
Modified Files:
piglit-git/Makefile
piglit-git/distinfo
Added Files:
piglit-git/patches/patch-CMakeLists.txt
piglit-git/patches/patch-tests_util_CMakeLists.txt
Log Message:
piglit-git: Dust off.
Haven't got it to do anything useful but at least it builds now.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=8b1b5ea999e141e3fac7ca659eabfbc9534a2e87
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
piglit-git/Makefile | 16 ++++++----
piglit-git/distinfo | 2 ++
piglit-git/patches/patch-CMakeLists.txt | 37 ++++++++++++++++++++++
piglit-git/patches/patch-tests_util_CMakeLists.txt | 25 +++++++++++++++
4 files changed, 74 insertions(+), 6 deletions(-)
diffs:
diff --git a/piglit-git/Makefile b/piglit-git/Makefile
index 05b890278e..a6ea02e275 100644
--- a/piglit-git/Makefile
+++ b/piglit-git/Makefile
@@ -7,14 +7,13 @@ MASTER_SITES= http://cgit.freedesktop.org/piglit
MAINTAINER= tnn%NetBSD.org@localhost
HOMEPAGE= https://piglit.freedesktop.org/
COMMENT= OpenGL driver testing framework
-#LICENSE= mostly 2-clause-bsd but some GPL
+LICENSE= mit AND gnu-gpl-v2 AND gnu-gpl-v3 AND modified-bsd
GIT_REPOSITORIES= piglit
GIT_REPO.piglit= http://anongit.freedesktop.org/git/piglit.git
GIT_MODULE.piglit= piglit
WRKSRC= ${WRKDIR}/${PKGBASE}
-USE_CMAKE= yes
USE_LANGUAGES= c c++
USE_TOOLS+= pkg-config
@@ -25,8 +24,7 @@ DEPENDS+= ${PYPKGPREFIX}-simplejson-[0-9]*:../../converters/py-simplejson
DEPENDS+= ${PYPKGPREFIX}-six-[0-9]*:../../lang/py-six
DEPENDS+= ${PYPKGPREFIX}-lxml-[0-9]*:../../textproc/py-lxml
-PYTHON_VERSIONS_ACCEPTED= 27
-REPLACE_PYTHON= piglit piglit-*.py
+REPLACE_PYTHON= piglit piglit-*.py replayer/replayer.py
# A static PLIST would be several megabytes and the contents rapidly changes.
GENERATE_PLIST+= cd ${DESTDIR}${PREFIX} && \
@@ -36,16 +34,22 @@ CMAKE_CONFIGURE_ARGS+= -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/piglit/lib
+.include "../../devel/cmake/build.mk"
.include "../../lang/python/application.mk"
.include "../../wip/mk/git-package.mk"
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../graphics/png/buildlink3.mk"
-.include "../../graphics/glu/buildlink3.mk"
.include "../../graphics/freeglut/buildlink3.mk"
+.include "../../graphics/glu/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 "../../x11/libdrm/buildlink3.mk"
+.include "../../x11/libxcb/buildlink3.mk"
+.include "../../x11/libxkbcommon/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/piglit-git/distinfo b/piglit-git/distinfo
index afc76512f4..d04be857e1 100644
--- a/piglit-git/distinfo
+++ b/piglit-git/distinfo
@@ -1,2 +1,4 @@
$NetBSD$
+SHA1 (patch-CMakeLists.txt) = 4f45af571fb7348947270f818e7dd1f288137b57
+SHA1 (patch-tests_util_CMakeLists.txt) = c90362d7a09d92fe65870f48efc35c1e1dbc516f
diff --git a/piglit-git/patches/patch-CMakeLists.txt b/piglit-git/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..e96b256860
--- /dev/null
+++ b/piglit-git/patches/patch-CMakeLists.txt
@@ -0,0 +1,37 @@
+$NetBSD$
+
+Pretend NetBSD is Linux for the choice of components to build.
+XXX Maybe do this for *BSD, not just NetBSD.
+
+--- CMakeLists.txt.orig 2025-03-08 15:31:14.000000000 +0000
++++ CMakeLists.txt
+@@ -22,7 +22,7 @@ INCLUDE (FindPkgConfig)
+
+ set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ set(DEFAULT_EGL ON)
+ set(DEFAULT_GLX ON)
+ set(DEFAULT_WGL OFF)
+@@ -34,7 +34,11 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ set(DEFAULT_X11 ON)
+
+ set(DEFAULT_GLES_TESTS_BUILD ON)
++ if (${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
++ set(DEFAULT_VK_TESTS_BUILD OFF)
++ else()
+ set(DEFAULT_VK_TESTS_BUILD ON)
++ endif()
+ elseif(APPLE)
+ set(DEFAULT_EGL OFF)
+ set(DEFAULT_GLX OFF)
+@@ -230,7 +234,7 @@ if(PIGLIT_BUILD_WGL_TESTS)
+ add_definitions(-DPIGLIT_HAS_WGL)
+ endif()
+
+-IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+ pkg_check_modules(LIBDRM QUIET libdrm)
+ pkg_check_modules(XCB QUIET xcb)
+ pkg_check_modules(XCB_DRI2 QUIET xcb-dri2)
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 0000000000..4955b6ee20
--- /dev/null
+++ b/piglit-git/patches/patch-tests_util_CMakeLists.txt
@@ -0,0 +1,25 @@
+$NetBSD$
+
+Pretend NetBSD is Linux for the choice of components to build.
+XXX Maybe do this for *BSD, not just NetBSD.
+
+--- tests/util/CMakeLists.txt.orig 2025-03-08 15:31:15.000000000 +0000
++++ tests/util/CMakeLists.txt
+@@ -129,7 +129,7 @@ else()
+ )
+ endif()
+
+-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++if(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "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)
+@@ -160,7 +160,7 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+ list(APPEND UTIL_GL_LIBS ${WAYLAND_LDFLAGS})
+ endif()
+
+-endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
++endif(${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "NetBSD")
+
+ if(MSVC)
+ list(APPEND UTIL_SOURCES msvc/getopt.c)
Home |
Main Index |
Thread Index |
Old Index