[gentoo-commits] repo/gentoo:master commit in: media-libs/libfpx/, media-libs/libfpx/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/libfpx/, media-libs/libfpx/files/

[David Seifert]

commit:     f28a947813dbc0a1fd1a8d4a712d58a64c48ca01
Author:     Peter Levine <plevine457 <AT> gmail <DOT> com>
AuthorDate: Sun May 14 00:35:39 2017 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri May 26 20:58:04 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f28a9478

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

 .../files/libfpx-1.2.0.13-export-symbols.patch     |  4 +--
 media-libs/libfpx/files/libfpx-1.3.1_p6-gcc6.patch | 35 ++++++++++++++++++++++
 media-libs/libfpx/libfpx-1.3.1_p6.ebuild           |  9 ++++--
 3 files changed, 43 insertions(+), 5 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 9e0f1632550..dfb974bc716 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 00000000000..75c7a7efdbd
--- /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
+ //

diff --git a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
index f8bca2dbbed..fcaf30fc17d 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p6.ebuild
@@ -15,10 +15,13 @@ IUSE="static-libs"
 
 S=${WORKDIR}/${P/_p/-}
 
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
+	"${FILESDIR}"/${P}-gcc6.patch
+)
 
-	eapply_user
+src_prepare() {
+	default
 
 	# we're not windows, even though we don't define __unix by default
 	[[ ${CHOST} == *-darwin* ]] && append-flags -D__unix

[gentoo-commits] repo/gentoo:master commit in: media-libs/libfpx/, media-libs/libfpx/files/

[Sam James]

commit:     d8be3b508507f3671e6494108337ec92abdeda7a
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  6 03:54:33 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Aug  6 03:54:33 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8be3b50

media-libs/libfpx: fix build w/ musl 1.2.3 (and maybe libcxx)

Closes: https://bugs.gentoo.org/842123
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/libfpx-1.3.1_p10-musl-1.2.3-null.patch   | 51 ++++++++++++++++++++++
 media-libs/libfpx/libfpx-1.3.1_p10.ebuild          |  1 +
 2 files changed, 52 insertions(+)

diff --git a/media-libs/libfpx/files/libfpx-1.3.1_p10-musl-1.2.3-null.patch b/media-libs/libfpx/files/libfpx-1.3.1_p10-musl-1.2.3-null.patch
new file mode 100644
index 000000000000..2b8c960f616a
--- /dev/null
+++ b/media-libs/libfpx/files/libfpx-1.3.1_p10-musl-1.2.3-null.patch
@@ -0,0 +1,51 @@
+https://cgit.freebsd.org/ports/tree/graphics/libfpx/files/patch-null-casts
+https://bugs.gentoo.org/842123
+
+(May well fix libcxx too given the source.)
+--- a/oless/expdf.cxx
++++ b/oless/expdf.cxx
+@@ -610,5 +610,5 @@
+         olErr(EH_Err, STG_E_INVALIDFUNCTION);
+     olChk(Validate());
+-    if (snbExclude != NULL)
++    if (snbExclude != 0)
+         olErr(EH_Err, STG_E_INVALIDPARAMETER);
+     olChk(OpenEntry(pwcsName, STGTY_STORAGE, grfMode, (void **)&pdfExp));
+@@ -909,5 +909,5 @@
+     sc = OpenStorage(pwcsName, (IStorage*)NULL,
+                      STGM_DIRECT| STGM_READ| STGM_SHARE_EXCLUSIVE,
+-                     (SNBW)NULL, (DWORD)NULL, &pstgsrc);
++                     0, 0, &pstgsrc);
+ 
+     if (SUCCEEDED(sc))
+@@ -951,5 +951,5 @@
+         olChk(OpenStream(pwcsName, (void *)NULL,
+                          STGM_DIRECT | STGM_READ | STGM_SHARE_EXCLUSIVE,
+-                         (DWORD)NULL, &pstmsrc));
++                         0, &pstmsrc));
+ 
+         //  It's a stream
+@@ -1575,5 +1575,5 @@
+     olMemTo(EH_pst, pstExp = new CExposedStream());
+     olChkTo(EH_pstExp, pstExp->Init(pstDirect, this,
+-                                    df, pdfnName, (ULONG)NULL));
++                                    df, pdfnName, 0));
+     *ppStream = pstExp;
+     return S_OK;
+@@ -1624,5 +1624,5 @@
+     olMemTo(EH_pst, pstExp = new CExposedStream());
+     olChkTo(EH_pstExp, pstExp->Init(pstDirect, this,
+-                                    df, pdfnName, (ULONG)NULL));
++                                    df, pdfnName, 0));
+     *ppStream = pstExp;
+     return S_OK;
+--- a/oless/storage.cxx
++++ b/oless/storage.cxx
+@@ -144,5 +144,5 @@
+ 
+     olChk(ValidateNameW(pwcsName, CBMAXPATHCOMPLEN));
+-    olMem(pilb = new CFileILB(pwcsName, (DWORD)NULL, FALSE));
++    olMem(pilb = new CFileILB(pwcsName, 0, FALSE));
+     olChk(pilb->Open(STGM_READ));
+     sc = GetScode( StgIsStorageILockBytes(pilb) );
+

diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
index 3373f14d2228..e307cdb8b651 100644
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild
@@ -17,6 +17,7 @@ S=${WORKDIR}/${P/_p/-}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch
+	"${FILESDIR}"/${PN}-1.3.1_p10-musl-1.2.3-null.patch
 )
 
 src_prepare() {