From d9a7a9fa40fafc41276d960ade0e718e73222d04c96f724803d1f94e445b081f Mon Sep 17 00:00:00 2001 From: Dmitriy Perlow Date: Mon, 23 Jul 2018 15:31:05 +0000 Subject: [PATCH 1/2] Accepting request 624686 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Use %cmake macro. This fixes build for aarch64. - Make use of %license OBS-URL: https://build.opensuse.org/request/show/624686 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=19 --- MyGUI.changes | 6 ++++++ MyGUI.spec | 53 ++++++++++++++++++++++----------------------------- 2 files changed, 29 insertions(+), 30 deletions(-) diff --git a/MyGUI.changes b/MyGUI.changes index c02e7ca..31a748d 100644 --- a/MyGUI.changes +++ b/MyGUI.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jul 20 14:27:43 UTC 2018 - guillaume.gardet@opensuse.org + +- Use %cmake macro. This fixes build for aarch64. +- Make use of %license + ------------------------------------------------------------------- Wed Jan 24 11:34:18 UTC 2018 - kasimir_@outlook.de diff --git a/MyGUI.spec b/MyGUI.spec index b28bb73..0803d92 100644 --- a/MyGUI.spec +++ b/MyGUI.spec @@ -1,7 +1,7 @@ # # spec file for package MyGUI # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -130,35 +130,27 @@ chmod 644 *.txt COPYING.MIT %build install -dm 755 build -pushd 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 \ - -DOGRE_LIBRARIES="$OGRE_LIBRARIES" \ - -DCMAKE_INSTALL_PREFIX=%{_prefix} \ - -DCMAKE_SKIP_RPATH=YES \ - -DCMAKE_BUILD_TYPE=release \ -%ifarch x86_64 aarch64 ppc64 ppc64le s390x - -DLIB_SUFFIX=64 \ -%endif - -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 \ - .. +# 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 \ + -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 - make %{?_smp_mflags} V=1 -popd +make %{?_smp_mflags} V=1 -pushd Docs +pushd ../Docs doxygen -s -g Doxyfile 2> /dev/null doxygen Doxyfile popd @@ -262,7 +254,8 @@ rm Docs/html/installdox || true %files %defattr(-,root,root) -%doc *.txt COPYING.MIT +%doc *.txt +%license COPYING.MIT %{_bindir}/%{name}.sh %{_bindir}/FontEditor %{_bindir}/ImageEditor @@ -301,7 +294,7 @@ rm Docs/html/installdox || true %dir %{_includedir}/%{capname} %{_includedir}/%{capname}/*.h %{_libdir}/libMyGUIEngine.so -%{_libdir}/libMyGUI.OgrePlatform.a +%{_libdir}/libMyGUI.OgrePlatform.so %{_libdir}/pkgconfig/*.pc %{_libdir}/Plugin_StrangeButton.so %{_libdir}/libEditorFramework.so From e7eb70e97d2d7b4e00e1a8fafc5658875dbebce2de5e95bf3b731690f2bb564c Mon Sep 17 00:00:00 2001 From: Michael Vetter Date: Fri, 25 Jan 2019 13:59:52 +0000 Subject: [PATCH 2/2] Accepting request 668638 from home:Guillaume_G:branches:openSUSE:Factory:ARM - Add _constraints to avoid OOM errors - Handle properly libCommon.so* - Add patch to get a versionned libCommon.so file: * MyGUI-libCommon-fixup.patch OBS-URL: https://build.opensuse.org/request/show/668638 OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=20 --- MyGUI-libCommon-fixup.patch | 10 ++++++++++ MyGUI.changes | 12 ++++++++++++ MyGUI.spec | 15 +++++++++------ _constraints | 8 ++++++++ 4 files changed, 39 insertions(+), 6 deletions(-) create mode 100644 MyGUI-libCommon-fixup.patch create mode 100644 _constraints diff --git a/MyGUI-libCommon-fixup.patch b/MyGUI-libCommon-fixup.patch new file mode 100644 index 0000000..e612d67 --- /dev/null +++ b/MyGUI-libCommon-fixup.patch @@ -0,0 +1,10 @@ +--- Common/CMakeLists.txt.orig 2016-03-05 07:17:23.175753455 -0600 ++++ Common/CMakeLists.txt 2016-03-05 07:18:03.880751014 -0600 +@@ -89,6 +89,7 @@ + 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) diff --git a/MyGUI.changes b/MyGUI.changes index 31a748d..8df6d6a 100644 --- a/MyGUI.changes +++ b/MyGUI.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jan 25 09:40:32 UTC 2019 - Guillaume GARDET + +- Add _constraints to avoid OOM errors + +------------------------------------------------------------------- +Fri Jan 25 09:17:46 UTC 2019 - Guillaume GARDET + +- Handle properly libCommon.so* +- Add patch to get a versionned libCommon.so file: + * MyGUI-libCommon-fixup.patch + ------------------------------------------------------------------- Fri Jul 20 14:27:43 UTC 2018 - guillaume.gardet@opensuse.org diff --git a/MyGUI.spec b/MyGUI.spec index 0803d92..fd9e9d2 100644 --- a/MyGUI.spec +++ b/MyGUI.spec @@ -1,7 +1,7 @@ # # spec file for package MyGUI # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2014 B1 Systems GmbH, Vohburg, Germany. # # All modifications and additions to the file contributed by third parties @@ -13,7 +13,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -36,6 +36,8 @@ Patch0: %{name}-lib_suffix.patch Patch1: %{name}-gcc47-visibility.patch # PATCH-FIX-OPENSUSE MyGUI-freetype2-include.patch Patch2: MyGUI-freetype2-include.patch +# PATCH-FIX-UPSTREAM MyGUI-libCommon-fixup.patch -- https://github.com/MyGUI/mygui/issues/157 +Patch3: MyGUI-libCommon-fixup.patch BuildRequires: cmake BuildRequires: dejavu BuildRequires: dos2unix @@ -124,6 +126,7 @@ This subpackage contains the development documentation for MyGUI. %patch0 -p1 %patch1 -p1 %patch2 -p1 +%patch3 -p0 dos2unix *.txt COPYING.MIT chmod 644 *.txt COPYING.MIT @@ -158,6 +161,8 @@ popd %install pushd build %make_install +# Install libCommon manually as cmake does not install it +cp -a %{_lib}/libCommon.so* %{buildroot}%{_libdir}/ popd # rename demos to avoid duplicate names with other packages @@ -261,6 +266,7 @@ rm Docs/html/installdox || true %{_bindir}/ImageEditor %{_bindir}/LayoutEditor %{_bindir}/SkinEditor +%{_libdir}/libCommon.so.* %dir %{_datadir}/%{capname} %{_datadir}/%{capname}/*.cfg %{_datadir}/%{capname}/*.xml @@ -293,11 +299,8 @@ rm Docs/html/installdox || true %defattr(-,root,root) %dir %{_includedir}/%{capname} %{_includedir}/%{capname}/*.h -%{_libdir}/libMyGUIEngine.so -%{_libdir}/libMyGUI.OgrePlatform.so +%{_libdir}/*.so %{_libdir}/pkgconfig/*.pc -%{_libdir}/Plugin_StrangeButton.so -%{_libdir}/libEditorFramework.so %{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.cpp %{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.h diff --git a/_constraints b/_constraints new file mode 100644 index 0000000..75475c3 --- /dev/null +++ b/_constraints @@ -0,0 +1,8 @@ + + + + + 4500 + + +