1 |
commit: 4dae40527089e38bc44c0f33056c24bf126cace9 |
2 |
Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> |
3 |
AuthorDate: Fri Mar 23 06:14:30 2018 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 31 10:27:49 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dae4052 |
7 |
|
8 |
media-libs/libilbc: use patch for ppc/ppc64/sparc now upstream |
9 |
|
10 |
Bug: https://bugs.gentoo.org/610546 |
11 |
Closes: https://github.com/gentoo/gentoo/pull/7560 |
12 |
|
13 |
.../libilbc/files/libilbc-2.0.2-ppc_ppc64.patch | 16 ---------- |
14 |
.../files/libilbc-2.0.2-ppc_ppc64_sparc.patch | 35 ++++++++++++++++++++++ |
15 |
media-libs/libilbc/libilbc-2.0.2.ebuild | 2 +- |
16 |
media-libs/libilbc/libilbc-9999.ebuild | 1 - |
17 |
4 files changed, 36 insertions(+), 18 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch |
20 |
deleted file mode 100644 |
21 |
index ae24dde38cf..00000000000 |
22 |
--- a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch |
23 |
+++ /dev/null |
24 |
@@ -1,16 +0,0 @@ |
25 |
---- libilbc-2.0.2/typedefs.h |
26 |
-+++ libilbc-2.0.2/typedefs.h |
27 |
-@@ -47,6 +47,13 @@ |
28 |
- #elif defined(__pnacl__) |
29 |
- #define WEBRTC_ARCH_32_BITS |
30 |
- #define WEBRTC_ARCH_LITTLE_ENDIAN |
31 |
-+#elif defined(__PPC__) |
32 |
-+#define WEBRTC_ARCH_BIG_ENDIAN |
33 |
-+#if defined(__PPC64__) |
34 |
-+#define WEBRTC_ARCH_64_BITS |
35 |
-+#else |
36 |
-+#define WEBRTC_ARCH_32_BITS |
37 |
-+#endif |
38 |
- #else |
39 |
- #error Please add support for your architecture in typedefs.h |
40 |
- #endif |
41 |
|
42 |
diff --git a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch |
43 |
new file mode 100644 |
44 |
index 00000000000..dcca9c2ac32 |
45 |
--- /dev/null |
46 |
+++ b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch |
47 |
@@ -0,0 +1,35 @@ |
48 |
+From 4d0c2edf1f9477f80e361e17de638806b1399a51 Mon Sep 17 00:00:00 2001 |
49 |
+From: Rolf Eike Beer <eike@×××××××.de> |
50 |
+Date: Fri, 23 Mar 2018 01:08:17 +0100 |
51 |
+Subject: [PATCH] add platform definitions for PPC and Sparc (#23) |
52 |
+ |
53 |
+The PPC flags are taken from a Gentoo patch. |
54 |
+--- |
55 |
+ typedefs.h | 14 ++++++++++++++ |
56 |
+ 1 file changed, 14 insertions(+) |
57 |
+ |
58 |
+diff --git a/typedefs.h b/typedefs.h |
59 |
+index 669451626..2f9fe77ea 100644 |
60 |
+--- a/typedefs.h |
61 |
++++ b/typedefs.h |
62 |
+@@ -47,6 +47,20 @@ |
63 |
+ #elif defined(__pnacl__) |
64 |
+ #define WEBRTC_ARCH_32_BITS |
65 |
+ #define WEBRTC_ARCH_LITTLE_ENDIAN |
66 |
++#elif defined(__PPC__) |
67 |
++#define WEBRTC_ARCH_BIG_ENDIAN |
68 |
++#if defined(__PPC64__) |
69 |
++#define WEBRTC_ARCH_64_BITS |
70 |
++#else |
71 |
++#define WEBRTC_ARCH_32_BITS |
72 |
++#endif |
73 |
++#elif defined(__sparc__) |
74 |
++#define WEBRTC_ARCH_BIG_ENDIAN |
75 |
++#if __SIZEOF_LONG__ == 8 |
76 |
++#define WEBRTC_ARCH_64_BITS |
77 |
++#else |
78 |
++#define WEBRTC_ARCH_32_BITS |
79 |
++#endif |
80 |
+ #else |
81 |
+ #error Please add support for your architecture in typedefs.h |
82 |
+ #endif |
83 |
|
84 |
diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild |
85 |
index 65a7182ed61..f132e82b28c 100644 |
86 |
--- a/media-libs/libilbc/libilbc-2.0.2.ebuild |
87 |
+++ b/media-libs/libilbc/libilbc-2.0.2.ebuild |
88 |
@@ -22,7 +22,7 @@ SLOT="0" |
89 |
IUSE="static-libs" |
90 |
|
91 |
src_prepare() { |
92 |
- epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64.patch |
93 |
+ epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch |
94 |
[[ ${PV} == *9999 ]] && eautoreconf |
95 |
autotools-multilib_src_prepare |
96 |
} |
97 |
|
98 |
diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild |
99 |
index c3aa37fdd75..a7ac81e5c6d 100644 |
100 |
--- a/media-libs/libilbc/libilbc-9999.ebuild |
101 |
+++ b/media-libs/libilbc/libilbc-9999.ebuild |
102 |
@@ -22,7 +22,6 @@ SLOT="0" |
103 |
IUSE="static-libs" |
104 |
|
105 |
src_prepare() { |
106 |
- epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64.patch |
107 |
[[ ${PV} == *9999 ]] && eautoreconf |
108 |
autotools-multilib_src_prepare |
109 |
} |