Accepting request 107048 from home:worldcitizen:branches:games

Build MyGUI 3.20

OBS-URL: https://build.opensuse.org/request/show/107048
OBS-URL: https://build.opensuse.org/package/show/games/MyGUI?expand=0&rev=9
This commit is contained in:
Ilya Chernykh 2012-02-27 03:57:41 +00:00 committed by Git OBS Bridge
parent cf7da6d8f3
commit 4a5143c062
6 changed files with 91 additions and 78 deletions

View File

@ -1,8 +1,7 @@
Index: CMake/ConfigureBuild.cmake
===================================================================
--- CMake/ConfigureBuild.cmake (revision 2802)
+++ CMake/ConfigureBuild.cmake (working copy)
@@ -44,7 +44,7 @@
diff -Naur MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake MyGUI_3.2.0/CMake/ConfigureBuild.cmake
--- MyGUI_3.2.0.orig/CMake/ConfigureBuild.cmake 2012-02-22 22:27:34.000000000 +0100
+++ MyGUI_3.2.0/CMake/ConfigureBuild.cmake 2012-02-26 16:03:12.000000000 +0100
@@ -47,7 +47,7 @@
else ()
configure_file(${MYGUI_TEMPLATES_DIR}/MYGUI.pc.in ${MYGUI_BINARY_DIR}/pkgconfig/MYGUI${MYGUI_LIB_SUFFIX}.pc @ONLY)
endif ()
@ -11,44 +10,49 @@ Index: CMake/ConfigureBuild.cmake
# configure additional packages
Index: CMake/Utils/MyGUIConfigTargets.cmake
===================================================================
--- CMake/Utils/MyGUIConfigTargets.cmake (revision 2802)
+++ CMake/Utils/MyGUIConfigTargets.cmake (working copy)
@@ -38,8 +38,8 @@
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 "bin${MYGUI_RELEASE_PATH}" CONFIGURATIONS Release None ""
)
install(TARGETS ${TARGETNAME}
@@ -65,8 +65,8 @@
# 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
)
mygui_create_vcproj_userfile(${TARGETNAME})
Index: CMakeLists.txt
===================================================================
--- CMakeLists.txt (revision 2802)
+++ CMakeLists.txt (working copy)
@@ -84,8 +84,8 @@
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)
diff -Naur MyGUI_3.2.0.orig/CMake/Utils/MyGUIConfigTargets.cmake MyGUI_3.2.0/CMake/Utils/MyGUIConfigTargets.cmake
--- MyGUI_3.2.0.orig/CMake/Utils/MyGUIConfigTargets.cmake 2012-02-22 22:27:34.000000000 +0100
+++ MyGUI_3.2.0/CMake/Utils/MyGUIConfigTargets.cmake 2012-02-26 16:05:06.000000000 +0100
@@ -57,8 +57,8 @@
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}
@@ -84,8 +84,8 @@
# 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
)
mygui_create_vcproj_userfile(${TARGETNAME})
@@ -326,4 +326,4 @@
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
set_property(TARGET ${PROJECTNAME} PROPERTY INSTALL_RPATH_USE_LINK_PATH TRUE)
endif ()
-endfunction(mygui_config_sample)
\ No newline at end of file
+endfunction(mygui_config_sample)
diff -Naur MyGUI_3.2.0.orig/CMakeLists.txt MyGUI_3.2.0/CMakeLists.txt
--- MyGUI_3.2.0.orig/CMakeLists.txt 2012-02-22 22:28:40.000000000 +0100
+++ MyGUI_3.2.0/CMakeLists.txt 2012-02-26 16:05:47.000000000 +0100
@@ -85,8 +85,8 @@
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)

View File

@ -1,14 +0,0 @@
# This line is mandatory to access the configuration functions
from Config import *
addFilter("devel-file-in-non-devel-package .*/MYGUI/Media/Tools/LayoutEditor/CodeTemplates.*")
# MyGUI-devel
addFilter("no-dependency-on .*/libMyGUI")
addFilter("static-library-without-debuginfo .*/libMyGUI.OgrePlatform.a")
# MyGUI-devel-doc
addFilter("devel-package-with-non-devel-group Documentation/HTML")
# MyGUI-demo
setBadness('shlib-policy-name-error', 0)

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Feb 26 14:48:40 UTC 2012 - joop.boonen@opensuse.org
- Build MyGUI 3.20
-------------------------------------------------------------------
Mon Dec 5 13:31:39 UTC 2011 - anixx@opensuse.org
@ -25,3 +30,4 @@ Wed Apr 20 13:35:58 UTC 2011 - prusnak@opensuse.org
- based on a package by Toni Graffy
-------------------------------------------------------------------

