summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam James <sam@gentoo.org>2022-08-06 04:54:33 +0100
committerSam James <sam@gentoo.org>2022-08-06 04:54:33 +0100
commitd8be3b508507f3671e6494108337ec92abdeda7a (patch)
tree5a7e8022fcc977da7c57ba6e33c97679dac243b8 /media-libs/libfpx
parentsci-libs/coinor-vol: fix build w/ musl 1.2.3 (diff)
downloadgentoo-d8be3b508507f3671e6494108337ec92abdeda7a.tar.gz
gentoo-d8be3b508507f3671e6494108337ec92abdeda7a.tar.bz2
gentoo-d8be3b508507f3671e6494108337ec92abdeda7a.zip
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@gentoo.org>
Diffstat (limited to 'media-libs/libfpx')
-rw-r--r--media-libs/libfpx/files/libfpx-1.3.1_p10-musl-1.2.3-null.patch51
-rw-r--r--media-libs/libfpx/libfpx-1.3.1_p10.ebuild1
2 files changed, 52 insertions, 0 deletions
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() {