All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor
@ 2021-12-31 12:47 Romain Naour
  2021-12-31 12:47 ` [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file Romain Naour
                   ` (2 more replies)
  0 siblings, 3 replies; 6+ messages in thread
From: Romain Naour @ 2021-12-31 12:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour

Flare games use OGG audio file format througt SDL2-mixer.

Without OGG support, flare-engine trigger a lot of errors in its
log and fail to start the game.

ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/flare-engine/Config.in       | 1 +
 package/flare-engine/flare-engine.mk | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/package/flare-engine/Config.in b/package/flare-engine/Config.in
index d08b740af3..9c997c2b9a 100644
--- a/package/flare-engine/Config.in
+++ b/package/flare-engine/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_FLARE_ENGINE
 	select BR2_PACKAGE_SDL2_IMAGE
 	select BR2_PACKAGE_SDL2_MIXER
 	select BR2_PACKAGE_SDL2_TTF
+	select BR2_PACKAGE_TREMOR # for SDL2_mixer ogg support
 	help
 	  Flare (Free Libre Action Roleplaying Engine) is a simple game
 	  engine built to handle a very specific kind of game:
diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk
index 14d2681fda..d722a42208 100644
--- a/package/flare-engine/flare-engine.mk
+++ b/package/flare-engine/flare-engine.mk
@@ -9,7 +9,7 @@ FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION
 FLARE_ENGINE_LICENSE = GPL-3.0+
 FLARE_ENGINE_LICENSE_FILES = COPYING
 
-FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf
+FLARE_ENGINE_DEPENDENCIES += sdl2 sdl2_image sdl2_mixer sdl2_ttf tremor
 
 # Don't use /usr/games and /usr/share/games
 FLARE_ENGINE_CONF_OPTS += -DBINDIR=bin -DDATADIR=share/flare
-- 
2.31.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file
  2021-12-31 12:47 [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Romain Naour
@ 2021-12-31 12:47 ` Romain Naour
  2022-01-26 13:07   ` Peter Korsgaard
  2021-12-31 12:47 ` [Buildroot] [PATCH 3/3] flare-{engine,game}: bump to version 1.12 Romain Naour
  2022-01-26 13:07 ` [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Romain Naour @ 2021-12-31 12:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour

The previous version bump [1] added the hash of LICENSE.txt but
forgot to update FLARE_GAME_LICENSE_FILES.

[1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/flare-game/flare-game.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk
index d65e3d6c38..2845dc9714 100644
--- a/package/flare-game/flare-game.mk
+++ b/package/flare-game/flare-game.mk
@@ -8,7 +8,7 @@ FLARE_GAME_VERSION = 1.11
 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION))
 FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \
 	OFL-1.1 (Liberation Sans)
-FLARE_GAME_LICENSE_FILES = README
+FLARE_GAME_LICENSE_FILES = LICENSE.txt
 
 FLARE_GAME_DEPENDENCIES = flare-engine
 
-- 
2.31.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [Buildroot] [PATCH 3/3] flare-{engine,game}: bump to version 1.12
  2021-12-31 12:47 [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Romain Naour
  2021-12-31 12:47 ` [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file Romain Naour
@ 2021-12-31 12:47 ` Romain Naour
  2022-01-01  8:42   ` [Buildroot] [PATCH 3/3] flare-{engine, game}: " Yann E. MORIN
  2022-01-26 13:07 ` [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Peter Korsgaard
  2 siblings, 1 reply; 6+ messages in thread
From: Romain Naour @ 2021-12-31 12:47 UTC (permalink / raw)
  To: buildroot; +Cc: Romain Naour

See:
https://flarerpg.org/2021/08/02/flare-1-12/

Signed-off-by: Romain Naour <romain.naour@gmail.com>
---
 package/flare-engine/flare-engine.hash | 2 +-
 package/flare-engine/flare-engine.mk   | 2 +-
 package/flare-game/flare-game.hash     | 2 +-
 package/flare-game/flare-game.mk       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash
index 0e37a71922..7f6169381c 100644
--- a/package/flare-engine/flare-engine.hash
+++ b/package/flare-engine/flare-engine.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d  flare-engine-1.11.tar.gz
+sha256  287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e  flare-engine-1.12.tar.gz
 sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk
index d722a42208..cbb7add4bb 100644
--- a/package/flare-engine/flare-engine.mk
+++ b/package/flare-engine/flare-engine.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLARE_ENGINE_VERSION = 1.11
+FLARE_ENGINE_VERSION = 1.12
 FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION))
 FLARE_ENGINE_LICENSE = GPL-3.0+
 FLARE_ENGINE_LICENSE_FILES = COPYING
diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash
index 983c23200f..3d6d678c94 100644
--- a/package/flare-game/flare-game.hash
+++ b/package/flare-game/flare-game.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a  flare-game-1.11.tar.gz
+sha256  19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160  flare-game-1.12.tar.gz
 sha256  3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f  LICENSE.txt
diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk
index 2845dc9714..41f02bec93 100644
--- a/package/flare-game/flare-game.mk
+++ b/package/flare-game/flare-game.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-FLARE_GAME_VERSION = 1.11
+FLARE_GAME_VERSION = 1.12
 FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION))
 FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \
 	OFL-1.1 (Liberation Sans)
-- 
2.31.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 3/3] flare-{engine, game}: bump to version 1.12
  2021-12-31 12:47 ` [Buildroot] [PATCH 3/3] flare-{engine,game}: bump to version 1.12 Romain Naour
@ 2022-01-01  8:42   ` Yann E. MORIN
  0 siblings, 0 replies; 6+ messages in thread
From: Yann E. MORIN @ 2022-01-01  8:42 UTC (permalink / raw)
  To: Romain Naour; +Cc: buildroot

