package/physfs: bump to 3.0.1

PATCH New Romain Naour 2 participants 4 messages Nov 29, 2017

lore

Share & tools

lore

Romain Naour

author

2017-11-29 20:04 UTC #0 lore raw

PATCH v4 1/2 package/physfs: bump to 3.0.1

Remove upstream patch.

Use the official archive and add a hash file.
Also add a license file hash.

Remove LGPL.txt license file since src/lzma directory has been removed from the sources.

Signed-off-by Romain Naour <[email protected]>

Cc Julien BOIBESSOT <[email protected]>

---
 .../physfs/0001-Fix-builds-with-modern-GCC.patch   | 38 ----------------------
 package/physfs/physfs.hash                         |  3 ++
 package/physfs/physfs.mk                           | 10 +++---
 3 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 package/physfs/0001-Fix-builds-with-modern-GCC.patch
 create mode 100644 package/physfs/physfs.hash

package/physfs/0001-Fix-builds-with-modern-GCC.patch deleted +0 ~~-38~~

deleted file mode 100644
index 710b4ff..0000000
@@ -1,38 +0,0 @@
-From 61d3b63abcba8e9615dcb8a3d1fc026bf7f8d5f8 Mon Sep 17 00:00:00 2001
-From: Jacob Burroughs <[email protected]>
-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 <[email protected]>
----
- 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
-

package/physfs/physfs.hash new file +3 -0

new file mode 100644
index 0000000..3d97fe0
@@ -0,0 +1,3 @@
+# Locally calculated
+sha256 b77b9f853168d9636a44f75fca372b363106f52d789d18a2f776397bf117f2f1  physfs-3.0.1.tar.bz2
+sha256 7ce475991f6cc09958ef0d57312522eba78e36d984307c95f9a3965adf7e4e2b  LICENSE.txt

package/physfs/physfs.mk +5 -5

index 9193ad5..78176be 100644
@@ -4,12 +4,12 @@
 #
 ################################################################################
 
-PHYSFS_VERSION = be27dfd07d97336145e7f49d3fd200a6e902f85e
-PHYSFS_SITE = https://hg.icculus.org/icculus/physfs
-PHYSFS_SITE_METHOD = hg
+PHYSFS_VERSION = 3.0.1
+PHYSFS_SOURCE = physfs-$(PHYSFS_VERSION).tar.bz2
+PHYSFS_SITE = https://icculus.org/physfs/downloads
 
-PHYSFS_LICENSE = Zlib (physfs), LGPL with exceptions (lzma)
-PHYSFS_LICENSE_FILES = LICENSE.txt src/lzma/LGPL.txt
+PHYSFS_LICENSE = Zlib
+PHYSFS_LICENSE_FILES = LICENSE.txt
 
 PHYSFS_INSTALL_STAGING = YES

Signature · 1 line

2.9.5

Romain Naour

author

2017-11-29 20:04 UTC #1 lore raw

PATCH v4 2/2 package/solatus: new package

Sample quest and testing quest are not included in SOLARUS_LICENSE since it's notinstalled by default.

Remove Werror when building with debugging symbols.

Add libpng runtime dependency since solarus games require png image support.

Signed-off-by Romain Naour <[email protected]>

Cc Julien BOIBESSOT <[email protected]>

---
Q: The SDL2 Solarus support seems to needs at least one video renderer
(directfb, x11 or kms/drm) but the Salurs package selects none. It's not explicitely listed in the build instructions:
http://www.solarus-games.org/development/compilation-instructions
How can we add a dependency on without introducing circular dependency on SDL2 package?
As reported by Julien, if no video renderer is selected solarus doesn't start. But selecting a video renderer is an user choice depending on the target.

v4: add license file hash
Add libpng runtime dependency
v3: no change
v2: add DEVELOPERS entry
Add a note in help text about Salarus games
Add license hash.

