| 1 |
commit: f28a947813dbc0a1fd1a8d4a712d58a64c48ca01 |
| 2 |
Author: Peter Levine <plevine457 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Sun May 14 00:35:39 2017 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 26 20:58:04 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28a9478 |
| 7 |
|
| 8 |
media-libs/libfpx: Fix building with GCC-6 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594094 |
| 11 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/4623 |
| 13 |
|
| 14 |
.../files/libfpx-1.2.0.13-export-symbols.patch | 4 +-- |
| 15 |
media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch | 35 ++++++++++++++++++++++ |
| 16 |
media-libs/libfpx/libfpx-1.3.1_p6.ebuild | 9 ++++-- |
| 17 |
3 files changed, 43 insertions(+), 5 deletions(-) |
| 18 |
|
| 19 |
diff --git a/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch b/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch |
| 20 |
index 9e0f1632550..dfb974bc716 100644 |
| 21 |
--- a/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch |
| 22 |
+++ b/media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
* At least the Darwin linker doesn't like double symbols during the |
| 25 |
final linking stage... |
| 26 |
|
| 27 |
---- jpeg/jpegconf.h |
| 28 |
-+++ jpeg/jpegconf.h |
| 29 |
+--- a/jpeg/jpegconf.h |
| 30 |
++++ b/jpeg/jpegconf.h |
| 31 |
@@ -27,6 +27,6 @@ |
| 32 |
# pragma warning(disable : 4244) |
| 33 |
# pragma warning(disable : 4142) |
| 34 |
|
| 35 |
diff --git a/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch b/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch |
| 36 |
new file mode 100644 |
| 37 |
index 00000000000..75c7a7efdbd |
| 38 |
--- /dev/null |
| 39 |
+++ b/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch |
| 40 |
@@ -0,0 +1,35 @@ |
| 41 |
+--- a/oless/h/page.hxx |
| 42 |
++++ b/oless/h/page.hxx |
| 43 |
+@@ -47,6 +47,7 @@ |
| 44 |
+ { |
| 45 |
+ public: |
| 46 |
+ void * operator new(size_t size, size_t sizeData); |
| 47 |
++ void operator delete(void *ptr); |
| 48 |
+ |
| 49 |
+ CMSFPage(CMSFPage *pmpNext); |
| 50 |
+ inline ~CMSFPage(); |
| 51 |
+@@ -133,6 +134,24 @@ |
| 52 |
+ } |
| 53 |
+ |
| 54 |
+ //+--------------------------------------------------------------------------- |
| 55 |
++// |
| 56 |
++// Member: CMSFPage::operator delete, public |
| 57 |
++// |
| 58 |
++// Synopsis: Overloaded delete operator for CMSFPage. |
| 59 |
++// |
| 60 |
++// Arguments: [ptr] -- Pointer to CMSFPage object |
| 61 |
++// |
| 62 |
++//---------------------------------------------------------------------------- |
| 63 |
++ |
| 64 |
++inline void CMSFPage::operator delete(void *ptr) |
| 65 |
++{ |
| 66 |
++ if (ptr) { |
| 67 |
++ free(ptr); |
| 68 |
++ ptr = NULL; |
| 69 |
++ } |
| 70 |
++} |
| 71 |
++ |
| 72 |
++//+--------------------------------------------------------------------------- |
| 73 |
+ // |
| 74 |
+ // Member: CMSFPage::GetNext, public |
| 75 |
+ // |
| 76 |
|
| 77 |
diff --git a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild |
| 78 |
index f8bca2dbbed..fcaf30fc17d 100644 |
| 79 |
--- a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild |
| 80 |
+++ b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild |
| 81 |
@@ -15,10 +15,13 @@ IUSE="static-libs" |
| 82 |
|
| 83 |
S=${WORKDIR}/${P/_p/-} |
| 84 |
|
| 85 |
-src_prepare() { |
| 86 |
- epatch "${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch |
| 87 |
+PATCHES=( |
| 88 |
+ "${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch |
| 89 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 90 |
+) |
| 91 |
|
| 92 |
- eapply_user |
| 93 |
+src_prepare() { |
| 94 |
+ default |
| 95 |
|
| 96 |
# we're not windows, even though we don't define __unix by default |
| 97 |
[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix |
Archives