From patchwork Thu Jul 13 13:04:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 787715 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3x7bdg175cz9ryk for ; Thu, 13 Jul 2017 23:05:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="mQn8KZJx"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 17A388A2B0; Thu, 13 Jul 2017 13:05:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xjsxyCy27QFE; Thu, 13 Jul 2017 13:05:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 1D7C68A2AD; Thu, 13 Jul 2017 13:05:02 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id CC6241C1777 for ; Thu, 13 Jul 2017 13:04:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C66538811D for ; Thu, 13 Jul 2017 13:04:59 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GhMShrBaea-S for ; Thu, 13 Jul 2017 13:04:58 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 3756188108 for ; Thu, 13 Jul 2017 13:04:58 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id y28so4686652wrd.2 for ; Thu, 13 Jul 2017 06:04:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=fLVgDCpTFH328d+Bf/tEoHaQDikdxHlNZB+GknNvI2k=; b=mQn8KZJxJiwLD4L8uF2czFOvlmKg8mlBIz0YCsIJlraEjMpjXmk7Iu9CxJZkJxOS7L fszNcGNgukrna3gzt+bNlXQJAD2Y7cnkLtsj7ftLafALyyFDj5d46aLEH7TjrX/oylSS 6Fa2/r8mOZe6UNEZC+6BFyrPsg6tw75op0jOWwd4OqWSy3+hG67N6tYkbHIhLgZh3fCj HCbFIB8MAdfu0a2bznMgDVzYn1RgX3+bhJrExQWEHct4McMsy+ZPvcleueMTfXAWU2CK 3PRiQuMauWFaIbMs3ofAaQRVKTqDBBDfjFHjIv5HvyeQ7QMa54oaODJndxY2zyEoegme VeAA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=fLVgDCpTFH328d+Bf/tEoHaQDikdxHlNZB+GknNvI2k=; b=hd5fIPfA0S7bCrcJnRgxNZwCv/Z7uCZhBcmsTkj9IjDz1tjOQRe8xK06RnXV1MFgdh DUHwzRpX3JJjIQtJNaqbOo7hwqhN0Y+JF6rP/g8W8dkBtEbHNixjCdqPx5g9jo9Ta1sp wkf3P1JinCJIB5eEZWnRwz/YhbIx/pktZnMNiWtCemz0z1mnMVOTVFLLfglCw/gVbXF+ 9znkaVmwTZ0A2EXHGq8woHXCTULfNbQWBwhp6OpjhxKk5Jpx9eXGwk/TIbyLu20yB8v2 3vdSpbycicXWeQRkhiBU8cYjE3o1MaNYPEnWai6pLBYgysIfTumeqcnrPrPiseJ7TU17 hjjw== X-Gm-Message-State: AIVw113arwKB8aOxok3FljwXHdX4335tU+XpuXN2luzqpa1PvSOtCFIB w41d9aUIbbPjHfje5Zo= X-Received: by 10.223.154.10 with SMTP id z10mr1310915wrb.73.1499951096252; Thu, 13 Jul 2017 06:04:56 -0700 (PDT) Received: from localhost.localdomain (gam75-1-81-57-22-125.fbx.proxad.net. [81.57.22.125]) by smtp.gmail.com with ESMTPSA id l14sm3124798wrb.19.2017.07.13.06.04.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 13 Jul 2017 06:04:55 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 13 Jul 2017 15:04:43 +0200 Message-Id: <20170713130445.28410-1-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.4 Cc: Romain Naour Subject: [Buildroot] [PATCH v3 1/3] package/supertux: use the bundled version of physfs X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" In order to add supertux package, a physfs package was introduced using the same version (2.1.x) than the one bundled in supertux sources. However this version is not released yet and it's still under development. The 2.1.x version introduce API changes that may break other packages using the latest stable version of physfs (2.0.x). Also, there is an issue (segfault) with physfs 2.1.x while extracting a zip archive. This issue is fixed in 2.0.x branch but not in 2.1.x branch since physfs 2.1.x now use minizip which doesn't provide inflateCopy() used by the bugfix [1]. This doesn't affect supertux itself, so we can safely use the bundled version. [1] https://hg.icculus.org/icculus/physfs/rev/090cb9c74b87 Signed-off-by: Romain Naour --- package/supertux/Config.in | 1 - package/supertux/supertux.mk | 12 +++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package/supertux/Config.in b/package/supertux/Config.in index 684c2cc..38e4a98 100644 --- a/package/supertux/Config.in +++ b/package/supertux/Config.in @@ -19,7 +19,6 @@ config BR2_PACKAGE_SUPERTUX select BR2_PACKAGE_LIBOGG select BR2_PACKAGE_LIBVORBIS select BR2_PACKAGE_OPENAL - select BR2_PACKAGE_PHYSFS select BR2_PACKAGE_SDL2 select BR2_PACKAGE_SDL2_IMAGE select BR2_PACKAGE_SDL2_OPENGL diff --git a/package/supertux/supertux.mk b/package/supertux/supertux.mk index e397441..0caceb1 100644 --- a/package/supertux/supertux.mk +++ b/package/supertux/supertux.mk @@ -10,13 +10,14 @@ SUPERTUX_SOURCE = SuperTux-v$(SUPERTUX_VERSION)-Source.tar.gz # Supertux itself is GPL-3.0+, but it bundles a few libraries with different # licenses (sexp-cpp, squirrel, tinygettext) which are linked statically. -SUPERTUX_LICENSE = GPL-3.0+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, GPL-2.0+ (images music sounds) +SUPERTUX_LICENSE = GPL-3.0+ (code), CC-BY-SA-2.0, CC-BY-SA-3.0, GPL-2.0+ (images music sounds) \ + Zlib (physfs) SUPERTUX_LICENSE_FILES = LICENSE.txt data/AUTHORS # Use bundled squirrel, tinygettext sexp-cpp packages which are hardcoded in # the CMake build system. SUPERTUX_DEPENDENCIES = host-pkgconf boost libcurl libgl libglew libglu \ - libogg libvorbis openal physfs sdl2 sdl2_image + libogg libvorbis openal sdl2 sdl2_image # ENABLE_BOOST_STATIC_LIBS=OFF: use boost shared libraries since supertux # depends on !BR2_STATIC_LIBS and boost provide only shared libraries with @@ -24,8 +25,9 @@ SUPERTUX_DEPENDENCIES = host-pkgconf boost libcurl libgl libglew libglu \ # ENABLE_OPENGL=ON: Can be disabled but will make SuperTux unplayable slow. # GLBINDING_ENABLED=OFF: use GLEW (default) instead of glbinding. # Install the game directly in /usr/bin and game data in /usr/share/supertux2. -# Force using physfs.so from staging since the check on PHYSFS_getPrefDir symbol -# in physfs.h (CHECK_SYMBOL_EXISTS) doesn't work. +# Force using the bundled version of physfs since it use a non released version +# of physfs (2.1.x) which is incompatible with the latest released version (2.0.x) +# due to API changes. SUPERTUX_CONF_OPTS += \ -DENABLE_BOOST_STATIC_LIBS=OFF \ -DBUILD_DOCUMENTATION=OFF \ @@ -33,7 +35,7 @@ SUPERTUX_CONF_OPTS += \ -DGLBINDING_ENABLED=OFF \ -DINSTALL_SUBDIR_BIN="bin" \ -DINSTALL_SUBDIR_SHARE="share/supertux2" \ - -DUSE_SYSTEM_PHYSFS=ON + -DUSE_SYSTEM_PHYSFS=OFF # Avoid incompatible posix_memalign declaration on x86 and x86_64 with # musl.