pool/MyGUI
SHA256
4
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Accepting request 945892 from home:susnux:branches:games

Browse Source 
- Update to version 3.4.1

OBS-URL: https://build.opensuse.org/request/show/945892
OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=27
This commit is contained in:
Dirk Stoecker 2022-01-18 08:15:01 +00:00 committed by Git OBS Bridge
parent eb2b2155b1
commit e71e4ecf1f
10 changed files with 183 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
0001-Fix-linking-with-Wl-no-undefined.patch Normal file
View File

@ -0,0 +1,42 @@
From 4bd1332d39cfd3d42030f96903c18d8d0847f768 Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Mon, 20 Dec 2021 00:44:24 +0100
Subject: [PATCH] Fix linking with -Wl,--no-undefined
---
CMake/Packages/FindSDL2.cmake | 6 ++++++
Common/CMakeLists.txt | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/CMake/Packages/FindSDL2.cmake b/CMake/Packages/FindSDL2.cmake
index ca4d209c4..4261f0efd 100644
--- a/CMake/Packages/FindSDL2.cmake
+++ b/CMake/Packages/FindSDL2.cmake
@@ -97,5 +97,11 @@ IF(NOT SDL2_FOUND)
VERSION_VAR SDL2_VERSION_STRING)
mark_as_advanced(SDL2_INCLUDE_DIR SDL2_LIBRARY)
+ add_library(SDL2::Main INTERFACE IMPORTED)
+ set_target_properties(
+ SDL2::Main PROPERTIES
+ INTERFACE_LINK_LIBRARIES "${SDL2_LIBRARY}"
+ INTERFACE_INCLUDE_DIRECTORIES "${SDL2_INCLUDE_DIR}"
+ )
CMAKE_POLICY(POP)
ENDIF(NOT SDL2_FOUND)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 1340f4373..18953e5a0 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -99,7 +99,7 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
-target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
+target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform SDL2::Main)
if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
mygui_install_target(${PROJECTNAME} "")
--
2.34.1

19
MyGUI-gcc47-visibility.patch
View File

@ -1,19 +0,0 @@
diff --git a/MyGUIEngine/include/MyGUI_Singleton.h b/MyGUIEngine/include/MyGUI_Singleton.h
index 5067da9..e12287d 100644
--- a/MyGUIEngine/include/MyGUI_Singleton.h
+++ b/MyGUIEngine/include/MyGUI_Singleton.h
@@ -58,8 +58,14 @@ namespace MyGUI
}
private:
+#if MYGUI_COMPILER == MYGUI_COMPILER_MSVC || MYGUI_PLATFORM == MYGUI_PLATFORM_APPLE
static T* msInstance;
static const char* mClassTypeName;
+#else
+ static MYGUI_EXPORT T* msInstance;
+
+ static MYGUI_EXPORT const char* mClassTypeName;
+#endif
};
} // namespace MyGUI

82
MyGUI-install-libCommon.patch
View File

