svn commit: r379627 - in head/graphics/waffle: . files
Koop Mast
kwm at FreeBSD.org
Sun Feb 22 20:21:52 UTC 2015
Author: kwm
Date: Sun Feb 22 20:21:48 2015
New Revision: 379627
URL: https://svnweb.freebsd.org/changeset/ports/379627
QAT: https://qat.redports.org/buildarchive/r379627/
Log:
Update waffle to 1.5.1.
Use USES=compiler:c11 to allow it to build on older FreeBSD versions.
Enable GLX support.
Fix plist when cmake is in debug build mode.
Submitted by: dumbbell@
Added:
head/graphics/waffle/files/patch-cmake_Modules_WaffleFindDependencies.cmake (contents, props changed)
head/graphics/waffle/files/patch-cmake_Modules_WaffleValidateOptions.cmake (contents, props changed)
Modified:
head/graphics/waffle/Makefile
head/graphics/waffle/distinfo
head/graphics/waffle/files/patch-CMakeLists.txt
head/graphics/waffle/files/patch-Options.cmake
head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake
head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake
head/graphics/waffle/files/patch-examples_CMakeLists.txt
head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt
head/graphics/waffle/pkg-plist
Modified: head/graphics/waffle/Makefile
==============================================================================
--- head/graphics/waffle/Makefile Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/Makefile Sun Feb 22 20:21:48 2015 (r379627)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= waffle
-PORTVERSION= 1.5.0
+PORTVERSION= 1.5.1
CATEGORIES= graphics
MASTER_SITES= http://www.waffle-gl.org/files/release/waffle-${PORTVERSION}/
@@ -11,7 +11,7 @@ COMMENT= Library that allows to defer se
LICENSE= BSD2CLAUSE
-USES= cmake:outsource ninja pkgconfig tar:xz
+USES= cmake:outsource compiler:c11 ninja pkgconfig tar:xz
USE_LDCONFIG= yes
DOCSDIR= ${PREFIX}/share/doc/waffle1
@@ -21,13 +21,11 @@ OPTIONS_DEFINE= DOCS
USE_XORG= x11 xcb
USE_GL= gl egl
CFLAGS+= -I${LOCALBASE}/include
-LIBS+= -L${LOCALBASE}/lib
+LIBS+= -L${LOCALBASE}/lib
-#CMAKE_ARGS+= -Dwaffle_has_glx=ON \
-# -Dwaffle_has_x11_egl=ON
-
-# todo needs libudev
-# -Dwaffle_has_gbm=ON
+CMAKE_ARGS+= -Dwaffle_has_glx=ON
+#CMAKE_ARGS+= -Dwaffle_has_x11_egl=ON
+#CMAKE_ARGS+= -Dwaffle_has_gbm=ON # FIXME: Required udev
PLIST_SUB+= PORTVERSION=${PORTVERSION}
Modified: head/graphics/waffle/distinfo
==============================================================================
--- head/graphics/waffle/distinfo Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/distinfo Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,2 +1,2 @@
-SHA256 (waffle-1.5.0.tar.xz) = 6344fa2803d76182a08380780605b36c38e795639a3229281c96b75cc30137a8
-SIZE (waffle-1.5.0.tar.xz) = 177164
+SHA256 (waffle-1.5.1.tar.xz) = cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa
+SIZE (waffle-1.5.1.tar.xz) = 178136
Modified: head/graphics/waffle/files/patch-CMakeLists.txt
==============================================================================
--- head/graphics/waffle/files/patch-CMakeLists.txt Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/files/patch-CMakeLists.txt Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,6 +1,6 @@
---- 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 @@
+--- CMakeLists.txt.orig 2015-01-22 20:00:17 UTC
++++ CMakeLists.txt
+@@ -136,7 +136,7 @@ configure_file(waffle.pc.in ${waffle_lib
install(
FILES ${CMAKE_BINARY_DIR}/${waffle_libname}.pc
Modified: head/graphics/waffle/files/patch-Options.cmake
==============================================================================
--- head/graphics/waffle/files/patch-Options.cmake Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/files/patch-Options.cmake Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,10 +1,8 @@
-diff --git Options.cmake Options.cmake
-index 7f694e3..8fa62dd 100644
---- Options.cmake
+--- Options.cmake.orig 2015-01-22 20:00:17 UTC
+++ 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)
+ if(gl_FOUND AND x11-xcb_FOUND)
+ set(glx_default ON)
+ else()
Modified: head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake
==============================================================================
--- head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineCompilerFlags.cmake Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,6 +1,6 @@
---- 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 @@
+--- cmake/Modules/WaffleDefineCompilerFlags.cmake.orig 2015-01-22 20:00:17 UTC
++++ cmake/Modules/WaffleDefineCompilerFlags.cmake
+@@ -50,7 +50,7 @@ if (NOT MSVC)
waffle_add_c_flag("-Werror=int-conversion" WERROR_INT_CONVERSION)
waffle_add_c_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN)
@@ -9,7 +9,7 @@
# On MacOS, the SSE2 headers trigger this error.
waffle_add_c_flag("-Werror=missing-prototypes" WERROR_MISSING_PROTOTYPES)
endif()
-@@ -97,7 +97,7 @@
+@@ -97,7 +97,7 @@ if(waffle_on_mac)
add_definitions(-DWAFFLE_HAS_CGL)
endif()
Modified: head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake
==============================================================================
--- head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/files/patch-cmake_Modules_WaffleDefineOS.cmake Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,6 +1,4 @@
-diff --git cmake/Modules/WaffleDefineOS.cmake cmake/Modules/WaffleDefineOS.cmake
-index e437947..b1a3079 100644
---- cmake/Modules/WaffleDefineOS.cmake
+--- cmake/Modules/WaffleDefineOS.cmake.orig 2015-01-22 20:00:17 UTC
+++ cmake/Modules/WaffleDefineOS.cmake
@@ -25,6 +25,8 @@
@@ -10,4 +8,4 @@ index e437947..b1a3079 100644
+ set(waffle_on_freebsd true)
elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")
set(waffle_on_mac true)
- else()
+ elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Windows")
Added: head/graphics/waffle/files/patch-cmake_Modules_WaffleFindDependencies.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/waffle/files/patch-cmake_Modules_WaffleFindDependencies.cmake Sun Feb 22 20:21:48 2015 (r379627)
@@ -0,0 +1,11 @@
+--- cmake/Modules/WaffleFindDependencies.cmake.orig 2015-01-22 20:00:17 UTC
++++ cmake/Modules/WaffleFindDependencies.cmake
+@@ -62,7 +62,7 @@ if(waffle_on_mac)
+ endif()
+
+
+-if(waffle_on_linux)
++if(waffle_on_linux OR waffle_on_freebsd)
+ # waffle_has_egl
+ waffle_pkg_config(egl egl)
+
Added: head/graphics/waffle/files/patch-cmake_Modules_WaffleValidateOptions.cmake
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/graphics/waffle/files/patch-cmake_Modules_WaffleValidateOptions.cmake Sun Feb 22 20:21:48 2015 (r379627)
@@ -0,0 +1,11 @@
+--- cmake/Modules/WaffleValidateOptions.cmake.orig 2015-01-22 20:00:17 UTC
++++ cmake/Modules/WaffleValidateOptions.cmake
+@@ -44,7 +44,7 @@ if(DEFINED waffle_install_docdir)
+ "details.")
+ endif()
+
+-if(waffle_on_linux)
++if(waffle_on_linux OR waffle_on_freebsd)
+ if(NOT waffle_has_glx AND NOT waffle_has_wayland AND
+ NOT waffle_has_x11_egl AND NOT waffle_has_gbm)
+ message(FATAL_ERROR
Modified: head/graphics/waffle/files/patch-examples_CMakeLists.txt
==============================================================================
--- head/graphics/waffle/files/patch-examples_CMakeLists.txt Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/files/patch-examples_CMakeLists.txt Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,8 +1,6 @@
-diff --git examples/CMakeLists.txt examples/CMakeLists.txt
-index 48147f9..d6d1b5a 100644
---- examples/CMakeLists.txt
+--- examples/CMakeLists.txt.orig 2015-01-22 20:00:17 UTC
+++ examples/CMakeLists.txt
-@@ -7,7 +7,7 @@ install(FILES Makefile.example
+@@ -11,7 +11,7 @@ install(
# Target: simple-x11-egl (executable)
# ----------------------------------------------------------------------------
Modified: head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt
==============================================================================
--- head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/files/patch-src_waffle_CMakeLists.txt Sun Feb 22 20:21:48 2015 (r379627)
@@ -1,6 +1,6 @@
---- 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 @@
+--- src/waffle/CMakeLists.txt.orig 2015-01-22 20:00:17 UTC
++++ src/waffle/CMakeLists.txt
+@@ -38,7 +38,7 @@ list(APPEND waffle_libdeps
${THREADS_LIBRARIES}
)
@@ -9,7 +9,7 @@
if(waffle_has_wayland)
list(APPEND waffle_libdeps
${wayland-client_LDFLAGS}
-@@ -114,15 +114,22 @@
+@@ -114,15 +114,22 @@ if(waffle_has_glx)
)
endif()
Modified: head/graphics/waffle/pkg-plist
==============================================================================
--- head/graphics/waffle/pkg-plist Sun Feb 22 20:18:54 2015 (r379626)
+++ head/graphics/waffle/pkg-plist Sun Feb 22 20:21:48 2015 (r379627)
@@ -5,9 +5,11 @@ 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/cmake/Waffle/WaffleConfig.cmake
+lib/cmake/Waffle/WaffleConfigVersion.cmake
lib/libwaffle-1.so
lib/libwaffle-1.so.0
-lib/libwaffle-1.so.0.5.0
+lib/libwaffle-1.so.0.5.1
libdata/pkgconfig/waffle-1.pc
share/cmake/Modules/FindWaffle.cmake
%%PORTDOCS%%%%DOCSDIR%%/HACKING.txt
@@ -17,21 +19,23 @@ share/cmake/Modules/FindWaffle.cmake
%%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
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-0.3.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.0.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.1.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.2.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.3.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.1.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.2.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.3.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.4.4.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-1.5.0.txt
+%%PORTDOCS%%%%DOCSDIR%%/release-notes/waffle-%%PORTVERSION%%.txt
More information about the svn-ports-all
mailing list