1 |
commit: c2374d1613f689dcea637a805f383da4cfe511b6 |
2 |
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Jan 29 22:24:25 2017 +0000 |
4 |
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Jan 29 22:38:00 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c2374d16 |
7 |
|
8 |
media-libs/libsidplay: Fix patches. |
9 |
|
10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
11 |
|
12 |
media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch | 4 ++-- |
13 |
...sidplay2-gcc41.patch => libsidplay-2.1.1-gcc41.patch} | 8 ++++---- |
14 |
media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch | 16 ++++++++-------- |
15 |
.../files/libsidplay-2.1.1-no_libtool_reference.patch | 8 ++++---- |
16 |
media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild | 4 ++-- |
17 |
5 files changed, 20 insertions(+), 20 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch |
20 |
index b2f4acd..0f4740e 100644 |
21 |
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch |
22 |
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-fbsd.patch |
23 |
@@ -1,5 +1,5 @@ |
24 |
---- libsidutils/src/ini/ini.cpp |
25 |
-+++ libsidutils/src/ini/ini.cpp |
26 |
+--- a/libsidutils/src/ini/ini.cpp |
27 |
++++ b/libsidutils/src/ini/ini.cpp |
28 |
@@ -100,7 +100,7 @@ |
29 |
//******************************************************************************************************************* |
30 |
#include <assert.h> |
31 |
|
32 |
diff --git a/media-libs/libsidplay/files/libsidplay2-gcc41.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch |
33 |
similarity index 82% |
34 |
rename from media-libs/libsidplay/files/libsidplay2-gcc41.patch |
35 |
rename to media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch |
36 |
index f2e3b31..c05f8d3 100644 |
37 |
--- a/media-libs/libsidplay/files/libsidplay2-gcc41.patch |
38 |
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc41.patch |
39 |
@@ -1,5 +1,5 @@ |
40 |
---- libsidplay/include/sidplay/SmartPtr.h |
41 |
-+++ libsidplay/include/sidplay/SmartPtr.h |
42 |
+--- a/libsidplay/include/sidplay/SmartPtr.h |
43 |
++++ b/libsidplay/include/sidplay/SmartPtr.h |
44 |
@@ -211,16 +211,16 @@ |
45 |
{ |
46 |
if ( bufferLen >= 1 ) |
47 |
@@ -24,8 +24,8 @@ |
48 |
} |
49 |
} |
50 |
}; |
51 |
---- libsidutils/include/sidplay/utils/SidUsage.h |
52 |
-+++ libsidutils/include/sidplay/utils/SidUsage.h |
53 |
+--- a/libsidutils/include/sidplay/utils/SidUsage.h |
54 |
++++ b/libsidutils/include/sidplay/utils/SidUsage.h |
55 |
@@ -33,7 +33,7 @@ |
56 |
uint_least16_t length; // usage scan length |
57 |
|
58 |
|
59 |
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch |
60 |
index 857a297..419b126 100644 |
61 |
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch |
62 |
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-gcc43.patch |
63 |
@@ -1,5 +1,5 @@ |
64 |
---- builders/resid-builder/src/resid.cpp |
65 |
-+++ builders/resid-builder/src/resid.cpp |
66 |
+--- a/builders/resid-builder/src/resid.cpp |
67 |
++++ b/builders/resid-builder/src/resid.cpp |
68 |
@@ -16,6 +16,8 @@ |
69 |
* * |
70 |
***************************************************************************/ |
71 |
@@ -9,8 +9,8 @@ |
72 |
#include "config.h" |
73 |
|
74 |
#ifdef HAVE_EXCEPTIONS |
75 |
---- builders/resid-builder/src/resid-builder.cpp |
76 |
-+++ builders/resid-builder/src/resid-builder.cpp |
77 |
+--- a/builders/resid-builder/src/resid-builder.cpp |
78 |
++++ b/builders/resid-builder/src/resid-builder.cpp |
79 |
@@ -37,6 +37,7 @@ |
80 |
***************************************************************************/ |
81 |
|
82 |
@@ -19,8 +19,8 @@ |
83 |
|
84 |
#include "config.h" |
85 |
#ifdef HAVE_EXCEPTIONS |
86 |
---- builders/hardsid-builder/src/hardsid-builder.cpp |
87 |
-+++ builders/hardsid-builder/src/hardsid-builder.cpp |
88 |
+--- a/builders/hardsid-builder/src/hardsid-builder.cpp |
89 |
++++ b/builders/hardsid-builder/src/hardsid-builder.cpp |
90 |
@@ -47,6 +47,7 @@ |
91 |
***************************************************************************/ |
92 |
|
93 |
@@ -29,8 +29,8 @@ |
94 |
#include "config.h" |
95 |
|
96 |
#ifdef HAVE_EXCEPTIONS |
97 |
---- libsidplay/src/sidtune/SidTune.cpp |
98 |
-+++ libsidplay/src/sidtune/SidTune.cpp |
99 |
+--- a/libsidplay/src/sidtune/SidTune.cpp |
100 |
++++ b/libsidplay/src/sidtune/SidTune.cpp |
101 |
@@ -283,7 +283,7 @@ |
102 |
uint_least32_t fileLen = 0; |
103 |
|
104 |
|
105 |
diff --git a/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch |
106 |
index ee05643..c93f3cf 100644 |
107 |
--- a/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch |
108 |
+++ b/media-libs/libsidplay/files/libsidplay-2.1.1-no_libtool_reference.patch |
109 |
@@ -1,5 +1,5 @@ |
110 |
---- libsidplay/unix/libsidplay2.pc.in |
111 |
-+++ libsidplay/unix/libsidplay2.pc.in |
112 |
+--- a/libsidplay/unix/libsidplay2.pc.in |
113 |
++++ b/libsidplay/unix/libsidplay2.pc.in |
114 |
@@ -7,5 +7,5 @@ |
115 |
Name: @PACKAGE@ |
116 |
Description: C64 cycle exact stereo sidplayer library. |
117 |
@@ -7,8 +7,8 @@ |
118 |
-Libs: ${libdir}/libsidplay2.la |
119 |
+Libs: -lsidplay2 |
120 |
Cflags: -DHAVE_UNIX -I${includedir} |
121 |
---- libsidutils/unix/libsidutils.pc.in |
122 |
-+++ libsidutils/unix/libsidutils.pc.in |
123 |
+--- a/libsidutils/unix/libsidutils.pc.in |
124 |
++++ b/libsidutils/unix/libsidutils.pc.in |
125 |
@@ -6,5 +6,5 @@ |
126 |
Name: @PACKAGE@ |
127 |
Description: Utils for supporting the libsidplay2 library. |
128 |
|
129 |
diff --git a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild |
130 |
index 99e72b3..9dbf823 100644 |
131 |
--- a/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild |
132 |
+++ b/media-libs/libsidplay/libsidplay-2.1.1-r4.ebuild |
133 |
@@ -1,4 +1,4 @@ |
134 |
-# Copyright 1999-2015 Gentoo Foundation |
135 |
+# Copyright 1999-2017 Gentoo Foundation |
136 |
# Distributed under the terms of the GNU General Public License v2 |
137 |
# $Id$ |
138 |
|
139 |
@@ -26,7 +26,7 @@ MULTILIB_WRAPPED_HEADERS=( |
140 |
|
141 |
src_prepare() { |
142 |
epatch \ |
143 |
- "${FILESDIR}"/${PN}2-gcc41.patch \ |
144 |
+ "${FILESDIR}"/${P}-gcc41.patch \ |
145 |
"${FILESDIR}"/${P}-fbsd.patch \ |
146 |
"${FILESDIR}"/${P}-gcc43.patch \ |
147 |
"${FILESDIR}"/${P}-no_libtool_reference.patch |