[planetblupi] annotated tag debian/1.12.4-1 created (now a028df8)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to annotated tag debian/1.12.4-1
in repository planetblupi.

at  a028df8   (tag)
   tagging  8241de7e428f5966c45dfcaeb6180d95199ef9a4 (commit)
  replaces  debian/1.12.2-1
 tagged by  Didier Raboud
on  Thu Mar 15 08:49:52 2018 +0100

- Log -
planetblupi release 1.12.4-1 for unstable (sid)
(maintainer view tag generated by dgit --quilt=dpm)
-BEGIN PGP SIGNATURE-

iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlqqJuEACgkQi8+nHsoW
NFXfSwv8DgjuHTk6pjxXy+BPVSTl2N6rpEzhvsmAOsPi0Sl7xKj6UV4BbYh5hx6Y
B4zzuzDGX8HpPokQJf1lWc4MQQ8pmzZLj4JN/RZLOAtemKWc/0UGPVkNsJSJIqON
Hn4a1k7+j4dt0eNackV21B6hkIfmuk7k31TZXhRsUzwFBUjEofaYcr6rAX1/Q3Od
eLdZAA8nlqgxUy1kbwBW0cqnGKFtnWNUbxg6LN/ZBtaldH3hp7rapph97m5VmVMG
DfhXhZ0L/ov514E5nr6NZMwi1YkCFBSv5W+kM7zVHm/p4JgUjHsPNGuhFzqnSYLC
tWHfCew6jMMFG2KUL+DC7X+dlyG8RC7Za9wIGy0tiY6pJN08TLJ8qbVMRnKYjwHp
+TfL1dPTP2qXO5mr6808EM7K7w8+v8TVHB1xJy3vI6zCy2pk9bq+zMaVcFJLNeEM
LCoGcEjHz5hgmE58RGlL1tLTj7pe4yYb9+9H8flcUvmH8vBys9/zZ9DuDD4QsQhB
33Q6WKuX
=2KEn
-END PGP SIGNATURE-

Didier Raboud (2):
  record new upstream branch and merge it
  planetblupi 1.12.4-1 Debian release

Mathieu Schroeter (12):
  Ensure that gettext strings are always regenerated
  Cosmetic
  Use the right mouse click (when building) for deleting
  Update some copyright dates
  Move code for testing if an object can burn in a dedicated func
  Ensure that it's not possible to put fire on all objects
  Bump micro version for next release
  Do not count blupis that are dying / burning
  Revert "Do not count blupis that are dying / burning"
  Fix properly issue #53 by updating the stats
  Fix regression where the fire was no longer propagated
  Bump patch version

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch upstream/latest updated (61a1ab6 -> 5db7fe9)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch upstream/latest
in repository planetblupi.

  from  61a1ab6   Fix mission stripped paving stones goal when there are 
less or more than 4 blupi
  adds  0239d1e   Ensure that gettext strings are always regenerated
  adds  0bc1d00   Cosmetic
  adds  403b5db   Use the right mouse click (when building) for deleting
  adds  1093c04   Update some copyright dates
  adds  d2046a9   Move code for testing if an object can burn in a 
dedicated func
  adds  e7dd0ec   Ensure that it's not possible to put fire on all objects
  adds  eb1a1da   Bump micro version for next release
  adds  e3d9377   Do not count blupis that are dying / burning
  adds  b0be4e1   Revert "Do not count blupis that are dying / burning"
  adds  cddc7de   Fix properly issue #53 by updating the stats
  adds  c08b750   Fix regression where the fire was no longer propagated
  adds  5db7fe9   Bump patch version

No new revisions were added by this update.

Summary of changes:
 CMakeLists.txt   |  2 +-
 src/button.cxx   |  4 +---
 src/decmap.cxx   | 20 +
 src/decmove.cxx  | 67 +---
 src/decor.h  |  1 +
 src/decstat.cxx  |  4 +++-
 src/event.cxx| 40 ++---
 src/event.h  |  5 +++--
 src/fifo.cxx |  6 +++--
 src/menu.cxx |  4 +---
 src/pixmap.cxx   | 14 ++--
 src/progress.cxx |  4 +---
 12 files changed, 99 insertions(+), 72 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 12/15: Bump patch version

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
Author: Mathieu Schroeter 
Date:   Wed Mar 14 17:59:43 2018 +0100

Bump patch version
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a24fdc5..ab5e09f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
 project (planetblupi)
 set (PB_VERSION_MAJOR 1)
 set (PB_VERSION_MINOR 12)
-set (PB_VERSION_PATCH 3)
+set (PB_VERSION_PATCH 4)
 set (PB_VERSION_EXTRA "")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 14/15: planetblupi 1.12.4-1 Debian release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 8241de7e428f5966c45dfcaeb6180d95199ef9a4
Author: Didier Raboud <o...@debian.org>
Date:   Thu Mar 15 08:49:52 2018 +0100

planetblupi 1.12.4-1 Debian release
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index abf629f..abf9e0f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+planetblupi (1.12.4-1) unstable; urgency=medium
+
+  * New 1.12.4 release
+
+ -- Didier Raboud <o...@debian.org>  Thu, 15 Mar 2018 08:49:52 +0100
+
 planetblupi (1.12.2-1) unstable; urgency=medium
 
   * New 1.12.2 upstream release

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 13/15: record new upstream branch and merge it

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 9833e9d1303ab5d8f4d3802e942d7367afa62c34
Merge: 51403b6 5db7fe9
Author: Didier Raboud <o...@debian.org>
Date:   Thu Mar 15 08:47:59 2018 +0100

record new upstream branch and merge it

 CMakeLists.txt   |  2 +-
 debian/.git-dpm  | 14 ++--
 src/button.cxx   |  4 +---
 src/decmap.cxx   | 20 +
 src/decmove.cxx  | 67 +---
 src/decor.h  |  1 +
 src/decstat.cxx  |  4 +++-
 src/event.cxx| 40 ++---
 src/event.h  |  5 +++--
 src/fifo.cxx |  6 +++--
 src/menu.cxx |  4 +---
 src/pixmap.cxx   | 14 ++--
 src/progress.cxx |  4 +---
 13 files changed, 106 insertions(+), 79 deletions(-)

diff --cc debian/.git-dpm
index 4fdd93a,000..20be32e
mode 100644,00..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
- planetblupi_1.12.2.orig.tar.gz
- 4a95a5b39fc0d62ce4c560984762053ff0937d36
- 106578253
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++5db7fe91f6334926622b881c3b90e8bd0e1b0fe4
++planetblupi_1.12.4.orig.tar.gz
++1efff98cbe040a7ee2ae9b7949fcb8c89b611078
++106578442

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 10/15: Fix properly issue #53 by updating the stats

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit cddc7de326834f6714236119ca32afc927e3796b
Author: Mathieu Schroeter 
Date:   Mon Feb 19 18:05:47 2018 +0100

Fix properly issue #53 by updating the stats
---
 src/decstat.cxx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/decstat.cxx b/src/decstat.cxx
