On Wed, Sep 28, 2016 at 2:35 PM, Martin Jansa <[email protected]> wrote: > On Tue, Sep 27, 2016 at 07:55:33AM +0200, Andreas Müller wrote: >> It seems that physfs is still maintained there and has the functionality >> required by latest supertux. >> >> Signed-off-by: Andreas Müller <[email protected]> >> --- >> .../physfs/files/0001-fix-build-with-gcc-6.patch | 52 >> ++++++++++++++++++++++ >> .../physfs/{physfs_2.0.3.bb => physfs_git.bb} | 10 +++-- >> 2 files changed, 59 insertions(+), 3 deletions(-) >> create mode 100644 >> meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch >> rename meta-filesystems/recipes-support/physfs/{physfs_2.0.3.bb => >> physfs_git.bb} (55%) >> >> diff --git >> a/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch >> >> b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch >> new file mode 100644 >> index 0000000..805c4a1 >> --- /dev/null >> +++ >> b/meta-filesystems/recipes-support/physfs/files/0001-fix-build-with-gcc-6.patch >> @@ -0,0 +1,52 @@ >> +From 06fe4c205094e0b65d3e5d1244f52089ed5bdafb Mon Sep 17 00:00:00 2001 >> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <[email protected]> >> +Date: Sun, 25 Sep 2016 23:50:22 +0200 >> +Subject: [PATCH] fix build with gcc-6 >> +MIME-Version: 1.0 >> +Content-Type: text/plain; charset=UTF-8 >> +Content-Transfer-Encoding: 8bit >> + >> +Upstream-Status: Pending >> + >> +Signed-off-by: Andreas Müller <[email protected]> >> +--- >> + src/archiver_zip.c | 1 - >> + src/physfs_miniz.h | 3 +++ >> + 2 files changed, 3 insertions(+), 1 deletion(-) >> + >> +diff --git a/src/archiver_zip.c b/src/archiver_zip.c >> +index 5c4996d..3b436db 100644 >> +--- a/src/archiver_zip.c >> ++++ b/src/archiver_zip.c >> +@@ -845,7 +845,6 @@ static ZIPentry *zip_hash_ancestors(ZIPinfo *info, char >> *name) >> + if (sep) >> + { >> + const size_t namelen = (sep - name) + 1; >> +- ZIPentry *parent; >> + >> + *sep = '\0'; /* chop off last piece. */ >> + retval = zip_find_entry(info, name); >> +diff --git a/src/physfs_miniz.h b/src/physfs_miniz.h >> +index 619cb71..fd877c0 100644 >> +--- a/src/physfs_miniz.h >> ++++ b/src/physfs_miniz.h >> +@@ -194,6 +194,8 @@ struct tinfl_decompressor_tag >> + code_len = TINFL_FAST_LOOKUP_BITS; do { temp = (pHuff)->m_tree[~temp + >> ((bit_buf >> code_len++) & 1)]; } while (temp < 0); \ >> + } sym = temp; bit_buf >>= code_len; num_bits -= code_len; } MZ_MACRO_END >> + >> ++#pragma GCC diagnostic push >> ++#pragma GCC diagnostic ignored "-Wmisleading-indentation" >> + static tinfl_status tinfl_decompress(tinfl_decompressor *r, const mz_uint8 >> *pIn_buf_next, size_t *pIn_buf_size, mz_uint8 *pOut_buf_start, mz_uint8 >> *pOut_buf_next, size_t *pOut_buf_size, const mz_uint32 decomp_flags) >> + { >> + static const int s_length_base[31] = { 3,4,5,6,7,8,9,10,11,13, >> 15,17,19,23,27,31,35,43,51,59, 67,83,99,115,131,163,195,227,258,0,0 }; >> +@@ -465,6 +467,7 @@ common_exit: >> + } >> + return status; >> + } >> ++#pragma GCC diagnostic pop >> + >> + /* Flush values. For typical usage you only need MZ_NO_FLUSH and >> MZ_FINISH. The other stuff is for advanced use. */ >> + enum { MZ_NO_FLUSH = 0, MZ_PARTIAL_FLUSH = 1, MZ_SYNC_FLUSH = 2, >> MZ_FULL_FLUSH = 3, MZ_FINISH = 4, MZ_BLOCK = 5 }; >> +-- >> +2.5.5 >> + >> diff --git a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb >> b/meta-filesystems/recipes-support/physfs/physfs_git.bb >> similarity index 55% >> rename from meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb >> rename to meta-filesystems/recipes-support/physfs/physfs_git.bb >> index 5618f28..3f1c156 100644 >> --- a/meta-filesystems/recipes-support/physfs/physfs_2.0.3.bb >> +++ b/meta-filesystems/recipes-support/physfs/physfs_git.bb >> @@ -6,6 +6,10 @@ DEPENDS = "readline zlib" >> >> inherit cmake >> >> -SRC_URI = "http://icculus.org/${BPN}/downloads/${BP}.tar.bz2"; >> -SRC_URI[md5sum] = "c2c727a8a8deb623b521b52d0080f613" >> -SRC_URI[sha256sum] = >> "ca862097c0fb451f2cacd286194d071289342c107b6fe69079c079883ff66b69" >> +SRC_URI = " \ >> + git://github.com/SuperTux/physfs.git \ >> + file://0001-fix-build-with-gcc-6.patch \ >> +" >> +SRCREV = "f3b45a94d0b7c0a85469b1e60fefd8383b6719ba" > > ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: QA Issue: > physfs: The LIC_FILES_CHKSUM does not match for > file://LICENSE.txt;md5=5d94e3eaaa10b00ca803ba35a3e87cde > physfs: The new md5 checksum is 4424d2cfb8a288df2843c4467b5d719a > physfs: Check if the license information has changed in > /home/jenkins/oe/world/shr-core/tmp-glibc/work/i586-oe-linux/physfs/2.0.3+gitAUTOINC+f3b45a94d0-r0/git/LICENSE.txt > to verify that the LICENSE value "Zlib" remains valid [license-checksum] > ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: Fatal QA errors > found, failing task. > ERROR: physfs-2.0.3+gitAUTOINC+f3b45a94d0-r0 do_populate_lic: Function > failed: populate_lic_qa_checksum > >> +S = "${WORKDIR}/git" >> +PV = "2.0.3+git${SRCPV}" >> -- >> 2.5.5 >> Strange thought I tested that - will check and send V2.
Andreas -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