Romain, All,

On 2021-12-31 13:47 +0100, Romain Naour spake thusly:
> See:
> https://flarerpg.org/2021/08/02/flare-1-12/
> 
> Signed-off-by: Romain Naour <romain.naour@gmail.com>

Applied to master, thanks.

Regards,
Yann E. MORIN.

> ---
>  package/flare-engine/flare-engine.hash | 2 +-
>  package/flare-engine/flare-engine.mk   | 2 +-
>  package/flare-game/flare-game.hash     | 2 +-
>  package/flare-game/flare-game.mk       | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/package/flare-engine/flare-engine.hash b/package/flare-engine/flare-engine.hash
> index 0e37a71922..7f6169381c 100644
> --- a/package/flare-engine/flare-engine.hash
> +++ b/package/flare-engine/flare-engine.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  035ffd936d9e120dc2eb792779a0b7ff64574d4a29a1124946deaf7946d1059d  flare-engine-1.11.tar.gz
> +sha256  287a08532972fa3ac56ce7cb213d21be8be35b529339f61d4eeadbd501c78a8e  flare-engine-1.12.tar.gz
>  sha256  8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903  COPYING
> diff --git a/package/flare-engine/flare-engine.mk b/package/flare-engine/flare-engine.mk
> index d722a42208..cbb7add4bb 100644
> --- a/package/flare-engine/flare-engine.mk
> +++ b/package/flare-engine/flare-engine.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -FLARE_ENGINE_VERSION = 1.11
> +FLARE_ENGINE_VERSION = 1.12
>  FLARE_ENGINE_SITE = $(call github,flareteam,flare-engine,v$(FLARE_ENGINE_VERSION))
>  FLARE_ENGINE_LICENSE = GPL-3.0+
>  FLARE_ENGINE_LICENSE_FILES = COPYING
> diff --git a/package/flare-game/flare-game.hash b/package/flare-game/flare-game.hash
> index 983c23200f..3d6d678c94 100644
> --- a/package/flare-game/flare-game.hash
> +++ b/package/flare-game/flare-game.hash
> @@ -1,3 +1,3 @@
>  # Locally calculated
> -sha256  c13231c7dd021252487f6cf117f7f2bb24bbda40af0a2b2902d72b5e2d4c242a  flare-game-1.11.tar.gz
> +sha256  19a909f2c6e0868baae823bb491e8840d5fb3e0454f00201de8da119772e5160  flare-game-1.12.tar.gz
>  sha256  3f941b3b89cf7b8370ceb83cc76d2120d471b58735d8ca60238a751a48d7f72f  LICENSE.txt
> diff --git a/package/flare-game/flare-game.mk b/package/flare-game/flare-game.mk
> index 2845dc9714..41f02bec93 100644
> --- a/package/flare-game/flare-game.mk
> +++ b/package/flare-game/flare-game.mk
> @@ -4,7 +4,7 @@
>  #
>  ################################################################################
>  
> -FLARE_GAME_VERSION = 1.11
> +FLARE_GAME_VERSION = 1.12
>  FLARE_GAME_SITE = $(call github,flareteam,flare-game,v$(FLARE_GAME_VERSION))
>  FLARE_GAME_LICENSE = CC-BY-SA-3.0 (data files), GPL-2.0 (GNU Unifont), \
>  	OFL-1.1 (Liberation Sans)
> -- 
> 2.31.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor
  2021-12-31 12:47 [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Romain Naour
  2021-12-31 12:47 ` [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file Romain Naour
  2021-12-31 12:47 ` [Buildroot] [PATCH 3/3] flare-{engine,game}: bump to version 1.12 Romain Naour
@ 2022-01-26 13:07 ` Peter Korsgaard
  2 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2022-01-26 13:07 UTC (permalink / raw)
  To: Romain Naour; +Cc: buildroot

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > Flare games use OGG audio file format througt SDL2-mixer.
 > Without OGG support, flare-engine trigger a lot of errors in its
 > log and fail to start the game.

 > ERROR: SoundManager: ItemManager: Loading sound /usr/share/flare/mods/fantasycore/soundfx/inventory/inventory_gem.ogg (soundfx/inventory/inventory_gem.ogg) failed: Unrecognized audio format

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed to 2021.02.x and 2021.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file
  2021-12-31 12:47 ` [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file Romain Naour
@ 2022-01-26 13:07   ` Peter Korsgaard
  0 siblings, 0 replies; 6+ messages in thread
From: Peter Korsgaard @ 2022-01-26 13:07 UTC (permalink / raw)
  To: Romain Naour; +Cc: buildroot

>>>>> "Romain" == Romain Naour <romain.naour@gmail.com> writes:

 > The previous version bump [1] added the hash of LICENSE.txt but
 > forgot to update FLARE_GAME_LICENSE_FILES.

 > [1] 4d09d1b47672823e3dc2fb3a84e2349f6b19906c

 > Signed-off-by: Romain Naour <romain.naour@gmail.com>

Committed to 2021.02.x and 2021.11.x, thanks.

-- 
Bye, Peter Korsgaard
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2022-01-26 13:07 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-12-31 12:47 [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Romain Naour
2021-12-31 12:47 ` [Buildroot] [PATCH 2/3] package/flare-game: really use LICENSE.txt as license file Romain Naour
2022-01-26 13:07   ` Peter Korsgaard
2021-12-31 12:47 ` [Buildroot] [PATCH 3/3] flare-{engine,game}: bump to version 1.12 Romain Naour
2022-01-01  8:42   ` [Buildroot] [PATCH 3/3] flare-{engine, game}: " Yann E. MORIN
2022-01-26 13:07 ` [Buildroot] [PATCH 1/3] package/flare-engine: enable ogg support in SDL2-mixer via Tremor Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.