---
 DEVELOPERS                                     |  1 +
 package/Config.in                              |  1 +
 package/solarus/0001-cmake-remove-Werror.patch | 27 ++++++++++++++++++++++
 package/solarus/Config.in                      | 31 ++++++++++++++++++++++++++
 package/solarus/solarus.hash                   |  5 +++++
 package/solarus/solarus.mk                     | 23 +++++++++++++++++++
 6 files changed, 88 insertions(+)
 create mode 100644 package/solarus/0001-cmake-remove-Werror.patch
 create mode 100644 package/solarus/Config.in
 create mode 100644 package/solarus/solarus.hash
 create mode 100644 package/solarus/solarus.mk

DEVELOPERS +1 -0

index 40123bc..4057438 100644
@@ -1422,6 +1422,7 @@ F:	package/minetest/
 F:	package/minetest-game/
 F:	package/openpowerlink/
 F:	package/physfs/
+F:	package/solarus/
 F:	package/stress-ng/
 F:	package/supertux/
 F:	package/terminology/

package/Config.in +1 -0

index fa6bc19..e2f71b4 100644
@@ -241,6 +241,7 @@ menu "Games"
 	source "package/prboom/Config.in"
 	source "package/rubix/Config.in"
 	source "package/sl/Config.in"
+	source "package/solarus/Config.in"
 	source "package/stella/Config.in"
 	source "package/supertux/Config.in"
 	source "package/supertuxkart/Config.in"

package/solarus/0001-cmake-remove-Werror.patch new file +27 -0

new file mode 100644
index 0000000..b27908c
@@ -0,0 +1,27 @@
+From 4d315359d15e1221f3463b77a960a60093aac893 Mon Sep 17 00:00:00 2001
+From: Romain Naour <[email protected]>
+Date: Thu, 22 Jun 2017 00:19:56 +0200
+Subject: [PATCH] cmake: remove Werror
+
+Signed-off-by: Romain Naour <[email protected]>
+---
+ cmake/AddCompilationFlags.cmake | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/cmake/AddCompilationFlags.cmake b/cmake/AddCompilationFlags.cmake
+index 5159ff9..a506033 100644
+--- a/cmake/AddCompilationFlags.cmake
++++ b/cmake/AddCompilationFlags.cmake
+@@ -24,9 +24,6 @@ endif()
+ # Be less pedantic in release builds for users.
+ set(CMAKE_CXX_FLAGS_RELEASE "-Wno-error -Wall -Wextra -Wno-unknown-pragmas -Wno-fatal-errors ${CMAKE_CXX_FLAGS_RELEASE}")
+ 
+-# Be more pedantic in debug mode for developers.
+-set(CMAKE_CXX_FLAGS_DEBUG "-Werror -Wall -Wextra -pedantic ${CMAKE_CXX_FLAGS_DEBUG}")
+-
+ # Platform-specific flags.
+ if(WIN32)
+   # MinGW: disable the console by default.
+-- 
+2.9.4
+

package/solarus/Config.in new file +31 -0

new file mode 100644
index 0000000..30c7aa2
@@ -0,0 +1,31 @@
+config BR2_PACKAGE_SOLARUS
+	bool "solarus"
+	depends on BR2_INSTALL_LIBSTDCPP
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 # C++11
+	depends on BR2_TOOLCHAIN_HAS_THREADS_NPTL # openal
+	depends on !BR2_STATIC_LIBS # SDL2
+	select BR2_PACKAGE_LIBMODPLUG
+	select BR2_PACKAGE_LIBOGG
+	select BR2_PACKAGE_LIBPNG # runtime
+	select BR2_PACKAGE_LIBVORBIS
+	select BR2_PACKAGE_LUAJIT
+	select BR2_PACKAGE_OPENAL
+	select BR2_PACKAGE_PHYSFS
+	select BR2_PACKAGE_SDL2
+	select BR2_PACKAGE_SDL2_IMAGE
+	select BR2_PACKAGE_SDL2_TTF
+	help
+	  Solarus is an open-source Zelda-like 2D game engine written
+	  in C++. It can run games scripted in Lua. This engine is used
+	  by our Zelda fangames. Solarus is licensed under GPL v3.
+
+	  http://www.solarus-games.org
+	  https://github.com/solarus-games/solarus
+
+comment "solarus needs a toolchain w/ C++, gcc >= 4.8, NPTL, dynamic library"
+	depends on BR2_PACKAGE_LUAJIT_ARCH_SUPPORTS
+	depends on BR2_PACKAGE_OPENAL_ARCH_SUPPORTS
+	depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_8 \
+		|| !BR2_TOOLCHAIN_HAS_THREADS_NPTL || BR2_STATIC_LIBS