View File

@ -1,7 +1,7 @@
#
# spec file for package MyGUI
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -17,20 +17,19 @@
%define capname MYGUI
%define _major 3.0
%define _minor 1
%define _major 3.2
%define _minor 0
%define _sover 3
Name: MyGUI
Version: %{_major}.%{_minor}
Release: 1
License: LGPLv3
Release: 0
License: LGPL-3.0
Summary: A GUI library for Ogre Rendering Engine
URL: http://my-gui.sourceforge.net/
Url: http://my-gui.sourceforge.net/
Group: Development/Tools/GUI Builders
Source: %{name}_%{version}_source.zip
Source: %{name}_%{version}.zip
Source1: %{name}.png
Source90: %{name}-rpmlintrc
Patch0: %{name}-lib_suffix.patch
BuildRequires: Cg
BuildRequires: Cg-devel
@ -126,8 +125,8 @@ next targets: GUI have to be fast, flexible and simple in using.
Development documentation for package MyGUI.
%prep
%setup -q -n %{name}%{_major}
%patch0
%setup -q -n %{name}_%{version}
%patch0 -p1
dos2unix *.txt COPYING.LESSER
chmod 644 *.txt COPYING.LESSER
@ -160,7 +159,7 @@ pushd build
popd
pushd Docs
doxygen -u 2> /dev/null
doxygen -s -g Doxyfile 2> /dev/null
doxygen Doxyfile
popd
@ -269,13 +268,31 @@ rm Docs/html/installdox || true
%{_bindir}/FontViewer
%{_bindir}/ImageSetViewer
%{_bindir}/LayoutEditor
%{_bindir}/SkinEditor
%dir %{_datadir}/%{capname}
%{_datadir}/%{capname}/*.cfg
%{_datadir}/%{capname}/*.xml
%dir %{_datadir}/%{capname}/Media
%{_datadir}/%{capname}/Media/Common/
%{_datadir}/%{capname}/Media/MyGUI_Media/
%{_datadir}/%{capname}/Media/Tools/
%dir %{_datadir}/%{capname}/Media/Tools
%dir %{_datadir}/%{capname}/Media/Tools/LayoutEditor
%dir %{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates
%{_datadir}/%{capname}/Media/Tools/FontViewer
%{_datadir}/%{capname}/Media/Tools/ImageSetViewer
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/A*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/B*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeGeneratorWindow.layout
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutCPP.xml
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/Colour*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/E*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/I*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/M*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/P*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/S*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/T*
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/W*
%{_datadir}/%{capname}/Media/Tools/SkinEditor
%{_datadir}/applications/FontViewer.desktop
%{_datadir}/applications/ImageSetViewer.desktop
%{_datadir}/applications/LayoutEditor.desktop
@ -288,6 +305,9 @@ rm Docs/html/installdox || true
%{_libdir}/libMyGUIEngine.so
%{_libdir}/libMyGUI.OgrePlatform.a
%{_libdir}/pkgconfig/*.pc
%{_libdir}/libPlugin_StrangeButton.so
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.cpp
%{_datadir}/%{capname}/Media/Tools/LayoutEditor/CodeTemplates/BaseLayoutTemplate.h
%files devel-doc
%defattr(-,root,root)
@ -300,9 +320,6 @@ rm Docs/html/installdox || true
%files demo
%defattr(-,root,root)
%{_bindir}/%{name}-Demo_*
%{_libdir}/libPlugin_StrangeButton.so
#%dir %{_datadir}/%{capname}
#%dir %{_datadir}/%{capname}/Media
%{_datadir}/%{capname}/Media/Demos/
%changelog

View File

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

3
MyGUI_3.2.0.zip Normal file
View File

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