| 1 |
commit: d8be3b508507f3671e6494108337ec92abdeda7a |
| 2 |
Author: Sam James <sam <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Aug 6 03:54:33 2022 +0000 |
| 4 |
Commit: Sam James <sam <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Aug 6 03:54:33 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8be3b50 |
| 7 |
|
| 8 |
media-libs/libfpx: fix build w/ musl 1.2.3 (and maybe libcxx) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/842123 |
| 11 |
Signed-off-by: Sam James <sam <AT> gentoo.org> |
| 12 |
|
| 13 |
.../files/libfpx-1.3.1_p10-musl-1.2.3-null.patch | 51 ++++++++++++++++++++++ |
| 14 |
media-libs/libfpx/libfpx-1.3.1_p10.ebuild | 1 + |
| 15 |
2 files changed, 52 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 000000000000..2b8c960f616a |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-libs/libfpx/files/libfpx-1.3.1_p10-musl-1.2.3-null.patch |
| 22 |
@@ -0,0 +1,51 @@ |
| 23 |
+https://cgit.freebsd.org/ports/tree/graphics/libfpx/files/patch-null-casts |
| 24 |
+https://bugs.gentoo.org/842123 |
| 25 |
+ |
| 26 |
+(May well fix libcxx too given the source.) |
| 27 |
+--- a/oless/expdf.cxx |
| 28 |
++++ b/oless/expdf.cxx |
| 29 |
+@@ -610,5 +610,5 @@ |
| 30 |
+ olErr(EH_Err, STG_E_INVALIDFUNCTION); |
| 31 |
+ olChk(Validate()); |
| 32 |
+- if (snbExclude != NULL) |
| 33 |
++ if (snbExclude != 0) |
| 34 |
+ olErr(EH_Err, STG_E_INVALIDPARAMETER); |
| 35 |
+ olChk(OpenEntry(pwcsName, STGTY_STORAGE, grfMode, (void **)&pdfExp)); |
| 36 |
+@@ -909,5 +909,5 @@ |
| 37 |
+ sc = OpenStorage(pwcsName, (IStorage*)NULL, |
| 38 |
+ STGM_DIRECT| STGM_READ| STGM_SHARE_EXCLUSIVE, |
| 39 |
+- (SNBW)NULL, (DWORD)NULL, &pstgsrc); |
| 40 |
++ 0, 0, &pstgsrc); |
| 41 |
+ |
| 42 |
+ if (SUCCEEDED(sc)) |
| 43 |
+@@ -951,5 +951,5 @@ |
| 44 |
+ olChk(OpenStream(pwcsName, (void *)NULL, |
| 45 |
+ STGM_DIRECT | STGM_READ | STGM_SHARE_EXCLUSIVE, |
| 46 |
+- (DWORD)NULL, &pstmsrc)); |
| 47 |
++ 0, &pstmsrc)); |
| 48 |
+ |
| 49 |
+ // It's a stream |
| 50 |
+@@ -1575,5 +1575,5 @@ |
| 51 |
+ olMemTo(EH_pst, pstExp = new CExposedStream()); |
| 52 |
+ olChkTo(EH_pstExp, pstExp->Init(pstDirect, this, |
| 53 |
+- df, pdfnName, (ULONG)NULL)); |
| 54 |
++ df, pdfnName, 0)); |
| 55 |
+ *ppStream = pstExp; |
| 56 |
+ return S_OK; |
| 57 |
+@@ -1624,5 +1624,5 @@ |
| 58 |
+ olMemTo(EH_pst, pstExp = new CExposedStream()); |
| 59 |
+ olChkTo(EH_pstExp, pstExp->Init(pstDirect, this, |
| 60 |
+- df, pdfnName, (ULONG)NULL)); |
| 61 |
++ df, pdfnName, 0)); |
| 62 |
+ *ppStream = pstExp; |
| 63 |
+ return S_OK; |
| 64 |
+--- a/oless/storage.cxx |
| 65 |
++++ b/oless/storage.cxx |
| 66 |
+@@ -144,5 +144,5 @@ |
| 67 |
+ |
| 68 |
+ olChk(ValidateNameW(pwcsName, CBMAXPATHCOMPLEN)); |
| 69 |
+- olMem(pilb = new CFileILB(pwcsName, (DWORD)NULL, FALSE)); |
| 70 |
++ olMem(pilb = new CFileILB(pwcsName, 0, FALSE)); |
| 71 |
+ olChk(pilb->Open(STGM_READ)); |
| 72 |
+ sc = GetScode( StgIsStorageILockBytes(pilb) ); |
| 73 |
+ |
| 74 |
|
| 75 |
diff --git a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild |
| 76 |
index 3373f14d2228..e307cdb8b651 100644 |
| 77 |
--- a/media-libs/libfpx/libfpx-1.3.1_p10.ebuild |
| 78 |
+++ b/media-libs/libfpx/libfpx-1.3.1_p10.ebuild |
| 79 |
@@ -17,6 +17,7 @@ S=${WORKDIR}/${P/_p/-} |
| 80 |
|
| 81 |
PATCHES=( |
| 82 |
"${FILESDIR}"/${PN}-1.2.0.13-export-symbols.patch |
| 83 |
+ "${FILESDIR}"/${PN}-1.3.1_p10-musl-1.2.3-null.patch |
| 84 |
) |
| 85 |
|
| 86 |
src_prepare() { |
Archives