@ -1,10 +1,72 @@
Index: mygui-MyGUI3.4.0/Common/CMakeLists.txt
===================================================================
--- mygui-MyGUI3.4.0.orig/Common/CMakeLists.txt
+++ mygui-MyGUI3.4.0/Common/CMakeLists.txt
@@ -173,3 +173,5 @@ if(NOT WIN32)
include_directories(${X11_INCLUDE_DIR})
endif(UNIX AND NOT APPLE)
endif()
+
+mygui_install_target(${PROJECTNAME} "")
From 4a53f10e0260c30a38824f843b32a6d809dcc08e Mon Sep 17 00:00:00 2001
From: Ferdinand Thiessen <rpm@fthiessen.de>
Date: Mon, 20 Dec 2021 02:01:19 +0100
Subject: [PATCH 2/3] Install libMyGUICommon if tools or demos are installed,
fixes #157
---
CMake/Utils/MyGUIConfigTargets.cmake | 8 ++++----
Common/CMakeLists.txt | 6 +++++-
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index 8fb1ce43f..dc7618e67 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -173,13 +173,13 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
endif ()
set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
- add_dependencies(${PROJECTNAME} MyGUIEngine Common)
+ add_dependencies(${PROJECTNAME} MyGUIEngine MyGUICommon)
mygui_config_sample(${PROJECTNAME})
# link Common, Platform and MyGUIEngine
target_link_libraries(${PROJECTNAME}
- Common
+ MyGUICommon
)
if (NOT EMSCRIPTEN)
@@ -285,12 +285,12 @@ function(mygui_dll PROJECTNAME SOLUTIONFOLDER)
mygui_config_lib(${PROJECTNAME})
- add_dependencies(${PROJECTNAME} MyGUIEngine Common)
+ add_dependencies(${PROJECTNAME} MyGUIEngine MyGUICommon)
mygui_config_sample(${PROJECTNAME})
target_link_libraries(${PROJECTNAME}
- Common
+ MyGUICommon
)
if (NOT EMSCRIPTEN)
diff --git a/Common/CMakeLists.txt b/Common/CMakeLists.txt
index 2b160ff05..1340f4373 100644
--- a/Common/CMakeLists.txt
+++ b/Common/CMakeLists.txt
@@ -3,7 +3,7 @@ function(mygui_add_base_manager_include PLATFORM_ID)
include_directories(../../Common/Base/${MYGUI_PLATFORM_NAME})
endfunction(mygui_add_base_manager_include)
-set (PROJECTNAME Common)
+set (PROJECTNAME MyGUICommon)
include_directories(
.
@@ -100,5 +100,9 @@ add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
mygui_set_platform_name(${MYGUI_RENDERSYSTEM})
add_dependencies(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
target_link_libraries(${PROJECTNAME} MyGUI.${MYGUI_PLATFORM_NAME}Platform)
+if (MYGUI_INSTALL_TOOLS OR MYGUI_INSTALL_DEMOS)
+ set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
+ mygui_install_target(${PROJECTNAME} "")
+endif()
add_dependencies(${PROJECTNAME} MyGUIEngine)
--
2.34.1

54
MyGUI-lib_suffix.patch
View File

@ -1,54 +0,0 @@
diff --git a/CMake/ConfigureBuild.cmake b/CMake/ConfigureBuild.cmake
index 9c6aad9..74fe84f 100644
--- a/CMake/ConfigureBuild.cmake
+++ b/CMake/ConfigureBuild.cmake
@@ -47,7 +47,7 @@ if (UNIX)
else ()
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
endif ()
- install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib/pkgconfig)
+ install(FILES ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc DESTINATION lib${LIB_SUFFIX}/pkgconfig)
# configure additional packages
diff --git a/CMake/Utils/MyGUIConfigTargets.cmake b/CMake/Utils/MyGUIConfigTargets.cmake
index bba3f91..0f6d842 100644
--- a/CMake/Utils/MyGUIConfigTargets.cmake
+++ b/CMake/Utils/MyGUIConfigTargets.cmake
@@ -34,8 +34,8 @@ endif ()
function(mygui_install_target TARGETNAME SUFFIX)
install(TARGETS ${TARGETNAME}
RUNTIME DESTINATION "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
- LIBRARY DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
- ARCHIVE DESTINATION "lib${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ LIBRARY DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
+ ARCHIVE DESTINATION "lib${LIB_SUFFIX}${MYGUI_LIB_RELEASE_PATH}${SUFFIX}" CONFIGURATIONS Release None ""
FRAMEWORK DESTINATION "${MYGUI_FRAMEWORK_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
@@ -61,8 +61,8 @@ endfunction(mygui_install_target)
# setup common target settings
function(mygui_config_common TARGETNAME)
set_target_properties(${TARGETNAME} PROPERTIES
- ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
- LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib
+ ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
+ LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX}
RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin
)
endfunction(mygui_config_common)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 35658d9..f94482f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -81,8 +81,8 @@ endif ()
set(MYGUI_LIBRARIES MyGUIEngine)
# Specify build paths
-set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib)
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/lib${LIB_SUFFIX})
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${MYGUI_BINARY_DIR}/bin)
if (WIN32 OR APPLE)
if (CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)

36
MyGUI-libs-versioning.patch
View File

