rpms/openmw/devel openmw.spec, 1.16, 1.17 openmw.use_fpic_flag.patch, 1.1, 1.2
Author: nobrakal
Update of /cvs/free/rpms/openmw/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18297
Modified Files:
openmw.spec openmw.use_fpic_flag.patch
Log Message:
* Wed Aug 05 2015 Alexandre Moine <nobrakal(a)gmail.com> 0.36.1-2
- Specify the -fPIC flag in the right CMakeLists.txt
Index: openmw.spec
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/openmw.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- openmw.spec 5 Aug 2015 12:30:45 -0000 1.16
+++ openmw.spec 5 Aug 2015 12:47:13 -0000 1.17
@@ -1,6 +1,6 @@
Name: openmw
Version: 0.36.1
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Unofficial open source engine re-implementation of the game Morrowind
License: GPLv3 and MIT and zlib
@@ -116,6 +116,9 @@
%changelog
+* Wed Aug 05 2015 Alexandre Moine <nobrakal(a)gmail.com> 0.36.1-2
+- Specify the -fPIC flag in the right CMakeLists.txt
+
* Tue Aug 04 2015 Alexandre Moine <nobrakal(a)gmail.com> 0.36.1-1
- New maintenance update.
- Add appdata file for openmw.
openmw.use_fpic_flag.patch:
CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: openmw.use_fpic_flag.patch
===================================================================
RCS file: /cvs/free/rpms/openmw/devel/openmw.use_fpic_flag.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openmw.use_fpic_flag.patch 5 Aug 2015 12:30:45 -0000 1.1
+++ openmw.use_fpic_flag.patch 5 Aug 2015 12:47:13 -0000 1.2
@@ -1,12 +1,12 @@
-diff -ru openmw-openmw-0.36.1.orig/CMakeLists.txt openmw-openmw-0.36.1/CMakeLists.txt
---- CMakeLists.txt 2015-05-31 14:21:21.000000000 +0200
-+++ CMakeLists.txt 2015-08-05 13:47:24.150616896 +0200
-@@ -351,7 +351,7 @@
+diff -ru openmw-openmw-0.36.1.orig/plugins/mygui_resource_plugin/CMakeLists.txt
openmw-openmw-0.36.1/plugins/mygui_resource_plugin/CMakeLists.txt
+--- plugins/mygui_resource_plugin/CMakeLists.txt 2015-05-31 14:21:21.000000000 +0200
++++ plugins/mygui_resource_plugin/CMakeLists.txt 2015-08-05 14:39:10.010972034 +0200
+@@ -8,7 +8,7 @@
+ Plugin_MyGUI_OpenMW_Resources
+ )
- # CXX Compiler settings
- if (CMAKE_CXX_COMPILER_ID STREQUAL GNU OR CMAKE_CXX_COMPILER_ID STREQUAL Clang)
-- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter
-Wno-reorder -std=c++98 -pedantic -Wno-long-long")
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -Wno-unused-parameter
-Wno-reorder -std=c++98 -pedantic -Wno-long-long -fPIC")
+-add_definitions("-D_USRDLL -DMYGUI_BUILD_DLL")
++add_definitions("-D_USRDLL -DMYGUI_BUILD_DLL -fPIC")
- if (CMAKE_CXX_COMPILER_ID STREQUAL Clang AND NOT APPLE)
- execute_process(COMMAND ${CMAKE_C_COMPILER} --version OUTPUT_VARIABLE
CLANG_VERSION)
+ add_library(${MYGUI_RESOURCE_PLUGIN_LIBRARY}
+ SHARED