[142043] trunk/dports/science/gr-fosphor/files

[michaelld at macports.org]

Revision: 142043
          https://trac.macports.org/changeset/142043
Author:   michaelld at macports.org
Date:     2015-11-02 11:09:16 -0800 (Mon, 02 Nov 2015)
Log Message:
-----------
gr-fosphor: add new patches.

Added Paths:
-----------
    trunk/dports/science/gr-fosphor/files/patch-add_find_libpng.diff
    trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindGLFW3.cmake.diff

Added: trunk/dports/science/gr-fosphor/files/patch-add_find_libpng.diff
===================================================================
--- trunk/dports/science/gr-fosphor/files/patch-add_find_libpng.diff	                        (rev 0)
+++ trunk/dports/science/gr-fosphor/files/patch-add_find_libpng.diff	2015-11-02 19:09:16 UTC (rev 142043)
@@ -0,0 +1,68 @@
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -109,6 +109,11 @@ if(NOT FREETYPE2_FOUND)
+ 	message(FATAL_ERROR "freetype2 required to compile gr-fosphor")
+ endif()
+ 
++find_package(libpng)
++if(NOT LIBPNG_FOUND)
++	message(FATAL_ERROR "libpng required to compile gr-fosphor")
++endif()
++
+ # Optional
+ find_package(GLFW3)
+ 
+--- lib/CMakeLists.txt.orig
++++ lib/CMakeLists.txt
+@@ -39,12 +39,14 @@ include_directories(
+ 	${OPENGL_INCLUDE_DIRS}
+ 	${OPENCL_INCLUDE_DIRS}
+ 	${FREETYPE2_INCLUDE_DIRS}
++	${LIBPNG_INCLUDE_DIRS}
+ 	${Boost_INCLUDE_DIR}
+ )
+ link_directories(
+ 	${OPENGL_LIBRARY_DIRS}
+ 	${OPENCL_LIBRARY_DIRS}
+ 	${FREETYPE2_LIBRARY_DIRS}
++	${LIBPNG_LIBRARY_DIRS}
+ 	${Boost_LIBRARY_DIRS}
+ )
+ 
+@@ -86,6 +88,7 @@ list(APPEND fosphor_libraries
+ 	${OPENGL_LIBRARIES}
+ 	${OPENCL_LIBRARIES}
+ 	${FREETYPE2_LIBRARIES}
++	${LIBPNG_LIBRARIES}
+ 	${Boost_LIBRARIES}
+ 	${GNURADIO_ALL_LIBRARIES}
+ 	${CMAKE_DL_LIBS}
+--- /dev/null
++++ cmake/Modules/Findlibpng.cmake
+@@ -0,0 +1,26 @@
++if(NOT LIBPNG_FOUND)
++  INCLUDE(FindPkgConfig)
++  pkg_check_modules(LIBPNG_PKG libpng)
++  find_path(LIBPNG_INCLUDE_DIRS
++    NAMES png.h
++    HINTS ${LIBPNG_PKG_INCLUDE_DIRS}
++    NO_DEFAULT_PATH
++  )
++
++  find_library(LIBPNG_LIBRARIES
++    NAMES ${LIBPNG_PKG_LIBRARIES} png
++    HINTS ${LIBPNG_PKG_LIBRARY_DIRS}
++    NO_DEFAULT_PATH
++  )
++
++  if(LIBPNG_INCLUDE_DIRS AND LIBPNG_LIBRARIES)
++    set(LIBPNG_FOUND TRUE CACHE INTERNAL "LIBPNG found")
++    message(STATUS "Found LIBPNG: ${LIBPNG_INCLUDE_DIRS}, ${LIBPNG_LIBRARIES}")
++  else(LIBPNG_INCLUDE_DIRS AND LIBPNG_LIBRARIES)
++    set(LIBPNG_FOUND FALSE CACHE INTERNAL "LIBPNG found")
++    message(STATUS "LIBPNG not found.")
++  endif(LIBPNG_INCLUDE_DIRS AND LIBPNG_LIBRARIES)
++
++  mark_as_advanced(LIBPNG_INCLUDE_DIRS LIBPNG_LIBRARIES)
++
++endif(NOT LIBPNG_FOUND)

Added: trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindGLFW3.cmake.diff
===================================================================
--- trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindGLFW3.cmake.diff	                        (rev 0)
+++ trunk/dports/science/gr-fosphor/files/patch-cmake_Modules_FindGLFW3.cmake.diff	2015-11-02 19:09:16 UTC (rev 142043)
@@ -0,0 +1,28 @@
+--- cmake/Modules/FindGLFW3.cmake.orig
++++ cmake/Modules/FindGLFW3.cmake
+@@ -1,18 +1,16 @@
+ if(NOT GLFW3_FOUND)
+   INCLUDE(FindPkgConfig)
+-  pkg_check_modules (GLFW3_PKG glfw3)
+-  find_path(GLFW3_INCLUDE_DIRS NAMES GLFW/glfw3.h
++  pkg_check_modules(GLFW3_PKG glfw3)
++  find_path(GLFW3_INCLUDE_DIRS
++    NAMES GLFW/glfw3.h
+     HINTS ${GLFW3_PKG_INCLUDE_DIRS}
+-    PATHS
+-    /usr/include
+-    /usr/local/include
++    NO_DEFAULT_PATH
+   )
+ 
+-  find_library(GLFW3_LIBRARIES NAMES glfw3 glfw
++  find_library(GLFW3_LIBRARIES
++    NAMES ${GLFW3_PKG_LIBRARIES} glfw3 glfw
+     HINTS ${GLFW3_PKG_LIBRARY_DIRS}
+-    PATHS
+-    /usr/lib
+-    /usr/local/lib
++    NO_DEFAULT_PATH
+   )
+ 
+   if(GLFW3_INCLUDE_DIRS AND GLFW3_LIBRARIES)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/ce7e3fe4/attachment.html>