package/solarus/solarus.hash new file +5 -0

new file mode 100644
index 0000000..8ed5caf
@@ -0,0 +1,5 @@
+# Locally calculated
+sha256 5930584e7c333089a2c1bf372ccc25ad3fb5c1d973189d2bf67f2308189af94d  solarus-v1.5.3.tar.gz
+
+sha256 09cb24006b6a3f2698d8851dc5df4f413c1a98e20d4008bffd76ec236f14244d  license.txt
+sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  license_gpl.txt

package/solarus/solarus.mk new file +23 -0

new file mode 100644
index 0000000..af37f81
@@ -0,0 +1,23 @@
+################################################################################
+#
+# solarus
+#
+################################################################################
+
+SOLARUS_VERSION = v1.5.3
+SOLARUS_SITE = $(call github,solarus-games,solarus,$(SOLARUS_VERSION))
+
+SOLARUS_LICENSE = GPL-3.0 (code), CC-BY-SA-4.0 (Solarus logos and icons), \
+	CC-BY-SA-3.0 (GUI icons)
+SOLARUS_LICENSE_FILES = license.txt license_gpl.txt
+
+# Install libsolarus.so
+SOLARUS_INSTALL_STAGING = YES
+
+SOLARUS_DEPENDENCIES = libmodplug libogg libvorbis luajit openal physfs sdl2 \
+	sdl2_image sdl2_ttf
+
+# Disable launcher GUI (requires Qt5)
+SOLARUS_CONF_OPTS = -DSOLARUS_GUI=OFF
+
+$(eval $(cmake-package))

Signature · 1 line

2.9.5

Thomas Petazzoni

Applied

2017-11-29 20:22 UTC #2 lore raw

PATCH v4 2/2 package/solatus: new package

Hello,

Quoted 10 lines · Romain Naour

Sample quest and testing quest are not included in SOLARUS_LICENSE since it's notinstalled by default.
Remove Werror when building with debugging symbols.
Add libpng runtime dependency since solarus games require png image support.
Signed-off-by Romain Naour <[email protected]>
Cc Julien BOIBESSOT <[email protected]>

Quoted 10 lines

---
Q: The SDL2 Solarus support seems to needs at least one video renderer
(directfb, x11 or kms/drm) but the Salurs package selects none. It's not explicitely listed in the build instructions:
http://www.solarus-games.org/development/compilation-instructions
How can we add a dependency on without introducing circular dependency on SDL2 package?
As reported by Julien, if no video renderer is selected solarus doesn't start. But selecting a video renderer is an user choice depending on the target.

Applied to next, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Thomas Petazzoni

Applied

2017-11-29 20:14 UTC #3 lore raw

PATCH v4 1/2 package/physfs: bump to 3.0.1

In reply to Romain Naour

Hello,

Quoted 10 lines · Romain Naour

Remove upstream patch.
Use the official archive and add a hash file.
Also add a license file hash.
Remove LGPL.txt license file since src/lzma directory has been removed from the sources.
Signed-off-by Romain Naour <[email protected]>
Cc Julien BOIBESSOT <[email protected]>

Quoted 7 lines

---
 .../physfs/0001-Fix-builds-with-modern-GCC.patch   | 38 ----------------------
 package/physfs/physfs.hash                         |  3 ++
 package/physfs/physfs.mk                           | 10 +++---
 3 files changed, 8 insertions(+), 43 deletions(-)
 delete mode 100644 package/physfs/0001-Fix-builds-with-modern-GCC.patch
 create mode 100644 package/physfs/physfs.hash

Applied to next, thanks.

Thomas

Signature · 3 lines

Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com