Description: provide Cairo.cmake and Pixman.cmake files
Author: Christian T. Steigies <cts@debian.org>
Last-Update: 2022-10-31
Index: gle-graphics-4.3.3/src/CMakeLists.txt
===================================================================
--- gle-graphics-4.3.3.orig/src/CMakeLists.txt
+++ gle-graphics-4.3.3/src/CMakeLists.txt
@@ -104,70 +104,16 @@ if(_isMultiConfig)
 		list(APPEND PNG_LIBRARIES ${PNG_DEBUG})
 	endif()
 endif()
-#find_package(Cairo )
-#find_package(Pixman )
-#
-# -- cairo library - cmake does not supply findCAIRO.cmake
-#	
-set(CAIRO_FOUND )
-get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(_isMultiConfig)
-	find_library(CAIRO_RELEASE NAMES cairo PATHS ${CAIRO_ROOT} PATH_SUFFIXES lib REQUIRED )
-	string(COMPARE NOTEQUAL "${CAIRO_RELEASE}" "CAIRO_RELEASE-NOTFOUND" CAIRO_FOUND)
-	find_library(CAIRO_DEBUG NAMES cairod PATHS ${CAIRO_ROOT} PATH_SUFFIXES lib )
-	set(HAS_DEBUG )
-	string(COMPARE NOTEQUAL "${CAIRO_DEBUG}" "CAIRO_DEBUG-NOTFOUND" HAS_DEBUG)
-	if(HAS_DEBUG)
-		list(APPEND CAIRO_LIBRARIES "optimized")
-		list(APPEND CAIRO_LIBRARIES ${CAIRO_RELEASE})
-		list(APPEND CAIRO_LIBRARIES "debug")
-		list(APPEND CAIRO_LIBRARIES ${CAIRO_DEBUG})
-	else()
-		list(APPEND CAIRO_LIBRARIES ${CAIRO_RELEASE})
-	endif()
-else()
-	find_library(CAIRO_LIBRARIES NAMES cairo cairod PATHS ${CAIRO_ROOT} PATH_SUFFIXES lib REQUIRED)
-	string(COMPARE NOTEQUAL "${CAIRO_LIBRARIES}" "CAIRO_LIBRARIES-NOTFOUND" CAIRO_FOUND)
-endif()
-find_path(CAIRO_INCLUDE_DIRS cairo.h PATHS ${CAIRO_ROOT} PATH_SUFFIXES include REQUIRED)
-if(CAIRO_FOUND)
-	message("-- Found CAIRO: " ${CAIRO_LIBRARIES} )
-endif()
-#
-# -- pixman library - cmake does not supply findPIXMAN.cmake
-#	
-set(PIXMAN_FOUND )
-get_property(_isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
-if(_isMultiConfig)
-	find_library(PIXMAN_RELEASE NAMES pixman PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
-	string(COMPARE NOTEQUAL "${PIXMAN_RELEASE}" "PIXMAN_RELEASE-NOTFOUND" PIXMAN_FOUND)
-	find_library(PIXMAN_DEBUG NAMES pixmand PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib )
-	set(HAS_DEBUG )
-	string(COMPARE NOTEQUAL "${PIXMAN_DEBUG}" "PIXMAN_DEBUG-NOTFOUND" HAS_DEBUG)
-	if(HAS_DEBUG)
-		list(APPEND PIXMAN_LIBRARIES "optimized")
-		list(APPEND PIXMAN_LIBRARIES ${PIXMAN_RELEASE})
-		list(APPEND PIXMAN_LIBRARIES "debug")
-		list(APPEND PIXMAN_LIBRARIES ${PIXMAN_DEBUG})
-	else()
-		list(APPEND PIXMAN_LIBRARIES ${PIXMAN_RELEASE})
-	endif()
-else()
-	find_library(PIXMAN_LIBRARIES NAMES pixman pixmand PATHS ${PIXMAN_ROOT} PATH_SUFFIXES lib REQUIRED)
-	string(COMPARE NOTEQUAL "${PIXMAN_LIBRARIES}" "PIXMAN_LIBRARIES-NOTFOUND" PIXMAN_FOUND)
-endif()
-find_path(PIXMAN_INCLUDE_DIRS pixman.h PATHS ${PIXMAN_ROOT} PATH_SUFFIXES include REQUIRED)
-if(PIXMAN_FOUND)
-	message("-- Found PIXMAN: " ${PIXMAN_LIBRARIES} )
-endif()
+find_package(Cairo )
+find_package(Pixman )
 #
 # -- GHOSTscript or GHOSTPDL include directory only since gle links to installed version at runtime
 #
-find_path(GDIR1 iapi.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
+find_path(GDIR1 iapi.h . ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
 list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR1} )
-find_path(GDIR2 gdevdsp.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
+find_path(GDIR2 gdevdsp.h . ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
 list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR2} )
-find_path(GDIR3 gserrors.h PATHS ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
+find_path(GDIR3 gserrors.h . ${GHOSTPDL_ROOT} PATH_SUFFIXES psi base devices )
 list(APPEND GHOSTPDL_INCLUDE_DIRS ${GDIR3} )
 
 include_directories(
Index: gle-graphics-4.3.3/src/gle/d_cairo.cpp
===================================================================
--- gle-graphics-4.3.3.orig/src/gle/d_cairo.cpp
+++ gle-graphics-4.3.3/src/gle/d_cairo.cpp
@@ -46,9 +46,9 @@
 
 #ifdef HAVE_CAIRO
 
-#include <cairo-ps.h>
-#include <cairo-pdf.h>
-#include <cairo-svg.h>
+#include <cairo/cairo-ps.h>
+#include <cairo/cairo-pdf.h>
+#include <cairo/cairo-svg.h>
 
 /************************************************************************************
  * Fonts in Cairo:
Index: gle-graphics-4.3.3/src/gle/d_interface.h
===================================================================
--- gle-graphics-4.3.3.orig/src/gle/d_interface.h
+++ gle-graphics-4.3.3/src/gle/d_interface.h
@@ -216,7 +216,7 @@ public:
 
 #ifdef HAVE_CAIRO
 
-#include <cairo.h>
+#include <cairo/cairo.h>
 
 class GLECairoDevice : public GLEDevice {
 protected:
Index: gle-graphics-4.3.3/src/gle/gle-poppler.h
===================================================================
--- gle-graphics-4.3.3.orig/src/gle/gle-poppler.h
+++ gle-graphics-4.3.3/src/gle/gle-poppler.h
@@ -56,7 +56,7 @@ void gle_convert_pdf_to_image(char* pdfD
 
 #ifdef HAVE_CAIRO
 
-#include <cairo.h>
+#include <cairo/cairo.h>
 
 void gle_write_cairo_surface_bitmap(cairo_surface_t* surface,
 		                            int device,
