| 1 |
commit: 730007d33d8249af97817dd38d369e82d6bb5f3e |
| 2 |
Author: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Oct 6 22:14:22 2015 +0000 |
| 4 |
Commit: Michael Sterrett <mr_bones_ <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Oct 6 22:14:42 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=730007d3 |
| 7 |
|
| 8 |
add patch to fix building shared libraries with patch from tt_1(bug #553746) |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.20.1 |
| 11 |
|
| 12 |
.../s25rttr/files/s25rttr-0.8.1-fpic.patch | 38 ++++++++++++++++++++++ |
| 13 |
games-strategy/s25rttr/s25rttr-0.8.1.ebuild | 3 +- |
| 14 |
2 files changed, 40 insertions(+), 1 deletion(-) |
| 15 |
|
| 16 |
diff --git a/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch |
| 17 |
new file mode 100644 |
| 18 |
index 0000000..4a1d11e |
| 19 |
--- /dev/null |
| 20 |
+++ b/games-strategy/s25rttr/files/s25rttr-0.8.1-fpic.patch |
| 21 |
@@ -0,0 +1,38 @@ |
| 22 |
+From 2b4f956263864cebb1b9c5ce120c7cd30f512bdb Mon Sep 17 00:00:00 2001 |
| 23 |
+From: nE0sIghT <ykonotopov@×××××.com> |
| 24 |
+Date: Sat, 18 Jul 2015 19:03:05 +0300 |
| 25 |
+Subject: [PATCH] Fixed build of sdl drivers |
| 26 |
+ |
| 27 |
+--- |
| 28 |
+ driver/audio/SDL/src/CMakeLists.txt | 1 + |
| 29 |
+ driver/video/SDL/src/CMakeLists.txt | 1 + |
| 30 |
+ 2 files changed, 2 insertions(+) |
| 31 |
+ |
| 32 |
+diff --git a/driver/audio/SDL/src/CMakeLists.txt b/driver/audio/SDL/src/CMakeLists.txt |
| 33 |
+index 5ad3f02..5a91cd5 100644 |
| 34 |
+--- a/driver/audio/SDL/src/CMakeLists.txt |
| 35 |
++++ b/driver/audio/SDL/src/CMakeLists.txt |
| 36 |
+@@ -20,6 +20,7 @@ IF (SDL_FOUND) |
| 37 |
+ |
| 38 |
+ ADD_LIBRARY(audioSDL SHARED SDL.cpp SDL.h main.h SoundSDL_Music.cpp SoundSDL_Music.h SoundSDL_Effect.cpp SoundSDL_Effect.h ${PROJECT_SOURCE_DIR}/build_version.cpp ../../../src/DriverInterface.cpp ../../../src/tempname.cpp ../../../src/tempname.h) |
| 39 |
+ |
| 40 |
++ ADD_DEFINITIONS(-fPIC) |
| 41 |
+ ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR}) |
| 42 |
+ ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR} -I${SDLMIXER_INCLUDE_DIR}) |
| 43 |
+ |
| 44 |
+diff --git a/driver/video/SDL/src/CMakeLists.txt b/driver/video/SDL/src/CMakeLists.txt |
| 45 |
+index 83d10cf..ca67573 100644 |
| 46 |
+--- a/driver/video/SDL/src/CMakeLists.txt |
| 47 |
++++ b/driver/video/SDL/src/CMakeLists.txt |
| 48 |
+@@ -16,6 +16,7 @@ IF (SDL_FOUND) |
| 49 |
+ |
| 50 |
+ ADD_LIBRARY(videoSDL SHARED SDL.cpp SDL.h main.h ../../../../build_version.cpp ../../../src/DriverInterface.cpp) |
| 51 |
+ |
| 52 |
++ ADD_DEFINITIONS(-fPIC) |
| 53 |
+ ADD_FLAGS(CMAKE_C_FLAGS -I${SDL_INCLUDE_DIR}) |
| 54 |
+ ADD_FLAGS(CMAKE_CXX_FLAGS -I${SDL_INCLUDE_DIR}) |
| 55 |
+ |
| 56 |
+-- |
| 57 |
+2.3.6 |
| 58 |
+ |
| 59 |
+ |
| 60 |
|
| 61 |
diff --git a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild |
| 62 |
index 0643f3a..202ecbc 100644 |
| 63 |
--- a/games-strategy/s25rttr/s25rttr-0.8.1.ebuild |
| 64 |
+++ b/games-strategy/s25rttr/s25rttr-0.8.1.ebuild |
| 65 |
@@ -30,7 +30,8 @@ DEPEND="${RDEPEND} |
| 66 |
|
| 67 |
src_prepare() { |
| 68 |
epatch "${FILESDIR}"/${P}-cmake.patch \ |
| 69 |
- "${FILESDIR}"/${P}-soundconverter.patch |
| 70 |
+ "${FILESDIR}"/${P}-soundconverter.patch \ |
| 71 |
+ "${FILESDIR}"/${P}-fpic.patch |
| 72 |
} |
| 73 |
|
| 74 |
src_configure() { |
Archives