Date: Wed, 14 Jan 2015 16:04:13 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r377024 - in head/graphics: . waffle waffle/files Message-ID: <201501141604.t0EG4DLw065822@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Wed Jan 14 16:04:12 2015 New Revision: 377024 URL: https://svnweb.freebsd.org/changeset/ports/377024 QAT: https://qat.redports.org/buildarchive/r377024/ Log: Add waffle 1.5.0. Waffle is a cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime. It is used by the piglit, Mesa's OpenGL test suite, to test multiple OpenGL flavors in a cross-platform way. Added: head/graphics/waffle/ head/graphics/waffle/Makefile (contents, props changed) head/graphics/waffle/distinfo (contents, props changed) head/graphics/waffle/files/ head/graphics/waffle/files/patch-CMakeLists.txt (contents, props changed) head/graphics/waffle/files/patch-Options.cmake (contents, props changed) head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake (contents, props changed) head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake (contents, props changed) head/graphics/waffle/files/patch-examples_CMakeLists.txt (contents, props changed) head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt (contents, props changed) head/graphics/waffle/pkg-descr (contents, props changed) head/graphics/waffle/pkg-plist (contents, props changed) Modified: head/graphics/Makefile Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Wed Jan 14 16:00:18 2015 (r377023) +++ head/graphics/Makefile Wed Jan 14 16:04:12 2015 (r377024) @@ -1006,6 +1006,7 @@ SUBDIR += visprint SUBDIR += volpack SUBDIR += vp + SUBDIR += waffle SUBDIR += webp SUBDIR += whirlgif SUBDIR += white_dune Added: head/graphics/waffle/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/Makefile Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,41 @@ +# Created by: Jean-Sébastien Pédron <dumbbell@FreeBSD.org> +# $FreeBSD$ + +PORTNAME= waffle +PORTVERSION= 1.5.0 +CATEGORIES= graphics +MASTER_SITES= http://www.waffle-gl.org/files/release/waffle-${PORTVERSION}/ + +MAINTAINER= x11@FreeBSD.org +COMMENT= Library that allows to defer selection of an OpenGL API until runtime + +LICENSE= BSD2CLAUSE + +USES= cmake:outsource ninja pkgconfig tar:xz +USE_LDCONFIG= yes + +DOCSDIR= ${PREFIX}/share/doc/waffle1 + +OPTIONS_DEFINE= DOCS + +USE_XORG= x11 xcb +USE_GL= gl egl +CFLAGS+= -I${LOCALBASE}/include +LIBS+= -L${LOCALBASE}/lib + +#CMAKE_ARGS+= -Dwaffle_has_glx=ON \ +# -Dwaffle_has_x11_egl=ON + +# todo needs libudev +# -Dwaffle_has_gbm=ON + +PLIST_SUB+= PORTVERSION=${PORTVERSION} + +.include <bsd.port.options.mk> + +.if ! ${PORT_OPTIONS:MDOCS} +post-install: + ${RM} -rf ${STAGEDIR}${DOCSDIR} +.endif + +.include <bsd.port.mk> Added: head/graphics/waffle/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/distinfo Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,2 @@ +SHA256 (waffle-1.5.0.tar.xz) = 6344fa2803d76182a08380780605b36c38e795639a3229281c96b75cc30137a8 +SIZE (waffle-1.5.0.tar.xz) = 177164 Added: head/graphics/waffle/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/files/patch-CMakeLists.txt Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2014-12-09 22:33:50.000000000 +0100 ++++ CMakeLists.txt 2015-01-02 15:27:40.696351276 +0100 +@@ -135,7 +135,7 @@ + + install( + FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc +- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++ DESTINATION ${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig + COMPONENT pkgconfig + ) + Added: head/graphics/waffle/files/patch-Options.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/files/patch-Options.cmake Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,10 @@ +diff --git Options.cmake Options.cmake +index 7f694e3..8fa62dd 100644 +--- Options.cmake ++++ Options.cmake +@@ -1,4 +1,4 @@ +-if(waffle_on_linux) ++if(waffle_on_linux OR waffle_on_freebsd) + # On Linux, you must enable at least one of the below options. + option(waffle_has_glx "Build support for GLX" OFF) + option(waffle_has_wayland "Build support for Wayland" OFF) Added: head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,20 @@ +--- cmake/Modules/WaffleDefineCompilerFlags.cmake.orig 2014-12-09 22:33:50.000000000 +0100 ++++ cmake/Modules/WaffleDefineCompilerFlags.cmake 2015-01-02 15:29:36.754344546 +0100 +@@ -50,7 +50,7 @@ + waffle_add_c_flag("-Werror=int-conversion" WERROR_INT_CONVERSION) + waffle_add_c_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN) + +- if(waffle_on_linux) ++ if(waffle_on_linux OR waffle_on_freebsd) + # On MacOS, the SSE2 headers trigger this error. + waffle_add_c_flag("-Werror=missing-prototypes" WERROR_MISSING_PROTOTYPES) + endif() +@@ -97,7 +97,7 @@ + add_definitions(-DWAFFLE_HAS_CGL) + endif() + +-if(waffle_on_linux) ++if(waffle_on_linux OR waffle_on_freebsd) + if(waffle_has_glx) + add_definitions(-DWAFFLE_HAS_GLX) + endif() Added: head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,13 @@ +diff --git cmake/Modules/WaffleDefineOS.cmake cmake/Modules/WaffleDefineOS.cmake +index e437947..b1a3079 100644 +--- cmake/Modules/WaffleDefineOS.cmake ++++ cmake/Modules/WaffleDefineOS.cmake +@@ -25,6 +25,8 @@ + + if("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux") + set(waffle_on_linux true) ++elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "FreeBSD") ++ set(waffle_on_freebsd true) + elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin") + set(waffle_on_mac true) + else() Added: head/graphics/waffle/files/patch-examples_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/files/patch-examples_CMakeLists.txt Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,13 @@ +diff --git examples/CMakeLists.txt examples/CMakeLists.txt +index 48147f9..d6d1b5a 100644 +--- examples/CMakeLists.txt ++++ examples/CMakeLists.txt +@@ -7,7 +7,7 @@ install(FILES Makefile.example + # Target: simple-x11-egl (executable) + # ---------------------------------------------------------------------------- + +-if(waffle_on_linux) ++if(waffle_on_linux OR waffle_on_freebsd) + add_executable(simple-x11-egl simple-x11-egl.c) + target_link_libraries(simple-x11-egl ${waffle_libname}) + endif() Added: head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,39 @@ +--- src/waffle/CMakeLists.txt.orig 2014-12-09 22:33:50.000000000 +0100 ++++ src/waffle/CMakeLists.txt 2015-01-14 10:00:50.216345455 +0100 +@@ -38,7 +38,7 @@ + ${THREADS_LIBRARIES} + ) + +-if(waffle_on_linux) ++if(waffle_on_linux OR waffle_on_freebsd) + if(waffle_has_wayland) + list(APPEND waffle_libdeps + ${wayland-client_LDFLAGS} +@@ -114,15 +114,22 @@ + ) + endif() + +-if(waffle_on_linux) ++if(waffle_on_linux OR waffle_on_freebsd) + list(APPEND waffle_sources + linux/linux_dl.c + linux/linux_platform.c + ) +- list(APPEND waffle_libdeps +- dl +- pthread +- ) ++ if(waffle_on_linux) ++ list(APPEND waffle_libdeps ++ dl ++ pthread ++ ) ++ endif() ++ if(waffle_on_freebsd) ++ list(APPEND waffle_libdeps ++ pthread ++ ) ++ endif() + endif() + + if(waffle_has_wayland) Added: head/graphics/waffle/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/pkg-descr Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,12 @@ +Waffle is a cross-platform C library that allows one to defer selection +of an OpenGL API and window system until runtime. For example, on Linux, +Waffle enables an application to select X11/EGL with an OpenGL 3.3 +core profile, Wayland with OpenGL ES2, and other window system / API +combinations. + +Waffle's immediate goal is to enable Piglit, Mesa's OpenGL test suite, +to test multiple OpenGL flavors in a cross-platform way. However, +Waffle's design does not preclude it from being useful to other +projects. + +WWW: http://www.waffle-gl.org/ Added: head/graphics/waffle/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/waffle/pkg-plist Wed Jan 14 16:04:12 2015 (r377024) @@ -0,0 +1,37 @@ +bin/wflinfo +include/waffle-1/waffle.h +include/waffle-1/waffle_gbm.h +include/waffle-1/waffle_glx.h +include/waffle-1/waffle_version.h +include/waffle-1/waffle_wayland.h +include/waffle-1/waffle_x11_egl.h +lib/libwaffle-1.so +lib/libwaffle-1.so.0 +lib/libwaffle-1.so.0.5.0 +libdata/pkgconfig/waffle-1.pc +share/cmake/Modules/FindWaffle.cmake +%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE-threads.txt +%%PORTDOCS%%%%DOCSDIR%%/LICENSE.txt +%%PORTDOCS%%%%DOCSDIR%%/README.txt +%%PORTDOCS%%%%DOCSDIR%%/examples/Makefile.example +%%PORTDOCS%%%%DOCSDIR%%/examples/gl_basic.c +%%PORTDOCS%%%%DOCSDIR%%/examples/simple-x11-egl.c +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.1.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.2.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.3.0.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-0.3.1.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.0.0.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.0.1.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.1.0.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.1.1.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.1.2.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.2.0.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.2.1.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.2.2.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.3.0.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.0.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.1.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.2.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.4.3.txt +%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes/waffle-1.5.0.txt
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201501141604.t0EG4DLw065822>