commit: 4dae40527089e38bc44c0f33056c24bf126cace9 Author: Rolf Eike Beer <eike <AT> sf-mail <DOT> de> AuthorDate: Fri Mar 23 06:14:30 2018 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sat Mar 31 10:27:49 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4dae4052
media-libs/libilbc: use patch for ppc/ppc64/sparc now upstream Bug: https://bugs.gentoo.org/610546 Closes: https://github.com/gentoo/gentoo/pull/7560 .../libilbc/files/libilbc-2.0.2-ppc_ppc64.patch | 16 ---------- .../files/libilbc-2.0.2-ppc_ppc64_sparc.patch | 35 ++++++++++++++++++++++ media-libs/libilbc/libilbc-2.0.2.ebuild | 2 +- media-libs/libilbc/libilbc-9999.ebuild | 1 - 4 files changed, 36 insertions(+), 18 deletions(-) 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 deleted file mode 100644 index ae24dde38cf..00000000000 --- a/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- libilbc-2.0.2/typedefs.h -+++ libilbc-2.0.2/typedefs.h -@@ -47,6 +47,13 @@ - #elif defined(__pnacl__) - #define WEBRTC_ARCH_32_BITS - #define WEBRTC_ARCH_LITTLE_ENDIAN -+#elif defined(__PPC__) -+#define WEBRTC_ARCH_BIG_ENDIAN -+#if defined(__PPC64__) -+#define WEBRTC_ARCH_64_BITS -+#else -+#define WEBRTC_ARCH_32_BITS -+#endif - #else - #error Please add support for your architecture in typedefs.h - #endif 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 new file mode 100644 index 00000000000..dcca9c2ac32 --- /dev/null +++ b/media-libs/libilbc/files/libilbc-2.0.2-ppc_ppc64_sparc.patch @@ -0,0 +1,35 @@ +From 4d0c2edf1f9477f80e361e17de638806b1399a51 Mon Sep 17 00:00:00 2001 +From: Rolf Eike Beer <[email protected]> +Date: Fri, 23 Mar 2018 01:08:17 +0100 +Subject: [PATCH] add platform definitions for PPC and Sparc (#23) + +The PPC flags are taken from a Gentoo patch. +--- + typedefs.h | 14 ++++++++++++++ + 1 file changed, 14 insertions(+) + +diff --git a/typedefs.h b/typedefs.h +index 669451626..2f9fe77ea 100644 +--- a/typedefs.h ++++ b/typedefs.h +@@ -47,6 +47,20 @@ + #elif defined(__pnacl__) + #define WEBRTC_ARCH_32_BITS + #define WEBRTC_ARCH_LITTLE_ENDIAN ++#elif defined(__PPC__) ++#define WEBRTC_ARCH_BIG_ENDIAN ++#if defined(__PPC64__) ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif ++#elif defined(__sparc__) ++#define WEBRTC_ARCH_BIG_ENDIAN ++#if __SIZEOF_LONG__ == 8 ++#define WEBRTC_ARCH_64_BITS ++#else ++#define WEBRTC_ARCH_32_BITS ++#endif + #else + #error Please add support for your architecture in typedefs.h + #endif diff --git a/media-libs/libilbc/libilbc-2.0.2.ebuild b/media-libs/libilbc/libilbc-2.0.2.ebuild index 65a7182ed61..f132e82b28c 100644 --- a/media-libs/libilbc/libilbc-2.0.2.ebuild +++ b/media-libs/libilbc/libilbc-2.0.2.ebuild @@ -22,7 +22,7 @@ SLOT="0" IUSE="static-libs" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64.patch + epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64_sparc.patch [[ ${PV} == *9999 ]] && eautoreconf autotools-multilib_src_prepare } diff --git a/media-libs/libilbc/libilbc-9999.ebuild b/media-libs/libilbc/libilbc-9999.ebuild index c3aa37fdd75..a7ac81e5c6d 100644 --- a/media-libs/libilbc/libilbc-9999.ebuild +++ b/media-libs/libilbc/libilbc-9999.ebuild @@ -22,7 +22,6 @@ SLOT="0" IUSE="static-libs" src_prepare() { - epatch "${FILESDIR}"/${PN}-2.0.2-ppc_ppc64.patch [[ ${PV} == *9999 ]] && eautoreconf autotools-multilib_src_prepare }