@ -1,36 +0,0 @@
Index: mygui-MyGUI3.4.0/Common/CMakeLists.txt
===================================================================
--- mygui-MyGUI3.4.0.orig/Common/CMakeLists.txt
+++ mygui-MyGUI3.4.0/Common/CMakeLists.txt
@@ -121,6 +121,7 @@ elseif(MYGUI_SAMPLES_INPUT EQUAL 4)
endif()
add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION ${MYGUI_VERSION_MAJOR})
if(MYGUI_RENDERSYSTEM EQUAL 1)
add_dependencies(${PROJECTNAME} MyGUI.DummyPlatform)
Index: mygui-MyGUI3.4.0/CMake/Utils/MyGUIConfigTargets.cmake
===================================================================
--- mygui-MyGUI3.4.0.orig/CMake/Utils/MyGUIConfigTargets.cmake
+++ mygui-MyGUI3.4.0/CMake/Utils/MyGUIConfigTargets.cmake
@@ -316,6 +316,7 @@ function(mygui_dll PROJECTNAME SOLUTIONF
add_definitions("-D_USRDLL -DMYGUI_BUILD_DLL")
add_library(${PROJECTNAME} ${MYGUI_LIB_TYPE} ${HEADER_FILES} ${SOURCE_FILES})
set_target_properties(${PROJECTNAME} PROPERTIES FOLDER ${SOLUTIONFOLDER})
+ set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
add_dependencies(${PROJECTNAME} MyGUIEngine)
target_link_libraries(${PROJECTNAME} MyGUIEngine)
Index: mygui-MyGUI3.4.0/Platforms/Ogre/OgrePlatform/CMakeLists.txt
===================================================================
--- mygui-MyGUI3.4.0.orig/Platforms/Ogre/OgrePlatform/CMakeLists.txt
+++ mygui-MyGUI3.4.0/Platforms/Ogre/OgrePlatform/CMakeLists.txt
@@ -9,6 +9,7 @@ include_directories(
include(${PROJECTNAME}.list)
add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+set_target_properties(${PROJECTNAME} PROPERTIES VERSION ${MYGUI_VERSION} SOVERSION "${MYGUI_VERSION_MAJOR}.${MYGUI_VERSION_MINOR}.${MYGUI_VERSION_PATCH}")
add_dependencies(${PROJECTNAME} MyGUIEngine)

2
MyGUI-rpmlintrc Normal file
View File

@ -0,0 +1,2 @@
# This is a template not a devel file
addFilter("MyGUI-tools.*: E: devel-file-in-non-devel-package")

29
MyGUI.changes
View File

@ -1,3 +1,32 @@
-------------------------------------------------------------------
Sun Dec 19 16:48:27 UTC 2021 - Ferdinand Thiessen <rpm@fthiessen.de>
- Update to version 3.4.1
* Implement new MSDF font
* Add new eventWidgetDestroyed
* Add support for custom shaders for each render item
* Add support for Unicode code points outside of the
Basic Multilingual Plane
* Allow std::function in the MyGUI::newDelegate
* Allow const functions and const classes in the MyGUI::newDelegate
* Some bug fixes
* Widgets
* Some bug fixes in ListBox and EditBox
* Button: make Button without "normal_checked" skin display
"pushed" skin
* Window: add borders snapping, when resizing it
* Platform Ogre:
* make it possible to use OGRE_RESOURCEMANAGER_STRICT=1 mode
* use Ogre::Renderable to render Gui, this fixes several issues
with recent Ogre version
* LayoutEditor: fix multi language support
- Update MyGUI-install-libCommon.patch
- Add 0001-Fix-linking-with-Wl-no-undefined.patch
- Drop upstream fixed MyGUI-lib_suffix.patch,
MyGUI-gcc47-visibility.patch,
MyGUI-libs-versioning.patch
- Add rpmlintrc
-------------------------------------------------------------------
Fri Oct 22 17:31:09 UTC 2021 - Adam Mizerski <adam@mizerski.pl>

68
MyGUI.spec
View File

@ -18,9 +18,9 @@
%define capname MYGUI
%define _sover 3_4_0
%define _sover 3_4_1
Name: MyGUI
Version: 3.4.0
Version: 3.4.1
Release: 0
Summary: A GUI library for Ogre Rendering Engine
License: MIT
@ -28,14 +28,11 @@ Group: Development/Tools/GUI Builders
URL: http://mygui.info/
Source: https://github.com/MyGUI/mygui/archive/MyGUI%{version}.tar.gz
Source1: %{name}.png
# PATCH-FIX-UPSTREAM MyGUI-lib_suffix.patch
Patch0: %{name}-lib_suffix.patch
# PATCH-FIX-UPSTREAM MyGUI-gcc47-visibility.patch
Patch1: %{name}-gcc47-visibility.patch
# PATCH-FEATURE-OPENSUSE MyGUI-libs-versioning.patch -- Add versioning to libs; Upstream seems uninterested: https://github.com/MyGUI/mygui/issues/157
Patch2: MyGUI-libs-versioning.patch
# PATCH-FEATURE-OPENSUSE MyGUI-install-libCommon.patch -- Use cmake to install libCommon
Patch3: MyGUI-install-libCommon.patch
Source99: %{name}-rpmlintrc
# PATCH-FIX-UPSTREAM MyGUI-install-libCommon.patch -- https://github.com/MyGUI/mygui/pull/233
Patch0: MyGUI-install-libCommon.patch
# PATCH-FIX-UPSTREAM 0001-Fix-linking-with-Wl-no-undefined.patch -- https://github.com/MyGUI/mygui/pull/232
Patch1: 0001-Fix-linking-with-Wl-no-undefined.patch
BuildRequires: cmake
BuildRequires: dejavu
BuildRequires: dos2unix
@ -47,8 +44,6 @@ BuildRequires: libOIS-devel
BuildRequires: libX11-devel
BuildRequires: libboost_system-devel
BuildRequires: ogre-devel
# MyGUI wants to copy plugins.cfg installed by ogre-demos
BuildRequires: ogre-demos
BuildRequires: pkgconfig
BuildRequires: unzip
BuildRequires: update-desktop-files
@ -92,6 +87,16 @@ for games and 3D applications.
This package contains the shared library for package MyGUI.
%package -n libMyGUICommon%{_sover}
Summary: Shared library for MyGUI
Group: System/Libraries
%description -n libMyGUICommon%{_sover}
MyGUI is a library for creating Graphical User Interfaces (GUIs)
for games and 3D applications.
This package contains the shared library used by most MyGUI tools and demos.
%package tools
Summary: Tools applications for MyGUI
Group: Development/Tools/GUI Builders
@ -107,6 +112,7 @@ This package contains tools applications for package MyGUI.
Summary: Development files for MyGUI
Group: Development/Libraries/C and C++
Requires: %{name} = %{version}
Requires: libMyGUICommon%{_sover} = %{version}
Requires: libMyGUIEngine%{_sover} = %{version}
Requires: libOIS-devel
Requires: libOgreMain-devel
@ -137,24 +143,19 @@ This subpackage contains the development documentation for MyGUI.
%autopatch -p1
%build
# this is probably an error in OGRE packaging... but let's just fix the build.
export OGRE_LIBRARIES="`pkg-config --libs OGRE` -lboost_system"
%cmake \
-DMYGUI_STATIC=OFF \
-DMYGUI_USE_FREETYPE=ON \
-DMYGUI_BUILD_PLUGINS=ON \
-DMYGUI_BUILD_TOOLS=ON \
-DMYGUI_BUILD_WRAPPER=OFF \
-DMYGUI_INSTALL_TOOLS=ON \
-DMYGUI_INSTALL_DEMOS=ON \
-DMYGUI_INSTALL_DOCS=ON \
-DMYGUI_INSTALL_MEDIA=ON \
-DMYGUI_FULL_RPATH=OFF \
-DCMAKE_SKIP_RPATH=ON \
-DCMAKE_BUILD_TYPE=release \
-DOGRE_LIBRARIES="$OGRE_LIBRARIES" \
-DMYGUI_STATIC=FALSE \
-DMYGUI_USE_FREETYPE=TRUE \
-DMYGUI_BUILD_SAMPLES=TRUE \
-DMYGUI_BUILD_PLUGINS=TRUE \
-DMYGUI_BUILD_TOOLS=TRUE \
-DMYGUI_BUILD_WRAPPER=FALSE \
-DMYGUI_INSTALL_SAMPLES=TRUE \
-DMYGUI_INSTALL_TOOLS=TRUE \
-DMYGUI_INSTALL_DOCS=TRUE \
-DMYGUI_INSTALL_MEDIA=TRUE \
-DMYGUI_INSTALL_SAMPLES_SOURCE=TRUE \
-DMYGUI_FULL_RPATH=FALSE \
-DCMAKE_SKIP_RPATH=TRUE \
-DOGRE_CONFIG_DIR=%{_datadir}/OGRE
%cmake_build
@ -252,15 +253,12 @@ rm -r %{buildroot}%{_datadir}/%{capname}/Media/Wrapper/WrapperBaseApp
%post -n libMyGUIEngine%{_sover} -p /sbin/ldconfig
%postun -n libMyGUIEngine%{_sover} -p /sbin/ldconfig
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post -n libMyGUICommon%{_sover} -p /sbin/ldconfig
%postun -n libMyGUICommon%{_sover} -p /sbin/ldconfig
%files
%doc README.md
%license COPYING.MIT
%{_bindir}/%{name}.sh
%{_libdir}/lib*.so.*
%exclude %{_libdir}/libMyGUIEngine.so.*
%{_libdir}/Plugin_*.so
%{_datadir}/%{capname}/
%exclude %{_datadir}/%{capname}/Media/Demos/
@ -277,11 +275,15 @@ rm -r %{buildroot}%{_datadir}/%{capname}/Media/Wrapper/WrapperBaseApp
%files -n libMyGUIEngine%{_sover}
%{_libdir}/libMyGUIEngine.so.*
%files -n libMyGUICommon%{_sover}
%{_libdir}/libMyGUICommon.so.*
%files demo
%{_bindir}/%{name}-Demo_*
%{_datadir}/%{capname}/Media/Demos/
%files tools
%{_bindir}/%{name}.sh
%{_bindir}/FontEditor
%{_bindir}/ImageEditor
%{_bindir}/LayoutEditor

3
MyGUI3.4.0.tar.gz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:d1d5f294670ae71f7200ed4b30859018281d8cfd45d6a38d18b97a4aba604c42
size 22391483

3
MyGUI3.4.1.tar.gz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:bdf730bdeb4ad89e6b8223967db01aa5274d2b93adc2c0d6aa4842faeed4de1a
size 22433198