summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Levine <plevine457@gmail.com>2017-05-13 20:35:39 -0400
committerDavid Seifert <soap@gentoo.org>2017-05-26 22:58:04 +0200
commitf28a947813dbc0a1fd1a8d4a712d58a64c48ca01 (patch)
treee44f8a348f5d671b4ef6d0d2870fb37eba9c0f1c /media-libs/libfpx/files
parentdev-python/bleach: keyworded for ~mips (diff)
downloadgentoo-f28a947813dbc0a1fd1a8d4a712d58a64c48ca01.tar.gz
gentoo-f28a947813dbc0a1fd1a8d4a712d58a64c48ca01.tar.bz2
gentoo-f28a947813dbc0a1fd1a8d4a712d58a64c48ca01.zip
media-libs/libfpx: Fix building with GCC-6
Bug: https://bugs.gentoo.org/show_bug.cgi?id=594094 Package-Manager: Portage-2.3.5, Repoman-2.3.2 Closes: https://github.com/gentoo/gentoo/pull/4623
Diffstat (limited to 'media-libs/libfpx/files')
-rw-r--r--media-libs/libfpx/files/libfpx-1.2.0.13-export-symbols.patch4
-rw-r--r--media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch35
2 files changed, 37 insertions, 2 deletions
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
index 9e0f16325500..dfb974bc7164 100644
--- 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
@@ -1,8 +1,8 @@
* At least the Darwin linker doesn't like double symbols during the
final linking stage...
---- jpeg/jpegconf.h
-+++ jpeg/jpegconf.h
+--- a/jpeg/jpegconf.h
++++ b/jpeg/jpegconf.h
@@ -27,6 +27,6 @@
# pragma warning(disable : 4244)
# pragma warning(disable : 4142)
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
new file mode 100644
index 000000000000..75c7a7efdbd4
--- /dev/null
+++ b/media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch
@@ -0,0 +1,35 @@
+--- a/oless/h/page.hxx
++++ b/oless/h/page.hxx
+@@ -47,6 +47,7 @@
+ {
+ public:
+ void * operator new(size_t size, size_t sizeData);
++ void operator delete(void *ptr);
+
+ CMSFPage(CMSFPage *pmpNext);
+ inline ~CMSFPage();
+@@ -133,6 +134,24 @@
+ }
+
+ //+---------------------------------------------------------------------------
++//
++// Member: CMSFPage::operator delete, public
++//
++// Synopsis: Overloaded delete operator for CMSFPage.
++//
++// Arguments: [ptr] -- Pointer to CMSFPage object
++//
++//----------------------------------------------------------------------------
++
++inline void CMSFPage::operator delete(void *ptr)
++{
++ if (ptr) {
++ free(ptr);
++ ptr = NULL;
++ }
++}
++
++//+---------------------------------------------------------------------------
+ //
+ // Member: CMSFPage::GetNext, public
+ //