From patchwork Wed Jun 21 22:47:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Romain Naour X-Patchwork-Id: 779201 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wtKbb4BWJz9s2s for ; Thu, 22 Jun 2017 08:47:23 +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="Wp+8N1/1"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E036D87283; Wed, 21 Jun 2017 22:47:21 +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 h6nPaWrWb2pr; Wed, 21 Jun 2017 22:47:18 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6AA8A87236; Wed, 21 Jun 2017 22:47:18 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id DD82B1C1190 for ; Wed, 21 Jun 2017 22:47:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id D8A1181D71 for ; Wed, 21 Jun 2017 22:47:12 +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 q8Y2egkPahRg for ; Wed, 21 Jun 2017 22:47:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f196.google.com (mail-wr0-f196.google.com [209.85.128.196]) by hemlock.osuosl.org (Postfix) with ESMTPS id 4ED0281DB6 for ; Wed, 21 Jun 2017 22:47:11 +0000 (UTC) Received: by mail-wr0-f196.google.com with SMTP id z45so30538657wrb.2 for ; Wed, 21 Jun 2017 15:47:11 -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:in-reply-to:references; bh=j9hAIEIh0+z+w9QUNIc0tgHJPvRrY+f0hxABrwM+/pc=; b=Wp+8N1/1bbs/8PRTmCJ2V58hnbYoi3wnvBu5pOmwNTX5Ob+b/yz4+10viXXy1TCLi4 JrC/S88XoSkgLjS9CYvB7VBP6c4LTYKfvmL5eoEYikUUP8EEIXPQL7WLxq71bHXBlaM1 rwlK+A0bpRs06yFrzA7YLVh+CrVpfWSaKK3+tsFZ2HafXhvL7Tr41cIMz/NQL/nzHLC6 yEbSQsFDhbUvnCSL+aA3DucsE1q4qH040EXnye967D7dGpO9mJgrIQ/BvP4X7WFugpGq B4l1wBeMj0bbI/E0SQFHHLVmJDNJkx1Uc5Go3XcgXoIsdDkdn1YSVRHlJC0ZnfLCfbYU IznA== 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:in-reply-to :references; bh=j9hAIEIh0+z+w9QUNIc0tgHJPvRrY+f0hxABrwM+/pc=; b=EkoVxYvBtbyU6kokTBiCAidGTAWiHm7B1jmBPr4JmXjwovxhzC09YUmwCeN1e5fDcB 7K5KAgCOUy0NCBkHgkBuY7XcTQzMaLhHbg+EeWLrhMMSIL32e0kS+Xsvfnzw6XgyGvaS hruC6cd8MvVaZ/3c9gH2vUghyLAzEyCR2jvDISaMzDRoYEBl3QGKWCyX0CPefj19TSmX IkecTrImIyQPscAhXAaFDA9uaxarXjeEFWVsxX46CxSSF8sjMQt4FaNRE3BBAxNElclL htPjkdFdUSTCZ0bJokvZssIQXhmgqiiETPR53siw6W7/OBWfc2cCG//p99ZKEV9qQmfn YA3Q== X-Gm-Message-State: AKS2vOxSi5oQMF2qoMjZbb4i2rbOhjN3Eo3+Qdau2yJ49V7GgkATmsX7 RYuE7+EGPm0Uqe6aVCM= X-Received: by 10.28.133.81 with SMTP id h78mr8500266wmd.81.1498085229629; Wed, 21 Jun 2017 15:47:09 -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 t8sm15737968wrc.28.2017.06.21.15.47.08 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 21 Jun 2017 15:47:09 -0700 (PDT) From: Romain Naour To: buildroot@buildroot.org Date: Thu, 22 Jun 2017 00:47:02 +0200 Message-Id: <20170621224704.23279-2-romain.naour@gmail.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170621224704.23279-1-romain.naour@gmail.com> References: <20170621224704.23279-1-romain.naour@gmail.com> Cc: Romain Naour Subject: [Buildroot] [PATCH v2 2/4] package/physfs: use the 2.0.x stable branch 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" The 2.1.x version is not released yet and it's still under development and 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]. [1] https://hg.icculus.org/icculus/physfs/rev/090cb9c74b87 Signed-off-by: Romain Naour --- .../physfs/0001-Fix-builds-with-modern-GCC.patch | 38 ---------------------- package/physfs/0001-Remove-Werror.patch | 28 ++++++++++++++++ package/physfs/Config.in | 1 + package/physfs/physfs.mk | 5 ++- 4 files changed, 33 insertions(+), 39 deletions(-) delete mode 100644 package/physfs/0001-Fix-builds-with-modern-GCC.patch create mode 100644 package/physfs/0001-Remove-Werror.patch diff --git a/package/physfs/0001-Fix-builds-with-modern-GCC.patch b/package/physfs/0001-Fix-builds-with-modern-GCC.patch deleted file mode 100644 index 710b4ff..0000000 --- a/package/physfs/0001-Fix-builds-with-modern-GCC.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 Mon Sep 17 00:00:00 2001 -From: Jacob Burroughs -Date: Thu, 23 Jun 2016 13:03:47 -0500 -Subject: [PATCH] Fix builds with modern GCC - -From SuperTux project: -https://github.com/SuperTux/physfs/commit/61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 - -Signed-off-by: Romain Naour ---- - CMakeLists.txt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2a371af..94c4844 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -50,7 +50,7 @@ endif() - # Add some gcc-specific command lines. - if(CMAKE_COMPILER_IS_GNUCC) - # Always build with debug symbols...you can strip it later. -- add_definitions(-g -pipe -Werror -fsigned-char) -+ add_definitions(-g -pipe -fsigned-char) - - # Stupid BeOS generates warnings in the system headers. - if(NOT BEOS) -@@ -304,7 +304,7 @@ if(PHYSFS_BUILD_TEST) - if(READLINE_LIBRARY) - set(HAVE_SYSTEM_READLINE TRUE) - set(TEST_PHYSFS_LIBS ${TEST_PHYSFS_LIBS} ${READLINE_LIBRARY} ${CURSES_LIBRARY}) -- include_directories(${READLINE_H} ${HISTORY_H}) -+ include_directories(SYSTEM ${READLINE_H} ${HISTORY_H}) - add_definitions(-DPHYSFS_HAVE_READLINE=1) - endif() - endif() --- -2.9.3 - diff --git a/package/physfs/0001-Remove-Werror.patch b/package/physfs/0001-Remove-Werror.patch new file mode 100644 index 0000000..5f6e879 --- /dev/null +++ b/package/physfs/0001-Remove-Werror.patch @@ -0,0 +1,28 @@ +From 2d75791a88e18225f4cbadaed30d25e0de00fef0 Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Thu, 22 Jun 2017 00:25:55 +0200 +Subject: [PATCH] Remove Werror + +This may break the build with new compiler version (gcc 7.x) + +Signed-off-by: Romain Naour +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a371af..6fef770 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -50,7 +50,7 @@ endif() + # Add some gcc-specific command lines. + if(CMAKE_COMPILER_IS_GNUCC) + # Always build with debug symbols...you can strip it later. +- add_definitions(-g -pipe -Werror -fsigned-char) ++ add_definitions(-g -pipe -fsigned-char) + + # Stupid BeOS generates warnings in the system headers. + if(NOT BEOS) +-- +2.9.4 + diff --git a/package/physfs/Config.in b/package/physfs/Config.in index dad3ab4..8b26295 100644 --- a/package/physfs/Config.in +++ b/package/physfs/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_PHYSFS bool "physfs" depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_ZLIB help PhysicsFS; a portable, flexible file i/o abstraction. diff --git a/package/physfs/physfs.mk b/package/physfs/physfs.mk index 9193ad5..9221723 100644 --- a/package/physfs/physfs.mk +++ b/package/physfs/physfs.mk @@ -4,13 +4,16 @@ # ################################################################################ -PHYSFS_VERSION = be27dfd07d97336145e7f49d3fd200a6e902f85e +# stable-2.0 branch +PHYSFS_VERSION = 090cb9c74b87198e6d520afca9d649ca0d84669f PHYSFS_SITE = https://hg.icculus.org/icculus/physfs PHYSFS_SITE_METHOD = hg PHYSFS_LICENSE = Zlib (physfs), LGPL with exceptions (lzma) PHYSFS_LICENSE_FILES = LICENSE.txt src/lzma/LGPL.txt +PHYSFS_DEPENDENCIES = zlib + PHYSFS_INSTALL_STAGING = YES PHYSFS_CONF_OPTS = -DPHYSFS_BUILD_TEST=OFF