Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package cegui for openSUSE:Factory checked in at 2021-06-11 00:17:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cegui (Old) and /work/SRC/openSUSE:Factory/.cegui.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cegui" Fri Jun 11 00:17:44 2021 rev:3 rq:896617 version:0.8.7+git20200906 Changes: -------- --- /work/SRC/openSUSE:Factory/cegui/cegui.changes 2021-05-08 22:08:35.857435991 +0200 +++ /work/SRC/openSUSE:Factory/.cegui.new.32437/cegui.changes 2021-06-11 00:17:49.757228881 +0200 @@ -1,0 +2,24 @@ +Mon May 10 17:16:51 UTC 2021 - Ferdinand Thiessen <r...@fthiessen.de> + +- Update to git snapshot 2020-09-06 + * Fixed build with OGRE >= 1.10 + * Many other bug fixes, this update does not introduce new + features, but fixs a lot build issues with newer versions of + CEGUI's dependencies +- Drop outdated cegui-0.8.3-irrlicht.patch +- Drop fix-tinyxmlparser-compile.patch, + as we now using libxml2 and libtinyxml2 +- Drop upstream merged + * use-cpp11.patch + * fix-findluapp.patch +- Replace fix-pkgconfig-private-dependency.patch with upstreamed + 0003-pkgconfig-Fix-private-dependency-of-OpenGL-renderer.patch +- Add upstreamed patches + * 0001-CMake-Fix-finding-OIS-1.4.patch + * 0002-Irrlicht-Fix-build-with-version-1.8.patch + * 0004-GLES-Fix-library-names-to-look-for.patch + * 0005-Partially-reverting-1200-c288602.patch + * 0006-OpenGLES-Renderer-Fix-dependency-on-EGL-on-non-APPLE.patch +- Split all renderer libraries into seperate packages + +------------------------------------------------------------------- Old: ---- cegui-0.8.3-irrlicht.patch cegui-0.8.7.tar.bz2 fix-findluapp.patch fix-pkgconfig-private-dependency.patch fix-tinyxmlparser-compile.patch use-cpp11.patch New: ---- 0001-CMake-Fix-finding-OIS-1.4.patch 0002-Irrlicht-Fix-build-with-version-1.8.patch 0003-pkgconfig-Fix-private-dependency-of-OpenGL-renderer.patch 0004-GLES-Fix-library-names-to-look-for.patch 0005-Partially-reverting-1200-c288602.patch 0006-OpenGLES-Renderer-Fix-dependency-on-EGL-on-non-APPLE.patch _service cegui-0.8.7+git20200906.obscpio cegui.obsinfo ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cegui.spec ++++++ --- /var/tmp/diff_new_pack.CpwfB0/_old 2021-06-11 00:17:50.797230687 +0200 +++ /var/tmp/diff_new_pack.CpwfB0/_new 2021-06-11 00:17:50.797230687 +0200 @@ -18,90 +18,125 @@ %define soname -0 +%define sover 2 +%define libname libCEGUI # Boost >= 1.60 is not supported at the moment, see: https://bitbucket.org/cegui/cegui/issues/1114/pycegui-084-fails-to-build-against-boost %bcond_with python -# OGRE > 1.9 is not supported at the moment -%bcond_with ogre +%bcond_without gles +%bcond_without ogre Name: cegui -Version: 0.8.7 +Version: 0.8.7+git20200906 Release: 0 Summary: Crazy Eddie's GUI System License: MIT Group: System/Libraries URL: http://www.cegui.org.uk/ -Source0: http://prdownloads.sourceforge.net/crayzedsgui/%{name}-%{version}.tar.bz2 +Source0: %{name}-%{version}.tar.xz Source99: %{name}.changes -# PATCH-FIX-SLED cegui-0.8.3-irrlicht.patch -Patch0: cegui-0.8.3-irrlicht.patch -# PATCH-FIX-OPENSUSE fix-findluapp.patch -- Find luapp library also if name has a version suffix (e.g. libluapp-5_1), needed for > 13.2 -Patch1: fix-findluapp.patch -Patch2: use-cpp11.patch -Patch3: fix-tinyxmlparser-compile.patch -# PATCH-FIX-UPSTREAM fix-pkgconfig-private-dependency.patch -- Fix missing private dependency on glew of CEGUI-OPENGL renderer -Patch4: fix-pkgconfig-private-dependency.patch -BuildRequires: Xerces-c-devel -BuildRequires: cmake >= 2.8.12 -BuildRequires: doxygen -BuildRequires: fribidi-devel +# PATCH-FIX-UPSTREAM 0001-CMake-Fix-finding-OIS-1.4.patch -- https://github.com/cegui/cegui/commit/c1ce0a9f35b358c3855af56806170695bbc995c7 +Patch0: 0001-CMake-Fix-finding-OIS-1.4.patch +# PATCH-FIX-UPSTREAM 0002-Irrlicht-Fix-build-with-version-1.8.patch -- https://github.com/cegui/cegui/pull/1218 +Patch1: 0002-Irrlicht-Fix-build-with-version-1.8.patch +# PATCH-FIX-UPSTREAM 0003-pkgconfig-Fix-private-dependency-of-OpenGL-renderer.patch -- https://github.com/cegui/cegui/pull/1218 +Patch2: 0003-pkgconfig-Fix-private-dependency-of-OpenGL-renderer.patch +# PATCH-FIX-UPSTREAM 0004-GLES-Fix-library-names-to-look-for.patch -- https://github.com/cegui/cegui/pull/1218 +Patch3: 0004-GLES-Fix-library-names-to-look-for.patch +# PATCH-FIX-UPSTREAM 0005-Partially-reverting-1200-c288602.patch -- https://github.com/cegui/cegui/pull/1218 +Patch4: 0005-Partially-reverting-1200-c288602.patch +# PATCH-FIX-UPSTREAM 0006-OpenGLES-Renderer-Fix-dependency-on-EGL-on-non-APPLE.patch -- https://github.com/cegui/cegui/pull/1218 +Patch5: 0006-OpenGLES-Renderer-Fix-dependency-on-EGL-on-non-APPLE.patch +BuildRequires: cmake >= 3.9 BuildRequires: gcc-c++ -BuildRequires: glm-devel -BuildRequires: gtk2-devel BuildRequires: irrlicht-devel >= 1.8 -BuildRequires: libexpat-devel BuildRequires: libfreeimage-devel +BuildRequires: libtolua++-5_1-devel BuildRequires: lua51-devel BuildRequires: pkgconfig -BuildRequires: tinyxml-devel BuildRequires: pkgconfig(IL) BuildRequires: pkgconfig(ILU) BuildRequires: pkgconfig(OIS) +BuildRequires: pkgconfig(SDL2_image) BuildRequires: pkgconfig(SILLY) +BuildRequires: pkgconfig(expat) BuildRequires: pkgconfig(freetype2) +BuildRequires: pkgconfig(fribidi) BuildRequires: pkgconfig(gl) BuildRequires: pkgconfig(glew) BuildRequires: pkgconfig(glfw3) +BuildRequires: pkgconfig(glm) BuildRequires: pkgconfig(glu) +BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(minizip) +BuildRequires: pkgconfig(sdl2) +BuildRequires: pkgconfig(sfml-graphics) +BuildRequires: pkgconfig(sfml-window) +BuildRequires: pkgconfig(tinyxml2) %if %{with ogre} -BuildRequires: pkgconfig(OGRE) +BuildRequires: ogre-devel +%endif +%if %{with gles} +BuildRequires: pkgconfig(egl) +BuildRequires: pkgconfig(glesv1_cm) %endif %if %{with python} BuildRequires: python BuildRequires: python-devel %endif -BuildRequires: libtolua++-5_1-devel -%description -Crazy Eddie's GUI System is a free library providing windowing and widgets for -graphics APIs / engines where such functionality is not natively available, or -severely lacking. The library is object orientated, written in C++, and -targeted at games developers who should be spending their time creating great +%define dsc Crazy Eddie's GUI System is a free library providing windowing and widgets for \ +graphics APIs / engines where such functionality is not natively available, or \ +severely lacking. The library is object orientated, written in C++, and \ +targeted at games developers who should be spending their time creating great \ games, not building GUI sub-systems! -%package -n lib%{name}%{soname} +%define renderer_pkg() \ +%%package -n %{libname}%{1}Renderer%{soname}-%{sover}\ +Summary: Crazy Eddie's GUI System\ +Group: System/Libraries\ +Provides: cegui\ +%%description -n %{libname}%{1}Renderer%{soname}-%{sover}\ +%{dsc}\ +%%post -n %{libname}%{1}Renderer%{soname}-%{sover} -p /sbin/ldconfig\ +%%postun -n %{libname}%{1}Renderer%{soname}-%{sover} -p /sbin/ldconfig\ +%%files -n %{libname}%{1}Renderer%{soname}-%{sover}\ +%{_libdir}/%{libname}%{1}Renderer%{soname}.so.%{sover}*\ + + +%description +%{dsc} + +%package -n %{libname}%{soname} Summary: Crazy Eddie's GUI System Group: System/Libraries Provides: cegui -%description -n lib%{name}%{soname} -Crazy Eddie's GUI System is a free library providing windowing and widgets for -graphics APIs / engines where such functionality is not natively available, or -severely lacking. The library is object orientated, written in C++, and -targeted at games developers who should be spending their time creating great -games, not building GUI sub-systems! +%description -n %{libname}%{soname} +%{dsc} -%package -n lib%{name}-devel +%renderer_pkg Irrlicht +%renderer_pkg Null +%renderer_pkg Ogre +%renderer_pkg OpenGL +%if %{with gles} +%renderer_pkg OpenGLES +%endif + +%package devel Summary: Crazy Eddie's GUI System Group: Development/Libraries/C and C++ -Requires: lib%{name}%{soname} = %{version} +Requires: %{libname}%{soname} = %{version} +Requires: %{libname}IrrlichtRenderer%{soname}-%{sover} = %{version} +Requires: %{libname}NullRenderer%{soname}-%{sover} = %{version} +Requires: %{libname}OgreRenderer%{soname}-%{sover} = %{version} +Requires: %{libname}OpenGLRenderer%{soname}-%{sover} = %{version} +%if %{with gles} +Requires: %{libname}OpenGLESRenderer%{soname}-%{sover} = %{version} +%endif -%description -n lib%{name}-devel -Crazy Eddie's GUI System is a free library providing windowing and widgets for -graphics APIs / engines where such functionality is not natively available, or -severely lacking. The library is object orientated, written in C++, and -targeted at games developers who should be spending their time creating great -games, not building GUI sub-systems! +%description devel +%{dsc} This package contains the development libraries and headers. @@ -111,11 +146,7 @@ Obsoletes: cegui-demos %description demos-devel -Crazy Eddie's GUI System is a free library providing windowing and widgets for -graphics APIs / engines where such functionality is not natively available, or -severely lacking. The library is object orientated, written in C++, and -targeted at games developers who should be spending their time creating great -games, not building GUI sub-systems! +%{dsc} This package contains some example programs. @@ -125,11 +156,7 @@ Group: Development/Libraries/C and C++ %description python -Crazy Eddie's GUI System is a free library providing windowing and widgets for -graphics APIs / engines where such functionality is not natively available, or -severely lacking. The library is object orientated, written in C++, and -targeted at games developers who should be spending their time creating great -games, not building GUI sub-systems! +%{dsc} This package contains the python interface. %endif @@ -144,9 +171,6 @@ grep -Rl -e "__DATE__" -e "__TIME__" | xargs sed -i -e "s/__DATE__/$DATE/g" -e "s/__TIME__/$TIME/g" %build -Mem=$(grep MemAvailable /proc/meminfo | awk '{print $2}') -Thr=$(if [ "$((Mem/500000))" -gt "$(nproc)" ]; then echo "$(nproc)"; else echo "$((Mem/500000))"; fi) - cp -r samples Samples %cmake \ -DCEGUI_BUILD_RENDERER_NULL=true \ @@ -156,9 +180,12 @@ %if %{without ogre} -DCEGUI_BUILD_RENDERER_OGRE=OFF \ %endif +%if %{without gles} + -DCEGUI_BUILD_RENDERER_OPENGLES=OFF \ +%endif -DCEGUI_BUILD_TESTS=true - -make -j$Thr VERBOSE=1 +cat cegui/include/CEGUI/Config.h +%make_build %check CEGUI_SAMPLE_DATAPATH=datafiles ctest -V @@ -173,22 +200,25 @@ rm -f %{buildroot}%{_bindir}/CEGUITests-0.8 %endif -%post -n lib%{name}%{soname} -p /sbin/ldconfig -%postun -n lib%{name}%{soname} -p /sbin/ldconfig +%post -n %{libname}%{soname} -p /sbin/ldconfig +%postun -n %{libname}%{soname} -p /sbin/ldconfig -%files -n lib%{name}%{soname} +%files -n %{libname}%{soname} %doc COPYING README.md doc/*-LICENSE +%{_libdir}/%{libname}*.so.* +%exclude %{_libdir}/%{libname}*Renderer*.so.%{sover}* # the *.so files are in the main packaged because they are often # dynamically loaded, unversioned. So programs would not run without them -%{_libdir}/libCEGUI*.so.* -%{_libdir}/cegui-* +%{_libdir}/cegui-0.8 +%exclude %{_libdir}/cegui-0.8/*Demo.so -%files -n lib%{name}-devel +%files devel %{_includedir}/cegui* %{_libdir}/libCEGUI*.so %{_libdir}/pkgconfig/CEGUI*.pc %files demos-devel +%{_libdir}/cegui-0.8/*Demo.so %{_bindir}/tolua* %{_bindir}/CEGUISampleFramework-0.8 %{_datadir}/cegui* ++++++ 0001-CMake-Fix-finding-OIS-1.4.patch ++++++ >From d3ab7ba386f17a19de59391264d7c5f06c160991 Mon Sep 17 00:00:00 2001 From: R?mi Verschelde <rversche...@gmail.com> Date: Tue, 13 Nov 2018 12:00:34 +0100 Subject: [PATCH 1/6] CMake: Fix finding OIS 1.4+ * With version 1.4, upstream OIS changed the location of their system-installed headers from /usr/include/OIS to /usr/include/ois. --- application_templates/Ogre.cpp | 2 +- cmake/FindOIS.cmake | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/application_templates/Ogre.cpp b/application_templates/Ogre.cpp index 5ee466d63..c2b8741f6 100644 --- a/application_templates/Ogre.cpp +++ b/application_templates/Ogre.cpp @@ -333,4 +333,4 @@ int main(int argc, char *argv[]){ } return 0; -} \ No newline at end of file +} diff --git a/cmake/FindOIS.cmake b/cmake/FindOIS.cmake index 7a4d015b4..14731a153 100644 --- a/cmake/FindOIS.cmake +++ b/cmake/FindOIS.cmake @@ -15,13 +15,7 @@ set(OIS_PREFIX_PATH find_path(OIS_H_PATH NAMES OIS.h PATHS ${OIS_PREFIX_PATH} - PATH_SUFFIXES OIS include includes) - -if(NOT OIS_H_PATH) - find_path(OIS_H_PATH NAMES OIS.h - PATHS ${OIS_PREFIX_PATH} - PATH_SUFFIXES OIS include include/OIS) -endif() + PATH_SUFFIXES ois OIS include includes include/ois include/OIS) find_library(OIS_LIB NAMES OIS libOIS PATHS ${OIS_PREFIX_PATH} -- 2.26.2 ++++++ 0002-Irrlicht-Fix-build-with-version-1.8.patch ++++++ >From e844899171e941fd56a6f7a5d418aa76361cfbe5 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen <r...@fthiessen.de> Date: Tue, 11 May 2021 16:49:14 +0200 Subject: [PATCH 2/6] Irrlicht: Fix build with version <= 1.8 Fixes "error: cannot declare of abstract type 'CEGUI::IrrlichtMemoryFile'" --- cegui/include/CEGUI/RendererModules/Irrlicht/MemoryFile.h | 4 ++++ cegui/src/RendererModules/Irrlicht/MemoryFile.cpp | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cegui/include/CEGUI/RendererModules/Irrlicht/MemoryFile.h b/cegui/include/CEGUI/RendererModules/Irrlicht/MemoryFile.h index 87ed3430c..90a74a49b 100644 --- a/cegui/include/CEGUI/RendererModules/Irrlicht/MemoryFile.h +++ b/cegui/include/CEGUI/RendererModules/Irrlicht/MemoryFile.h @@ -52,7 +52,11 @@ public: virtual ~IrrlichtMemoryFile() {}; // implement required interface from IReadFile +#if CEGUI_IRR_SDK_VERSION > 18 std::size_t read(void* buffer, std::size_t sizeToRead); +#else + irr::s32 read(void* buffer, irr::u32 sizeToRead); +#endif long getSize() const; long getPos() const; bool seek(long finalPos, bool relativeMovement = false); diff --git a/cegui/src/RendererModules/Irrlicht/MemoryFile.cpp b/cegui/src/RendererModules/Irrlicht/MemoryFile.cpp index 1325c2361..d6b8f9952 100644 --- a/cegui/src/RendererModules/Irrlicht/MemoryFile.cpp +++ b/cegui/src/RendererModules/Irrlicht/MemoryFile.cpp @@ -40,7 +40,11 @@ IrrlichtMemoryFile::IrrlichtMemoryFile(const String& filename, { } +#if CEGUI_IRR_SDK_VERSION > 18 std::size_t IrrlichtMemoryFile::read(void* buffer, std::size_t sizeToRead) +#else +irr::s32 IrrlichtMemoryFile::read(void* buffer, irr::u32 sizeToRead) +#endif { std::size_t realReadSize = ((d_position + sizeToRead) > d_size) ? d_size - d_position : sizeToRead; -- 2.26.2 ++++++ 0003-pkgconfig-Fix-private-dependency-of-OpenGL-renderer.patch ++++++ >From 02be4affeca9c0d9bbfbf5b614f05f1e48c84f8a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen <r...@fthiessen.de> Date: Tue, 11 May 2021 17:08:34 +0200 Subject: [PATCH 3/6] pkgconfig: Fix private dependency of OpenGL renderer The old OpenGL renderer (not GL3) requires GLEW in the headers, so add GLEW as a private requirement inside the pkgconfig file. --- cegui/CEGUI-OPENGL.pc.in | 1 + 1 file changed, 1 insertion(+) diff --git a/cegui/CEGUI-OPENGL.pc.in b/cegui/CEGUI-OPENGL.pc.in index 7614a03f0..f48e91d53 100644 --- a/cegui/CEGUI-OPENGL.pc.in +++ b/cegui/CEGUI-OPENGL.pc.in @@ -9,4 +9,5 @@ Name: CEGUI-@CEGUI_VERSION_MAJOR@ OpenGL Renderer Description: OpenGL based renderer module for CEGUI. Version: @CEGUI_VERSION@ Requires: CEGUI-@CEGUI_VERSION_MAJOR@ = @CEGUI_VERSION@ +Requires.private: glew Libs: -l@CEGUI_OPENGL_RENDERER_LIBNAME@ -- 2.26.2 ++++++ 0004-GLES-Fix-library-names-to-look-for.patch ++++++ >From 59cd489c5e80e3a2b0b7b13ca9eece6e6f217581 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen <r...@fthiessen.de> Date: Tue, 11 May 2021 17:30:40 +0200 Subject: [PATCH 4/6] GLES: Fix library names to look for Already fixed in master, but for v0 branch CMake is still not searching all commonly used library names --- cmake/FindOpenGLES.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/FindOpenGLES.cmake b/cmake/FindOpenGLES.cmake index e6fd9dbc6..6b149fec5 100644 --- a/cmake/FindOpenGLES.cmake +++ b/cmake/FindOpenGLES.cmake @@ -7,7 +7,7 @@ include(FindPackageHandleStandardArgs) find_path(OPENGLES_H_PATH NAMES GLES/gl.h) -find_library(OPENGLES_LIB NAMES GLES_CM) +find_library(OPENGLES_LIB NAMES GLES_CM GLESv1_CM) mark_as_advanced(OPENGLES_H_PATH OPENGLES_LIB OPENGLES_LIB_DBG) find_package_handle_standard_args(OPENGLES DEFAULT_MSG OPENGLES_LIB OPENGLES_H_PATH) -- 2.26.2 ++++++ 0005-Partially-reverting-1200-c288602.patch ++++++ >From b1822301162475c2f4081e17557239a91c69fbf4 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen <r...@fthiessen.de> Date: Tue, 11 May 2021 18:16:14 +0200 Subject: [PATCH 5/6] Partially reverting #1200 (c288602) For details, see https://github.com/cegui/cegui/issues/1163#issuecomment-838766688 --- CMakeLists.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 99bca69e2..96972ae55 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -115,6 +115,10 @@ if(${OGRE_FOUND}) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) + + set(CEGUI_FOUND_OGRE_VERSION_MAJOR ${OGRE_VERSION_MAJOR}) + set(CEGUI_FOUND_OGRE_VERSION_MINOR ${OGRE_VERSION_MINOR}) + set(CEGUI_FOUND_OGRE_VERSION_PATCH ${OGRE_VERSION_PATCH}) endif() endif() -- 2.26.2 ++++++ 0006-OpenGLES-Renderer-Fix-dependency-on-EGL-on-non-APPLE.patch ++++++ >From faa536589fd177d6abf40035f7d0583d016e4e11 Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen <r...@fthiessen.de> Date: Tue, 11 May 2021 19:00:55 +0200 Subject: [PATCH 6/6] OpenGLES Renderer: Fix dependency on EGL on non APPLE OpenGLES (v1) renderer requires EGL on non Apple systems, see FBOTextureTarget.cpp, so we nee to look for the EGL library to prevent undefined references. Backported from master --- CMakeLists.txt | 5 ++++ .../RendererModules/OpenGLES/CMakeLists.txt | 3 +++ cmake/FindEGL.cmake | 23 +++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 cmake/FindEGL.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 96972ae55..9c8000144 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -394,6 +394,11 @@ endif() # Option wether to build application templates; default off option(CEGUI_BUILD_APPLICATION_TEMPLATES "Specifies whether to build the application templates." TRUE) +if (NOT APPLE AND CEGUI_BUILD_RENDERER_OPENGLES) + find_package(EGL) + set(CEGUI_BUILD_RENDERER_OPENGLES ${EGL_FOUND} CACHE BOOL "OpenGL ES 1 RenderSystem requires EGL on other systems than APPLE" FORCE) +endif() + if (WIN32 OR APPLE) set (CEGUI_BUILD_SUFFIX "_d" CACHE STRING "String holding a suffix appended to the name of output binaries (under CMake build, only used for debug).") else() diff --git a/cegui/src/RendererModules/OpenGLES/CMakeLists.txt b/cegui/src/RendererModules/OpenGLES/CMakeLists.txt index e7090ff3a..d3907dfa6 100644 --- a/cegui/src/RendererModules/OpenGLES/CMakeLists.txt +++ b/cegui/src/RendererModules/OpenGLES/CMakeLists.txt @@ -4,6 +4,9 @@ cegui_gather_files() cegui_add_library(${CEGUI_TARGET_NAME} CORE_SOURCE_FILES CORE_HEADER_FILES) cegui_add_dependency(${CEGUI_TARGET_NAME} OPENGLES PRIVATE TRUE) +if (NOT APPLE) + cegui_add_dependency(${CEGUI_TARGET_NAME} EGL PRIVATE TRUE) +endif() cegui_target_link_libraries(${CEGUI_TARGET_NAME} ${CEGUI_BASE_LIBNAME}) diff --git a/cmake/FindEGL.cmake b/cmake/FindEGL.cmake new file mode 100644 index 000000000..f779d0a80 --- /dev/null +++ b/cmake/FindEGL.cmake @@ -0,0 +1,23 @@ +# Try to find EGL library and include dir. +# Once done this will define +# +# EGL_FOUND - true if EGL has been found +# EGL_INCLUDE_DIR - where the EGL/egl.h and KHR/khrplatform.h can be found +# EGL_LIBRARIES - link this to use libEGL.so.1 + +include(FindPackageHandleStandardArgs) + +find_path(EGL_H_PATH NAMES EGL/egl.h) +find_library(EGL_LIB NAMES EGL) +mark_as_advanced(EGL_H_PATH EGL_LIB) + +cegui_find_package_handle_standard_args(EGL EGL_LIB EGL_H_PATH) + +if (EGL_FOUND) + set (EGL_INCLUDE_DIR ${EGL_H_PATH}) + set (EGL_LIBRARIES ${EGL_LIB}) +else() + set (EGL_INCLUDE_DIR) + set (EGL_LIBRARIES) +endif() + -- 2.26.2 ++++++ _service ++++++ <services> <service name="obs_scm" mode="disabled"> <param name="url">https://github.com/cegui/cegui.git</param> <param name="revision">v0-8</param> <param name="versionformat">0.8.7+git%cd</param> <param name="scm">git</param> </service> <service mode="buildtime" name="tar" /> <service mode="buildtime" name="recompress"> <param name="file">*.tar</param> <param name="compression">xz</param> </service> <service mode="buildtime" name="set_version" /> </services> ++++++ cegui.obsinfo ++++++ name: cegui version: 0.8.7+git20200906 mtime: 1599421687 commit: 876d067d0f6bcc0ad3ad311df9f08fe857b7162a