index 639e362..f4e8385 100644
--- a/src/decstat.cxx
+++ b/src/decstat.cxx
@@ -448,7 +448,9 @@ CDecor::StatisticUpdate ()
   {
 if (m_blupi[rank].bExist)
 {
-  if (m_blupi[rank].perso == 0) // blupi ?
+  if (
+m_blupi[rank].perso == 0 && m_blupi[rank].action != ACTION_TCHAO &&
+m_blupi[rank].action != ACTION_BURN) // blupi ?
   {
 if (m_blupi[rank].bMalade)
   table_statistic[STATBLUPIm].nb++;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 15/15: d/copyright update

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit ff4029c41a049553a0c62c016b0f131261235c1f
Author: Didier Raboud <o...@debian.org>
Date:   Thu Mar 15 08:59:00 2018 +0100

d/copyright update
---
 debian/copyright | 38 +++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index e35bf73..2d38a2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,14 +4,46 @@ Upstream-Contact: Mathieu Schroeter <math...@schroetersa.ch>
 Source: https://github.com/blupi-games/planetblupi/
 
 Files: *
-Copyright: 2017 Mathieu Schroeter
-   1997 Daniel Roux, EPSITEC SA & Denis Dumoulin
+Copyright: 2017,2018, Mathieu Schroeter
+   1997, Daniel Roux, EPSITEC SA & Denis Dumoulin
 License: GPL-3+
 
 Files: debian/*
-Copyright: 2017 Didier Raboud <o...@debian.org>
+Copyright: 2017-2018, Didier Raboud <o...@debian.org>
 License: GPL-3+
 
+Files: src/json/*
+Copyright: 2013-2017, Niels Lohmann .
+License: Expat
+
+License: Expat
+ The MIT License
+ .
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall
+ be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT
+ WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
 License: GPL-3+
  This program is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 09/15: Revert "Do not count blupis that are dying / burning"

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit b0be4e1139749ceec892b9d60f3a60367dad4e50
Author: Mathieu Schroeter 
Date:   Mon Feb 19 18:05:27 2018 +0100

Revert "Do not count blupis that are dying / burning"

This reverts commit e3d9377c424bc188bf97c861fe798fb3a1fa8c13.

Bad fix...
---
 src/decstat.cxx | 9 +
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/decstat.cxx b/src/decstat.cxx
index 80bb66a..639e362 100644
--- a/src/decstat.cxx
+++ b/src/decstat.cxx
@@ -644,15 +644,8 @@ CDecor::StatisticUpdate ()
 Sint32
 CDecor::StatisticGetBlupi ()
 {
-  size_t rm = 0;
-  for (size_t i = 0; i < countof (m_blupi); ++i)
-rm += (m_blupi[i].bExist && (m_blupi[i].action == ACTION_TCHAO ||
- m_blupi[i].action == ACTION_BURN))
-? 1
-: 0;
-
   return table_statistic[STATBLUPIf].nb + table_statistic[STATBLUPIm].nb +
- table_statistic[STATBLUPI].nb + rm;
+ table_statistic[STATBLUPI].nb;
 }
 
 // Retourne le nombre de cellules en feu.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 11/15: Fix regression where the fire was no longer propagated

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit c08b750804b21a802626e7822e1ee682dda1c5c9
Author: Mathieu Schroeter 
Date:   Wed Mar 14 17:57:53 2018 +0100

Fix regression where the fire was no longer propagated

It's better to keep the map as it without changing this behaviour. It's
just protected with the map editor; then everything is now working
again.

It fixes issue https://github.com/blupi-games/planetblupi/issues/54
---
 src/decor.cxx | 10 --
 1 file changed, 10 deletions(-)

diff --git a/src/decor.cxx b/src/decor.cxx
index ca2af57..2090904 100644
--- a/src/decor.cxx
+++ b/src/decor.cxx
@@ -382,11 +382,6 @@ CDecor::PutFloor (Point cel, Sint32 channel, Sint32 icon)
   m_decor[cel.x / 2][cel.y / 2].floorChannel = channel;
   m_decor[cel.x / 2][cel.y / 2].floorIcon= icon;
 
-  if (
-!g_restoreBugs && m_decor[cel.x / 2][cel.y / 2].fire &&
-!this->CanBurn (cel))
-m_decor[cel.x / 2][cel.y / 2].fire = 0;
-
   m_bGroundRedraw = true;
 
   //? SubDrapeau(cel);  // on pourra de nouveau planter un drapeau
@@ -408,11 +403,6 @@ CDecor::PutObject (Point cel, Sint32 channel, Sint32 icon)
   m_decor[cel.x / 2][cel.y / 2].objectChannel = channel;
   m_decor[cel.x / 2][cel.y / 2].objectIcon= icon;
 
-  if (
-!g_restoreBugs && m_decor[cel.x / 2][cel.y / 2].fire &&
-!this->CanBurn (cel))
-m_decor[cel.x / 2][cel.y / 2].fire = 0;
-
   SubDrapeau (cel); // on pourra de nouveau planter un drapeau
 
   return true;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 08/15: Do not count blupis that are dying / burning

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit e3d9377c424bc188bf97c861fe798fb3a1fa8c13
Author: Mathieu Schroeter 
Date:   Mon Feb 19 17:33:59 2018 +0100

Do not count blupis that are dying / burning

It fixes issue #53.
---
 src/decstat.cxx | 9 -
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/decstat.cxx b/src/decstat.cxx
index 639e362..80bb66a 100644
--- a/src/decstat.cxx
+++ b/src/decstat.cxx
@@ -644,8 +644,15 @@ CDecor::StatisticUpdate ()
 Sint32
 CDecor::StatisticGetBlupi ()
 {
+  size_t rm = 0;
+  for (size_t i = 0; i < countof (m_blupi); ++i)
+rm += (m_blupi[i].bExist && (m_blupi[i].action == ACTION_TCHAO ||
+ m_blupi[i].action == ACTION_BURN))
+? 1
+: 0;
+
   return table_statistic[STATBLUPIf].nb + table_statistic[STATBLUPIm].nb +
- table_statistic[STATBLUPI].nb;
+ table_statistic[STATBLUPI].nb + rm;
 }
 
 // Retourne le nombre de cellules en feu.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 07/15: Bump micro version for next release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit eb1a1da4209e4aea8eb738e6cfe1cf56553b2c89
Author: Mathieu Schroeter 
Date:   Sun Feb 18 23:40:32 2018 +0100

Bump micro version for next release
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e2fc80e..a24fdc5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
 project (planetblupi)
 set (PB_VERSION_MAJOR 1)
 set (PB_VERSION_MINOR 12)
-set (PB_VERSION_PATCH 2)
+set (PB_VERSION_PATCH 3)
 set (PB_VERSION_EXTRA "")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch debian/master updated (51403b6 -> ff4029c)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch debian/master
in repository planetblupi.

  from  51403b6   planetblupi 1.12.2-1 Debian release
   new  0239d1e   Ensure that gettext strings are always regenerated
   new  0bc1d00   Cosmetic
   new  403b5db   Use the right mouse click (when building) for deleting
   new  1093c04   Update some copyright dates
   new  d2046a9   Move code for testing if an object can burn in a 
dedicated func
   new  e7dd0ec   Ensure that it's not possible to put fire on all objects
   new  eb1a1da   Bump micro version for next release
   new  e3d9377   Do not count blupis that are dying / burning
   new  b0be4e1   Revert "Do not count blupis that are dying / burning"
   new  cddc7de   Fix properly issue #53 by updating the stats
   new  c08b750   Fix regression where the fire was no longer propagated
   new  5db7fe9   Bump patch version
   new  9833e9d   record new upstream branch and merge it
   new  8241de7   planetblupi 1.12.4-1 Debian release
   new  ff4029c   d/copyright update

The 15 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt   |  2 +-
 debian/.git-dpm  | 14 ++--
 debian/changelog |  6 +
 debian/copyright | 38 +---
 src/button.cxx   |  4 +---
 src/decmap.cxx   | 20 +
 src/decmove.cxx  | 67 +---
 src/decor.h  |  1 +
 src/decstat.cxx  |  4 +++-
 src/event.cxx| 40 ++---
 src/event.h  |  5 +++--
 src/fifo.cxx |  6 +++--
 src/menu.cxx |  4 +---
 src/pixmap.cxx   | 14 ++--
 src/progress.cxx |  4 +---
 15 files changed, 147 insertions(+), 82 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 01/15: Ensure that gettext strings are always regenerated

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 0239d1e4ee7740c3a623c971f00217e445cf6240
Author: Mathieu Schroeter 
Date:   Tue Feb 13 23:38:23 2018 +0100

Ensure that gettext strings are always regenerated

- It fixes issue #52.
---
 src/event.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index ad7876b..3e5b65c 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -2448,7 +2448,7 @@ CEvent::DrawButtons ()
   // Affiche le texte lorsque c'est raté.
   if (m_phase == EV_PHASE_LOST)
   {
-static char * list[] = {
+const char * list[] = {
   gettext ("You have failed, try again..."),
   gettext ("No, wrong way ..."),
   gettext ("Bang, failed again !"),
@@ -2464,7 +2464,7 @@ CEvent::DrawButtons ()
   // Affiche le texte lorsque c'est réussi.
   if (m_phase == EV_PHASE_WIN)
   {
-static char * list[] = {
+const char * list[] = {
   gettext ("Well done !"), gettext ("Yes, great ..."),
   gettext ("Very good."),  gettext ("Excellent..."),
   gettext ("Mission over..."),

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 06/15: Ensure that it's not possible to put fire on all objects

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit e7dd0ec7c753341ab51b8ccfdeed15de55b51f75
Author: Mathieu Schroeter 
Date:   Sun Feb 18 23:31:43 2018 +0100

Ensure that it's not possible to put fire on all objects

Only burnable objects can have a fire.

Note that it's possible to re-enable the previous feature with the
--restore-bugs argument.

- It fixes issue #54.
---
 src/decor.cxx | 10 ++
 src/event.cxx |  3 ++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/decor.cxx b/src/decor.cxx
index 2090904..ca2af57 100644
--- a/src/decor.cxx
+++ b/src/decor.cxx
@@ -382,6 +382,11 @@ CDecor::PutFloor (Point cel, Sint32 channel, Sint32 icon)
   m_decor[cel.x / 2][cel.y / 2].floorChannel = channel;
   m_decor[cel.x / 2][cel.y / 2].floorIcon= icon;
 
+  if (
+!g_restoreBugs && m_decor[cel.x / 2][cel.y / 2].fire &&
+!this->CanBurn (cel))
+m_decor[cel.x / 2][cel.y / 2].fire = 0;
+
   m_bGroundRedraw = true;
 
   //? SubDrapeau(cel);  // on pourra de nouveau planter un drapeau
@@ -403,6 +408,11 @@ CDecor::PutObject (Point cel, Sint32 channel, Sint32 icon)
   m_decor[cel.x / 2][cel.y / 2].objectChannel = channel;
   m_decor[cel.x / 2][cel.y / 2].objectIcon= icon;
 
+  if (
+!g_restoreBugs && m_decor[cel.x / 2][cel.y / 2].fire &&
+!this->CanBurn (cel))
+m_decor[cel.x / 2][cel.y / 2].fire = 0;
+
   SubDrapeau (cel); // on pourra de nouveau planter un drapeau
 
   return true;
diff --git a/src/event.cxx b/src/event.cxx
index 1ede8bf..8ad1a02 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -4419,7 +4419,8 @@ CEvent::BuildDown (Point pos, Uint16 mod, const SDL_Event 
* event, bool bMix)
 
 if (menu == 0) // supprime ?
   m_pDecor->SetFire (cel, false);
-if (menu == 1) // ajoute ?
+
+if (menu == 1 && (g_restoreBugs || m_pDecor->CanBurn (cel))) // ajoute ?
   m_pDecor->SetFire (cel, true);
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 03/15: Use the right mouse click (when building) for deleting

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 403b5dbb3d1fd6629eeaf97b90ea9eb76eebb785
Author: Mathieu Schroeter 
Date:   Wed Feb 14 06:16:45 2018 +0100

Use the right mouse click (when building) for deleting

- It fixes issue #55.
---
 src/event.cxx | 27 ++-
 src/event.h   |  3 ++-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 2a38d3f..823d5de 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -4269,7 +4269,7 @@ static Sint32 tableHome[] = {
 // Modifie le décor lorsque le bouton de la souris est pressé.
 
 bool
-CEvent::BuildDown (Point pos, Uint16 mod, bool bMix)
+CEvent::BuildDown (Point pos, Uint16 mod, const SDL_Event * event, bool bMix)
 {
   Point  cel;
   Sint32 menu, channel, icon;
@@ -4282,12 +4282,14 @@ CEvent::BuildDown (Point pos, Uint16 mod, bool bMix)
 pos.y > POSDRAWY + DIMDRAWY)
 return false;
 
+  bool isRightClick = event ? event->button.button == SDL_BUTTON_RIGHT : false;
+
   if (bMix)
   {
 m_pDecor->UndoCopy (); // copie le décor pour undo év.
   }
 
-  if (GetState (EV_DECOR1) == 1) // pose d'un sol
+  if (GetState (EV_DECOR1) == 1 && !isRightClick) // pose d'un sol
   {
 cel  = m_pDecor->ConvPosToCel2 (pos);
 menu = GetMenu (EV_DECOR1);
@@ -4321,10 +4323,10 @@ CEvent::BuildDown (Point pos, Uint16 mod, bool bMix)
 }
   }
 
-  if (GetState (EV_DECOR2) == 1) // pose d'un objet
+  if (GetState (EV_DECOR2) == 1 || isRightClick) // pose d'un objet
   {
 cel  = m_pDecor->ConvPosToCel2 (pos);
-menu = GetMenu (EV_DECOR2);
+menu = isRightClick ? 0 : GetMenu (EV_DECOR2);
 
 if (!m_pDecor->GetObject (cel, channel, icon))
   return false;
@@ -4352,10 +4354,10 @@ CEvent::BuildDown (Point pos, Uint16 mod, bool bMix)
 }
   }
 
-  if (GetState (EV_DECOR3) == 1) // pose d'un batiment
+  if (GetState (EV_DECOR3) == 1 || isRightClick) // pose d'un batiment
   {
 cel  = m_pDecor->ConvPosToCel2 (pos);
-menu = GetMenu (EV_DECOR3);
+menu = isRightClick ? 0 : GetMenu (EV_DECOR3);
 
 if (!m_pDecor->GetObject (cel, channel, icon))
   return false;
@@ -4383,10 +4385,10 @@ CEvent::BuildDown (Point pos, Uint16 mod, bool bMix)
 }
   }
 
-  if (GetState (EV_DECOR4) == 1) // pose d'un blupi
+  if (GetState (EV_DECOR4) == 1 || isRightClick) // pose d'un blupi
   {
 cel  = m_pDecor->ConvPosToCel (pos);
-menu = GetMenu (EV_DECOR4);
+menu = isRightClick ? 0 : GetMenu (EV_DECOR4);
 
 if (menu == 0) // supprime ?
   m_pDecor->BlupiDelete (cel);
@@ -4410,10 +4412,10 @@ CEvent::BuildDown (Point pos, Uint16 mod, bool bMix)
   m_pDecor->BlupiCreate (cel, ACTION_STOP, DIRECT_S, 4, MAXENERGY);
   }
 
-  if (GetState (EV_DECOR5) == 1) // pose d'une cata
+  if (GetState (EV_DECOR5) == 1 || isRightClick) // pose d'une cata
   {
 cel  = m_pDecor->ConvPosToCel2 (pos);
-menu = GetMenu (EV_DECOR5);
+menu = isRightClick ? 0 : GetMenu (EV_DECOR5);
 
 if (menu == 0) // supprime ?
   m_pDecor->SetFire (cel, false);
@@ -4432,8 +4434,7 @@ bool
 CEvent::BuildMove (Point pos, Uint16 mod, const SDL_Event & event)
 {
   if (event.motion.state & SDL_BUTTON (SDL_BUTTON_LEFT)) // bouton souris 
pressé
- // ?
-BuildDown (pos, mod, false);
+BuildDown (pos, mod, nullptr, false);
 
   if (GetState (EV_DECOR4) == 1) // pose d'un blupi
 m_pDecor->CelHili (pos, 1);
@@ -5652,7 +5653,7 @@ CEvent::TreatEventBase (const SDL_Event & event)
   return true;
 if (m_phase == EV_PHASE_BUILD)
 {
-  if (BuildDown (pos, m_keymod))
+  if (BuildDown (pos, m_keymod, ))
 return true;
 }
 if (m_phase == EV_PHASE_PLAY)
diff --git a/src/event.h b/src/event.h
index d31a532..721861e 100644
--- a/src/event.h
+++ b/src/event.h
@@ -170,7 +170,8 @@ protected:
 
   void BuildFloor (Point cel, Sint32 insIcon);
   void BuildWater (Point cel, Sint32 insIcon);
-  bool BuildDown (Point pos, Uint16 mod, bool bMix = true);
+  bool
+   BuildDown (Point pos, Uint16 mod, const SDL_Event * event, bool bMix = 
true);
   bool BuildMove (Point pos, Uint16 mod, const SDL_Event & event);
 
   void PrivateLibelle ();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 05/15: Move code for testing if an object can burn in a dedicated func

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit d2046a93894c6c4884c67c8601efc9f53cfc61cc
Author: Mathieu Schroeter 
Date:   Sun Feb 18 23:24:06 2018 +0100

Move code for testing if an object can burn in a dedicated func
---
 src/decmove.cxx | 67 +
 src/decor.h |  1 +
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/src/decmove.cxx b/src/decmove.cxx
index 228f7fd..5decaad 100644
--- a/src/decmove.cxx
+++ b/src/decmove.cxx
@@ -1012,53 +1012,64 @@ CDecor::MoveAddIcons (Point cel, Sint32 rankIcons, bool 
bContinue)
 }
 
 /**
- * \brief Start the fire on a cell.
+ * \brief Test if something can burn at a specified cell.
  *
  * \param[in] cel - Position.
  * \returns true if possible.
  */
 bool
-CDecor::MoveStartFire (Point cel)
+CDecor::CanBurn (Point cel)
 {
   Sint32 channel, icon;
+  bool   canBurn = false;
 
   cel.x = (cel.x / 2) * 2;
   cel.y = (cel.y / 2) * 2;
 
-  channel = m_decor[cel.x / 2][cel.y / 2].objectChannel;
-  icon= m_decor[cel.x / 2][cel.y / 2].objectIcon;
-
-  if (
-channel == CHOBJECT && ((icon >= 6 && icon <= 11) // trees ?
-|| (icon >= 65 && icon <= 71) // palissade ?
-|| icon == 61 // cabane ?
-|| icon == 36 // planches ?
-|| icon == 60 // tomatoes ?
-|| icon == 63 // eggs ?
-|| icon == 113// house ?
-|| icon == 121// mine de fer ?
-|| icon == 122// mine de fer ?
-))
-  {
-if (!MoveCreate (cel, -1, false, CHOBJECT, -1, -1, -1, , 1, 0, true))
-  return false;
-
-MoveAddIcons (cel, 1, true); // small fire
-m_decor[cel.x / 2][cel.y / 2].fire = 2;
+  const auto cell = m_decor[cel.x / 2][cel.y / 2];
+
+  channel = cell.objectChannel;
+  icon= cell.objectIcon;
+
+  canBurn = channel == CHOBJECT && ((icon >= 6 && icon <= 11) // trees ?
+|| (icon >= 65 && icon <= 71) // palissade 
?
+|| icon == 61 // cabane ?
+|| icon == 36 // planches ?
+|| icon == 60 // tomatoes ?
+|| icon == 63 // eggs ?
+|| icon == 113// house ?
+|| icon == 121 // mine de fer ?
+|| icon == 122 // mine de fer ?
+   );
+  if (canBurn)
 return true;
-  }
 
   // If there is an other object, then no fire.
   if (channel >= 0)
 return false;
 
-  channel = m_decor[cel.x / 2][cel.y / 2].floorChannel;
-  icon= m_decor[cel.x / 2][cel.y / 2].floorIcon;
+  channel = cell.floorChannel;
+  icon= cell.floorIcon;
 
-  if (
-channel == CHFLOOR && (icon == 20 ||// herbe foncée ?
-   (icon >= 59 && icon <= 64))) // bridge ?
+  canBurn = channel == CHFLOOR && (icon == 20 || // herbe foncée ?
+   (icon >= 59 && icon <= 64));
+  return canBurn;
+}
+
+/**
+ * \brief Start the fire on a cell.
+ *
+ * \param[in] cel - Position.
+ * \returns true if possible.
+ */
+bool
+CDecor::MoveStartFire (Point cel)
+{
+  if (this->CanBurn (cel))
   {
+cel.x = (cel.x / 2) * 2;
+cel.y = (cel.y / 2) * 2;
+
 if (!MoveCreate (cel, -1, false, CHOBJECT, -1, -1, -1, , 1, 0, true))
   return false;
 
diff --git a/src/decor.h b/src/decor.h
index ddcc376..70ea98b 100644
--- a/src/decor.h
+++ b/src/decor.h
@@ -322,6 +322,7 @@ public:
   Term * GetTerminated ();
 
   // DecMove.cpp
+  bool   CanBurn (Point cel);
   void   MoveFlush ();
   Sint32 MoveMaxFire ();
   void   MoveFixInit ();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 04/15: Update some copyright dates

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 1093c048ac977bd982d3475e7d8c7842e1bcfc62
Author: Mathieu Schroeter 
Date:   Wed Feb 14 06:36:22 2018 +0100

Update some copyright dates
---
 src/event.cxx | 2 +-
 src/event.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 823d5de..1ede8bf 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -1,7 +1,7 @@
 /*
  * This file is part of the planetblupi source code
  * Copyright (C) 1997, Daniel Roux & EPSITEC SA
- * Copyright (C) 2017, Mathieu Schroeter
+ * Copyright (C) 2017-2018, Mathieu Schroeter
  * http://epsitec.ch; http://www.blupi.org; http://github.com/blupi-games
  *
  * This program is free software: you can redistribute it and/or modify
diff --git a/src/event.h b/src/event.h
index 721861e..e177afb 100644
--- a/src/event.h
+++ b/src/event.h
@@ -1,7 +1,7 @@
 /*
  * This file is part of the planetblupi source code
  * Copyright (C) 1997, Daniel Roux & EPSITEC SA
- * Copyright (C) 2017, Mathieu Schroeter
+ * Copyright (C) 2017-2018, Mathieu Schroeter
  * http://epsitec.ch; http://www.blupi.org; http://github.com/blupi-games
  *
  * This program is free software: you can redistribute it and/or modify

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 02/15: Cosmetic

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 0bc1d0007459ce3bbac60d65a4dbc52b284a8e6b
Author: Mathieu Schroeter 
Date:   Tue Feb 13 23:44:08 2018 +0100

Cosmetic
---
 src/button.cxx   |  4 +---
 src/decmap.cxx   | 20 
 src/event.cxx|  4 +++-
 src/fifo.cxx |  6 --
 src/menu.cxx |  4 +---
 src/pixmap.cxx   | 14 +++---
 src/progress.cxx |  4 +---
 7 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/button.cxx b/src/button.cxx
index 7247a63..d31ca01 100644
--- a/src/button.cxx
+++ b/src/button.cxx
@@ -48,9 +48,7 @@ CButton::CButton ()
   m_toolTips   = nullptr;
 }
 
-CButton::~CButton ()
-{
-}
+CButton::~CButton () {}
 
 // Crée un nouveau bouton.
 
diff --git a/src/decmap.cxx b/src/decmap.cxx
index 66d4d5b..9b68ca2 100644
--- a/src/decmap.cxx
+++ b/src/decmap.cxx
@@ -406,19 +406,31 @@ static char color_object[] =
 // clang-format on
 
 static char color_deffog[4] = {
-  MAP_FOG, MAP_FOG, MAP_FOG, MAP_FOG,
+  MAP_FOG,
+  MAP_FOG,
+  MAP_FOG,
+  MAP_FOG,
 };
 
 static char color_deftree[4] = {
-  MAP_TREE, MAP_TREE, MAP_TREE, MAP_TREE,
+  MAP_TREE,
+  MAP_TREE,
+  MAP_TREE,
+  MAP_TREE,
 };
 
 static char color_deffloor[4] = {
-  MAP_HERB1, MAP_HERB1, MAP_HERB1, MAP_HERB1,
+  MAP_HERB1,
+  MAP_HERB1,
+  MAP_HERB1,
+  MAP_HERB1,
 };
 
 static char color_fire[4] = {
-  MAP_FIRE, MAP_FIRE, MAP_FIRE, MAP_FIRE,
+  MAP_FIRE,
+  MAP_FIRE,
+  MAP_FIRE,
+  MAP_FIRE,
 };
 
 // Met le contenu d'une cellule dans le bitmap de la carte
diff --git a/src/event.cxx b/src/event.cxx
index 3e5b65c..2a38d3f 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3839,7 +3839,9 @@ bool
 CEvent::PlayUp (Point pos)
 {
   static Sounds table_sound_boing[] = {
-SOUND_BOING1, SOUND_BOING2, SOUND_BOING3,
+SOUND_BOING1,
+SOUND_BOING2,
+SOUND_BOING3,
   };
 
   m_pDecor->StatisticUp (pos);
diff --git a/src/fifo.cxx b/src/fifo.cxx
index 2aed801..b012964 100644
--- a/src/fifo.cxx
+++ b/src/fifo.cxx
@@ -39,7 +39,8 @@ CPileTriee::~CPileTriee ()
   free (m_data);
 }
 
-Sint32 CPileTriee::get ()
+Sint32
+CPileTriee::get ()
 {
   if (m_out == m_max)
 return -1;
@@ -50,7 +51,8 @@ Sint32 CPileTriee::get ()
   return val;
 }
 
-void CPileTriee::put (Sint32 pos, Sint32 dist)
+void
+CPileTriee::put (Sint32 pos, Sint32 dist)
 {
   Sint32 i = m_out;
   Sint32 p, d, m;
diff --git a/src/menu.cxx b/src/menu.cxx
index 35b1145..19a242a 100644
--- a/src/menu.cxx
+++ b/src/menu.cxx
@@ -148,9 +148,7 @@ CMenu::CMenu ()
 
 // Destructeur.
 
-CMenu::~CMenu ()
-{
-}
+CMenu::~CMenu () {}
 
 // Crée un nouveau bouton.
 
diff --git a/src/pixmap.cxx b/src/pixmap.cxx
index aef25d1..d23181c 100644
--- a/src/pixmap.cxx
+++ b/src/pixmap.cxx
@@ -226,14 +226,14 @@ bool
 CPixmap::Cache (
   size_t channel, const std::string & pFilename, Point totalDim, Point iconDim)
 {
-  std::string   file= GetBaseDir () + pFilename;
-  SDL_Surface * surface = IMG_Load (file.c_str ());
-  bool blupiChSet = false;
+  std::string   file   = GetBaseDir () + pFilename;
+  SDL_Surface * surface= IMG_Load (file.c_str ());
+  bool  blupiChSet = false;
 
   if (channel == CHBLUPI && !m_lpSDLBlupi)
   {
 m_lpSDLBlupi = surface;
-blupiChSet = true;
+blupiChSet   = true;
   }
 
   SDL_Texture * texture = SDL_CreateTextureFromSurface (g_renderer, surface);
@@ -789,13 +789,13 @@ on the endianness (byte order) of the machine */
 
   for (int i = SPRITE_BEGIN; i <= SPRITE_END; ++i)
   {
-MouseSprites sprite  = static_cast (i);
+MouseSprites sprite = static_cast (i);
 
 if (m_lpSDLCursors[sprite - 1])
   SDL_FreeCursor (m_lpSDLCursors[sprite - 1]);
 
-SDL_Pointhotspot = this->GetCursorHotSpot (sprite);
-SDL_Rect rect= this->GetCursorRect (sprite);
+SDL_Point hotspot = this->GetCursorHotSpot (sprite);
+SDL_Rect  rect= this->GetCursorRect (sprite);
 
 SDL_Surface * surface = SDL_CreateRGBSurface (
   0, rect.w * scale, rect.h * scale, 32, rmask, gmask, bmask, amask);
diff --git a/src/progress.cxx b/src/progress.cxx
index 6b131aa..9eb049c 100644
--- a/src/progress.cxx
+++ b/src/progress.cxx
@@ -37,9 +37,7 @@ CJauge::CJauge ()
   m_pSound  = nullptr;
 }
 
-CJauge::~CJauge ()
-{
-}
+CJauge::~CJauge () {}
 
 // Crée un nouveau bouton.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch upstream/latest updated (13a7e27 -> 61a1ab6)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch upstream/latest
in repository planetblupi.

  from  13a7e27   Update README-user.md
  adds  daa3dbf   Move the code to retrieve the music in a dedicated method
  adds  7097c67   Return the music format finally retrieved by 
GetMusicLocation
  adds  ce0fe82   Add an argument to look for music only in the base 
location
  adds  e52704d   Revert "Add an argument to look for music only in the 
base location"
  adds  fbfadb1   Enable only music choices accordingly to the available 
formats
  adds  6975b66   Prefer directsound over winmm under Windows
  adds  c6d109f   Revert "Return the music format finally retrieved by 
GetMusicLocation"
  adds  8bfafd3   Fix first texture loading on OSX where it was possible to 
have garbage
  adds  883ab7c   Free the renderer only fter the textures in order to 
prevent double free
  adds  61a1ab6   Fix mission stripped paving stones goal when there are 
less or more than 4 blupi

No new revisions were added by this update.

Summary of changes:
 src/blupi.cxx| 10 +++--
 src/decblupi.cxx |  2 +-
 src/event.cxx| 65 
 src/event.h  | 22 ++-
 src/pixmap.cxx   | 12 +--
 5 files changed, 68 insertions(+), 43 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] annotated tag debian/1.12.2-1 created (now 435fba7)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to annotated tag debian/1.12.2-1
in repository planetblupi.

at  435fba7   (tag)
   tagging  51403b62a99fbcdba0d412c151b4cf9c55e13ded (commit)
  replaces  debian/1.12.1-22-g13a7e27-3
 tagged by  Didier Raboud
on  Tue Feb 6 20:41:19 2018 +0100

- Log -
planetblupi release 1.12.2-1 for unstable (sid)
(maintainer view tag generated by dgit --quilt=dpm)
-BEGIN PGP SIGNATURE-

iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlp6BlQACgkQi8+nHsoW
NFUimQv/YhppN00bTS9CJBtgts0hTpSWiMgF9SyaPvudloNLnUYHzjA/Hgn9NtdB
123vMWxW2U2ux7XfAaoXVmqtE0WpHENzYj2T1Eeedgy4naMemjUfvJarZ8c64X98
XHsog+giktAc9LJKrRPYj69FdHQqWdd0hlco376Gzw/MifG4U4HIBiZWkAKveE8x
I2Wg7voArBuSfzFA+V+jjitbYhLQnQKkEUdS0eIdzltKIS6zcAgMzqLjca8Ktwww
msAlEAzsxBSD/e1zSFyy8kStDxyBdGd9VGJotacIlyi0hJzO++JmCFKK7rR2rqaW
HK1licgDxCYoB8Xn7b0pQehA6wBJVL7q1tFJsmmTDtAsKhG5v/QHg1S/IFu+WTWV
bDti96TtyA++SgXgQMtrXmw/K4rTeC+34tLYhUDJ2qV7si3WHd95b2khrvhHctjS
HDGpoU4I/aFG8RdvOEZNGG+SuYN+OUBpccvd5vjTPDJyGstMjNobwM8Neg8FJhBT
YyQt1AJF
=daKf
-END PGP SIGNATURE-

Didier Raboud (3):
  record new upstream branch
  merge patched-debian/master into debian/master
  planetblupi 1.12.2-1 Debian release

Mathieu Schroeter (10):
  Move the code to retrieve the music in a dedicated method
  Return the music format finally retrieved by GetMusicLocation
  Add an argument to look for music only in the base location
  Revert "Add an argument to look for music only in the base location"
  Enable only music choices accordingly to the available formats
  Prefer directsound over winmm under Windows
  Revert "Return the music format finally retrieved by GetMusicLocation"
  Fix first texture loading on OSX where it was possible to have garbage
  Free the renderer only fter the textures in order to prevent double free
  Fix mission stripped paving stones goal when there are less or more than 
4 blupi

---

This annotated tag includes the following new commits:

   new  daa3dbf   Move the code to retrieve the music in a dedicated method
   new  7097c67   Return the music format finally retrieved by 
GetMusicLocation
   new  ce0fe82   Add an argument to look for music only in the base 
location
   new  e52704d   Revert "Add an argument to look for music only in the 
base location"
   new  fbfadb1   Enable only music choices accordingly to the available 
formats
   new  6975b66   Prefer directsound over winmm under Windows
   new  c6d109f   Revert "Return the music format finally retrieved by 
GetMusicLocation"
   new  8bfafd3   Fix first texture loading on OSX where it was possible to 
have garbage
   new  883ab7c   Free the renderer only fter the textures in order to 
prevent double free
   new  61a1ab6   Fix mission stripped paving stones goal when there are 
less or more than 4 blupi
   new  de252f0   record new upstream branch
   new  741c8aa   merge patched-debian/master into debian/master
   new  51403b6   planetblupi 1.12.2-1 Debian release

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 07/13: Revert "Return the music format finally retrieved by GetMusicLocation"

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit c6d109f87d5ea61f5c9adfe4f3337143552448f8
Author: Mathieu Schroeter 
Date:   Wed Jan 31 23:57:49 2018 +0100

Revert "Return the music format finally retrieved by GetMusicLocation"

This reverts commit 7097c6708dc4e00d2aa86e95cea279cdfe20a432.
---
 src/event.cxx | 19 ++-
 src/event.h   |  2 +-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 9b43a4a..ad7876b 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3079,26 +3079,20 @@ CEvent::IsBaseMusicAvailable (Sint32 music, const 
std::string & format)
 }
 
 std::string
-CEvent::GetMusicLocation (Sint32 music, std::string & format)
+CEvent::GetMusicLocation (Sint32 music)
 {
   static const std::string exts[] = {"ogg", "mid"};
   static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
   std::string  absolute;
 
-  format = "";
-
   // Look for music in the user directory, then in the game directory.
   for (size_t i = 0; i < countof (locs); ++i)
   {
-format = exts[g_restoreMidi ? 1 : 0];
-auto filename =
-  string_format ("music/music%.3d.%s", music - 1, format.c_str ());
+auto filename = string_format (
+  "music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 1 : 0].c_str ());
 if (!FileExists (filename, absolute, locs[i]))
-{
-  format = exts[g_restoreMidi ? 0 : 1];
-  filename =
-string_format ("music/music%.3d.%s", music - 1, format.c_str ());
-}
+  filename = string_format (
+"music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 0 : 1].c_str ());
 
 if (FileExists (filename, absolute, locs[i]))
   break;
@@ -3418,8 +3412,7 @@ CEvent::ChangePhase (Uint32 phase)
   music = m_pDecor->GetMusic ();
   if (music > 0)
   {
-std::string format;
-autoabsolute = this->GetMusicLocation (music, format);
+auto absolute = this->GetMusicLocation (music);
 
 m_pSound->StopMusic ();
 m_pSound->PlayMusic (absolute);
diff --git a/src/event.h b/src/event.h
index 9f5fac0..d31a532 100644
--- a/src/event.h
+++ b/src/event.h
@@ -101,7 +101,7 @@ public:
   Sint32  GetImageWorld ();
   boolIsHelpHide ();
   boolIsBaseMusicAvailable (Sint32 music, const std::string & format);
-  std::string GetMusicLocation (Sint32 music, std::string & format);
+  std::string GetMusicLocation (Sint32 music);
   boolChangePhase (Uint32 phase);
   boolMovieToStart ();
   Uint32  GetPhase ();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] tag upstream/1.12.2 created (now 61a1ab6)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to tag upstream/1.12.2
in repository planetblupi.

at  61a1ab6   (commit)
This tag includes the following new commits:

   new  daa3dbf   Move the code to retrieve the music in a dedicated method
   new  7097c67   Return the music format finally retrieved by 
GetMusicLocation
   new  ce0fe82   Add an argument to look for music only in the base 
location
   new  e52704d   Revert "Add an argument to look for music only in the 
base location"
   new  fbfadb1   Enable only music choices accordingly to the available 
formats
   new  6975b66   Prefer directsound over winmm under Windows
   new  c6d109f   Revert "Return the music format finally retrieved by 
GetMusicLocation"
   new  8bfafd3   Fix first texture loading on OSX where it was possible to 
have garbage
   new  883ab7c   Free the renderer only fter the textures in order to 
prevent double free
   new  61a1ab6   Fix mission stripped paving stones goal when there are 
less or more than 4 blupi

The 10 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 04/13: Revert "Add an argument to look for music only in the base location"

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit e52704d937768169d19748de6f46ef581c27a782
Author: Mathieu Schroeter 
Date:   Wed Jan 31 07:20:31 2018 +0100

Revert "Add an argument to look for music only in the base location"

This reverts commit ce0fe82a02c0334a068bd2b78fa1f92e81680806.

It's not very useful..
---
 src/event.cxx |  5 +
 src/event.h   | 23 +++
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index d40042b..e9fe135 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3066,7 +3066,7 @@ CEvent::IsHelpHide ()
 }
 
 std::string
-CEvent::GetMusicLocation (Sint32 music, std::string & format, bool onlyBase)
+CEvent::GetMusicLocation (Sint32 music, std::string & format)
 {
   static const std::string exts[] = {"ogg", "mid"};
   static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
@@ -3077,9 +3077,6 @@ CEvent::GetMusicLocation (Sint32 music, std::string & 
format, bool onlyBase)
   // Look for music in the user directory, then in the game directory.
   for (size_t i = 0; i < countof (locs); ++i)
   {
-if (onlyBase && locs[i] != LOCATION_BASE)
-  continue;
-
 format = exts[g_restoreMidi ? 1 : 0];
 auto filename =
   string_format ("music/music%.3d.%s", music - 1, format.c_str ());
diff --git a/src/event.h b/src/event.h
index 02dbbb9..3ca7b03 100644
--- a/src/event.h
+++ b/src/event.h
@@ -94,18 +94,17 @@ public:
 
   Point GetMousePos ();
   void
- Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * 
pMovie);
-  void   SetFullScreen (bool bFullScreen);
-  Sint32 GetWorld ();
-  Sint32 GetPhysicalWorld ();
-  Sint32 GetImageWorld ();
-  bool   IsHelpHide ();
-  std::string
- GetMusicLocation (Sint32 music, std::string & format, bool onlyBase = 
false);
-  bool   ChangePhase (Uint32 phase);
-  bool   MovieToStart ();
-  Uint32 GetPhase ();
-  void   TryInsert ();
+  Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, 
CMovie * pMovie);
+  voidSetFullScreen (bool bFullScreen);
+  Sint32  GetWorld ();
+  Sint32  GetPhysicalWorld ();
+  Sint32  GetImageWorld ();
+  boolIsHelpHide ();
+  std::string GetMusicLocation (Sint32 music, std::string & format);
+  boolChangePhase (Uint32 phase);
+  boolMovieToStart ();
+  Uint32  GetPhase ();
+  voidTryInsert ();
 
   Sint32 GetButtonIndex (Sint32 button);
   Sint32 GetState (Sint32 button);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 09/13: Free the renderer only fter the textures in order to prevent double free

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 883ab7ca1903bc57ff5e03ae360a0cb9fe356621
Author: Mathieu Schroeter 
Date:   Mon Feb 5 18:22:31 2018 +0100

Free the renderer only fter the textures in order to prevent double free

The reason is that the renderer tries to free the associated textures.
It generates assertion errors on macOS.
---
 src/blupi.cxx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 1c83429..b4dc147 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -1038,14 +1038,15 @@ main (int argc, char * argv[])
   break;
   }
 
+  SDL_RemoveTimer (updateTimer);
+  FinishObjects ();
+
   if (g_renderer)
 SDL_DestroyRenderer (g_renderer);
 
   if (g_window)
 SDL_DestroyWindow (g_window);
 
-  SDL_RemoveTimer (updateTimer);
-  FinishObjects ();
   SDL_Quit ();
 
   if (g_updateThread)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 05/13: Enable only music choices accordingly to the available formats

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit fbfadb1eef41dfe95f66e6741f9b3c1aaf98d8ed
Author: Mathieu Schroeter 
Date:   Wed Jan 31 07:32:33 2018 +0100

Enable only music choices accordingly to the available formats

It fixes OdyX need #47.
---
 src/event.cxx | 19 ---
 src/event.h   |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index e9fe135..9b43a4a 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -2075,6 +2075,10 @@ CEvent::DrawButtons ()
 SetEnable (EV_BUTTON10, bEnable);
   }
 
+  /* Check if both music formats are available */
+  auto ogg = this->IsBaseMusicAvailable (1, "ogg");
+  auto mid = this->IsBaseMusicAvailable (1, "mid");
+
   if (m_phase == EV_PHASE_SETTINGS)
   {
 SetEnable (EV_BUTTON1, m_Lang != m_Languages.begin ());
@@ -2086,8 +2090,8 @@ CEvent::DrawButtons ()
 SetEnable (EV_BUTTON5, !g_bFullScreen && g_zoom > 1);
 SetEnable (EV_BUTTON6, !g_bFullScreen && g_zoom < 2);
 
-SetEnable (EV_BUTTON7, g_restoreMidi);
-SetEnable (EV_BUTTON8, !g_restoreMidi);
+SetEnable (EV_BUTTON7, g_restoreMidi && mid && ogg);
+SetEnable (EV_BUTTON8, !g_restoreMidi && mid && ogg);
   }
 
   assert (m_index >= 0);
@@ -2577,7 +2581,7 @@ CEvent::DrawButtons ()
   DrawText (m_pPixmap, pos, res);
 }
 
-text  = g_restoreMidi ? gettext ("Midi") : gettext ("Ogg");
+text  = (g_restoreMidi && mid) || !ogg ? gettext ("Midi") : gettext 
("Ogg");
 lg= GetTextWidth (text);
 pos.x = (399 + 40) - lg / 2;
 pos.y = 330 - 20;
@@ -3065,6 +3069,15 @@ CEvent::IsHelpHide ()
   return bHide;
 }
 
+bool
+CEvent::IsBaseMusicAvailable (Sint32 music, const std::string & format)
+{
+  std::string absolute;
+  autofilename =
+string_format ("music/music%.3d.%s", music - 1, format.c_str ());
+  return FileExists (filename, absolute, LOCATION_BASE);
+}
+
 std::string
 CEvent::GetMusicLocation (Sint32 music, std::string & format)
 {
diff --git a/src/event.h b/src/event.h
index 3ca7b03..9f5fac0 100644
--- a/src/event.h
+++ b/src/event.h
@@ -100,6 +100,7 @@ public:
   Sint32  GetPhysicalWorld ();
   Sint32  GetImageWorld ();
   boolIsHelpHide ();
+  boolIsBaseMusicAvailable (Sint32 music, const std::string & format);
   std::string GetMusicLocation (Sint32 music, std::string & format);
   boolChangePhase (Uint32 phase);
   boolMovieToStart ();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 08/13: Fix first texture loading on OSX where it was possible to have garbage

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 8bfafd3e4e7165eb0c747a3216f40e120505fb9d
Author: Mathieu Schroeter 
Date:   Mon Feb 5 18:14:21 2018 +0100

Fix first texture loading on OSX where it was possible to have garbage

The cache ensures that the texture is cleared after the rendering.
---
 src/pixmap.cxx | 12 +---
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/pixmap.cxx b/src/pixmap.cxx
index e62fa34..aef25d1 100644
--- a/src/pixmap.cxx
+++ b/src/pixmap.cxx
@@ -257,13 +257,11 @@ CPixmap::Cache (
 SDL_SetTextureBlendMode (
   m_SDLTextureInfo[channel].texture, SDL_BLENDMODE_BLEND);
   }
-  else
-  {
-SDL_SetRenderTarget (g_renderer, m_SDLTextureInfo[channel].texture);
-SDL_SetRenderDrawColor (g_renderer, 0, 0, 0, 0);
-SDL_RenderClear (g_renderer);
-SDL_SetRenderTarget (g_renderer, nullptr);
-  }
+
+  SDL_SetRenderTarget (g_renderer, m_SDLTextureInfo[channel].texture);
+  SDL_SetRenderDrawColor (g_renderer, 0, 0, 0, 0);
+  SDL_RenderClear (g_renderer);
+  SDL_SetRenderTarget (g_renderer, nullptr);
 
   m_SDLTextureInfo[channel].texMask  = channel == CHMASK2 ? texture : nullptr;
   m_SDLTextureInfo[channel].target   = true;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 11/13: record new upstream branch

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit de252f037fd04626b900eae8879afc328d4c6d06
Author: Didier Raboud <o...@debian.org>
Date:   Tue Feb 6 20:38:38 2018 +0100

record new upstream branch
---
 debian/.git-dpm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 5589174..93fb3fb 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -2,7 +2,7 @@
 3baa931c68cc55464f545163b4f8c4f6f9537f40
 3baa931c68cc55464f545163b4f8c4f6f9537f40
 13a7e27133bfb0ceb5c4df8a377354c580bf3b01
-13a7e27133bfb0ceb5c4df8a377354c580bf3b01
-planetblupi_1.12.1-22-g13a7e27.orig.tar.xz
-af499e148a32d28bb1f8e1f1620c1f5bc362dd49
-83827908
+61a1ab65ebe5fa609899deffa05903d74e8ec6c0
+planetblupi_1.12.2.orig.tar.gz
+4a95a5b39fc0d62ce4c560984762053ff0937d36
+106578253

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 06/13: Prefer directsound over winmm under Windows

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 6975b664b9a4d679a2b4d907c2931bfc18e0c81c
Author: Mathieu Schroeter 
Date:   Wed Jan 31 23:38:27 2018 +0100

Prefer directsound over winmm under Windows
---
 src/blupi.cxx | 5 +
 1 file changed, 5 insertions(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 71b57df..1c83429 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -709,6 +709,11 @@ DoInit (int argc, char * argv[], bool & exit)
 return EXIT_FAILURE;
   }
 
+#ifdef _WIN32
+  /* Fix laggy sounds on Windows by not using winmm driver. */
+  SDL_setenv ("SDL_AUDIODRIVER", "directsound", true);
+#endif /* _WIN32 */
+
   auto res = SDL_Init (SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER);
   if (res < 0)
   {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 02/13: Return the music format finally retrieved by GetMusicLocation

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 7097c6708dc4e00d2aa86e95cea279cdfe20a432
Author: Mathieu Schroeter 
Date:   Wed Jan 31 06:59:02 2018 +0100

Return the music format finally retrieved by GetMusicLocation

It means that it's possible that this function returns something
different of the restoreMusic settings. It's the case when the prefered
format is not available in the directories.
---
 src/event.cxx | 19 +--
 src/event.h   |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 9854f0c..e9fe135 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3066,20 +3066,26 @@ CEvent::IsHelpHide ()
 }
 
 std::string
-CEvent::GetMusicLocation (Sint32 music)
+CEvent::GetMusicLocation (Sint32 music, std::string & format)
 {
   static const std::string exts[] = {"ogg", "mid"};
   static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
   std::string  absolute;
 
+  format = "";
+
   // Look for music in the user directory, then in the game directory.
   for (size_t i = 0; i < countof (locs); ++i)
   {
-auto filename = string_format (
-  "music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 1 : 0].c_str ());
+format = exts[g_restoreMidi ? 1 : 0];
+auto filename =
+  string_format ("music/music%.3d.%s", music - 1, format.c_str ());
 if (!FileExists (filename, absolute, locs[i]))
-  filename = string_format (
-"music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 0 : 1].c_str ());
+{
+  format = exts[g_restoreMidi ? 0 : 1];
+  filename =
+string_format ("music/music%.3d.%s", music - 1, format.c_str ());
+}
 
 if (FileExists (filename, absolute, locs[i]))
   break;
@@ -3399,7 +3405,8 @@ CEvent::ChangePhase (Uint32 phase)
   music = m_pDecor->GetMusic ();
   if (music > 0)
   {
-auto absolute = this->GetMusicLocation (music);
+std::string format;
+autoabsolute = this->GetMusicLocation (music, format);
 
 m_pSound->StopMusic ();
 m_pSound->PlayMusic (absolute);
diff --git a/src/event.h b/src/event.h
index 73fe2d5..3ca7b03 100644
--- a/src/event.h
+++ b/src/event.h
@@ -100,7 +100,7 @@ public:
   Sint32  GetPhysicalWorld ();
   Sint32  GetImageWorld ();
   boolIsHelpHide ();
-  std::string GetMusicLocation (Sint32 music);
+  std::string GetMusicLocation (Sint32 music, std::string & format);
   boolChangePhase (Uint32 phase);
   boolMovieToStart ();
   Uint32  GetPhase ();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 10/13: Fix mission stripped paving stones goal when there are less or more than 4 blupi

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 61a1ab65ebe5fa609899deffa05903d74e8ec6c0
Author: Mathieu Schroeter 
Date:   Mon Feb 5 23:20:19 2018 +0100

Fix mission stripped paving stones goal when there are less or more than 4 
blupi

The minimal number of blupi must be used instead of 4.

- It fixes issue #51.
---
 src/decblupi.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/decblupi.cxx b/src/decblupi.cxx
index db33cfb..d5261b8 100644
--- a/src/decblupi.cxx
+++ b/src/decblupi.cxx
@@ -4623,7 +4623,7 @@ CDecor::IsTerminated ()
   m_pSound->PlayImage (SOUND_GOAL, pos);
 m_winLastHachBlupi = m_nbStatHachBlupi;
 
-if (m_nbStatHachBlupi < m_nbStatHach * 4)
+if (m_nbStatHachBlupi < m_nbStatHach * m_term.nbMinBlupi)
   return 0; // continue;
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 03/13: Add an argument to look for music only in the base location

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit ce0fe82a02c0334a068bd2b78fa1f92e81680806
Author: Mathieu Schroeter 
Date:   Wed Jan 31 07:10:32 2018 +0100

Add an argument to look for music only in the base location
---
 src/event.cxx |  5 -
 src/event.h   | 23 ---
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index e9fe135..d40042b 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3066,7 +3066,7 @@ CEvent::IsHelpHide ()
 }
 
 std::string
-CEvent::GetMusicLocation (Sint32 music, std::string & format)
+CEvent::GetMusicLocation (Sint32 music, std::string & format, bool onlyBase)
 {
   static const std::string exts[] = {"ogg", "mid"};
   static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
@@ -3077,6 +3077,9 @@ CEvent::GetMusicLocation (Sint32 music, std::string & 
format)
   // Look for music in the user directory, then in the game directory.
   for (size_t i = 0; i < countof (locs); ++i)
   {
+if (onlyBase && locs[i] != LOCATION_BASE)
+  continue;
+
 format = exts[g_restoreMidi ? 1 : 0];
 auto filename =
   string_format ("music/music%.3d.%s", music - 1, format.c_str ());
diff --git a/src/event.h b/src/event.h
index 3ca7b03..02dbbb9 100644
--- a/src/event.h
+++ b/src/event.h
@@ -94,17 +94,18 @@ public:
 
   Point GetMousePos ();
   void
-  Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, 
CMovie * pMovie);
-  voidSetFullScreen (bool bFullScreen);
-  Sint32  GetWorld ();
-  Sint32  GetPhysicalWorld ();
-  Sint32  GetImageWorld ();
-  boolIsHelpHide ();
-  std::string GetMusicLocation (Sint32 music, std::string & format);
-  boolChangePhase (Uint32 phase);
-  boolMovieToStart ();
-  Uint32  GetPhase ();
-  voidTryInsert ();
+ Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * 
pMovie);
+  void   SetFullScreen (bool bFullScreen);
+  Sint32 GetWorld ();
+  Sint32 GetPhysicalWorld ();
+  Sint32 GetImageWorld ();
+  bool   IsHelpHide ();
+  std::string
+ GetMusicLocation (Sint32 music, std::string & format, bool onlyBase = 
false);
+  bool   ChangePhase (Uint32 phase);
+  bool   MovieToStart ();
+  Uint32 GetPhase ();
+  void   TryInsert ();
 
   Sint32 GetButtonIndex (Sint32 button);
   Sint32 GetState (Sint32 button);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 13/13: planetblupi 1.12.2-1 Debian release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 51403b62a99fbcdba0d412c151b4cf9c55e13ded
Author: Didier Raboud <o...@debian.org>
Date:   Tue Feb 6 20:41:19 2018 +0100

planetblupi 1.12.2-1 Debian release
---
 debian/changelog | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f02d71e..abf629f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+planetblupi (1.12.2-1) unstable; urgency=medium
+
+  * New 1.12.2 upstream release
+- Drop the patches from upstream
+
+ -- Didier Raboud <o...@debian.org>  Tue, 06 Feb 2018 20:41:19 +0100
+
 planetblupi (1.12.1-22-g13a7e27-3) unstable; urgency=medium
 
   * Cherry-pick two upstream fixes to only allow music format choices

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 12/13: merge patched-debian/master into debian/master

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 741c8aadd8f8135f101719213dcce01af53c1398
Merge: de252f0 61a1ab6
Author: Didier Raboud <o...@debian.org>
Date:   Tue Feb 6 20:38:57 2018 +0100

merge patched-debian/master into debian/master

 debian/.git-dpm|   6 +-
 ...de-to-retrieve-the-music-in-a-dedicated-m.patch | 106 -
 ...-music-choices-accordingly-to-the-availab.patch |  74 --
 debian/patches/series  |   2 -
 src/blupi.cxx  |  10 +-
 src/decblupi.cxx   |   2 +-
 src/pixmap.cxx |  12 +--
 7 files changed, 17 insertions(+), 195 deletions(-)

diff --cc debian/.git-dpm
index 93fb3fb,000..4fdd93a
mode 100644,00..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 3baa931c68cc55464f545163b4f8c4f6f9537f40
- 3baa931c68cc55464f545163b4f8c4f6f9537f40
- 13a7e27133bfb0ceb5c4df8a377354c580bf3b01
++61a1ab65ebe5fa609899deffa05903d74e8ec6c0
++61a1ab65ebe5fa609899deffa05903d74e8ec6c0
++61a1ab65ebe5fa609899deffa05903d74e8ec6c0
 +61a1ab65ebe5fa609899deffa05903d74e8ec6c0
 +planetblupi_1.12.2.orig.tar.gz
 +4a95a5b39fc0d62ce4c560984762053ff0937d36
 +106578253

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch debian/master updated (1d6738f -> 51403b6)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch debian/master
in repository planetblupi.

  from  1d6738f   planetblupi 1.12.1-22-g13a7e27-3 Debian release
   new  de252f0   record new upstream branch
   new  daa3dbf   Move the code to retrieve the music in a dedicated method
   new  7097c67   Return the music format finally retrieved by 
GetMusicLocation
   new  ce0fe82   Add an argument to look for music only in the base 
location
   new  e52704d   Revert "Add an argument to look for music only in the 
base location"
   new  fbfadb1   Enable only music choices accordingly to the available 
formats
   new  6975b66   Prefer directsound over winmm under Windows
   new  c6d109f   Revert "Return the music format finally retrieved by 
GetMusicLocation"
   new  8bfafd3   Fix first texture loading on OSX where it was possible to 
have garbage
   new  883ab7c   Free the renderer only fter the textures in order to 
prevent double free
   new  61a1ab6   Fix mission stripped paving stones goal when there are 
less or more than 4 blupi
   new  741c8aa   merge patched-debian/master into debian/master
   new  51403b6   planetblupi 1.12.2-1 Debian release

The 13 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/.git-dpm|  14 +--
 debian/changelog   |   7 ++
 ...de-to-retrieve-the-music-in-a-dedicated-m.patch | 106 -
 ...-music-choices-accordingly-to-the-availab.patch |  74 --
 debian/patches/series  |   2 -
 src/blupi.cxx  |  10 +-
 src/decblupi.cxx   |   2 +-
 src/pixmap.cxx |  12 +--
 8 files changed, 28 insertions(+), 199 deletions(-)
 delete mode 100644 
debian/patches/0001-Move-the-code-to-retrieve-the-music-in-a-dedicated-m.patch
 delete mode 100644 
debian/patches/0002-Enable-only-music-choices-accordingly-to-the-availab.patch
 delete mode 100644 debian/patches/series

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 01/13: Move the code to retrieve the music in a dedicated method

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit daa3dbf22bfb64d14e199b1eb70c158d9266a1fa
Author: Mathieu Schroeter 
Date:   Wed Jan 31 06:50:56 2018 +0100

Move the code to retrieve the music in a dedicated method
---
 src/event.cxx | 46 ++
 src/event.h   | 21 +++--
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 31429a9..9854f0c 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3065,6 +3065,31 @@ CEvent::IsHelpHide ()
   return bHide;
 }
 
+std::string
+CEvent::GetMusicLocation (Sint32 music)
+{
+  static const std::string exts[] = {"ogg", "mid"};
+  static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
+  std::string  absolute;
+
+  // Look for music in the user directory, then in the game directory.
+  for (size_t i = 0; i < countof (locs); ++i)
+  {
+auto filename = string_format (
+  "music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 1 : 0].c_str ());
+if (!FileExists (filename, absolute, locs[i]))
+  filename = string_format (
+"music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 0 : 1].c_str ());
+
+if (FileExists (filename, absolute, locs[i]))
+  break;
+
+absolute = "";
+  }
+
+  return absolute;
+}
+
 /**
  * \brief Change the phase.
  *
@@ -3374,26 +3399,7 @@ CEvent::ChangePhase (Uint32 phase)
   music = m_pDecor->GetMusic ();
   if (music > 0)
   {
-static const std::string exts[] = {"ogg", "mid"};
-static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
-std::string  absolute;
-
-// Look for music in the user directory, then in the game directory.
-for (size_t i = 0; i < countof (locs); ++i)
-{
-  filename = string_format (
-"music/music%.3d.%s", music - 1,
-exts[g_restoreMidi ? 1 : 0].c_str ());
-  if (!FileExists (filename, absolute, locs[i]))
-filename = string_format (
-  "music/music%.3d.%s", music - 1,
-  exts[g_restoreMidi ? 0 : 1].c_str ());
-
-  if (FileExists (filename, absolute, locs[i]))
-break;
-
-  absolute = "";
-}
+auto absolute = this->GetMusicLocation (music);
 
 m_pSound->StopMusic ();
 m_pSound->PlayMusic (absolute);
diff --git a/src/event.h b/src/event.h
index 4f16e91..73fe2d5 100644
--- a/src/event.h
+++ b/src/event.h
@@ -94,16 +94,17 @@ public:
 
   Point GetMousePos ();
   void
- Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * 
pMovie);
-  void   SetFullScreen (bool bFullScreen);
-  Sint32 GetWorld ();
-  Sint32 GetPhysicalWorld ();
-  Sint32 GetImageWorld ();
-  bool   IsHelpHide ();
-  bool   ChangePhase (Uint32 phase);
-  bool   MovieToStart ();
-  Uint32 GetPhase ();
-  void   TryInsert ();
+  Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, 
CMovie * pMovie);
+  voidSetFullScreen (bool bFullScreen);
+  Sint32  GetWorld ();
+  Sint32  GetPhysicalWorld ();
+  Sint32  GetImageWorld ();
+  boolIsHelpHide ();
+  std::string GetMusicLocation (Sint32 music);
+  boolChangePhase (Uint32 phase);
+  boolMovieToStart ();
+  Uint32  GetPhase ();
+  voidTryInsert ();
 
   Sint32 GetButtonIndex (Sint32 button);
   Sint32 GetState (Sint32 button);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 02/05: Move the code to retrieve the music in a dedicated method

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to annotated tag debian/1.12.1-22-g13a7e27-3
in repository planetblupi.

commit c2db10c29276a6bdab67c64cc290a6347b35a9b5
Author: Mathieu Schroeter 
Date:   Wed Jan 31 06:50:56 2018 +0100

Move the code to retrieve the music in a dedicated method
---
 src/event.cxx | 46 ++
 src/event.h   | 21 +++--
 2 files changed, 37 insertions(+), 30 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 31429a9..9854f0c 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3065,6 +3065,31 @@ CEvent::IsHelpHide ()
   return bHide;
 }
 
+std::string
+CEvent::GetMusicLocation (Sint32 music)
+{
+  static const std::string exts[] = {"ogg", "mid"};
+  static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
+  std::string  absolute;
+
+  // Look for music in the user directory, then in the game directory.
+  for (size_t i = 0; i < countof (locs); ++i)
+  {
+auto filename = string_format (
+  "music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 1 : 0].c_str ());
+if (!FileExists (filename, absolute, locs[i]))
+  filename = string_format (
+"music/music%.3d.%s", music - 1, exts[g_restoreMidi ? 0 : 1].c_str ());
+
+if (FileExists (filename, absolute, locs[i]))
+  break;
+
+absolute = "";
+  }
+
+  return absolute;
+}
+
 /**
  * \brief Change the phase.
  *
@@ -3374,26 +3399,7 @@ CEvent::ChangePhase (Uint32 phase)
   music = m_pDecor->GetMusic ();
   if (music > 0)
   {
-static const std::string exts[] = {"ogg", "mid"};
-static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
-std::string  absolute;
-
-// Look for music in the user directory, then in the game directory.
-for (size_t i = 0; i < countof (locs); ++i)
-{
-  filename = string_format (
-"music/music%.3d.%s", music - 1,
-exts[g_restoreMidi ? 1 : 0].c_str ());
-  if (!FileExists (filename, absolute, locs[i]))
-filename = string_format (
-  "music/music%.3d.%s", music - 1,
-  exts[g_restoreMidi ? 0 : 1].c_str ());
-
-  if (FileExists (filename, absolute, locs[i]))
-break;
-
-  absolute = "";
-}
+auto absolute = this->GetMusicLocation (music);
 
 m_pSound->StopMusic ();
 m_pSound->PlayMusic (absolute);
diff --git a/src/event.h b/src/event.h
index 4f16e91..73fe2d5 100644
--- a/src/event.h
+++ b/src/event.h
@@ -94,16 +94,17 @@ public:
 
   Point GetMousePos ();
   void
- Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, CMovie * 
pMovie);
-  void   SetFullScreen (bool bFullScreen);
-  Sint32 GetWorld ();
-  Sint32 GetPhysicalWorld ();
-  Sint32 GetImageWorld ();
-  bool   IsHelpHide ();
-  bool   ChangePhase (Uint32 phase);
-  bool   MovieToStart ();
-  Uint32 GetPhase ();
-  void   TryInsert ();
+  Create (CPixmap * pPixmap, CDecor * pDecor, CSound * pSound, 
CMovie * pMovie);
+  voidSetFullScreen (bool bFullScreen);
+  Sint32  GetWorld ();
+  Sint32  GetPhysicalWorld ();
+  Sint32  GetImageWorld ();
+  boolIsHelpHide ();
+  std::string GetMusicLocation (Sint32 music);
+  boolChangePhase (Uint32 phase);
+  boolMovieToStart ();
+  Uint32  GetPhase ();
+  voidTryInsert ();
 
   Sint32 GetButtonIndex (Sint32 button);
   Sint32 GetState (Sint32 button);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 01/05: Fix git-dpm

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to annotated tag debian/1.12.1-22-g13a7e27-3
in repository planetblupi.

commit f2d93e1b05a855d7616e13a1f85506e1a65079b8
Author: Didier Raboud <o...@debian.org>
Date:   Fri Feb 2 19:11:09 2018 +0100

Fix git-dpm
---
 debian/.git-dpm | 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
index 2637300..bd3ade5 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,8 +1,8 @@
 # see git-dpm(1) from git-dpm package
-222113a3435624018122c62cf9bf76cac6885b96
-222113a3435624018122c62cf9bf76cac6885b96
-222113a3435624018122c62cf9bf76cac6885b96
-222113a3435624018122c62cf9bf76cac6885b96
-planetblupi_1.12.0-16-g222113a.orig.tar.xz
-f22390db2544e6555423c441d85b914fbe8679ce
-23152920
+13a7e27133bfb0ceb5c4df8a377354c580bf3b01
+13a7e27133bfb0ceb5c4df8a377354c580bf3b01
+13a7e27133bfb0ceb5c4df8a377354c580bf3b01
+13a7e27133bfb0ceb5c4df8a377354c580bf3b01
+planetblupi_1.12.1-22-g13a7e27.orig.tar.xz
+af499e148a32d28bb1f8e1f1620c1f5bc362dd49
+83827908

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 03/05: Enable only music choices accordingly to the available formats

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to annotated tag debian/1.12.1-22-g13a7e27-3
in repository planetblupi.

commit 3baa931c68cc55464f545163b4f8c4f6f9537f40
Author: Mathieu Schroeter 
Date:   Wed Jan 31 07:32:33 2018 +0100

Enable only music choices accordingly to the available formats

It fixes OdyX need #47.
---
 src/event.cxx | 19 ---
 src/event.h   |  1 +
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 9854f0c..ad7876b 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -2075,6 +2075,10 @@ CEvent::DrawButtons ()
 SetEnable (EV_BUTTON10, bEnable);
   }
 
+  /* Check if both music formats are available */
+  auto ogg = this->IsBaseMusicAvailable (1, "ogg");
+  auto mid = this->IsBaseMusicAvailable (1, "mid");
+
   if (m_phase == EV_PHASE_SETTINGS)
   {
 SetEnable (EV_BUTTON1, m_Lang != m_Languages.begin ());
@@ -2086,8 +2090,8 @@ CEvent::DrawButtons ()
 SetEnable (EV_BUTTON5, !g_bFullScreen && g_zoom > 1);
 SetEnable (EV_BUTTON6, !g_bFullScreen && g_zoom < 2);
 
-SetEnable (EV_BUTTON7, g_restoreMidi);
-SetEnable (EV_BUTTON8, !g_restoreMidi);
+SetEnable (EV_BUTTON7, g_restoreMidi && mid && ogg);
+SetEnable (EV_BUTTON8, !g_restoreMidi && mid && ogg);
   }
 
   assert (m_index >= 0);
@@ -2577,7 +2581,7 @@ CEvent::DrawButtons ()
   DrawText (m_pPixmap, pos, res);
 }
 
-text  = g_restoreMidi ? gettext ("Midi") : gettext ("Ogg");
+text  = (g_restoreMidi && mid) || !ogg ? gettext ("Midi") : gettext 
("Ogg");
 lg= GetTextWidth (text);
 pos.x = (399 + 40) - lg / 2;
 pos.y = 330 - 20;
@@ -3065,6 +3069,15 @@ CEvent::IsHelpHide ()
   return bHide;
 }
 
+bool
+CEvent::IsBaseMusicAvailable (Sint32 music, const std::string & format)
+{
+  std::string absolute;
+  autofilename =
+string_format ("music/music%.3d.%s", music - 1, format.c_str ());
+  return FileExists (filename, absolute, LOCATION_BASE);
+}
+
 std::string
 CEvent::GetMusicLocation (Sint32 music)
 {
diff --git a/src/event.h b/src/event.h
index 73fe2d5..d31a532 100644
--- a/src/event.h
+++ b/src/event.h
@@ -100,6 +100,7 @@ public:
   Sint32  GetPhysicalWorld ();
   Sint32  GetImageWorld ();
   boolIsHelpHide ();
+  boolIsBaseMusicAvailable (Sint32 music, const std::string & format);
   std::string GetMusicLocation (Sint32 music);
   boolChangePhase (Uint32 phase);
   boolMovieToStart ();

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 05/05: planetblupi 1.12.1-22-g13a7e27-3 Debian release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to annotated tag debian/1.12.1-22-g13a7e27-3
in repository planetblupi.

commit 1d6738f56e568bcbacdd92c80eb841873b6a9be1
Author: Didier Raboud <o...@debian.org>
Date:   Fri Feb 2 19:13:04 2018 +0100

planetblupi 1.12.1-22-g13a7e27-3 Debian release
---
 debian/changelog | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 3e2b497..f02d71e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+planetblupi (1.12.1-22-g13a7e27-3) unstable; urgency=medium
+
+  * Cherry-pick two upstream fixes to only allow music format choices
+amongst those available
+
+ -- Didier Raboud <o...@debian.org>  Fri, 02 Feb 2018 19:13:04 +0100
+
 planetblupi (1.12.1-22-g13a7e27-2) unstable; urgency=medium
 
   * Add missing Replaces/Breaks in the two new packages

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch debian/master updated (48aa2bb -> 1d6738f)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch debian/master
in repository planetblupi.

  from  48aa2bb   planetblupi 1.12.1-22-g13a7e27-2 Debian release
  adds  f2d93e1   Fix git-dpm
  adds  c2db10c   Move the code to retrieve the music in a dedicated method
  adds  3baa931   Enable only music choices accordingly to the available 
formats
  adds  1412e87   merge patched-debian/master into debian/master
  adds  1d6738f   planetblupi 1.12.1-22-g13a7e27-3 Debian release

No new revisions were added by this update.

Summary of changes:
 debian/.git-dpm|  14 +--
 debian/changelog   |   7 ++
 ...de-to-retrieve-the-music-in-a-dedicated-m.patch | 106 +
 ...-music-choices-accordingly-to-the-availab.patch |  74 ++
 debian/patches/series  |   2 +
 src/event.cxx  |  65 -
 src/event.h|  22 +++--
 7 files changed, 250 insertions(+), 40 deletions(-)
 create mode 100644 
debian/patches/0001-Move-the-code-to-retrieve-the-music-in-a-dedicated-m.patch
 create mode 100644 
debian/patches/0002-Enable-only-music-choices-accordingly-to-the-availab.patch
 create mode 100644 debian/patches/series

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch upstream/latest updated (5c92d14 -> 13a7e27)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch upstream/latest
in repository planetblupi.

  from  5c92d14   Add missing lib in the main LICENSE file
  adds  a058da1   Move the function to test if a file exists in misc
  adds  d2bfd12   Restore midi playback support and add --restore-midi cli 
argument
  adds  67ea4d0   Look music for user dir, fallback to the game dir
  adds  648233b   Add more info about music possibilities in the user README
  adds  54d7eec   Add a way to change the driver used by the accelerated 
renderer
  adds  6237cfd   Add the restoremidi option with the config.json file
  adds  14836df   Remove stupid code
  adds  3f505a0   Update the USER readme
  adds  c6fbe15   Fix Windows user files location
  adds  da3d683   Add a global settings entry for switching between ogg and 
midi music
  adds  352fab5   Bump patch version
  adds  a2904a9   Use the new main setup screen image
  adds  bbe262c   Fix cdrom position in setup screen
  adds  2ac9f73   Exit immediatly on error with the cli parser
  adds  f97d1c3   Check that the zoom (-z) is in the range
  adds  1db67ed   Save the window zoom and fullscreen settings in the user 
preferences
  adds  d27aaf4   Cosmetic: remove stupid comment
  adds  dc8f631   Cosmetic: rename windowScale to zoom
  adds  82cbcc3   Change and add missing fr translations
  adds  9543ebb   Add support for all drivers (renderers)
  adds  13a7e27   Update README-user.md

No new revisions were added by this update.

Summary of changes:
 CMakeLists.txt   |   2 +-
 README-user.md   |  44 +++--
 resources/image/setup00.png  | Bin 217338 -> 209119 bytes
 resources/music/music000.mid | Bin 0 -> 131400 bytes
 resources/music/music001.mid | Bin 0 -> 150115 bytes
 resources/music/music002.mid | Bin 0 -> 160403 bytes
 resources/music/music003.mid | Bin 0 -> 90444 bytes
 resources/music/music004.mid | Bin 0 -> 91458 bytes
 resources/music/music005.mid | Bin 0 -> 184644 bytes
 resources/music/music006.mid | Bin 0 -> 97149 bytes
 resources/music/music007.mid | Bin 0 -> 151127 bytes
 resources/music/music008.mid | Bin 0 -> 139355 bytes
 resources/music/music009.mid | Bin 0 -> 191817 bytes
 resources/po/de.po   |  21 ++-
 resources/po/en_US.po|  19 +-
 resources/po/fr.po   |  24 +++-
 resources/po/it.po   |  21 ++-
 resources/po/pl.po   |  21 ++-
 resources/po/planetblupi.pot |  19 +-
 src/blupi.cxx|  89 +++
 src/blupi.h  |  14 +
 src/event.cxx| 143 +--
 src/event.h  |   7 +--
 src/menu.cxx |   4 +-
 src/misc.cxx |  30 +
 src/misc.h   |   5 ++
 src/movie.cxx|  16 -
 src/sound.cxx|   9 ++-
 28 files changed, 372 insertions(+), 116 deletions(-)
 create mode 100644 resources/music/music000.mid
 create mode 100644 resources/music/music001.mid
 create mode 100644 resources/music/music002.mid
 create mode 100644 resources/music/music003.mid
 create mode 100644 resources/music/music004.mid
 create mode 100644 resources/music/music005.mid
 create mode 100644 resources/music/music006.mid
 create mode 100644 resources/music/music007.mid
 create mode 100644 resources/music/music008.mid
 create mode 100644 resources/music/music009.mid

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] annotated tag debian/1.12.1-22-g13a7e27-1 created (now c4d5fa9)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to annotated tag debian/1.12.1-22-g13a7e27-1
in repository planetblupi.

at  c4d5fa9   (tag)
   tagging  1b114f129094fc12d37852fbdead7fe91513a760 (commit)
  replaces  debian/1.12.0-16-g222113a-1
 tagged by  Didier Raboud
on  Sun Dec 31 14:41:26 2017 +0100

- Log -
planetblupi 1.12.1-22-g13a7e27-1 Debian release
-BEGIN PGP SIGNATURE-

iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlpLRr0ACgkQi8+nHsoW
NFXi7wv/aRswN9gW/aqDme2x/YxWiqUVe3G3SLH0+nTO3Bs1nU/XytpK2M/zVH7M
Hmt1WVybOUqGtzi6P1C4h8x3Pkic/ldOHbXhKonpr32qRstl547WMBm0nj2PyCL6
8fKiplndX5TZ1Qga2U3BDujKZID73QqsIH2Y+b6i1MBbXXBHLBtATGv+OA3Jq1hS
lIVJOM5bQvWtcvMVwEL2/bh5XmdRQTGiM6Morvl93LzlQFp+bFz2EOlzPPh6+82w
8oVN98BmZd4uZvwtOahSBXDJCWjE4BFhTAYWFkYQMkECynLFc/+OWbLAcV8aA0kp
WFkj1SI4vZ0KXb9hQgQ9cZi9gIy8GQztnlUwKN25DH4axWjjij5KRaRyCP4hNyZG
/Uclst20VRu8q//sPvrtoyXYBCzle0/pvp13woMxjm/u30GKcBkR1fuO0RsB6Xes
ZGqLH71uq/nETa924awRhNXjL49ZhfLHEw7gov/NdPbm15TgDJNyTGjWOHhwpykg
hTEQ4X4b
=Cpig
-END PGP SIGNATURE-

Didier Raboud (4):
  Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master
  Convert the .mid's to .ogg's using timidity and timgm6mb-soundfont
  Split data package in -music-mid and -music-ogg alternatives
  planetblupi 1.12.1-22-g13a7e27-1 Debian release

Mathieu Schroeter (25):
  Use ogg music files instead of midi
  Add link on libvorbis
  Add licenses of new lib (especially for ogg playing)
  Add missing lib in the main LICENSE file
  Move the function to test if a file exists in misc
  Restore midi playback support and add --restore-midi cli argument
  Look music for user dir, fallback to the game dir
  Add more info about music possibilities in the user README
  Add a way to change the driver used by the accelerated renderer
  Add the restoremidi option with the config.json file
  Remove stupid code
  Update the USER readme
  Fix Windows user files location
  Add a global settings entry for switching between ogg and midi music
  Bump patch version
  Use the new main setup screen image
  Fix cdrom position in setup screen
  Exit immediatly on error with the cli parser
  Check that the zoom (-z) is in the range
  Save the window zoom and fullscreen settings in the user preferences
  Cosmetic: remove stupid comment
  Cosmetic: rename windowScale to zoom
  Change and add missing fr translations
  Add support for all drivers (renderers)
  Update README-user.md

---

No new revisions were added by this update.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 23/29: Convert the .mid's to .ogg's using timidity and timgm6mb-soundfont

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 84010fa4cbbcf603450454f58f4549458007d6cb
Author: Didier Raboud <o...@debian.org>
Date:   Fri Dec 22 19:16:18 2017 +0100

Convert the .mid's to .ogg's using timidity and timgm6mb-soundfont
---
 debian/control | 3 +++
 debian/rules   | 5 +
 2 files changed, 8 insertions(+)

diff --git a/debian/control b/debian/control
index c3a9d14..8d2be34 100644
--- a/debian/control
+++ b/debian/control
@@ -12,6 +12,9 @@ Build-Depends:
  libsdl2-mixer-dev,
  libsdl-kitchensink-dev,
  argagg-dev,
+Build-Depends-Indep:
+ timidity,
+ timgm6mb-soundfont,
 Standards-Version: 4.1.1
 Rules-Requires-Root: no
 Homepage: http://blupi.org
diff --git a/debian/rules b/debian/rules
index 61983c6..4081dea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,3 +5,8 @@
 
 override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_INSTALL_BINDIR=games
+
+override_dh_auto_build-indep:
+   dh_auto_build -i
+   # Convert the .mid's to .ogg
+   timidity -c /etc/timidity/timgm6mb.cfg -Ov resources/music/music*.mid

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] tag upstream/1.12.1-22-g13a7e27 created (now 13a7e27)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to tag upstream/1.12.1-22-g13a7e27
in repository planetblupi.

at  13a7e27   (commit)
This tag includes the following new commits:

   new  a058da1   Move the function to test if a file exists in misc
   new  d2bfd12   Restore midi playback support and add --restore-midi cli 
argument
   new  67ea4d0   Look music for user dir, fallback to the game dir
   new  648233b   Add more info about music possibilities in the user README
   new  54d7eec   Add a way to change the driver used by the accelerated 
renderer
   new  6237cfd   Add the restoremidi option with the config.json file
   new  14836df   Remove stupid code
   new  3f505a0   Update the USER readme
   new  c6fbe15   Fix Windows user files location
   new  da3d683   Add a global settings entry for switching between ogg and 
midi music
   new  352fab5   Bump patch version
   new  a2904a9   Use the new main setup screen image
   new  bbe262c   Fix cdrom position in setup screen
   new  2ac9f73   Exit immediatly on error with the cli parser
   new  f97d1c3   Check that the zoom (-z) is in the range
   new  1db67ed   Save the window zoom and fullscreen settings in the user 
preferences
   new  d27aaf4   Cosmetic: remove stupid comment
   new  dc8f631   Cosmetic: rename windowScale to zoom
   new  82cbcc3   Change and add missing fr translations
   new  9543ebb   Add support for all drivers (renderers)
   new  13a7e27   Update README-user.md

The 21 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 19/29: Change and add missing fr translations

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 82cbcc361113ab8c1f7cf9fedaa70c2ed17e6351
Author: Mathieu Schroeter 
Date:   Thu Dec 14 23:17:24 2017 +0100

Change and add missing fr translations
---
 resources/po/de.po   | 18 +-
 resources/po/en_US.po|  8 
 resources/po/fr.po   | 25 ++---
 resources/po/it.po   | 18 +-
 resources/po/pl.po   | 18 +-
 resources/po/planetblupi.pot |  4 ++--
 src/event.cxx|  2 +-
 7 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/resources/po/de.po b/resources/po/de.po
index 36a4f44..2a07b3e 100644
--- a/resources/po/de.po
+++ b/resources/po/de.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 23:45+0100\n"
-"PO-Revision-Date: 2017-12-07 17:36+0100\n"
+"POT-Creation-Date: 2017-12-14 23:13+0100\n"
+"PO-Revision-Date: 2017-12-14 23:15+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: de\n"
@@ -284,16 +284,16 @@ msgstr "Steine bearbeiten"
 
 msgid ""
 "Change the\n"
-"music format"
-msgstr ""
-
-msgid ""
-"Change the\n"
 "window size"
 msgstr ""
 "Fentergrösse\n"
 "anpassen"
 
+msgid ""
+"Choose the\n"
+"music format"
+msgstr ""
+
 msgid "Construct this game"
 msgstr "Diese Mission konstruieren"
 
@@ -532,7 +532,7 @@ msgid "Medical potion"
 msgstr "Medikament"
 
 msgid "Midi"
-msgstr ""
+msgstr "Midi"
 
 msgid "Mine"
 msgstr "Bergwerk"
@@ -639,7 +639,7 @@ msgid "Occupied ground"
 msgstr "Untergrund schon besetzt"
 
 msgid "Ogg"
-msgstr ""
+msgstr "Ogg"
 
 msgid "Open another game"
 msgstr "Gespeicherte Mission öffnen"
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index 410b94d..3fc0705 100644
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 23:45+0100\n"
+"POT-Creation-Date: 2017-12-14 23:13+0100\n"
 "PO-Revision-Date: 2017-02-27 21:28+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -240,12 +240,12 @@ msgstr ""
 
 msgid ""
 "Change the\n"
-"music format"
+"window size"
 msgstr ""
 
 msgid ""
-"Change the\n"
-"window size"
+"Choose the\n"
+"music format"
 msgstr ""
 
 msgid "Construct this game"
diff --git a/resources/po/fr.po b/resources/po/fr.po
index 45d3485..77eddb1 100644
--- a/resources/po/fr.po
+++ b/resources/po/fr.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 23:45+0100\n"
-"PO-Revision-Date: 2017-12-07 17:37+0100\n"
+"POT-Creation-Date: 2017-12-14 23:13+0100\n"
+"PO-Revision-Date: 2017-12-14 23:14+0100\n"
 "Last-Translator: Mathieu Schroeter \n"
 "Language-Team: French \n"
 "Language: fr\n"
@@ -282,16 +282,19 @@ msgstr "Taille des rochers"
 
 msgid ""
 "Change the\n"
-"music format"
-msgstr ""
-
-msgid ""
-"Change the\n"
 "window size"
 msgstr ""
 "Modifie la taille\n"
 "de la fenêtre"
 
+msgid ""
+"Choose the\n"
+"music format"
+msgstr ""
+"Choisi le\n"
+"format de\n"
+"la musique"
+
 msgid "Construct this game"
 msgstr "Construire cette partie"
 
@@ -527,7 +530,7 @@ msgid "Medical potion"
 msgstr "Potion"
 
 msgid "Midi"
-msgstr ""
+msgstr "Midi"
 
 msgid "Mine"
 msgstr "Mine de fer"
@@ -634,7 +637,7 @@ msgid "Occupied ground"
 msgstr "Terrain occupé"
 
 msgid "Ogg"
-msgstr ""
+msgstr "Ogg"
 
 msgid "Open another game"
 msgstr "Ouvrir une autre partie"
@@ -847,10 +850,10 @@ msgid "Tree trunks"
 msgstr "Troncs"
 
 msgid "Use Midi music (original)"
-msgstr ""
+msgstr "Utilise la musique Midi (originale)"
 
 msgid "Use Ogg music"
-msgstr ""
+msgstr "Utilise la musique Ogg"
 
 msgid "Version"
 msgstr "Version"
diff --git a/resources/po/it.po b/resources/po/it.po
index b8d9c19..ed2cd8b 100644
--- a/resources/po/it.po
+++ b/resources/po/it.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-12 23:45+0100\n"
-"PO-Revision-Date: 2017-12-07 17:38+0100\n"
+"POT-Creation-Date: 2017-12-14 23:13+0100\n"
+"PO-Revision-Date: 2017-12-14 23:15+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: it\n"
@@ -282,17 +282,17 @@ msgstr "Spacca delle roccie"
 
 msgid ""
 "Change the\n"
-"music format"
-msgstr ""
-
-msgid ""
-"Change the\n"
 "window size"
 msgstr ""
 "Cambiare la\n"
 "dimensione\n"
 "della finestra"
 
+msgid ""
+"Choose the\n"
+"music format"
+msgstr ""
+
 msgid "Construct this game"
 msgstr "Costruire questa partita"
 
@@ -530,7 +530,7 @@ msgid "Medical potion"
 msgstr "Pozione"
 
 msgid "Midi"
-msgstr ""
+msgstr "Midi"
 
 msgid "Mine"
 msgstr "Miniera"
@@ -637,7 +637,7 @@ msgid "Occupied ground"
 msgstr "Terreno occupato"
 
 msgid "Ogg"
-msgstr ""
+msgstr "Ogg"
 
 msgid 

[planetblupi] 29/29: planetblupi 1.12.1-22-g13a7e27-2 Debian release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 48aa2bb0f4bbd1d7b5c4fbb59ac6fe33d6cc8e97
Author: Didier Raboud <o...@debian.org>
Date:   Mon Jan 1 10:41:23 2018 +0100

planetblupi 1.12.1-22-g13a7e27-2 Debian release
---
 debian/changelog | 8 
 1 file changed, 8 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 135bc7e..3e2b497 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+planetblupi (1.12.1-22-g13a7e27-2) unstable; urgency=medium
+
+  * Add missing Replaces/Breaks in the two new packages
+  * Pipe timidity to sox for encoding to ogg
+  * Bump S-V to 4.1.3 without changes needed
+
+ -- Didier Raboud <o...@debian.org>  Mon, 01 Jan 2018 10:41:23 +0100
+
 planetblupi (1.12.1-22-g13a7e27-1) unstable; urgency=medium
 
   * New pre-1.12.2 snapshot; MIDI files are restored, no release yet

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 26/29: Add missing Replaces/Breaks in the two new packages

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 39fdadb4d987463e2b0ef0e2bb7071c73892f3cf
Author: Didier Raboud <o...@debian.org>
Date:   Mon Jan 1 10:08:44 2018 +0100

Add missing Replaces/Breaks in the two new packages
---
 debian/control | 4 
 1 file changed, 4 insertions(+)

diff --git a/debian/control b/debian/control
index 58f5967..5fb9fe3 100644
--- a/debian/control
+++ b/debian/control
@@ -51,6 +51,8 @@ Multi-Arch: foreign
 Depends: ${misc:Depends}
 Enhances: planetblupi
 Recommends: planetblupi (>= ${source:Version})
+Replaces: planetblupi-common (<< 1.12.1-22-g13a7e27-1)
+Breaks: planetblupi-common (<< 1.12.1-22-g13a7e27-1)
 Description: Planet Blupi - A delirious spell-binding game - Ogg music
  Planet Blupi is a strategy and adventure game. It subtly blends action with
  thought-provoking challenges. Behind the quiet and gentle facade, you'll enjoy
@@ -66,6 +68,8 @@ Depends: ${misc:Depends},
 # ^ these are libfluidsynth's suggests
 Enhances: planetblupi
 Recommends: planetblupi (>= ${source:Version})
+Replaces: planetblupi-common (<< 1.12.1-22-g13a7e27-1)
+Breaks: planetblupi-common (<< 1.12.1-22-g13a7e27-1)
 Description: Planet Blupi - A delirious spell-binding game - MIDI music
  Planet Blupi is a strategy and adventure game. It subtly blends action with
  thought-provoking challenges. Behind the quiet and gentle facade, you'll enjoy

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 13/29: Fix cdrom position in setup screen

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit bbe262c3bc6734fb010627ee6c3f12af6bfa8782
Author: Mathieu Schroeter 
Date:   Wed Dec 13 19:29:05 2017 +0100

Fix cdrom position in setup screen
---
 resources/image/setup00.png | Bin 210590 -> 209119 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/image/setup00.png b/resources/image/setup00.png
index 8ec47e7..2b2b43e 100644
Binary files a/resources/image/setup00.png and b/resources/image/setup00.png 
differ

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 28/29: Pipe timidity to sox for encoding to ogg

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 631f13f590a30329761779639f2c2fa2bc67723e
Author: Didier Raboud <o...@debian.org>
Date:   Mon Jan 1 10:28:40 2018 +0100

Pipe timidity to sox for encoding to ogg

This offers a finer control on the output quality (aka smaller files)

Also use Makefile syntax for more clarity.
---
 debian/control |  1 +
 debian/rules   | 16 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 33364db..68a2a69 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends:
  argagg-dev,
 Build-Depends-Indep:
  timidity,
+ sox,
  timgm6mb-soundfont,
 Standards-Version: 4.1.3
 Rules-Requires-Root: no
diff --git a/debian/rules b/debian/rules
index 4081dea..bf3f952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,17 @@
 override_dh_auto_configure:
dh_auto_configure -- -DCMAKE_INSTALL_BINDIR=games
 
-override_dh_auto_build-indep:
+midfiles := $(wildcard resources/music/music*.mid)
+oggfiles := $(midfiles:.mid=.ogg)
+
+override_dh_clean-indep:
+   dh_clean -i
+   # These are shipped in the source archive, let's rebuild them
+   rm -f $(oggfiles)
+
+override_dh_auto_build-indep: $(oggfiles)
dh_auto_build -i
-   # Convert the .mid's to .ogg
-   timidity -c /etc/timidity/timgm6mb.cfg -Ov resources/music/music*.mid
+
+resources/music/music%.ogg: resources/music/music%.mid
+   # Encode to ogg with "Quality=0" ~ 64 kB
+   timidity -c /etc/timidity/timgm6mb.cfg -Ow $< -o - | sox -t wav - -C0 $@

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 25/29: planetblupi 1.12.1-22-g13a7e27-1 Debian release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 1b114f129094fc12d37852fbdead7fe91513a760
Author: Didier Raboud <o...@debian.org>
Date:   Sun Dec 31 14:41:26 2017 +0100

planetblupi 1.12.1-22-g13a7e27-1 Debian release
---
 debian/changelog | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index ae1f446..135bc7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+planetblupi (1.12.1-22-g13a7e27-1) unstable; urgency=medium
+
+  * New pre-1.12.2 snapshot; MIDI files are restored, no release yet
+
+  * During build, convert the .mid's to .ogg's using timidity and
+timgm6mb-soundfont
+  * Split data package in -music-mid and -music-ogg alternatives
+
+ -- Didier Raboud <o...@debian.org>  Sun, 31 Dec 2017 14:41:26 +0100
+
 planetblupi (1.12.0-16-g222113a-1) unstable; urgency=medium
 
   * New pre-1.12.1 snapshot; just before the MIDI-to-Ogg conversion

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 16/29: Save the window zoom and fullscreen settings in the user preferences

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 1db67ed20012839628efba65d24ba0bee6cf449d
Author: Mathieu Schroeter 
Date:   Thu Dec 14 23:07:17 2017 +0100

Save the window zoom and fullscreen settings in the user preferences
---
 src/blupi.cxx | 16 ++-
 src/blupi.h   |  1 +
 src/event.cxx | 87 ---
 src/event.h   |  3 ---
 src/menu.cxx  |  3 +--
 5 files changed, 53 insertions(+), 57 deletions(-)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 515d38d..c516ff2 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -936,10 +936,6 @@ DoInit (int argc, char * argv[], bool & exit)
 return EXIT_FAILURE;
   }
 
-  // Load all cursors
-  g_pPixmap->LoadCursors (g_windowScale);
-  g_pPixmap->ChangeSprite (SPRITE_WAIT); // met le sablier maison
-
   // Create the sound manager.
   g_pSound = new CSound;
   if (g_pSound == nullptr)
@@ -981,10 +977,18 @@ DoInit (int argc, char * argv[], bool & exit)
 return EXIT_FAILURE;
   }
 
+  const bool zoom = g_windowScale;
+
   g_pEvent->Create (g_pPixmap, g_pDecor, g_pSound, g_pMovie);
+
+  // Load all cursors
+  g_pPixmap->LoadCursors (g_windowScale);
+  g_pPixmap->ChangeSprite (SPRITE_WAIT); // met le sablier maison
+
   g_updateThread = new std::thread (CheckForUpdates);
-  g_pEvent->SetFullScreen (g_bFullScreen);
-  if (!g_bFullScreen)
+  if (g_bFullScreen)
+g_pEvent->SetFullScreen (true);
+  if (!g_bFullScreen && zoom != g_windowScale)
 g_pEvent->SetWindowSize (g_windowScale);
   g_pEvent->ChangePhase (EV_PHASE_INTRO1);
 
diff --git a/src/blupi.h b/src/blupi.h
index 49d4363..54b7bd8 100644
--- a/src/blupi.h
+++ b/src/blupi.h
@@ -29,6 +29,7 @@
 extern SDL_Window *   g_window;
 extern SDL_Renderer * g_renderer;
 extern bool   g_bFullScreen;
+extern Uint8  g_windowScale;
 extern bool   g_restoreBugs;
 extern bool   g_restoreMidi;
 extern bool   g_enableRecorder;
diff --git a/src/event.cxx b/src/event.cxx
index 959e141..f8817bd 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -72,8 +72,10 @@ typedef struct {
   Sint16 language;
   // v1.2
   Sint16 musicMidi;
+  Sint16 fullScreen;
+  Sint16 zoom;
 
-  Sint16 reserve2[91];
+  Sint16 reserve2[89];
 } DescInfo;
 
 // Toutes les premières lettres doivent
@@ -1539,8 +1541,6 @@ CEvent::CEvent ()
 {
   Sint32 i;
 
-  m_bFullScreen = false;
-  m_WindowScale = 1;
   m_exercice= 0;
   m_mission = 0;
   m_private = 0;
@@ -1657,25 +1657,22 @@ CEvent::GetMousePos ()
 void
 CEvent::SetFullScreen (bool bFullScreen)
 {
-  if (bFullScreen == m_bFullScreen)
-return;
-
   int x, y;
   SDL_GetMouseState (, );
-  x /= m_WindowScale;
-  y /= m_WindowScale;
+  x /= g_windowScale;
+  y /= g_windowScale;
 
-  m_WindowScale = 1;
+  g_windowScale = 1;
   SDL_SetWindowSize (g_window, LXIMAGE, LYIMAGE);
 
-  m_bFullScreen = bFullScreen;
+  g_bFullScreen = bFullScreen;
   SDL_SetWindowFullscreen (g_window, bFullScreen ? SDL_WINDOW_FULLSCREEN : 0);
   SDL_SetWindowBordered (g_window, bFullScreen ? SDL_FALSE : SDL_TRUE);
   SDL_SetWindowGrab (g_window, bFullScreen ? SDL_TRUE : SDL_FALSE);
   SDL_SetWindowPosition (
 g_window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
 
-  m_pPixmap->LoadCursors (m_WindowScale);
+  m_pPixmap->LoadCursors (g_windowScale);
   m_pPixmap->ReloadTargetTextures ();
 
   /* Force this update before otherwise the coordinates retrieved with
@@ -1699,16 +1696,13 @@ CEvent::SetFullScreen (bool bFullScreen)
 void
 CEvent::SetWindowSize (Uint8 newScale)
 {
-  if (newScale == m_WindowScale)
-return;
-
-  auto scale= m_WindowScale;
-  m_WindowScale = newScale;
+  auto scale= g_windowScale;
+  g_windowScale = newScale;
   switch (newScale)
   {
   case 1:
   case 2:
-SetWindowSize (scale, m_WindowScale);
+SetWindowSize (scale, g_windowScale);
 break;
 
   default:
@@ -1748,12 +1742,6 @@ CEvent::SetWindowSize (Uint8 prevScale, Uint8 newScale)
   CEvent::PushUserEvent (EV_WARPMOUSE, coord);
 }
 
-Uint8
-CEvent::GetWindowScale ()
-{
-  return m_WindowScale;
-}
-
 // Crée le gestionnaire d'événements.
 
 void
@@ -2092,11 +2080,11 @@ CEvent::DrawButtons ()
 SetEnable (EV_BUTTON1, m_Lang != m_Languages.begin ());
 SetEnable (EV_BUTTON2, m_Lang != m_Languages.end () - 1);
 
-SetEnable (EV_BUTTON3, !m_bFullScreen);
-SetEnable (EV_BUTTON4, m_bFullScreen);
+SetEnable (EV_BUTTON3, !g_bFullScreen);
+SetEnable (EV_BUTTON4, g_bFullScreen);
 
-SetEnable (EV_BUTTON5, !m_bFullScreen && m_WindowScale > 1);
-SetEnable (EV_BUTTON6, !m_bFullScreen && m_WindowScale < 2);
+SetEnable (EV_BUTTON5, !g_bFullScreen && g_windowScale > 1);
+SetEnable (EV_BUTTON6, !g_bFullScreen && g_windowScale < 2);
 
 SetEnable (EV_BUTTON7, g_restoreMidi);
 SetEnable (EV_BUTTON8, !g_restoreMidi);
@@ -2574,15 +2562,15 @@ 

[planetblupi] 20/29: Add support for all drivers (renderers)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 9543ebb60fe516d5de4f6030e711ddb27d70efac
Author: Mathieu Schroeter 
Date:   Thu Dec 14 23:42:54 2017 +0100

Add support for all drivers (renderers)
---
 src/blupi.cxx | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 3833f70..71b57df 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -168,10 +169,10 @@ ReadConfig ()
 !(g_settingsOverload & SETTING_DRIVER) && j.find ("driver") != j.end () &&
 (!g_rendererType || g_rendererType == SDL_RENDERER_ACCELERATED))
   {
-if (j["driver"] == "direct3d")
-  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "direct3d");
-else if (j["driver"] == "opengl")
-  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "opengl");
+std::string input = j["driver"];
+if (std::regex_match (
+  input, std::regex ("direct3d|direct3d11|opengl|opengles2|opengles")))
+  SDL_SetHint (SDL_HINT_RENDER_DRIVER, input.c_str ());
   }
 
   if (
@@ -573,7 +574,8 @@ parseArgs (int argc, char * argv[], bool & exit)
   1},
  {"driver",
   {"-d", "--driver"},
-  "set a driver [auto;direct3d;opengl] (default: auto, ignored with "
+  "set a driver [auto;direct3d;direct3d11;opengl;opengles2;opengles] "
+  "(default: auto, ignored with "
   "software renderer)",
   1},
  {"enablerecorder",
@@ -661,10 +663,10 @@ parseArgs (int argc, char * argv[], bool & exit)
 args["driver"] &&
 (!g_rendererType || g_rendererType == SDL_RENDERER_ACCELERATED))
   {
-if (args["driver"].as () == "direct3d")
-  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "direct3d");
-else if (args["driver"].as () == "opengl")
-  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "opengl");
+std::string input = args["driver"].as ();
+if (std::regex_match (
+  input, std::regex ("direct3d|direct3d11|opengl|opengles2|opengles")))
+  SDL_SetHint (SDL_HINT_RENDER_DRIVER, input.c_str ());
 g_settingsOverload |= SETTING_DRIVER;
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 17/29: Cosmetic: remove stupid comment

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit d27aaf4b3ece293d6cddf5281f10dbb12b601d01
Author: Mathieu Schroeter 
Date:   Thu Dec 14 23:08:05 2017 +0100

Cosmetic: remove stupid comment
---
 src/blupi.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index c516ff2..0f13b6d 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -983,7 +983,7 @@ DoInit (int argc, char * argv[], bool & exit)
 
   // Load all cursors
   g_pPixmap->LoadCursors (g_windowScale);
-  g_pPixmap->ChangeSprite (SPRITE_WAIT); // met le sablier maison
+  g_pPixmap->ChangeSprite (SPRITE_WAIT);
 
   g_updateThread = new std::thread (CheckForUpdates);
   if (g_bFullScreen)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 27/29: Bump S-V to 4.1.3 without changes needed

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 7e69b93684dd52a6560a7fff6b7ade51135e6387
Author: Didier Raboud <o...@debian.org>
Date:   Mon Jan 1 10:08:56 2018 +0100

Bump S-V to 4.1.3 without changes needed
---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index 5fb9fe3..33364db 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Build-Depends:
 Build-Depends-Indep:
  timidity,
  timgm6mb-soundfont,
-Standards-Version: 4.1.1
+Standards-Version: 4.1.3
 Rules-Requires-Root: no
 Homepage: http://blupi.org
 Vcs-Git: https://alioth.debian.org/anonscm/git/pkg-games/planetblupi.git

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] annotated tag debian/1.12.1-22-g13a7e27-2 created (now a00d202)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to annotated tag debian/1.12.1-22-g13a7e27-2
in repository planetblupi.

at  a00d202   (tag)
   tagging  48aa2bb0f4bbd1d7b5c4fbb59ac6fe33d6cc8e97 (commit)
  replaces  debian/1.12.0-16-g222113a-1
 tagged by  Didier Raboud
on  Mon Jan 1 10:41:23 2018 +0100

- Log -
planetblupi 1.12.1-22-g13a7e27-2 Debian release
-BEGIN PGP SIGNATURE-

iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAlpLRMsACgkQi8+nHsoW
NFVT5Av8CQPpc9WCthfyYu3il6eWXOsqudlKY7mTdd1CB6ArPCIGHEHLftWL79jP
7QygV0kVexpsscjuRR7SnfIdbYOZkkMn/Tcjd8iR+iTQg5GSnqeyO1hv4xB9kpxr
WI0vJwr3IrabF/iZZR99PF5UxzAEi/5JUQ9M7S2/yAtVgWGRS2H7a/xO7eG81G/0
yxYyDyN5X1/sN7B5UWjPXs3lL2ZBx8QkmbECWGGxm5NYAIi2PAalAq6jZ3mBbwZ/
XxFJ4HfCfGkDuMWZbbWp+JtUIVCRvAgDaAwCEVJriZWHBiTOJv1N92KidErjGgsk
5KG8+AqQSijdW3pxMF0Swl5Q8vE98bk9aui2tyxyaWafNekMVaTjp/+nuORUew50
S4YhqpjEZNiEorxZhkRDdyJoHkIkhkiwZxKG7WhN2PrUGiZU3JIVPZMjsKN9BqJ7
uXJdE+kckjgSs9pPsg6H4jfXXrxAAgAGM8zYvRS7ZKHXYWBR1tk21oI7OY/bYVM6
6xHNjeAk
=139s
-END PGP SIGNATURE-

Didier Raboud (8):
  Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master
  Convert the .mid's to .ogg's using timidity and timgm6mb-soundfont
  Split data package in -music-mid and -music-ogg alternatives
  planetblupi 1.12.1-22-g13a7e27-1 Debian release
  Add missing Replaces/Breaks in the two new packages
  Bump S-V to 4.1.3 without changes needed
  Pipe timidity to sox for encoding to ogg
  planetblupi 1.12.1-22-g13a7e27-2 Debian release

Mathieu Schroeter (25):
  Use ogg music files instead of midi
  Add link on libvorbis
  Add licenses of new lib (especially for ogg playing)
  Add missing lib in the main LICENSE file
  Move the function to test if a file exists in misc
  Restore midi playback support and add --restore-midi cli argument
  Look music for user dir, fallback to the game dir
  Add more info about music possibilities in the user README
  Add a way to change the driver used by the accelerated renderer
  Add the restoremidi option with the config.json file
  Remove stupid code
  Update the USER readme
  Fix Windows user files location
  Add a global settings entry for switching between ogg and midi music
  Bump patch version
  Use the new main setup screen image
  Fix cdrom position in setup screen
  Exit immediatly on error with the cli parser
  Check that the zoom (-z) is in the range
  Save the window zoom and fullscreen settings in the user preferences
  Cosmetic: remove stupid comment
  Cosmetic: rename windowScale to zoom
  Change and add missing fr translations
  Add support for all drivers (renderers)
  Update README-user.md

---

This annotated tag includes the following new commits:

   new  a058da1   Move the function to test if a file exists in misc
   new  d2bfd12   Restore midi playback support and add --restore-midi cli 
argument
   new  67ea4d0   Look music for user dir, fallback to the game dir
   new  648233b   Add more info about music possibilities in the user README
   new  54d7eec   Add a way to change the driver used by the accelerated 
renderer
   new  6237cfd   Add the restoremidi option with the config.json file
   new  14836df   Remove stupid code
   new  3f505a0   Update the USER readme
   new  c6fbe15   Fix Windows user files location
   new  da3d683   Add a global settings entry for switching between ogg and 
midi music
   new  352fab5   Bump patch version
   new  a2904a9   Use the new main setup screen image
   new  bbe262c   Fix cdrom position in setup screen
   new  2ac9f73   Exit immediatly on error with the cli parser
   new  f97d1c3   Check that the zoom (-z) is in the range
   new  1db67ed   Save the window zoom and fullscreen settings in the user 
preferences
   new  d27aaf4   Cosmetic: remove stupid comment
   new  dc8f631   Cosmetic: rename windowScale to zoom
   new  82cbcc3   Change and add missing fr translations
   new  9543ebb   Add support for all drivers (renderers)
   new  13a7e27   Update README-user.md
   new  f76c9af   Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master
   new  84010fa   Convert the .mid's to .ogg's using timidity and 
timgm6mb-soundfont
   new  3740327   Split data package in -music-mid and -music-ogg 
alternatives
   new  1b114f1   planetblupi 1.12.1-22-g13a7e27-1 Debian release
   new  39fdadb   Add missing Replaces/Breaks in the two new packages
   new  7e69b93   Bump S-V to 4.1.3 without changes needed
   new  631f13f   Pipe timidity to sox for encoding to ogg
   new  48aa2bb   planetblupi 1.12.1-22-g13a7e27-2 Debian release

The 29 revisions listed above as "new" ar

[planetblupi] 24/29: Split data package in -music-mid and -music-ogg alternatives

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 3740327d6924a651ddf79a235de80dc5ec99ed83
Author: Didier Raboud <o...@debian.org>
Date:   Mon Dec 25 21:30:41 2017 +0100

Split data package in -music-mid and -music-ogg alternatives
---
 debian/control| 32 +++-
 debian/planetblupi-common.install |  5 -
 debian/planetblupi-music-midi.install |  1 +
 debian/planetblupi-music-ogg.install  |  1 +
 4 files changed, 37 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 8d2be34..58f5967 100644
--- a/debian/control
+++ b/debian/control
@@ -25,6 +25,7 @@ Package: planetblupi
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends},
  planetblupi-common (>= ${source:Version}),
+ planetblupi-music-ogg (>= ${source:Version}) | planetblupi-music-midi (>= 
${source:Version}),
 Description: Planet Blupi - A delirious spell-binding game
  Planet Blupi is a strategy and adventure game. It subtly blends action with
  thought-provoking challenges. Behind the quiet and gentle facade, you'll enjoy
@@ -33,7 +34,8 @@ Description: Planet Blupi - A delirious spell-binding game
 Package: planetblupi-common
 Architecture: all
 Multi-Arch: foreign
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
+Enhances: planetblupi
 Recommends:
  planetblupi (>= ${source:Version})
 Description: Planet Blupi - A delirious spell-binding game - data
@@ -42,3 +44,31 @@ Description: Planet Blupi - A delirious spell-binding game - 
data
  a fascinating diversion full of surprises.
  .
  This package contains the architecture-independent game data.
+
+Package: planetblupi-music-ogg
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Enhances: planetblupi
+Recommends: planetblupi (>= ${source:Version})
+Description: Planet Blupi - A delirious spell-binding game - Ogg music
+ Planet Blupi is a strategy and adventure game. It subtly blends action with
+ thought-provoking challenges. Behind the quiet and gentle facade, you'll enjoy
+ a fascinating diversion full of surprises.
+ .
+ This package contains the heavyweight OGG music.
+
+Package: planetblupi-music-midi
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends},
+ fluidr3mono-gm-soundfont | timgm6mb-soundfont | fluid-soundfont-gm,
+# ^ these are libfluidsynth's suggests
+Enhances: planetblupi
+Recommends: planetblupi (>= ${source:Version})
+Description: Planet Blupi - A delirious spell-binding game - MIDI music
+ Planet Blupi is a strategy and adventure game. It subtly blends action with
+ thought-provoking challenges. Behind the quiet and gentle facade, you'll enjoy
+ a fascinating diversion full of surprises.
+ .
+ This package contains the lightweight MIDI music
diff --git a/debian/planetblupi-common.install 
b/debian/planetblupi-common.install
index e6822c4..feb1ee5 100644
--- a/debian/planetblupi-common.install
+++ b/debian/planetblupi-common.install
@@ -1 +1,4 @@
-usr/share/planetblupi/
+usr/share/planetblupi/data/
+usr/share/planetblupi/image/
+usr/share/planetblupi/movie/
+usr/share/planetblupi/sound/
diff --git a/debian/planetblupi-music-midi.install 
b/debian/planetblupi-music-midi.install
new file mode 100644
index 000..ec85ac4
--- /dev/null
+++ b/debian/planetblupi-music-midi.install
@@ -0,0 +1 @@
+/usr/share/planetblupi/music/*.mid
diff --git a/debian/planetblupi-music-ogg.install 
b/debian/planetblupi-music-ogg.install
new file mode 100644
index 000..20c0d6e
--- /dev/null
+++ b/debian/planetblupi-music-ogg.install
@@ -0,0 +1 @@
+/usr/share/planetblupi/music/*.ogg

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 21/29: Update README-user.md

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 13a7e27133bfb0ceb5c4df8a377354c580bf3b01
Author: Mathieu Schroeter 
Date:   Fri Dec 15 17:02:07 2017 +0100

Update README-user.md
---
 README-user.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README-user.md b/README-user.md
index 519d65d..7543bd4 100644
--- a/README-user.md
+++ b/README-user.md
@@ -82,7 +82,8 @@ possible to enforce the MIDI variant by starting the game 
with the
 to lose some instruments, it depends of your system.
 
 > You can edit the `share/planetblupi/data/config.json` file and add an entry
-> `"restoremidi": true` too.
+> `"restoremidi": true`, or simply use the new settings available in the global
+> settings screen in the game.
 
 If you want, you can overload all musics with yours by providing OGG or MIDI
 music files in your user directory.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 22/29: Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit f76c9af19cddb942e88a818b61250787820eb1f2
Merge: 0a38b1c 13a7e27
Author: Didier Raboud <o...@debian.org>
Date:   Sun Dec 31 10:39:28 2017 +0100

Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master

 CMakeLists.txt   |   5 +-
 LICENSE  |   3 +
 LICENSE.all  | 239 +++
 README-user.md   |  44 +++-
 resources/image/setup00.png  | Bin 217338 -> 209119 bytes
 resources/music/music000.ogg | Bin 0 -> 12724663 bytes
 resources/music/music001.ogg | Bin 0 -> 12472314 bytes
 resources/music/music002.ogg | Bin 0 -> 12009171 bytes
 resources/music/music003.ogg | Bin 0 -> 9254922 bytes
 resources/music/music004.ogg | Bin 0 -> 4854247 bytes
 resources/music/music005.ogg | Bin 0 -> 4710862 bytes
 resources/music/music006.ogg | Bin 0 -> 4602855 bytes
 resources/music/music007.ogg | Bin 0 -> 4800059 bytes
 resources/music/music008.ogg | Bin 0 -> 4853980 bytes
 resources/music/music009.ogg | Bin 0 -> 4509020 bytes
 resources/po/de.po   |  29 +-
 resources/po/en_US.po|  25 -
 resources/po/fr.po   |  32 +-
 resources/po/it.po   |  29 +-
 resources/po/pl.po   |  31 +-
 resources/po/planetblupi.pot |  25 -
 src/blupi.cxx|  89 +++-
 src/blupi.h  |  14 +++
 src/event.cxx| 145 +-
 src/event.h  |   7 +-
 src/menu.cxx |   4 +-
 src/misc.cxx |  30 ++
 src/misc.h   |   5 +
 src/movie.cxx|  16 ---
 src/sound.cxx|   9 +-
 30 files changed, 660 insertions(+), 121 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 18/29: Cosmetic: rename windowScale to zoom

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit dc8f6319f0b73fad624ec63af22d80e28ca71c42
Author: Mathieu Schroeter 
Date:   Thu Dec 14 23:10:24 2017 +0100

Cosmetic: rename windowScale to zoom
---
 src/blupi.cxx | 22 +++---
 src/blupi.h   |  2 +-
 src/event.cxx | 43 +--
 src/event.h   |  4 ++--
 src/menu.cxx  |  3 +--
 5 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 0f13b6d..3833f70 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -63,7 +63,7 @@ std::thread * g_updateThread = nullptr;
 std::atomic g_updateAbort (false);
 
 boolg_bFullScreen= false; // false si mode de test
-Uint8   g_windowScale= 1;
+Uint8   g_zoom   = 1;
 Sint32  g_speedRate  = 1;
 Sint32  g_timerInterval  = 50; // inverval = 50ms
 int g_rendererType   = 0;
@@ -150,9 +150,9 @@ ReadConfig ()
 
   if (!(g_settingsOverload & SETTING_ZOOM) && j.find ("zoom") != j.end ())
   {
-g_windowScale = j["zoom"].get ();
-if (g_windowScale != 1 && g_windowScale != 2)
-  g_windowScale = 1;
+g_zoom = j["zoom"].get ();
+if (g_zoom != 1 && g_zoom != 2)
+  g_zoom = 1;
   }
 
   if (
@@ -640,9 +640,9 @@ parseArgs (int argc, char * argv[], bool & exit)
 
   if (args["zoom"])
   {
-g_windowScale = args["zoom"];
-if (g_windowScale != 1 && g_windowScale != 2)
-  g_windowScale = 1;
+g_zoom = args["zoom"];
+if (g_zoom != 1 && g_zoom != 2)
+  g_zoom = 1;
 g_settingsOverload |= SETTING_ZOOM;
   }
 
@@ -977,19 +977,19 @@ DoInit (int argc, char * argv[], bool & exit)
 return EXIT_FAILURE;
   }
 
-  const bool zoom = g_windowScale;
+  const bool zoom = g_zoom;
 
   g_pEvent->Create (g_pPixmap, g_pDecor, g_pSound, g_pMovie);
 
   // Load all cursors
-  g_pPixmap->LoadCursors (g_windowScale);
+  g_pPixmap->LoadCursors (g_zoom);
   g_pPixmap->ChangeSprite (SPRITE_WAIT);
 
   g_updateThread = new std::thread (CheckForUpdates);
   if (g_bFullScreen)
 g_pEvent->SetFullScreen (true);
-  if (!g_bFullScreen && zoom != g_windowScale)
-g_pEvent->SetWindowSize (g_windowScale);
+  if (!g_bFullScreen && zoom != g_zoom)
+g_pEvent->SetWindowSize (g_zoom);
   g_pEvent->ChangePhase (EV_PHASE_INTRO1);
 
   g_bTermInit = true;
diff --git a/src/blupi.h b/src/blupi.h
index 54b7bd8..950ea10 100644
--- a/src/blupi.h
+++ b/src/blupi.h
@@ -29,7 +29,7 @@
 extern SDL_Window *   g_window;
 extern SDL_Renderer * g_renderer;
 extern bool   g_bFullScreen;
-extern Uint8  g_windowScale;
+extern Uint8  g_zoom;
 extern bool   g_restoreBugs;
 extern bool   g_restoreMidi;
 extern bool   g_enableRecorder;
diff --git a/src/event.cxx b/src/event.cxx
index f8817bd..5eb01fc 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -1659,10 +1659,10 @@ CEvent::SetFullScreen (bool bFullScreen)
 {
   int x, y;
   SDL_GetMouseState (, );
-  x /= g_windowScale;
-  y /= g_windowScale;
+  x /= g_zoom;
+  y /= g_zoom;
 
-  g_windowScale = 1;
+  g_zoom = 1;
   SDL_SetWindowSize (g_window, LXIMAGE, LYIMAGE);
 
   g_bFullScreen = bFullScreen;
@@ -1672,7 +1672,7 @@ CEvent::SetFullScreen (bool bFullScreen)
   SDL_SetWindowPosition (
 g_window, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED);
 
-  m_pPixmap->LoadCursors (g_windowScale);
+  m_pPixmap->LoadCursors (g_zoom);
   m_pPixmap->ReloadTargetTextures ();
 
   /* Force this update before otherwise the coordinates retrieved with
@@ -1696,13 +1696,13 @@ CEvent::SetFullScreen (bool bFullScreen)
 void
 CEvent::SetWindowSize (Uint8 newScale)
 {
-  auto scale= g_windowScale;
-  g_windowScale = newScale;
+  auto scale = g_zoom;
+  g_zoom = newScale;
   switch (newScale)
   {
   case 1:
   case 2:
-SetWindowSize (scale, g_windowScale);
+SetWindowSize (scale, g_zoom);
 break;
 
   default:
@@ -2083,8 +2083,8 @@ CEvent::DrawButtons ()
 SetEnable (EV_BUTTON3, !g_bFullScreen);
 SetEnable (EV_BUTTON4, g_bFullScreen);
 
-SetEnable (EV_BUTTON5, !g_bFullScreen && g_windowScale > 1);
-SetEnable (EV_BUTTON6, !g_bFullScreen && g_windowScale < 2);
+SetEnable (EV_BUTTON5, !g_bFullScreen && g_zoom > 1);
+SetEnable (EV_BUTTON6, !g_bFullScreen && g_zoom < 2);
 
 SetEnable (EV_BUTTON7, g_restoreMidi);
 SetEnable (EV_BUTTON8, !g_restoreMidi);
@@ -2570,7 +2570,7 @@ CEvent::DrawButtons ()
 
 if (!g_bFullScreen)
 {
-  snprintf (res, sizeof (res), "%dx", g_windowScale);
+  snprintf (res, sizeof (res), "%dx", g_zoom);
   lg= GetTextWidth (res);
   pos.x = (284 + 40) - lg / 2;
   pos.y = 330 - 20;
@@ -4114,18 +4114,18 @@ CEvent::ChangeButtons (Sint32 message)
   break;
 case EV_BUTTON5:
 {
-  auto scale = g_windowScale;
-  if (g_windowScale > 1)
---g_windowScale;
-  SetWindowSize (scale, 

[planetblupi] 10/29: Add a global settings entry for switching between ogg and midi music

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit da3d683bf7a7e3276386d2be3a1e901ded9459f9
Author: Mathieu Schroeter 
Date:   Tue Dec 12 23:48:21 2017 +0100

Add a global settings entry for switching between ogg and midi music
---
 resources/po/de.po   | 19 ++-
 resources/po/en_US.po| 19 ++-
 resources/po/fr.po   | 19 ++-
 resources/po/it.po   | 19 ++-
 resources/po/pl.po   | 19 ++-
 resources/po/planetblupi.pot | 19 ++-
 src/blupi.cxx| 13 +
 src/blupi.h  | 12 
 src/event.cxx| 40 ++--
 9 files changed, 159 insertions(+), 20 deletions(-)

diff --git a/resources/po/de.po b/resources/po/de.po
index ef231f2..36a4f44 100644
--- a/resources/po/de.po
+++ b/resources/po/de.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-07 17:31+0100\n"
+"POT-Creation-Date: 2017-12-12 23:45+0100\n"
 "PO-Revision-Date: 2017-12-07 17:36+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -284,6 +284,11 @@ msgstr "Steine bearbeiten"
 
 msgid ""
 "Change the\n"
+"music format"
+msgstr ""
+
+msgid ""
+"Change the\n"
 "window size"
 msgstr ""
 "Fentergrösse\n"
@@ -526,6 +531,9 @@ msgstr "Roboterchef"
 msgid "Medical potion"
 msgstr "Medikament"
 
+msgid "Midi"
+msgstr ""
+
 msgid "Mine"
 msgstr "Bergwerk"
 
@@ -630,6 +638,9 @@ msgstr "Du kannst jetzt mit den Missionen beginnen."
 msgid "Occupied ground"
 msgstr "Untergrund schon besetzt"
 
+msgid "Ogg"
+msgstr ""
+
 msgid "Open another game"
 msgstr "Gespeicherte Mission öffnen"
 
@@ -845,6 +856,12 @@ msgstr "Bäume"
 msgid "Tree trunks"
 msgstr "Baumstämme"
 
+msgid "Use Midi music (original)"
+msgstr ""
+
+msgid "Use Ogg music"
+msgstr ""
+
 msgid "Version"
 msgstr "Version"
 
diff --git a/resources/po/en_US.po b/resources/po/en_US.po
index c6a5d74..410b94d 100644
--- a/resources/po/en_US.po
+++ b/resources/po/en_US.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-07 17:31+0100\n"
+"POT-Creation-Date: 2017-12-12 23:45+0100\n"
 "PO-Revision-Date: 2017-02-27 21:28+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -240,6 +240,11 @@ msgstr ""
 
 msgid ""
 "Change the\n"
+"music format"
+msgstr ""
+
+msgid ""
+"Change the\n"
 "window size"
 msgstr ""
 
@@ -471,6 +476,9 @@ msgstr ""
 msgid "Medical potion"
 msgstr ""
 
+msgid "Midi"
+msgstr ""
+
 msgid "Mine"
 msgstr ""
 
@@ -573,6 +581,9 @@ msgstr ""
 msgid "Occupied ground"
 msgstr ""
 
+msgid "Ogg"
+msgstr ""
+
 msgid "Open another game"
 msgstr ""
 
@@ -775,6 +786,12 @@ msgstr ""
 msgid "Tree trunks"
 msgstr ""
 
+msgid "Use Midi music (original)"
+msgstr ""
+
+msgid "Use Ogg music"
+msgstr ""
+
 msgid "Version"
 msgstr ""
 
diff --git a/resources/po/fr.po b/resources/po/fr.po
index 4406b82..45d3485 100644
--- a/resources/po/fr.po
+++ b/resources/po/fr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-07 17:31+0100\n"
+"POT-Creation-Date: 2017-12-12 23:45+0100\n"
 "PO-Revision-Date: 2017-12-07 17:37+0100\n"
 "Last-Translator: Mathieu Schroeter \n"
 "Language-Team: French \n"
@@ -282,6 +282,11 @@ msgstr "Taille des rochers"
 
 msgid ""
 "Change the\n"
+"music format"
+msgstr ""
+
+msgid ""
+"Change the\n"
 "window size"
 msgstr ""
 "Modifie la taille\n"
@@ -521,6 +526,9 @@ msgstr "Robot-maître"
 msgid "Medical potion"
 msgstr "Potion"
 
+msgid "Midi"
+msgstr ""
+
 msgid "Mine"
 msgstr "Mine de fer"
 
@@ -625,6 +633,9 @@ msgstr "Passe maintenant aux missions."
 msgid "Occupied ground"
 msgstr "Terrain occupé"
 
+msgid "Ogg"
+msgstr ""
+
 msgid "Open another game"
 msgstr "Ouvrir une autre partie"
 
@@ -835,6 +846,12 @@ msgstr "Arbres"
 msgid "Tree trunks"
 msgstr "Troncs"
 
+msgid "Use Midi music (original)"
+msgstr ""
+
+msgid "Use Ogg music"
+msgstr ""
+
 msgid "Version"
 msgstr "Version"
 
diff --git a/resources/po/it.po b/resources/po/it.po
index 63d1d19..b8d9c19 100644
--- a/resources/po/it.po
+++ b/resources/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-12-07 17:31+0100\n"
+"POT-Creation-Date: 2017-12-12 23:45+0100\n"
 "PO-Revision-Date: 2017-12-07 17:38+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -282,6 +282,11 @@ msgstr "Spacca delle roccie"
 
 msgid ""
 "Change the\n"
+"music format"
+msgstr ""
+
+msgid ""
+"Change the\n"
 "window size"
 msgstr ""
 "Cambiare la\n"
@@ -524,6 +529,9 @@ msgstr "Robot-capo"
 msgid "Medical potion"
 msgstr "Pozione"
 
+msgid "Midi"
+msgstr ""
+
 msgid "Mine"
 msgstr "Miniera"
 
@@ 

[planetblupi] 11/29: Bump patch version

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 352fab5d83ab3f5b1098369d23b0d35e61182435
Author: Mathieu Schroeter 
Date:   Tue Dec 12 23:49:05 2017 +0100

Bump patch version
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ff280a3..e2fc80e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
 project (planetblupi)
 set (PB_VERSION_MAJOR 1)
 set (PB_VERSION_MINOR 12)
-set (PB_VERSION_PATCH 1)
+set (PB_VERSION_PATCH 2)
 set (PB_VERSION_EXTRA "")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 12/29: Use the new main setup screen image

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit a2904a9bf12c234facaea44d12649289851925b2
Author: Mathieu Schroeter 
Date:   Wed Dec 13 07:37:44 2017 +0100

Use the new main setup screen image
---
 resources/image/setup00.png | Bin 217338 -> 210590 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/resources/image/setup00.png b/resources/image/setup00.png
index b95f5eb..8ec47e7 100644
Binary files a/resources/image/setup00.png and b/resources/image/setup00.png 
differ

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 09/29: Fix Windows user files location

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit c6fbe158da6f9c388d01f8e7c1ae7e947635ef9d
Author: Mathieu Schroeter 
Date:   Tue Dec 12 22:59:51 2017 +0100

Fix Windows user files location
---
 README-user.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README-user.md b/README-user.md
index 890f57f..519d65d 100644
--- a/README-user.md
+++ b/README-user.md
@@ -87,7 +87,7 @@ to lose some instruments, it depends of your system.
 If you want, you can overload all musics with yours by providing OGG or MIDI
 music files in your user directory.
 
-On Windows, type `%LOCALAPPDATA%\Epsitec SA\Planet Blupi` in the file browser,
+On Windows, type `%APPDATA%\Epsitec SA\Planet Blupi` in the file browser,
 on macOS, look at `~/Library/Application Support/Epsitec SA/Planet Blupi`, and
 on Linux, look at `~/.local/share/Epsitec SA/Planet Blupi`.
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 15/29: Check that the zoom (-z) is in the range

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit f97d1c3644cb3e486e7d62f6da276f048c93e26c
Author: Mathieu Schroeter 
Date:   Wed Dec 13 23:01:48 2017 +0100

Check that the zoom (-z) is in the range
---
 src/blupi.cxx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 7ea1505..515d38d 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -641,6 +641,8 @@ parseArgs (int argc, char * argv[], bool & exit)
   if (args["zoom"])
   {
 g_windowScale = args["zoom"];
+if (g_windowScale != 1 && g_windowScale != 2)
+  g_windowScale = 1;
 g_settingsOverload |= SETTING_ZOOM;
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 14/29: Exit immediatly on error with the cli parser

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 2ac9f735af1245e8a91f13a4cd0e5313eda86c1c
Author: Mathieu Schroeter 
Date:   Wed Dec 13 22:40:42 2017 +0100

Exit immediatly on error with the cli parser
---
 src/blupi.cxx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 478d368..7ea1505 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -601,6 +601,7 @@ parseArgs (int argc, char * argv[], bool & exit)
   catch (const std::exception & e)
   {
 std::cerr << e.what () << std::endl;
+exit = true;
 return EXIT_FAILURE;
   }
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 08/29: Update the USER readme

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 3f505a03e8ff83dd0b8155090bafc90ad2b06a3c
Author: Mathieu Schroeter 
Date:   Tue Dec 12 22:42:25 2017 +0100

Update the USER readme
---
 README-user.md | 27 +--
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/README-user.md b/README-user.md
index 282e335..890f57f 100644
--- a/README-user.md
+++ b/README-user.md
@@ -1,5 +1,5 @@
 
-# Planet Blupi (v1.9.x)
+# Planet Blupi
 
 This version contains over 30 missions and a built in editor, which enables you
 to construct your own missions.
@@ -20,16 +20,28 @@ What ever your screen resolution is, the game "Planet 
Blupi" always runs in
 the game by default in windowed mode. Proceed as follows:
 
 1. Quit the game _Planet Blupi_.
-2. Open the file `/data/config.json` with a text editor.
+2. Open the file `share/planetblupi/data/config.json` with a text editor.
 3. Replace `fullscreen: true` by `fullscreen: false`.
 4. Save and restart the game.
 
 In this mode the screen is no more scrolled if the mouse touches the window
 border. Use the Keyboard arrows instead.
 
+> It's possible to start the game with `--fullscreen off` instead of editing
+> the `config.json` file.
+
+If the problem persists, maybe you should try to start the game with the 
software
+renderer. Edit the `config.json` file and add `"renderer": "software"` or start
+the game with `--renderer software`.
+
+On Windows, an other possibility exists. You can try to change the driver used
+by the software renderer. By default it uses `"direct3d"`, you can change by
+`"opengl"` with `"driver": "opengl"` with the `config.json` file or
+`--driver opengl` by command line argument.
+
 ## Mouse
 
-Left button:
+Left button:  
 This button is always used in three steps:
 
 1. Select a Blupi.
@@ -41,7 +53,7 @@ step 1) is not necessary.
 
 You may select several Blupis by maintaining the Shift button pressed.
 
-Right button:
+Right button:  
 The right button is a shortcut. It orders the selected Blupi to do the most
 useful operation on the selected spot.
 
@@ -67,7 +79,10 @@ The music is provided in OGG and MIDI formats. The OGG 
variant is prefered
 because the render is the same for all platforms. For purist fanboys, it's
 possible to enforce the MIDI variant by starting the game with the
 `--restore-midi` command line argument. Note that in this case, it's possible
-to lose some instruments, it depends of you system.
+to lose some instruments, it depends of your system.
+
+> You can edit the `share/planetblupi/data/config.json` file and add an entry
+> `"restoremidi": true` too.
 
 If you want, you can overload all musics with yours by providing OGG or MIDI
 music files in your user directory.
@@ -76,7 +91,7 @@ On Windows, type `%LOCALAPPDATA%\Epsitec SA\Planet Blupi` in 
the file browser,
 on macOS, look at `~/Library/Application Support/Epsitec SA/Planet Blupi`, and
 on Linux, look at `~/.local/share/Epsitec SA/Planet Blupi`.
 
-You can create a `music` sub-directory with your music. For example:
+You can create a `music` sub-directory with your music. For example:  
 `%LOCALAPPDATA%\Epsitec SA\Planet Blupi\music\music000.ogg`.
 
 Only 10 musics are supported: `music000` to `music009`.

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 07/29: Remove stupid code

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 14836df8fcf73e334e48b8a47e40fd062e671660
Author: Mathieu Schroeter 
Date:   Tue Dec 12 22:44:19 2017 +0100

Remove stupid code
---
 src/blupi.cxx | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 032325c..15784fa 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -157,11 +157,7 @@ ReadConfig ()
   if (
 !(g_settingsOverload & SETTING_FULLSCREEN) &&
 j.find ("fullscreen") != j.end ())
-  {
 g_bFullScreen = j["fullscreen"].get ();
-if (g_bFullScreen != 0)
-  g_bFullScreen = 1;
-  }
 
   if (!(g_settingsOverload & SETTING_ZOOM) && j.find ("zoom") != j.end ())
   {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch debian/master updated (0a38b1c -> 48aa2bb)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch debian/master
in repository planetblupi.

  from  0a38b1c   planetblupi 1.12.0-16-g222113a-1 Debian release
  adds  21bd7d3   Use ogg music files instead of midi
  adds  c4ab50f   Add link on libvorbis
  adds  9efce31   Add licenses of new lib (especially for ogg playing)
  adds  5c92d14   Add missing lib in the main LICENSE file
   new  a058da1   Move the function to test if a file exists in misc
   new  d2bfd12   Restore midi playback support and add --restore-midi cli 
argument
   new  67ea4d0   Look music for user dir, fallback to the game dir
   new  648233b   Add more info about music possibilities in the user README
   new  54d7eec   Add a way to change the driver used by the accelerated 
renderer
   new  6237cfd   Add the restoremidi option with the config.json file
   new  14836df   Remove stupid code
   new  3f505a0   Update the USER readme
   new  c6fbe15   Fix Windows user files location
   new  da3d683   Add a global settings entry for switching between ogg and 
midi music
   new  352fab5   Bump patch version
   new  a2904a9   Use the new main setup screen image
   new  bbe262c   Fix cdrom position in setup screen
   new  2ac9f73   Exit immediatly on error with the cli parser
   new  f97d1c3   Check that the zoom (-z) is in the range
   new  1db67ed   Save the window zoom and fullscreen settings in the user 
preferences
   new  d27aaf4   Cosmetic: remove stupid comment
   new  dc8f631   Cosmetic: rename windowScale to zoom
   new  82cbcc3   Change and add missing fr translations
   new  9543ebb   Add support for all drivers (renderers)
   new  13a7e27   Update README-user.md
   new  f76c9af   Merge tag 'upstream/1.12.1-22-g13a7e27' into debian/master
   new  84010fa   Convert the .mid's to .ogg's using timidity and 
timgm6mb-soundfont
   new  3740327   Split data package in -music-mid and -music-ogg 
alternatives
   new  1b114f1   planetblupi 1.12.1-22-g13a7e27-1 Debian release
   new  39fdadb   Add missing Replaces/Breaks in the two new packages
   new  7e69b93   Bump S-V to 4.1.3 without changes needed
   new  631f13f   Pipe timidity to sox for encoding to ogg
   new  48aa2bb   planetblupi 1.12.1-22-g13a7e27-2 Debian release

The 29 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt|   5 +-
 LICENSE   |   3 +
 LICENSE.all   | 239 ++
 README-user.md|  44 ++-
 debian/changelog  |  18 +++
 debian/control|  42 +-
 debian/planetblupi-common.install |   5 +-
 debian/planetblupi-music-midi.install |   1 +
 debian/planetblupi-music-ogg.install  |   1 +
 debian/rules  |  15 +++
 resources/image/setup00.png   | Bin 217338 -> 209119 bytes
 resources/music/music000.ogg  | Bin 0 -> 12724663 bytes
 resources/music/music001.ogg  | Bin 0 -> 12472314 bytes
 resources/music/music002.ogg  | Bin 0 -> 12009171 bytes
 resources/music/music003.ogg  | Bin 0 -> 9254922 bytes
 resources/music/music004.ogg  | Bin 0 -> 4854247 bytes
 resources/music/music005.ogg  | Bin 0 -> 4710862 bytes
 resources/music/music006.ogg  | Bin 0 -> 4602855 bytes
 resources/music/music007.ogg  | Bin 0 -> 4800059 bytes
 resources/music/music008.ogg  | Bin 0 -> 4853980 bytes
 resources/music/music009.ogg  | Bin 0 -> 4509020 bytes
 resources/po/de.po|  29 -
 resources/po/en_US.po |  25 +++-
 resources/po/fr.po|  32 -
 resources/po/it.po|  29 -
 resources/po/pl.po|  31 -
 resources/po/planetblupi.pot  |  25 +++-
 src/blupi.cxx |  89 +
 src/blupi.h   |  14 ++
 src/event.cxx | 145 ++---
 src/event.h   |   7 +-
 src/menu.cxx  |   4 +-
 src/misc.cxx  |  30 +
 src/misc.h|   5 +
 src/movie.cxx |  16 ---
 src/sound.cxx |   9 +-
 36 files changed, 739 insertions(+), 124 deletions(-)
 create mode 100644 debian/planetblupi-music-midi.install
 create mode 100644 debian/planetblupi-music-ogg.install
 create mode 100644 resources/music/music000.ogg
 create mode 100644 resources/music/music001.ogg
 create mode 100644 resources/music/music002.ogg
 create mode 

[planetblupi] 05/29: Add a way to change the driver used by the accelerated renderer

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 54d7eec1a3c7724795d53dbf6856f73c83562146
Author: Mathieu Schroeter 
Date:   Tue Dec 12 22:43:13 2017 +0100

Add a way to change the driver used by the accelerated renderer
---
 src/blupi.cxx | 27 +++
 1 file changed, 27 insertions(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 66f019c..363a70e 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -78,6 +78,7 @@ enum Settings {
   SETTING_TIMERINTERVAL = 1 << 2,
   SETTING_RENDERER  = 1 << 3,
   SETTING_ZOOM  = 1 << 4,
+  SETTING_DRIVER= 1 << 5,
 };
 
 static int g_settingsOverload = 0;
@@ -177,6 +178,16 @@ ReadConfig ()
   g_rendererType = SDL_RENDERER_ACCELERATED;
   }
 
+  if (
+!(g_settingsOverload & SETTING_DRIVER) && j.find ("driver") != j.end () &&
+(!g_rendererType || g_rendererType == SDL_RENDERER_ACCELERATED))
+  {
+if (j["driver"] == "direct3d")
+  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "direct3d");
+else if (j["driver"] == "opengl")
+  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "opengl");
+  }
+
   return true;
 }
 
@@ -570,6 +581,11 @@ parseArgs (int argc, char * argv[], bool & exit)
   {"-r", "--renderer"},
   "set a renderer [auto;software;accelerated] (default: auto)",
   1},
+ {"driver",
+  {"-d", "--driver"},
+  "set a driver [auto;direct3d;opengl] (default: auto, ignored with "
+  "software renderer)",
+  1},
  {"enablerecorder",
   {"-c", "--enable-recorder"},
   "enable the recorder feature (F3/F4)",
@@ -648,6 +664,17 @@ parseArgs (int argc, char * argv[], bool & exit)
 g_settingsOverload |= SETTING_RENDERER;
   }
 
+  if (
+args["driver"] &&
+(!g_rendererType || g_rendererType == SDL_RENDERER_ACCELERATED))
+  {
+if (args["driver"].as () == "direct3d")
+  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "direct3d");
+else if (args["driver"].as () == "opengl")
+  SDL_SetHint (SDL_HINT_RENDER_DRIVER, "opengl");
+g_settingsOverload |= SETTING_DRIVER;
+  }
+
   if (args["enablerecorder"])
 g_enableRecorder = true;
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 02/29: Restore midi playback support and add --restore-midi cli argument

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit d2bfd12934efc8c1c0645f1cd8d6e33b27516f75
Author: Mathieu Schroeter 
Date:   Sun Dec 10 15:29:46 2017 +0100

Restore midi playback support and add --restore-midi cli argument

- It closes issue #49.
---
 resources/music/music000.mid | Bin 0 -> 131400 bytes
 resources/music/music001.mid | Bin 0 -> 150115 bytes
 resources/music/music002.mid | Bin 0 -> 160403 bytes
 resources/music/music003.mid | Bin 0 -> 90444 bytes
 resources/music/music004.mid | Bin 0 -> 91458 bytes
 resources/music/music005.mid | Bin 0 -> 184644 bytes
 resources/music/music006.mid | Bin 0 -> 97149 bytes
 resources/music/music007.mid | Bin 0 -> 151127 bytes
 resources/music/music008.mid | Bin 0 -> 139355 bytes
 resources/music/music009.mid | Bin 0 -> 191817 bytes
 src/blupi.cxx|   8 
 src/blupi.h  |   1 +
 src/event.cxx|  11 ++-
 13 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/resources/music/music000.mid b/resources/music/music000.mid
new file mode 100644
index 000..172145c
Binary files /dev/null and b/resources/music/music000.mid differ
diff --git a/resources/music/music001.mid b/resources/music/music001.mid
new file mode 100644
index 000..3a408a2
Binary files /dev/null and b/resources/music/music001.mid differ
diff --git a/resources/music/music002.mid b/resources/music/music002.mid
new file mode 100644
index 000..4d29210
Binary files /dev/null and b/resources/music/music002.mid differ
diff --git a/resources/music/music003.mid b/resources/music/music003.mid
new file mode 100644
index 000..6bcab72
Binary files /dev/null and b/resources/music/music003.mid differ
diff --git a/resources/music/music004.mid b/resources/music/music004.mid
new file mode 100644
index 000..b7d4e38
Binary files /dev/null and b/resources/music/music004.mid differ
diff --git a/resources/music/music005.mid b/resources/music/music005.mid
new file mode 100644
index 000..08fba67
Binary files /dev/null and b/resources/music/music005.mid differ
diff --git a/resources/music/music006.mid b/resources/music/music006.mid
new file mode 100644
index 000..e511b04
Binary files /dev/null and b/resources/music/music006.mid differ
diff --git a/resources/music/music007.mid b/resources/music/music007.mid
new file mode 100644
index 000..f0853ca
Binary files /dev/null and b/resources/music/music007.mid differ
diff --git a/resources/music/music008.mid b/resources/music/music008.mid
new file mode 100644
index 000..ee7d6c3
Binary files /dev/null and b/resources/music/music008.mid differ
diff --git a/resources/music/music009.mid b/resources/music/music009.mid
new file mode 100644
index 000..fbb4773
Binary files /dev/null and b/resources/music/music009.mid differ
diff --git a/src/blupi.cxx b/src/blupi.cxx
index 238c925..66f019c 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -70,6 +70,7 @@ int g_rendererType   = 0;
 boolg_enableRecorder = false;
 std::string g_playRecord;
 boolg_restoreBugs = false; // restore original < v1.9 bugs
+boolg_restoreMidi = false; // restore music playback based on midi 
files
 
 enum Settings {
   SETTING_FULLSCREEN= 1 << 0,
@@ -580,6 +581,10 @@ parseArgs (int argc, char * argv[], bool & exit)
  {"restorebugs",
   {"-b", "--restore-bugs"},
   "restore funny original bugs of older versions < v1.9",
+  0},
+ {"restoremidi",
+  {"-m", "--restore-midi"},
+  "restore playback based on MIDI music instead of OGG",
   0}}};
 
   argagg::parser_results args;
@@ -652,6 +657,9 @@ parseArgs (int argc, char * argv[], bool & exit)
   if (args["restorebugs"])
 g_restoreBugs = true;
 
+  if (args["restoremidi"])
+g_restoreMidi = true;
+
   return EXIT_SUCCESS;
 }
 
diff --git a/src/blupi.h b/src/blupi.h
index 8d4a090..3ed2751 100644
--- a/src/blupi.h
+++ b/src/blupi.h
@@ -30,6 +30,7 @@ extern SDL_Window *   g_window;
 extern SDL_Renderer * g_renderer;
 extern bool   g_bFullScreen;
 extern bool   g_restoreBugs;
+extern bool   g_restoreMidi;
 extern bool   g_enableRecorder;
 extern std::stringg_playRecord;
 
diff --git a/src/event.cxx b/src/event.cxx
index fe88eb8..22ff6f4 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3362,7 +3362,16 @@ CEvent::ChangePhase (Uint32 phase)
   music = m_pDecor->GetMusic ();
   if (music > 0)
   {
-filename = string_format ("music/music%.3d.ogg", music - 1);
+const std::string exts[] = {"ogg", "mid"};
+
+filename = string_format (
+  "music/music%.3d.%s", music - 1,
+  exts[g_restoreMidi ? 1 : 0].c_str ());
+if (!FileExists (filename))
+  filename = string_format (
+"music/music%.3d.%s", music - 1,
+exts[g_restoreMidi ? 0 : 1].c_str ());
+
 

[planetblupi] 03/29: Look music for user dir, fallback to the game dir

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 67ea4d0c2ef566a615600c77ed32dcd621319261
Author: Mathieu Schroeter 
Date:   Mon Dec 11 18:42:49 2017 +0100

Look music for user dir, fallback to the game dir

Then it's possible to overload the original musicis by providing yours in
the user directory (in music subdir).
---
 src/event.cxx | 28 
 src/misc.cxx  | 24 
 src/misc.h|  6 +-
 src/sound.cxx |  9 -
 4 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 22ff6f4..315a1ab 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -3362,18 +3362,29 @@ CEvent::ChangePhase (Uint32 phase)
   music = m_pDecor->GetMusic ();
   if (music > 0)
   {
-const std::string exts[] = {"ogg", "mid"};
+static const std::string exts[] = {"ogg", "mid"};
+static const Locationlocs[] = {LOCATION_USER, LOCATION_BASE};
+std::string  absolute;
 
-filename = string_format (
-  "music/music%.3d.%s", music - 1,
-  exts[g_restoreMidi ? 1 : 0].c_str ());
-if (!FileExists (filename))
+// Look for music in the user directory, then in the game directory.
+for (size_t i = 0; i < countof (locs); ++i)
+{
   filename = string_format (
 "music/music%.3d.%s", music - 1,
-exts[g_restoreMidi ? 0 : 1].c_str ());
+exts[g_restoreMidi ? 1 : 0].c_str ());
+  if (!FileExists (filename, absolute, locs[i]))
+filename = string_format (
+  "music/music%.3d.%s", music - 1,
+  exts[g_restoreMidi ? 0 : 1].c_str ());
+
+  if (FileExists (filename, absolute, locs[i]))
+break;
+
+  absolute = "";
+}
 
 m_pSound->StopMusic ();
-m_pSound->PlayMusic (filename);
+m_pSound->PlayMusic (absolute);
   }
 }
   }
@@ -4403,7 +4414,8 @@ CEvent::StartMovie (const std::string & pFilename)
   if (!m_bMovie)
 return false;
 
-  if (!FileExists (pFilename))
+  std::string absolute;
+  if (!FileExists (pFilename, absolute))
 return false;
 
   HideMouse (true);
diff --git a/src/misc.cxx b/src/misc.cxx
index de244e9..3884ec7 100644
--- a/src/misc.cxx
+++ b/src/misc.cxx
@@ -157,12 +157,28 @@ AddUserPath (std::string & pFilename)
 }
 
 bool
-FileExists (const std::string & filename)
+FileExists (
+  const std::string & filename, std::string & absolute, enum Location location)
 {
-  const auto path = GetBaseDir () + filename;
-  FILE * file;
+  absolute = filename;
+  FILE * file;
 
-  file = fopen (path.c_str (), "rb");
+  switch (location)
+  {
+  case LOCATION_BASE:
+absolute = GetBaseDir () + filename;
+break;
+
+  case LOCATION_USER:
+AddUserPath (absolute);
+break;
+
+  default:
+  case LOCATION_ABSOLUTE:
+break;
+  }
+
+  file = fopen (absolute.c_str (), "rb");
   if (file == nullptr)
 return false;
 
diff --git a/src/misc.h b/src/misc.h
index db50f86..d1a5c98 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -37,7 +37,11 @@ std::string GetBaseDir ();
 std::string GetShareDir ();
 std::string GetLocale ();
 extern void AddUserPath (std::string & pFilename);
-boolFileExists (const std::string & filename);
+
+enum Location { LOCATION_ABSOLUTE, LOCATION_BASE, LOCATION_USER };
+bool FileExists (
+  const std::string & filename, std::string & absolute,
+  Location location = LOCATION_BASE);
 
 template 
 std::string
diff --git a/src/sound.cxx b/src/sound.cxx
index 6e0790b..2969914 100644
--- a/src/sound.cxx
+++ b/src/sound.cxx
@@ -326,20 +326,19 @@ CSound::PlayImage (Sounds channel, Point pos, Sint32 rank)
 bool
 CSound::PlayMusic (const std::string & lpszMIDIFilename)
 {
-  std::string path = GetBaseDir ();
-
   if (m_midiVolume == 0)
 return true;
 
+  if (lpszMIDIFilename.empty ())
+return false;
+
   Mix_VolumeMusic (MIX_MAX_VOLUME * 100 * m_midiVolume / 20 / 100);
   m_lastMidiVolume = m_midiVolume;
 
-  path += lpszMIDIFilename;
-
   if (m_pMusic)
 Mix_FreeMusic (m_pMusic);
 
-  m_pMusic = Mix_LoadMUS (path.c_str ());
+  m_pMusic = Mix_LoadMUS (lpszMIDIFilename.c_str ());
   if (!m_pMusic)
   {
 printf ("%s\n", Mix_GetError ());

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 04/29: Add more info about music possibilities in the user README

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 648233b470b696ea49ab30ce2a51f3517a7fa4a3
Author: Mathieu Schroeter 
Date:   Mon Dec 11 18:54:02 2017 +0100

Add more info about music possibilities in the user README
---
 README-user.md | 20 
 1 file changed, 20 insertions(+)

diff --git a/README-user.md b/README-user.md
index 1c4d195..282e335 100644
--- a/README-user.md
+++ b/README-user.md
@@ -61,6 +61,26 @@ useful operation on the selected spot.
 
 When you switch to an other application, the game is automatically paused.
 
+## Music
+
+The music is provided in OGG and MIDI formats. The OGG variant is prefered
+because the render is the same for all platforms. For purist fanboys, it's
+possible to enforce the MIDI variant by starting the game with the
+`--restore-midi` command line argument. Note that in this case, it's possible
+to lose some instruments, it depends of you system.
+
+If you want, you can overload all musics with yours by providing OGG or MIDI
+music files in your user directory.
+
+On Windows, type `%LOCALAPPDATA%\Epsitec SA\Planet Blupi` in the file browser,
+on macOS, look at `~/Library/Application Support/Epsitec SA/Planet Blupi`, and
+on Linux, look at `~/.local/share/Epsitec SA/Planet Blupi`.
+
+You can create a `music` sub-directory with your music. For example:
+`%LOCALAPPDATA%\Epsitec SA\Planet Blupi\music\music000.ogg`.
+
+Only 10 musics are supported: `music000` to `music009`.
+
 ## Epsitec SA
 
 _Planet Blupi_ is an original creation of [Epsitec SA][1].

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 06/29: Add the restoremidi option with the config.json file

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 6237cfda9fc0382b014d478f559c09e27a0ba323
Author: Mathieu Schroeter 
Date:   Tue Dec 12 22:43:56 2017 +0100

Add the restoremidi option with the config.json file
---
 src/blupi.cxx | 8 
 1 file changed, 8 insertions(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 363a70e..032325c 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -79,6 +79,7 @@ enum Settings {
   SETTING_RENDERER  = 1 << 3,
   SETTING_ZOOM  = 1 << 4,
   SETTING_DRIVER= 1 << 5,
+  SETTING_MIDI  = 1 << 6,
 };
 
 static int g_settingsOverload = 0;
@@ -188,6 +189,10 @@ ReadConfig ()
   SDL_SetHint (SDL_HINT_RENDER_DRIVER, "opengl");
   }
 
+  if (
+!(g_settingsOverload & SETTING_MIDI) && j.find ("restoremidi") != j.end ())
+g_restoreMidi = j["restoremidi"].get ();
+
   return true;
 }
 
@@ -685,7 +690,10 @@ parseArgs (int argc, char * argv[], bool & exit)
 g_restoreBugs = true;
 
   if (args["restoremidi"])
+  {
 g_restoreMidi = true;
+g_settingsOverload |= SETTING_MIDI;
+  }
 
   return EXIT_SUCCESS;
 }

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 01/29: Move the function to test if a file exists in misc

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit a058da17a3c4ff80fb9120e4f9198be3de1a15e2
Author: Mathieu Schroeter 
Date:   Sun Dec 10 15:29:11 2017 +0100

Move the function to test if a file exists in misc
---
 src/event.cxx |  2 +-
 src/misc.cxx  | 14 ++
 src/misc.h|  1 +
 src/movie.cxx | 16 
 4 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/src/event.cxx b/src/event.cxx
index 6938ab8..fe88eb8 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -4394,7 +4394,7 @@ CEvent::StartMovie (const std::string & pFilename)
   if (!m_bMovie)
 return false;
 
-  if (!m_pMovie->IsExist (pFilename))
+  if (!FileExists (pFilename))
 return false;
 
   HideMouse (true);
diff --git a/src/misc.cxx b/src/misc.cxx
index 65ab8b4..de244e9 100644
--- a/src/misc.cxx
+++ b/src/misc.cxx
@@ -155,3 +155,17 @@ AddUserPath (std::string & pFilename)
   pFilename = path;
   SDL_free (temp);
 }
+
+bool
+FileExists (const std::string & filename)
+{
+  const auto path = GetBaseDir () + filename;
+  FILE * file;
+
+  file = fopen (path.c_str (), "rb");
+  if (file == nullptr)
+return false;
+
+  fclose (file);
+  return true;
+}
diff --git a/src/misc.h b/src/misc.h
index bfd519c..db50f86 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -37,6 +37,7 @@ std::string GetBaseDir ();
 std::string GetShareDir ();
 std::string GetLocale ();
 extern void AddUserPath (std::string & pFilename);
+boolFileExists (const std::string & filename);
 
 template 
 std::string
diff --git a/src/movie.cxx b/src/movie.cxx
index a7172bf..085211c 100644
--- a/src/movie.cxx
+++ b/src/movie.cxx
@@ -191,22 +191,6 @@ CMovie::GetEnable ()
   return m_bEnable;
 }
 
-// Indique si un film existe.
-
-bool
-CMovie::IsExist (const std::string & pFilename)
-{
-  const auto path = GetBaseDir () + pFilename;
-  FILE * file;
-
-  file = fopen (path.c_str (), "rb");
-  if (file == nullptr)
-return false;
-
-  fclose (file);
-  return true;
-}
-
 // Montre un film avi.
 
 bool

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 01/04: Use ogg music files instead of midi

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository planetblupi.

commit 21bd7d3e90a9f830b7bd7713d3ff370e2b75f923
Author: Mathieu Schroeter 
Date:   Thu Dec 7 11:01:01 2017 +0100

Use ogg music files instead of midi

It prevents different behaviour between OS.
---
 resources/music/music000.mid | Bin 131400 -> 0 bytes
 resources/music/music000.ogg | Bin 0 -> 12724663 bytes
 resources/music/music001.mid | Bin 150115 -> 0 bytes
 resources/music/music001.ogg | Bin 0 -> 12472314 bytes
 resources/music/music002.mid | Bin 160403 -> 0 bytes
 resources/music/music002.ogg | Bin 0 -> 12009171 bytes
 resources/music/music003.mid | Bin 90444 -> 0 bytes
 resources/music/music003.ogg | Bin 0 -> 9254922 bytes
 resources/music/music004.mid | Bin 91458 -> 0 bytes
 resources/music/music004.ogg | Bin 0 -> 4854247 bytes
 resources/music/music005.mid | Bin 184644 -> 0 bytes
 resources/music/music005.ogg | Bin 0 -> 4710862 bytes
 resources/music/music006.mid | Bin 97149 -> 0 bytes
 resources/music/music006.ogg | Bin 0 -> 4602855 bytes
 resources/music/music007.mid | Bin 151127 -> 0 bytes
 resources/music/music007.ogg | Bin 0 -> 4800059 bytes
 resources/music/music008.mid | Bin 139355 -> 0 bytes
 resources/music/music008.ogg | Bin 0 -> 4853980 bytes
 resources/music/music009.mid | Bin 191817 -> 0 bytes
 resources/music/music009.ogg | Bin 0 -> 4509020 bytes
 src/event.cxx|   2 +-
 21 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/music/music000.mid b/resources/music/music000.mid
deleted file mode 100644
index 172145c..000
Binary files a/resources/music/music000.mid and /dev/null differ
diff --git a/resources/music/music000.ogg b/resources/music/music000.ogg
new file mode 100644
index 000..5c47708
Binary files /dev/null and b/resources/music/music000.ogg differ
diff --git a/resources/music/music001.mid b/resources/music/music001.mid
deleted file mode 100644
index 3a408a2..000
Binary files a/resources/music/music001.mid and /dev/null differ
diff --git a/resources/music/music001.ogg b/resources/music/music001.ogg
new file mode 100644
index 000..97d95e6
Binary files /dev/null and b/resources/music/music001.ogg differ
diff --git a/resources/music/music002.mid b/resources/music/music002.mid
deleted file mode 100644
index 4d29210..000
Binary files a/resources/music/music002.mid and /dev/null differ
diff --git a/resources/music/music002.ogg b/resources/music/music002.ogg
new file mode 100644
index 000..0a05f53
Binary files /dev/null and b/resources/music/music002.ogg differ
diff --git a/resources/music/music003.mid b/resources/music/music003.mid
deleted file mode 100644
index 6bcab72..000
Binary files a/resources/music/music003.mid and /dev/null differ
diff --git a/resources/music/music003.ogg b/resources/music/music003.ogg
new file mode 100644
index 000..de58b17
Binary files /dev/null and b/resources/music/music003.ogg differ
diff --git a/resources/music/music004.mid b/resources/music/music004.mid
deleted file mode 100644
index b7d4e38..000
Binary files a/resources/music/music004.mid and /dev/null differ
diff --git a/resources/music/music004.ogg b/resources/music/music004.ogg
new file mode 100644
index 000..7a19d3e
Binary files /dev/null and b/resources/music/music004.ogg differ
diff --git a/resources/music/music005.mid b/resources/music/music005.mid
deleted file mode 100644
index 08fba67..000
Binary files a/resources/music/music005.mid and /dev/null differ
diff --git a/resources/music/music005.ogg b/resources/music/music005.ogg
new file mode 100644
index 000..2dd982a
Binary files /dev/null and b/resources/music/music005.ogg differ
diff --git a/resources/music/music006.mid b/resources/music/music006.mid
deleted file mode 100644
index e511b04..000
Binary files a/resources/music/music006.mid and /dev/null differ
diff --git a/resources/music/music006.ogg b/resources/music/music006.ogg
new file mode 100644
index 000..057788d
Binary files /dev/null and b/resources/music/music006.ogg differ
diff --git a/resources/music/music007.mid b/resources/music/music007.mid
deleted file mode 100644
index f0853ca..000
Binary files a/resources/music/music007.mid and /dev/null differ
diff --git a/resources/music/music007.ogg b/resources/music/music007.ogg
new file mode 100644
index 000..8d782f2
Binary files /dev/null and b/resources/music/music007.ogg differ
diff --git a/resources/music/music008.mid b/resources/music/music008.mid
deleted file mode 100644
index ee7d6c3..000
Binary files a/resources/music/music008.mid and /dev/null differ
diff --git a/resources/music/music008.ogg b/resources/music/music008.ogg
new file mode 100644
index 000..b05d67d
Binary files /dev/null and b/resources/music/music008.ogg differ
diff --git a/resources/music/music009.mid b/resources/music/music009.mid
deleted file mode 100644
index fbb4773..000
Binary 

[planetblupi] 04/04: Add missing lib in the main LICENSE file

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository planetblupi.

commit 5c92d14c518653d30c608d4bd025337676afeaeb
Author: Mathieu Schroeter 
Date:   Fri Dec 8 07:33:53 2017 +0100

Add missing lib in the main LICENSE file
---
 LICENSE | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/LICENSE b/LICENSE
index 71b79ed..dea8bbe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -6,7 +6,10 @@ This game is linked on some static libraries:
   GNU/gettext (GPLv3)
   libcurl (MIT/X derivate)
   GNU/libiconv (GPLv3)
+  libogg (own license)
   libpng (own license)
+  libsndfile (LGPLv3)
+  libvorbis (own license)
   SDL_kitchensink (MIT)
   SDL2 (zlib license)
   SDL2_image (zlib license)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 17/19: record new upstream branch

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 64b4d930f100864fd6b55ee030e6b2be8d2ddf74
Author: Didier Raboud <o...@debian.org>
Date:   Fri Dec 8 09:50:01 2017 +0100

record new upstream branch
---
 debian/.git-dpm | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/debian/.git-dpm b/debian/.git-dpm
index da7c769..bdd7287 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -2,7 +2,7 @@
 7831bc6a1846d599a7d92c27760ed11218d91977
 7831bc6a1846d599a7d92c27760ed11218d91977
 8f51f0c9cf33dff0d410dc8eadb0763d8c79a496
-8f51f0c9cf33dff0d410dc8eadb0763d8c79a496
-planetblupi_1.12.0.orig.tar.gz
-8d0b14f6897a5e52561e5d279f9a5e0e111ccc5d
-32930919
+222113a3435624018122c62cf9bf76cac6885b96
+planetblupi_1.12.0-16-g222113a.orig.tar.xz
+f22390db2544e6555423c441d85b914fbe8679ce
+23152920

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 02/04: Add link on libvorbis

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository planetblupi.

commit c4ab50fabeb1c8fee4ecc6c88232369bd176b7e7
Author: Mathieu Schroeter 
Date:   Thu Dec 7 13:59:11 2017 +0100

Add link on libvorbis
---
 CMakeLists.txt | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 248f803..ff280a3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -141,6 +141,8 @@ if ("${STATIC_BUILD}")
   pkg_search_module (AVUTIL REQUIRED libavutil)
   pkg_search_module (SWSCALE REQUIRED libswscale)
   pkg_search_module (SWRESAMPLE REQUIRED libswresample)
+  # Statis dependencies for SDL_mixer
+  pkg_search_module (VORBIS REQUIRED vorbisfile)
 
   if (UNIX AND NOT APPLE)
 pkg_search_module (ALSA REQUIRED alsa)
@@ -172,6 +174,7 @@ if ("${STATIC_BUILD}")
 ${AVUTIL_STATIC_LIBRARIES}
 ${SWSCALE_STATIC_LIBRARIES}
 ${SWRESAMPLE_STATIC_LIBRARIES}
+${VORBIS_STATIC_LIBRARIES}
   )
 
   if (${PB_HTTP_VERSION_CHECK})

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] annotated tag debian/1.12.0-16-g222113a-1 created (now 27cddc7)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to annotated tag debian/1.12.0-16-g222113a-1
in repository planetblupi.

at  27cddc7   (tag)
   tagging  0a38b1c193df1b8f4cff8fc2b7584179c502f287 (commit)
  replaces  debian/1.12.0-1
 tagged by  Didier Raboud
on  Fri Dec 8 09:54:17 2017 +0100

- Log -
planetblupi release 1.12.0-16-g222113a-1 for unstable (sid)
(maintainer view tag generated by dgit --quilt=dpm)
-BEGIN PGP SIGNATURE-

iQGzBAABCgAdFiEEe+WPIRpjNw1/GSB7i8+nHsoWNFUFAloqVHQACgkQi8+nHsoW
NFU6agv+MBR2UEaBqM5hQwiTMrK1312DncHfTh9XFx5e3WS4JXCA0UByI2I6TX5X
/OW+NIxrxpsyaUT6GKS9p2Ai5ByfBj5Up4UAUhSXYE3AoszT+eoX/TEwoEF+wr6k
e7iVhGI+kDbmjC+NvUbR9IAzUlevpFfKqPrPCw3kcWPNEXyQ/ZqkJQyXqqxWynYL
7wRUCjE0FsfRqLJV1uVwdJsTvZ+Tg2BU0LagDXlVUx9ekR23cWK01DMmSh3iFkOC
1RfWUyelv21yh1YKG0oy2GKtU6yQclEDSbSwb128fjw2vevm9ov0yNo0QyY0r6y/
LK9Qn9GjwQ1G9P0aeP5lgceB0C60NisEOSRgZOeOPN+XXZlKZwkPawceoic6UD27
iFzsAeRddFHeAU87SxfQyykYByLWEOT2v7Hmf9gtH+y1BsHzzXYu+9TTgYWTq5i7
WMWaTBQaCWT+s+9CveoY9NY2uc1QzzP6QzLK3EBJzsZN8PJ6eiIsERqhxMmCvM0M
sl4A4z5N
=0caJ
-END PGP SIGNATURE-

Didier Raboud (4):
  Use @PB_ICON@ to link to the icon from the desktop file
  record new upstream branch
  merge patched-debian/master into debian/master
  planetblupi 1.12.0-16-g222113a-1 Debian release

Mathieu Schroeter (15):
  Prevent screen move when we are not playing or building
  Fix renderer memleak
  Fix blupi channel memleak
  Fix music memleaks
  Fix leak with audio when exiting
  Bump micro version (for fix release)
  Fix regression, halt only when suspend
  Find the right libwinpthread according to the mingw prefix
  Fix Win32 build by removing WPARAM/LPARAM clash
  Add the NSIS template file used by CPack
  Add a stupid bootstrap script for the NSIS template
  Keep a copy of the original template
  Sign the uninstaller only if desired
  Fix typo
  Add log for SDL_Init failures

---

This annotated tag includes the following new commits:

   new  32e734f   Prevent screen move when we are not playing or building
   new  33972f2   Use @PB_ICON@ to link to the icon from the desktop file
   new  cb4dd44   Fix renderer memleak
   new  579a740   Fix blupi channel memleak
   new  a1b5e5c   Fix music memleaks
   new  85b8f43   Fix leak with audio when exiting
   new  7c3c042   Bump micro version (for fix release)
   new  315117e   Fix regression, halt only when suspend
   new  3688d68   Find the right libwinpthread according to the mingw prefix
   new  8f5cfdf   Fix Win32 build by removing WPARAM/LPARAM clash
   new  88357d7   Add the NSIS template file used by CPack
   new  e9f7a71   Add a stupid bootstrap script for the NSIS template
   new  7e6a050   Keep a copy of the original template
   new  fd7fd47   Sign the uninstaller only if desired
   new  63783ca   Fix typo
   new  222113a   Add log for SDL_Init failures
   new  64b4d93   record new upstream branch
   new  2f4da9f   merge patched-debian/master into debian/master
   new  0a38b1c   planetblupi 1.12.0-16-g222113a-1 Debian release

The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 18/19: merge patched-debian/master into debian/master

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 2f4da9fda5cc1abeea65674bc093c74103a67296
Merge: 64b4d93 222113a
Author: Didier Raboud <o...@debian.org>
Date:   Fri Dec 8 09:50:10 2017 +0100

merge patched-debian/master into debian/master

 CMakeLists.txt |   15 +-
 debian/.git-dpm|6 +-
 ...-to-link-to-the-icon-from-the-desktop-fil.patch |   20 -
 debian/patches/series  |1 -
 resources/nsis/NSIS.template.in| 1016 
 resources/nsis/bootstrap.sh|6 +
 src/blupi.cxx  |6 +
 src/blupi.h|8 +-
 src/event.cxx  |   25 +-
 src/event.h|6 +-
 src/misc.cxx   |2 +-
 src/misc.h |2 +-
 src/pixmap.cxx |6 +-
 src/sound.cxx  |   11 +
 14 files changed, 1079 insertions(+), 51 deletions(-)

diff --cc debian/.git-dpm
index bdd7287,000..2637300
mode 100644,00..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 7831bc6a1846d599a7d92c27760ed11218d91977
- 7831bc6a1846d599a7d92c27760ed11218d91977
- 8f51f0c9cf33dff0d410dc8eadb0763d8c79a496
++222113a3435624018122c62cf9bf76cac6885b96
++222113a3435624018122c62cf9bf76cac6885b96
++222113a3435624018122c62cf9bf76cac6885b96
 +222113a3435624018122c62cf9bf76cac6885b96
 +planetblupi_1.12.0-16-g222113a.orig.tar.xz
 +f22390db2544e6555423c441d85b914fbe8679ce
 +23152920

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 15/19: Fix typo

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 63783cabe1cd19dd8bfe528845df88ba631cd5e1
Author: Mathieu Schroeter 
Date:   Fri Dec 1 16:50:03 2017 +0100

Fix typo
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc07310..248f803 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,7 +316,7 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND 
"${STATIC_BUILD}")
 set (CPACK_NSIS_INSTALLED_ICON_NAME "binplanetblupi.exe")
 set (CPACK_NSIS_URL_INFO_ABOUT "http://www.blupi.org;)
 set (CPACK_NSIS_MUI_FINISHPAGE_RUN "planetblupi")
-if (SIGN_APP
+if (SIGN_APP)
   set (CPACK_NSIS_SIGN_UNINSTALLER "sign -a -fd sha1 -t 
http://time.certum.pl -v")
 endif ()
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 08/19: Fix regression, halt only when suspend

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 315117e7da1d23301dab7fda583666d8845458f9
Author: Mathieu Schroeter 
Date:   Fri Dec 1 10:44:23 2017 +0100

Fix regression, halt only when suspend
---
 src/sound.cxx | 4 
 1 file changed, 4 deletions(-)

diff --git a/src/sound.cxx b/src/sound.cxx
index bfab4e1..6e0790b 100644
--- a/src/sound.cxx
+++ b/src/sound.cxx
@@ -87,7 +87,6 @@ CSound::~CSound ()
 
   if (m_pMusic)
   {
-Mix_HaltMusic ();
 Mix_FreeMusic (m_pMusic);
 m_pMusic = nullptr;
   }
@@ -338,10 +337,7 @@ CSound::PlayMusic (const std::string & lpszMIDIFilename)
   path += lpszMIDIFilename;
 
   if (m_pMusic)
-  {
-Mix_HaltMusic ();
 Mix_FreeMusic (m_pMusic);
-  }
 
   m_pMusic = Mix_LoadMUS (path.c_str ());
   if (!m_pMusic)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 09/19: Find the right libwinpthread according to the mingw prefix

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 3688d68d1089f75eb3a9781a4f7e8b81ecda1f7f
Author: Mathieu Schroeter 
Date:   Fri Dec 1 13:51:37 2017 +0100

Find the right libwinpthread according to the mingw prefix

It fixes the case of 32 bit builds.
---
 CMakeLists.txt | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e261087..cc1db3e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -281,10 +281,10 @@ endif ()
 
 # Copy libwinpthread-1.dll which seems not be linkable statically
 if (${CMAKE_SYSTEM_NAME} STREQUAL "Windows" AND MINGW)
-  execute_process (COMMAND cygpath.exe --windows /mingw64 OUTPUT_VARIABLE 
MINGW64_PATH)
-  string (REGEX REPLACE "[ \t\n\r]+$" "" MINGW64_PATH "${MINGW64_PATH}")
-  string (REGEX REPLACE "[\\]" "" MINGW64_PATH "${MINGW64_PATH}")
-  install (FILES "${MINGW64_PATH}binlibwinpthread-1.dll" DESTINATION 
bin)
+  execute_process (COMMAND cygpath.exe --windows $ENV{MINGW_PREFIX} 
OUTPUT_VARIABLE MINGW_PATH)
+  string (REGEX REPLACE "[ \t\n\r]+$" "" MINGW_PATH "${MINGW_PATH}")
+  string (REGEX REPLACE "[\\]" "" MINGW_PATH "${MINGW_PATH}")
+  install (FILES "${MINGW_PATH}binlibwinpthread-1.dll" DESTINATION bin)
 endif ()
 
 #

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch upstream/latest updated (8f51f0c -> 5c92d14)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch upstream/latest
in repository planetblupi.

  from  8f51f0c   Prepare new release v1.12
   new  32e734f   Prevent screen move when we are not playing or building
   new  33972f2   Use @PB_ICON@ to link to the icon from the desktop file
   new  cb4dd44   Fix renderer memleak
   new  579a740   Fix blupi channel memleak
   new  a1b5e5c   Fix music memleaks
   new  85b8f43   Fix leak with audio when exiting
   new  7c3c042   Bump micro version (for fix release)
   new  315117e   Fix regression, halt only when suspend
   new  3688d68   Find the right libwinpthread according to the mingw prefix
   new  8f5cfdf   Fix Win32 build by removing WPARAM/LPARAM clash
   new  88357d7   Add the NSIS template file used by CPack
   new  e9f7a71   Add a stupid bootstrap script for the NSIS template
   new  7e6a050   Keep a copy of the original template
   new  fd7fd47   Sign the uninstaller only if desired
   new  63783ca   Fix typo
   new  222113a   Add log for SDL_Init failures
   new  21bd7d3   Use ogg music files instead of midi
   new  c4ab50f   Add link on libvorbis
   new  9efce31   Add licenses of new lib (especially for ogg playing)
   new  5c92d14   Add missing lib in the main LICENSE file

The 20 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt |   18 +-
 LICENSE|3 +
 LICENSE.all|  239 
 resources/linux/application.desktop.in |2 +-
 resources/music/music000.mid   |  Bin 131400 -> 0 bytes
 resources/music/music000.ogg   |  Bin 0 -> 12724663 bytes
 resources/music/music001.mid   |  Bin 150115 -> 0 bytes
 resources/music/music001.ogg   |  Bin 0 -> 12472314 bytes
 resources/music/music002.mid   |  Bin 160403 -> 0 bytes
 resources/music/music002.ogg   |  Bin 0 -> 12009171 bytes
 resources/music/music003.mid   |  Bin 90444 -> 0 bytes
 resources/music/music003.ogg   |  Bin 0 -> 9254922 bytes
 resources/music/music004.mid   |  Bin 91458 -> 0 bytes
 resources/music/music004.ogg   |  Bin 0 -> 4854247 bytes
 resources/music/music005.mid   |  Bin 184644 -> 0 bytes
 resources/music/music005.ogg   |  Bin 0 -> 4710862 bytes
 resources/music/music006.mid   |  Bin 97149 -> 0 bytes
 resources/music/music006.ogg   |  Bin 0 -> 4602855 bytes
 resources/music/music007.mid   |  Bin 151127 -> 0 bytes
 resources/music/music007.ogg   |  Bin 0 -> 4800059 bytes
 resources/music/music008.mid   |  Bin 139355 -> 0 bytes
 resources/music/music008.ogg   |  Bin 0 -> 4853980 bytes
 resources/music/music009.mid   |  Bin 191817 -> 0 bytes
 resources/music/music009.ogg   |  Bin 0 -> 4509020 bytes
 resources/nsis/NSIS.template.in| 1016 
 resources/nsis/bootstrap.sh|6 +
 resources/po/de.po |   12 +-
 resources/po/en_US.po  |8 +-
 resources/po/fr.po |   12 +-
 resources/po/it.po |   12 +-
 resources/po/pl.po |   14 +-
 resources/po/planetblupi.pot   |8 +-
 src/blupi.cxx  |6 +
 src/blupi.h|8 +-
 src/event.cxx  |   29 +-
 src/event.h|6 +-
 src/misc.cxx   |2 +-
 src/misc.h |2 +-
 src/pixmap.cxx |6 +-
 src/sound.cxx  |   11 +
 40 files changed, 1376 insertions(+), 44 deletions(-)
 delete mode 100644 resources/music/music000.mid
 create mode 100644 resources/music/music000.ogg
 delete mode 100644 resources/music/music001.mid
 create mode 100644 resources/music/music001.ogg
 delete mode 100644 resources/music/music002.mid
 create mode 100644 resources/music/music002.ogg
 delete mode 100644 resources/music/music003.mid
 create mode 100644 resources/music/music003.ogg
 delete mode 100644 resources/music/music004.mid
 create mode 100644 resources/music/music004.ogg
 delete mode 100644 resources/music/music005.mid
 create mode 100644 resources/music/music005.ogg
 delete mode 100644 resources/music/music006.mid
 create mode 100644 resources/music/music006.ogg
 delete mode 100644 resources/music/music007.mid
 create mode 100644 resources/music/music007.ogg
 delete mode 100644 resources/music/music008.mid
 create mode 100644 resources/music/music008.ogg
 delete mode 100644 resources/music/music009.mid
 create mode 100644 

[planetblupi] 16/19: Add log for SDL_Init failures

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 222113a3435624018122c62cf9bf76cac6885b96
Author: Mathieu Schroeter 
Date:   Sat Dec 2 23:23:35 2017 +0100

Add log for SDL_Init failures
---
 src/blupi.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index 980073c..238c925 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -678,7 +678,10 @@ DoInit (int argc, char * argv[], bool & exit)
 
   auto res = SDL_Init (SDL_INIT_VIDEO | SDL_INIT_AUDIO | SDL_INIT_TIMER);
   if (res < 0)
+  {
+SDL_Log ("Unable to initialize SDL: %s", SDL_GetError ());
 return EXIT_FAILURE;
+  }
 
   // Create a window.
   g_window = SDL_CreateWindow (

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] branch debian/master updated (a787909 -> 0a38b1c)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to branch debian/master
in repository planetblupi.

  from  a787909   planetblupi 1.12.0-1 Debian release
   new  64b4d93   record new upstream branch
   new  32e734f   Prevent screen move when we are not playing or building
   new  33972f2   Use @PB_ICON@ to link to the icon from the desktop file
   new  cb4dd44   Fix renderer memleak
   new  579a740   Fix blupi channel memleak
   new  a1b5e5c   Fix music memleaks
   new  85b8f43   Fix leak with audio when exiting
   new  7c3c042   Bump micro version (for fix release)
   new  315117e   Fix regression, halt only when suspend
   new  3688d68   Find the right libwinpthread according to the mingw prefix
   new  8f5cfdf   Fix Win32 build by removing WPARAM/LPARAM clash
   new  88357d7   Add the NSIS template file used by CPack
   new  e9f7a71   Add a stupid bootstrap script for the NSIS template
   new  7e6a050   Keep a copy of the original template
   new  fd7fd47   Sign the uninstaller only if desired
   new  63783ca   Fix typo
   new  222113a   Add log for SDL_Init failures
   new  2f4da9f   merge patched-debian/master into debian/master
   new  0a38b1c   planetblupi 1.12.0-16-g222113a-1 Debian release

The 19 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 CMakeLists.txt |   15 +-
 debian/.git-dpm|   14 +-
 debian/changelog   |6 +
 ...-to-link-to-the-icon-from-the-desktop-fil.patch |   20 -
 debian/patches/series  |1 -
 resources/nsis/NSIS.template.in| 1016 
 resources/nsis/bootstrap.sh|6 +
 src/blupi.cxx  |6 +
 src/blupi.h|8 +-
 src/event.cxx  |   25 +-
 src/event.h|6 +-
 src/misc.cxx   |2 +-
 src/misc.h |2 +-
 src/pixmap.cxx |6 +-
 src/sound.cxx  |   11 +
 15 files changed, 1089 insertions(+), 55 deletions(-)
 delete mode 100644 
debian/patches/0001-Use-PB_ICON-to-link-to-the-icon-from-the-desktop-fil.patch
 delete mode 100644 debian/patches/series
 create mode 100644 resources/nsis/NSIS.template.in
 create mode 100755 resources/nsis/bootstrap.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 13/19: Keep a copy of the original template

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 7e6a05063e46a9271bd79015a5f889f7d8dff6ea
Author: Mathieu Schroeter 
Date:   Fri Dec 1 13:58:56 2017 +0100

Keep a copy of the original template
---
 resources/nsis/bootstrap.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/resources/nsis/bootstrap.sh b/resources/nsis/bootstrap.sh
index 13ee2e2..ac61603 100755
--- a/resources/nsis/bootstrap.sh
+++ b/resources/nsis/bootstrap.sh
@@ -1,4 +1,6 @@
 #!/bin/sh
 
+mv /C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in 
/C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in.orig
+mv /C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in 
/C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in.orig
 cp $(dirname $0)/NSIS.template.in 
/C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in
 cp $(dirname $0)/NSIS.template.in 
/C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 03/04: Add licenses of new lib (especially for ogg playing)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch upstream/latest
in repository planetblupi.

commit 9efce31d5758ab5a6fce9f174b80daa22c6e28d2
Author: Mathieu Schroeter 
Date:   Thu Dec 7 17:43:22 2017 +0100

Add licenses of new lib (especially for ogg playing)
---
 LICENSE.all  | 239 +++
 resources/po/de.po   |  12 ++-
 resources/po/en_US.po|   8 +-
 resources/po/fr.po   |  12 ++-
 resources/po/it.po   |  12 ++-
 resources/po/pl.po   |  14 ++-
 resources/po/planetblupi.pot |   8 +-
 src/event.cxx|   2 +
 8 files changed, 292 insertions(+), 15 deletions(-)

diff --git a/LICENSE.all b/LICENSE.all
index 4f7300a..7c593ef 100644
--- a/LICENSE.all
+++ b/LICENSE.all
@@ -7,8 +7,11 @@ List of all licenses, concerns Planet Blupi and dependencies
  * libasound -- https://www.alsa-project.org
  * libcurl -- https://curl.haxx.se/libcurl/
  * GNU/libiconv -- https://www.gnu.org/software/libiconv/
+ * libogg -- https://xiph.org/downloads/
  * libpng -- http://www.libpng.org/pub/png/libpng.html
  * libpulse -- https://freedesktop.org/software/pulseaudio/doxygen/
+ * libsndfile -- http://www.mega-nerd.com/libsndfile/
+ * libvorbis -- https://xiph.org/downloads/
  * SDL_kitchensink -- https://github.com/katajakasa/SDL_kitchensink
  * SDL2 -- https://www.libsdl.org
  * SDL2_image -- https://www.libsdl.org/projects/SDL_image/
@@ -3118,6 +3121,39 @@ Public License instead of this License.  But first, 
please read
 .
 
 ##
+# libogg - LICENSE
+##
+
+Copyright (c) 2002, Xiph.org Foundation
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+- Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+
+- Redistributions in binary form must reproduce the above copyright
+notice, this list of conditions and the following disclaimer in the
+documentation and/or other materials provided with the distribution.
+
+- Neither the name of the Xiph.org Foundation nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION
+OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+##
 # libpng - LICENSE
 ##
 
@@ -3302,6 +3338,209 @@ the packager to ensure the components they use in their 
build of PulseAudio
 meets their license requirements.
 
 ##
+# libsndfile - LICENSE
+##
+
+   GNU LESSER GENERAL PUBLIC LICENSE
+   Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. 
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  

[planetblupi] 11/19: Add the NSIS template file used by CPack

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 88357d7494b6a4bc7771d0e539ad7ec7e7238433
Author: Mathieu Schroeter 
Date:   Fri Dec 1 13:54:53 2017 +0100

Add the NSIS template file used by CPack

It's useful in order to sign the uninstaller.
---
 resources/nsis/NSIS.template.in | 1016 +++
 1 file changed, 1016 insertions(+)

diff --git a/resources/nsis/NSIS.template.in b/resources/nsis/NSIS.template.in
new file mode 100644
index 000..9a6b03d
--- /dev/null
+++ b/resources/nsis/NSIS.template.in
@@ -0,0 +1,1016 @@
+; CPack install script designed for a nmake build
+
+;
+; You must define these values
+
+  !define VERSION "@CPACK_PACKAGE_VERSION@"
+  !define PATCH  "@CPACK_PACKAGE_VERSION_PATCH@"
+  !define INST_DIR "@CPACK_TEMPORARY_DIRECTORY@"
+
+;
+;Variables
+
+  Var MUI_TEMP
+  Var STARTMENU_FOLDER
+  Var SV_ALLUSERS
+  Var START_MENU
+  Var DO_NOT_ADD_TO_PATH
+  Var ADD_TO_PATH_ALL_USERS
+  Var ADD_TO_PATH_CURRENT_USER
+  Var INSTALL_DESKTOP
+  Var IS_DEFAULT_INSTALLDIR
+;
+;Include Modern UI
+
+  !include "MUI.nsh"
+
+  ;Default installation folder
+  InstallDir "@CPACK_NSIS_INSTALL_ROOT@\@CPACK_PACKAGE_INSTALL_DIRECTORY@"
+
+;
+;General
+!ifdef INNER
+  OutFile "${TEMPINSTALLER}.exe"
+  SetCompress off   ; for speed
+!else
+  ; Call makensis again, defining INNER.  This writes an installer for us 
which, when
+  ; it is invoked, will just write the uninstaller to some location, and then 
exit.
+  ; Be sure to substitute the name of this script here.
+  !tempfile TEMPINSTALLER
+  !tempfile TEMPUNINSTALLER
+  !system "$\"makensis$\" /DTEMPINSTALLER=$\"${TEMPINSTALLER}$\" 
/DTEMPUNINSTALLER=$\"${TEMPUNINSTALLER}$\" /DINNER 
$\"@CPACK_TEMPORARY_DIRECTORY@/../project.nsi$\"" = 0
+
+  ; So now run that installer we just created as %TEMP%\tempinstaller.exe.  
Since it
+  ; calls quit the return value isn't zero.
+
+  !system "$\"${TEMPINSTALLER}.exe$\"" = 2
+
+  ; That will have written an uninstaller binary for us.  Now we sign it with 
your
+  ; favourite code signing tool.
+
+  ;!tempfile INCEXIST
+  ;!system 'if exist "@CPACK_NSIS_SIGN_UNINSTALLER@" echo !define 
HAVE_SIGN_UNINST > "${INCEXIST}"'
+  ;!include "${INCEXIST}"
+  ;!delfile "${INCEXIST}"
+  ;!ifdef HAVE_SIGN_UNINST
+  !system 'signtool @CPACK_NSIS_SIGN_UNINSTALLER@ "${TEMPUNINSTALLER}.exe"' = 0
+  ;!endif
+
+  ; Good.  Now we can carry on writing the real installer.
+
+  ;Name and file
+  Name "@CPACK_NSIS_PACKAGE_NAME@"
+  OutFile "@CPACK_TOPLEVEL_DIRECTORY@/@CPACK_OUTPUT_FILE_NAME@"
+
+  ;Set compression
+  SetCompressor @CPACK_NSIS_COMPRESSOR@
+!endif
+
+  ;Require administrator access
+  RequestExecutionLevel admin
+
+@CPACK_NSIS_DEFINES@
+
+  !include Sections.nsh
+
+;--- Component support macros: ---
+; The code for the add/remove functionality is from:
+;   http://nsis.sourceforge.net/Add/Remove_Functionality
+; It has been modified slightly and extended to provide
+; inter-component dependencies.
+Var AR_SecFlags
+Var AR_RegFlags
+@CPACK_NSIS_SECTION_SELECTED_VARS@
+
+; Loads the "selected" flag for the section named SecName into the
+; variable VarName.
+!macro LoadSectionSelectedIntoVar SecName VarName
+ SectionGetFlags ${${SecName}} $${VarName}
+ IntOp $${VarName} $${VarName} & ${SF_SELECTED}  ;Turn off all other bits
+!macroend
+
+; Loads the value of a variable... can we get around this?
+!macro LoadVar VarName
+  IntOp $R0 0 + $${VarName}
+!macroend
+
+; Sets the value of a variable
+!macro StoreVar VarName IntValue
+  IntOp $${VarName} 0 + ${IntValue}
+!macroend
+
+!macro InitSection SecName
+  ;  This macro reads component installed flag from the registry and
+  ;changes checked state of the section on the components page.
+  ;Input: section index constant name specified in Section command.
+
+  ClearErrors
+  ;Reading component status from registry
+  ReadRegDWORD $AR_RegFlags HKLM 
"Software\Microsoft\Windows\CurrentVersion\Uninstall\@CPACK_PACKAGE_INSTALL_REGISTRY_KEY@\Components\${SecName}"
 "Installed"
+  IfErrors "default_${SecName}"
+;Status will stay default if registry value not found
+;(component was never installed)
+  IntOp $AR_RegFlags $AR_RegFlags & ${SF_SELECTED} ;Turn off all other bits
+  SectionGetFlags ${${SecName}} $AR_SecFlags  ;Reading default section flags
+  IntOp $AR_SecFlags $AR_SecFlags & 0xFFFE  ;Turn lowest (enabled) bit off
+  IntOp $AR_SecFlags $AR_RegFlags | $AR_SecFlags  ;Change lowest bit
+
+  ; Note whether this component was installed before
+  !insertmacro StoreVar ${SecName}_was_installed $AR_RegFlags
+  IntOp $R0 $AR_RegFlags & $AR_RegFlags
+
+  ;Writing modified flags
+  SectionSetFlags ${${SecName}} $AR_SecFlags
+
+ "default_${SecName}:"
+ !insertmacro 

[planetblupi] 10/19: Fix Win32 build by removing WPARAM/LPARAM clash

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 8f5cfdfaa09d735fd093a370d3b379d19351f891
Author: Mathieu Schroeter 
Date:   Fri Dec 1 13:52:36 2017 +0100

Fix Win32 build by removing WPARAM/LPARAM clash
---
 src/blupi.h   |  8 
 src/event.cxx | 22 +++---
 src/event.h   |  6 +++---
 src/misc.cxx  |  2 +-
 src/misc.h|  2 +-
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/src/blupi.h b/src/blupi.h
index 3801da8..8d4a090 100644
--- a/src/blupi.h
+++ b/src/blupi.h
@@ -48,11 +48,11 @@ struct Rect {
 typedef Uint32 ColorRef;
 
 #if defined(_WIN64)
-typedef unsigned __int64 WPARAM;
-typedef __int64  LPARAM;
+typedef unsigned __int64 WParam;
+typedef __int64  LParam;
 #else
-typedef Uint32 WPARAM;
-typedef Sint32 LPARAM;
+typedef Uint32 WParam;
+typedef Sint32 LParam;
 #endif
 
 #undef LOWORD
diff --git a/src/event.cxx b/src/event.cxx
index e008ba7..10572a2 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -4929,10 +4929,10 @@ CEvent::DemoPlayStop ()
 
 void
 CEvent::WinToSDLEvent (
-  Uint32 msg, WPARAM wParam, LPARAM lParam, SDL_Event & event)
+  Uint32 msg, WParam wParam, LParam lParam, SDL_Event & event)
 {
-#define GET_X_LPARAM(lp) ((Sint32) (Sint16) LOWORD (lp))
-#define GET_Y_LPARAM(lp) ((Sint32) (Sint16) HIWORD (lp))
+#define GET_X_LParam(lp) ((Sint32) (Sint16) LOWORD (lp))
+#define GET_Y_LParam(lp) ((Sint32) (Sint16) HIWORD (lp))
 
   // clang-format off
   static const std::unordered_map keycodes = {
@@ -4997,8 +4997,8 @@ CEvent::WinToSDLEvent (
 msg == EV_LBUTTONDOWN ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
   event.button.button = SDL_BUTTON_LEFT;
   // TODO: wParam CTRL or SHIFT
-  event.button.x = GET_X_LPARAM (lParam);
-  event.button.y = GET_Y_LPARAM (lParam);
+  event.button.x = GET_X_LParam (lParam);
+  event.button.y = GET_Y_LParam (lParam);
   break;
 
 case EV_RBUTTONUP:
@@ -5007,15 +5007,15 @@ CEvent::WinToSDLEvent (
 msg == EV_RBUTTONDOWN ? SDL_MOUSEBUTTONDOWN : SDL_MOUSEBUTTONUP;
   event.button.button = SDL_BUTTON_RIGHT;
   // TODO: wParam CTRL or SHIFT
-  event.button.x = GET_X_LPARAM (lParam);
-  event.button.y = GET_Y_LPARAM (lParam);
+  event.button.x = GET_X_LParam (lParam);
+  event.button.y = GET_Y_LParam (lParam);
   break;
 
 case EV_MOUSEMOVE:
   event.type = SDL_MOUSEMOTION;
   // TODO: wParam CTRL or SHIFT
-  event.motion.x = GET_X_LPARAM (lParam);
-  event.motion.y = GET_Y_LPARAM (lParam);
+  event.motion.x = GET_X_LParam (lParam);
+  event.motion.y = GET_Y_LParam (lParam);
   break;
 }
   }
@@ -5032,8 +5032,8 @@ CEvent::DemoStep ()
 {
   Uint32 time= 0;
   Uint32 message = 0;
-  WPARAM wParam  = 0;
-  LPARAM lParam  = 0;
+  WParam wParam  = 0;
+  LParam lParam  = 0;
 
   if (m_phase == EV_PHASE_INIT)
   {
diff --git a/src/event.h b/src/event.h
index b325539..d54c433 100644
--- a/src/event.h
+++ b/src/event.h
@@ -61,8 +61,8 @@ typedef struct {
 typedef struct {
   Sint32 time;
   Uint32 message;
-  Uint32 wParam; // WPARAM
-  Uint32 lParam; // LPARAM
+  Uint32 wParam; // WParam
+  Uint32 lParam; // LParam
 } DemoEvent;
 
 struct DemoSDLEvent {
@@ -182,7 +182,7 @@ protected:
   bool DemoPlayStart (const std::string * demoFile = nullptr);
   void DemoPlayStop ();
   static void
-   WinToSDLEvent (Uint32 msg, WPARAM wParam, LPARAM lParam, SDL_Event & 
event);
+   WinToSDLEvent (Uint32 msg, WParam wParam, LParam lParam, SDL_Event & 
event);
   void DemoRecEvent (const SDL_Event & event);
 
 protected:
diff --git a/src/misc.cxx b/src/misc.cxx
index 8af0a8e..65ab8b4 100644
--- a/src/misc.cxx
+++ b/src/misc.cxx
@@ -48,7 +48,7 @@ OutputDebug (const char * pMessage)
 // Conversion de la position de la souris.
 
 Point
-ConvLongToPos (LPARAM lParam)
+ConvLongToPos (LParam lParam)
 {
   Point pos;
 
diff --git a/src/misc.h b/src/misc.h
index 312a824..bfd519c 100644
--- a/src/misc.h
+++ b/src/misc.h
@@ -28,7 +28,7 @@
 
 extern void OutputDebug (const char * pMessage);
 
-extern Point ConvLongToPos (LPARAM lParam);
+extern Point ConvLongToPos (LParam lParam);
 
 extern void   InitRandom ();
 extern Sint32 Random (Sint32 min, Sint32 max);

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] tag upstream/1.12.0-16-g222113a created (now 222113a)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a change to tag upstream/1.12.0-16-g222113a
in repository planetblupi.

at  222113a   (commit)
This tag includes the following new commits:

   new  32e734f   Prevent screen move when we are not playing or building
   new  33972f2   Use @PB_ICON@ to link to the icon from the desktop file
   new  cb4dd44   Fix renderer memleak
   new  579a740   Fix blupi channel memleak
   new  a1b5e5c   Fix music memleaks
   new  85b8f43   Fix leak with audio when exiting
   new  7c3c042   Bump micro version (for fix release)
   new  315117e   Fix regression, halt only when suspend
   new  3688d68   Find the right libwinpthread according to the mingw prefix
   new  8f5cfdf   Fix Win32 build by removing WPARAM/LPARAM clash
   new  88357d7   Add the NSIS template file used by CPack
   new  e9f7a71   Add a stupid bootstrap script for the NSIS template
   new  7e6a050   Keep a copy of the original template
   new  fd7fd47   Sign the uninstaller only if desired
   new  63783ca   Fix typo
   new  222113a   Add log for SDL_Init failures

The 16 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 12/19: Add a stupid bootstrap script for the NSIS template

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit e9f7a71b9b186c3eb29bf45adc7f3733bceb126d
Author: Mathieu Schroeter 
Date:   Fri Dec 1 13:57:34 2017 +0100

Add a stupid bootstrap script for the NSIS template
---
 resources/nsis/bootstrap.sh | 4 
 1 file changed, 4 insertions(+)

diff --git a/resources/nsis/bootstrap.sh b/resources/nsis/bootstrap.sh
new file mode 100755
index 000..13ee2e2
--- /dev/null
+++ b/resources/nsis/bootstrap.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cp $(dirname $0)/NSIS.template.in 
/C/msys64/mingw64/share/cmake-3.9/Modules/NSIS.template.in
+cp $(dirname $0)/NSIS.template.in 
/C/msys64/mingw32/share/cmake-3.9/Modules/NSIS.template.in

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 19/19: planetblupi 1.12.0-16-g222113a-1 Debian release

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 0a38b1c193df1b8f4cff8fc2b7584179c502f287
Author: Didier Raboud <o...@debian.org>
Date:   Fri Dec 8 09:54:17 2017 +0100

planetblupi 1.12.0-16-g222113a-1 Debian release
---
 debian/changelog | 6 ++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9984db0..ae1f446 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+planetblupi (1.12.0-16-g222113a-1) unstable; urgency=medium
+
+  * New pre-1.12.1 snapshot; just before the MIDI-to-Ogg conversion
+
+ -- Didier Raboud <o...@debian.org>  Fri, 08 Dec 2017 09:54:17 +0100
+
 planetblupi (1.12.0-1) unstable; urgency=medium
 
   * New 1.12.0 upstream release

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 02/19: Use @PB_ICON@ to link to the icon from the desktop file

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 33972f2072ba3adabf3c0fe09ef0f91a66732512
Author: Didier Raboud <o...@debian.org>
Date:   Thu Nov 2 20:15:32 2017 +0100

Use @PB_ICON@ to link to the icon from the desktop file
---
 resources/linux/application.desktop.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/linux/application.desktop.in 
b/resources/linux/application.desktop.in
index cda0397..db29df3 100644
--- a/resources/linux/application.desktop.in
+++ b/resources/linux/application.desktop.in
@@ -6,5 +6,5 @@ GenericName=Video Game
 Comment=@PB_DESCRIPTION@
 Exec=@PB_EXEC@
 StartupWMClass=@PB_EXEC@
-Icon=@APPIMAGE_ICON_REF@
+Icon=@PB_ICON_REF@
 Categories=Game;StrategyGame;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 14/19: Sign the uninstaller only if desired

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit fd7fd47e54757694a14117cc37667e97c59e60d5
Author: Mathieu Schroeter 
Date:   Fri Dec 1 16:00:35 2017 +0100

Sign the uninstaller only if desired
---
 CMakeLists.txt | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cc1db3e..dc07310 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -316,7 +316,10 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release" AND 
"${STATIC_BUILD}")
 set (CPACK_NSIS_INSTALLED_ICON_NAME "binplanetblupi.exe")
 set (CPACK_NSIS_URL_INFO_ABOUT "http://www.blupi.org;)
 set (CPACK_NSIS_MUI_FINISHPAGE_RUN "planetblupi")
-set (CPACK_NSIS_SIGN_UNINSTALLER "sign -a -fd sha1 -t 
http://time.certum.pl -v")
+if (SIGN_APP
+  set (CPACK_NSIS_SIGN_UNINSTALLER "sign -a -fd sha1 -t 
http://time.certum.pl -v")
+endif ()
+
 include (CPack)
 
 find_program (SIGNTOOL_EXECUTABLE signtool)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 01/19: Prevent screen move when we are not playing or building

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 32e734f59d2f4f4f950b2c1664eaccadb5a9b8c3
Author: Mathieu Schroeter 
Date:   Fri Nov 3 08:55:07 2017 +0100

Prevent screen move when we are not playing or building

- It closes issue #46.
---
 src/event.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/event.cxx b/src/event.cxx
index c574663..e008ba7 100644
--- a/src/event.cxx
+++ b/src/event.cxx
@@ -5426,6 +5426,9 @@ CEvent::TreatEventBase (const SDL_Event & event)
 case SDLK_UP:
 case SDLK_DOWN:
 {
+  if (m_phase != EV_PHASE_PLAY && m_phase != EV_PHASE_BUILD)
+return true;
+
   bool  left, right, up, down;
   const Uint8 * state = SDL_GetKeyboardState (nullptr);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 03/19: Fix renderer memleak

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit cb4dd444b447f3269ce560245ba16bfa512489d7
Author: Mathieu Schroeter 
Date:   Sun Nov 26 21:57:04 2017 +0100

Fix renderer memleak
---
 src/blupi.cxx | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/blupi.cxx b/src/blupi.cxx
index f7bf031..980073c 100644
--- a/src/blupi.cxx
+++ b/src/blupi.cxx
@@ -993,6 +993,9 @@ main (int argc, char * argv[])
   break;
   }
 
+  if (g_renderer)
+SDL_DestroyRenderer (g_renderer);
+
   if (g_window)
 SDL_DestroyWindow (g_window);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 04/19: Fix blupi channel memleak

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 579a74000c4852a9234474dd0b6eec26d22f987a
Author: Mathieu Schroeter 
Date:   Sun Nov 26 21:57:20 2017 +0100

Fix blupi channel memleak
---
 src/pixmap.cxx | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/pixmap.cxx b/src/pixmap.cxx
index 52b8a5e..e62fa34 100644
--- a/src/pixmap.cxx
+++ b/src/pixmap.cxx
@@ -228,9 +228,13 @@ CPixmap::Cache (
 {
   std::string   file= GetBaseDir () + pFilename;
   SDL_Surface * surface = IMG_Load (file.c_str ());
+  bool blupiChSet = false;
 
   if (channel == CHBLUPI && !m_lpSDLBlupi)
+  {
 m_lpSDLBlupi = surface;
+blupiChSet = true;
+  }
 
   SDL_Texture * texture = SDL_CreateTextureFromSurface (g_renderer, surface);
   Uint32format;
@@ -274,7 +278,7 @@ CPixmap::Cache (
   if (!m_SDLTextureInfo[channel].texMask)
 SDL_DestroyTexture (texture);
 
-  if (channel != CHBLUPI)
+  if (!blupiChSet)
 SDL_FreeSurface (surface);
 
   return true;

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 05/19: Fix music memleaks

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit a1b5e5c76f02934a97068d785cbd334f7f955207
Author: Mathieu Schroeter 
Date:   Sun Nov 26 22:21:37 2017 +0100

Fix music memleaks
---
 src/sound.cxx | 13 +
 1 file changed, 13 insertions(+)

diff --git a/src/sound.cxx b/src/sound.cxx
index 7040dee..b0f46a2 100644
--- a/src/sound.cxx
+++ b/src/sound.cxx
@@ -84,6 +84,13 @@ CSound::~CSound ()
 Mix_FreeChunk (m_lpSDL[i]);
 m_lpSDL[i] = nullptr;
   }
+
+  if (m_pMusic)
+  {
+Mix_HaltMusic ();
+Mix_FreeMusic (m_pMusic);
+m_pMusic = nullptr;
+  }
 }
 
 // Initialisation de DirectSound.
@@ -328,6 +335,12 @@ CSound::PlayMusic (const std::string & lpszMIDIFilename)
 
   path += lpszMIDIFilename;
 
+  if (m_pMusic)
+  {
+Mix_HaltMusic ();
+Mix_FreeMusic (m_pMusic);
+  }
+
   m_pMusic = Mix_LoadMUS (path.c_str ());
   if (!m_pMusic)
   {

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits

[planetblupi] 07/19: Bump micro version (for fix release)

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository planetblupi.

commit 7c3c0421ee96a6a6d86a5dc4fc4f3f5b85c612af
Author: Mathieu Schroeter 
Date:   Mon Nov 27 07:01:58 2017 +0100

Bump micro version (for fix release)
---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 292091c..e261087 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ link_directories (${CMAKE_INSTALL_PREFIX}/lib)
 project (planetblupi)
 set (PB_VERSION_MAJOR 1)
 set (PB_VERSION_MINOR 12)
-set (PB_VERSION_PATCH 0)
+set (PB_VERSION_PATCH 1)
 set (PB_VERSION_EXTRA "")
 set (PB_PRODUCT_NAME "Planet Blupi")
 set (PB_PACKAGE_NAME "planetblupi")

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-games/planetblupi.git

___
Pkg-games-commits mailing list
Pkg-games-commits@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits