diff options
Diffstat (limited to 'media-libs/libfpx')
| -rw-r--r-- | media-libs/libfpx/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/libfpx/files/libfpx-1.3.1_p10-musl-1.2.3-null.patch | 51 | ||||
| -rw-r--r-- | media-libs/libfpx/libfpx-1.3.1_p10.ebuild | 1 |
3 files changed, 54 insertions, 1 deletions
diff --git a/media-libs/libfpx/Manifest b/media-libs/libfpx/Manifest index f3e31b5d4f29..0fe805f94d68 100644 --- a/media-libs/libfpx/Manifest +++ b/media-libs/libfpx/Manifest @@ -1,4 +1,5 @@ AUX libfpx-1.2.0.13-export-symbols.patch 347 BLAKE2B d0bc3b1fecba641554a549c0241e098f801f0dd1a471427127c99f56945836ca679b14c2bdff3a85c3be32d399bae871911742fa1ea0c74c8a2e50741ae70938 SHA512 a8e9793f78902317fa2aacc9fc61160579fd211f6e36ae817afc1d8963c60eeb930b0f4574bb855b75bfbfa1b678882773b581db91462289132cd44bb2b0be6e +AUX libfpx-1.3.1_p10-musl-1.2.3-null.patch 1906 BLAKE2B 2dcccc22aa1f163ecc5d3f3de3981950844d89dce57599635eab749af8531b2e31e74dbdfba9c01895f530b15c054e1311a965c63e013c8b9115f91ab2b6c516 SHA512 d37d8315a8e3e1c6ee83e71cf38b1e0656ba59f6d6a9bd24ea9c03366b8d2c5f8a092ab2f39f1b10429eec2bb7aeba83dea94ebd8ea5dcb2146a2f7944f8cf2c DIST libfpx-1.3.1-10.tar.bz2 2358246 BLAKE2B d67b5a38e29d8916471ced46005983427ea1e77ff1fa682b67f80e8db71bd5460aafb59753bd901aa40e955cbeb453cf017109577b8d9357e86ac3e7d988d4b4 SHA512 afa96b240ead4d3c56e8e6c66db188d1f4441e7b4d08e12e0e96359cfa2cea9eae5625105d87df65ceacd97d84a386876c62dee5bc1916c420755d9bcc4655d4 -EBUILD libfpx-1.3.1_p10.ebuild 1014 BLAKE2B 36be13b45375cafa5d02e32e1e540ca5e5d78a106c44f01c853a3fa12cd8819e42ac163d8ad4ebdef4d261859f7ac38ee2a20c66c5ba3b853957c616353182bd SHA512 474c1e1aeb60803b0f0e03b625496fb9bf98e3d88d6c861f13538484476743a4075e6c4fbe619002e503f665486d2375ccd9f1cc15a9cbea644fd72f65d31fcc +EBUILD libfpx-1.3.1_p10.ebuild 1067 BLAKE2B 8bbf2fa22d8241dcd3ed4c9643120bb70c31a2b99af9287bf5fd353edd51277214ce65e23fd1b14b026462804d26b42702b046236d15584dc88ad9a6bdc1aa8a SHA512 756dcfd9cb574401e489e9e92b32be657288875367278455b98ca84b1d4fa63478811d8550e93b89d0e55f679b704c0c7b6a1c4f1a7b41f453b698b5af0344bc MISC metadata.xml 334 BLAKE2B 5f2c903be8e07657f0b5ea2f60d1d51cd22c18582227ca2f3d7e86b1911b790e442aed299bd894217c99e106fbcb4a31c3c240eba69338f9de14cfb8ede765da SHA512 b4d167b6a8f3dadcde95c86990d0855862b84e465bf4538c7991d0d581cc0c91d42923435e66d381c91f657b150ac322f25fd7bc1bdb4870cf489534279f5859 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() { |