On Wed, 20 Jan 2016 15:09:18 +0100 Chris Lamb <la...@debian.org> wrote: > Source: smc > Version: 1.9+git20121121-1.2 > Severity: serious > Justification: fails to build from source > User: reproducible-bui...@lists.alioth.debian.org > Usertags: ftbfs > X-Debbugs-Cc: reproducible-bui...@lists.alioth.debian.org > > Dear Maintainer, > > smc fails to build from source in unstable/amd64:
I had a go at this bug. SMC has to be ported to CEGUI 0.8.4. I replaced obsolete includes but there is obviously more work to do. I am attaching my preliminary work for now but I think it would be best to package the latest upstream release of SMC instead. Regards, Markus
From: Markus Koschany <a...@debian.org>
Date: Tue, 8 Mar 2016 15:25:53 +0100
Subject: cegui 0.8.4
---
configure.ac | 4 ++--
src/audio/random_sound.cpp | 2 +-
src/core/campaign_manager.h | 4 ++--
src/core/editor.h | 4 ++--
src/core/game_core.h | 2 +-
src/core/property_helper.h | 2 +-
src/enemies/bosses/turtle_boss.cpp | 2 +-
src/enemies/eato.cpp | 2 +-
src/enemies/flyon.cpp | 2 +-
src/enemies/furball.cpp | 2 +-
src/enemies/gee.cpp | 2 +-
src/enemies/krush.cpp | 2 +-
src/enemies/rokko.cpp | 2 +-
src/enemies/spika.cpp | 2 +-
src/enemies/spikeball.cpp | 2 +-
src/enemies/static.cpp | 2 +-
src/enemies/thromp.cpp | 2 +-
src/enemies/turtle.cpp | 2 +-
src/gui/menu.cpp | 2 +-
src/level/level.h | 4 ++--
src/level/level_background.h | 2 +-
src/objects/bonusbox.cpp | 2 +-
src/objects/box.cpp | 2 +-
src/objects/level_entry.cpp | 2 +-
src/objects/level_exit.cpp | 2 +-
src/objects/sprite.h | 2 +-
src/objects/star.cpp | 2 +-
src/overworld/overworld.cpp | 2 +-
src/overworld/overworld.h | 4 ++--
src/overworld/world_layer.h | 4 ++--
src/overworld/world_manager.h | 4 ++--
src/user/preferences.h | 4 ++--
src/user/savegame.h | 4 ++--
src/video/animation.cpp | 2 +-
src/video/color.h | 2 +-
src/video/img_manager.cpp | 4 ++--
src/video/video.cpp | 22 +++++++++++-----------
src/video/video.h | 4 ++--
38 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/configure.ac b/configure.ac
index bd0b059..7f41436 100644
--- a/configure.ac
+++ b/configure.ac
@@ -72,14 +72,14 @@ AC_CHECK_LIB([SDL_ttf], [TTF_Init], ,
[AC_MSG_ERROR([SDL_ttf library not found])])
# Check for the CEGUI library
-PKG_CHECK_MODULES([CEGUI_OPENGL], [CEGUI-OPENGL >= 0.7.2])
+PKG_CHECK_MODULES([CEGUI_OPENGL], [CEGUI-0-OPENGL >= 0.7.2])
CPPFLAGS="$CPPFLAGS $CEGUI_OPENGL_CFLAGS"
LIBS="$LIBS $CEGUI_OPENGL_LIBS"
# CEGUI 0.7.5 does not install CEGUI-NULL.pc
#PKG_CHECK_MODULES([CEGUI_NULL], [CEGUI-NULL >= 0.7.2])
#CPPFLAGS="$CPPFLAGS $CEGUI_NULL_CFLAGS"
#LIBS="$LIBS $CEGUI_NULL_LIBS"
-AC_CHECK_LIB([CEGUINullRenderer], [main], ,
+AC_CHECK_LIB([CEGUINullRenderer-0], [main], ,
[AC_MSG_ERROR([CEGUINullRenderer library not found - try building CEGUI with --enable-null-renderer])])
# Check for the gettext library
diff --git a/src/audio/random_sound.cpp b/src/audio/random_sound.cpp
index 01be27d..e2225f7 100644
--- a/src/audio/random_sound.cpp
+++ b/src/audio/random_sound.cpp
@@ -22,7 +22,7 @@
#include "../core/math/utilities.h"
#include "../core/i18n.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICheckbox.h"
diff --git a/src/core/campaign_manager.h b/src/core/campaign_manager.h
index cb2ce4b..02c3e7e 100644
--- a/src/core/campaign_manager.h
+++ b/src/core/campaign_manager.h
@@ -20,8 +20,8 @@
#include "../core/global_game.h"
#include "../core/obj_manager.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/core/editor.h b/src/core/editor.h
index 1cfbed5..01ed439 100644
--- a/src/core/editor.h
+++ b/src/core/editor.h
@@ -21,8 +21,8 @@
#include "../gui/hud.h"
#include "../video/img_settings.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
#include "elements/CEGUIListbox.h"
#include "elements/CEGUIListboxTextItem.h"
#include "CEGUIImageset.h"
diff --git a/src/core/game_core.h b/src/core/game_core.h
index f28f942..a0194c7 100644
--- a/src/core/game_core.h
+++ b/src/core/game_core.h
@@ -20,7 +20,7 @@
#include "../objects/sprite.h"
#include "../core/camera.h"
// CEGUI
-#include "CEGUIPropertyHelper.h"
+#include <CEGUI/PropertyHelper.h>
namespace SMC
{
diff --git a/src/core/property_helper.h b/src/core/property_helper.h
index c6f2033..d956398 100644
--- a/src/core/property_helper.h
+++ b/src/core/property_helper.h
@@ -21,7 +21,7 @@
#include "SDL.h"
#include <algorithm>
// CEGUI
-#include "CEGUIString.h"
+#include <CEGUI/String.h>
namespace SMC
{
diff --git a/src/enemies/bosses/turtle_boss.cpp b/src/enemies/bosses/turtle_boss.cpp
index bb1474e..0772d2e 100644
--- a/src/enemies/bosses/turtle_boss.cpp
+++ b/src/enemies/bosses/turtle_boss.cpp
@@ -24,7 +24,7 @@
#include "../../core/sprite_manager.h"
#include "../../core/i18n.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUICombobox.h"
#include "elements/CEGUIListboxTextItem.h"
diff --git a/src/enemies/eato.cpp b/src/enemies/eato.cpp
index 0cd3bbd..167f6a5 100644
--- a/src/enemies/eato.cpp
+++ b/src/enemies/eato.cpp
@@ -21,7 +21,7 @@
#include "../core/i18n.h"
#include "../core/filesystem/filesystem.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/enemies/flyon.cpp b/src/enemies/flyon.cpp
index 40e2a2b..032198f 100644
--- a/src/enemies/flyon.cpp
+++ b/src/enemies/flyon.cpp
@@ -24,7 +24,7 @@
#include "../core/i18n.h"
#include "../core/filesystem/filesystem.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/enemies/furball.cpp b/src/enemies/furball.cpp
index fe846f3..71b2c83 100644
--- a/src/enemies/furball.cpp
+++ b/src/enemies/furball.cpp
@@ -22,7 +22,7 @@
#include "../level/level_manager.h"
#include "../core/sprite_manager.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/enemies/gee.cpp b/src/enemies/gee.cpp
index 17c0363..c161953 100644
--- a/src/enemies/gee.cpp
+++ b/src/enemies/gee.cpp
@@ -21,7 +21,7 @@
#include "../input/mouse.h"
#include "../core/i18n.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/enemies/krush.cpp b/src/enemies/krush.cpp
index f9c67d7..fc46a78 100644
--- a/src/enemies/krush.cpp
+++ b/src/enemies/krush.cpp
@@ -23,7 +23,7 @@
#include "../core/i18n.h"
#include "../core/sprite_manager.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUICombobox.h"
#include "elements/CEGUIListboxTextItem.h"
diff --git a/src/enemies/rokko.cpp b/src/enemies/rokko.cpp
index 7059508..97b9159 100644
--- a/src/enemies/rokko.cpp
+++ b/src/enemies/rokko.cpp
@@ -23,7 +23,7 @@
#include "../input/mouse.h"
#include "../core/i18n.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/enemies/spika.cpp b/src/enemies/spika.cpp
index f24a3e9..705207f 100644
--- a/src/enemies/spika.cpp
+++ b/src/enemies/spika.cpp
@@ -23,7 +23,7 @@
#include "../core/i18n.h"
#include "../enemies/bosses/turtle_boss.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/enemies/spikeball.cpp b/src/enemies/spikeball.cpp
index 258d894..f0ab232 100644
--- a/src/enemies/spikeball.cpp
+++ b/src/enemies/spikeball.cpp
@@ -21,7 +21,7 @@
#include "../video/animation.h"
#include "../core/sprite_manager.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUICombobox.h"
#include "elements/CEGUIListboxTextItem.h"
diff --git a/src/enemies/static.cpp b/src/enemies/static.cpp
index 4e7aeeb..ed41ca3 100644
--- a/src/enemies/static.cpp
+++ b/src/enemies/static.cpp
@@ -24,7 +24,7 @@
#include "../objects/path.h"
#include "../core/filesystem/filesystem.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/enemies/thromp.cpp b/src/enemies/thromp.cpp
index c911f3a..6111d8f 100644
--- a/src/enemies/thromp.cpp
+++ b/src/enemies/thromp.cpp
@@ -26,7 +26,7 @@
#include "../core/i18n.h"
#include "../core/filesystem/filesystem.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUICombobox.h"
#include "elements/CEGUIListboxTextItem.h"
diff --git a/src/enemies/turtle.cpp b/src/enemies/turtle.cpp
index 3d3c543..a084d66 100644
--- a/src/enemies/turtle.cpp
+++ b/src/enemies/turtle.cpp
@@ -25,7 +25,7 @@
#include "../core/sprite_manager.h"
#include "../core/i18n.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUICombobox.h"
#include "elements/CEGUIListboxTextItem.h"
diff --git a/src/gui/menu.cpp b/src/gui/menu.cpp
index fdeef90..f1181cf 100644
--- a/src/gui/menu.cpp
+++ b/src/gui/menu.cpp
@@ -27,7 +27,7 @@
#include "../user/preferences.h"
#include "../input/keyboard.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIListbox.h"
#include "elements/CEGUIListboxItem.h"
diff --git a/src/level/level.h b/src/level/level.h
index 774c978..b370146 100644
--- a/src/level/level.h
+++ b/src/level/level.h
@@ -23,8 +23,8 @@
#include "../audio/random_sound.h"
#include "../video/animation.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/level/level_background.h b/src/level/level_background.h
index b605a8c..40e351e 100644
--- a/src/level/level_background.h
+++ b/src/level/level_background.h
@@ -20,7 +20,7 @@
#include "../video/video.h"
#include "../core/obj_manager.h"
// CEGUI
-#include "CEGUIXMLSerializer.h"
+#include <CEGUI/XMLSerializer.h>
namespace SMC
{
diff --git a/src/objects/bonusbox.cpp b/src/objects/bonusbox.cpp
index 152758b..48f87ae 100644
--- a/src/objects/bonusbox.cpp
+++ b/src/objects/bonusbox.cpp
@@ -26,7 +26,7 @@
#include "../core/sprite_manager.h"
#include "../core/i18n.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUICombobox.h"
#include "elements/CEGUIListboxTextItem.h"
diff --git a/src/objects/box.cpp b/src/objects/box.cpp
index dfd670a..63ec353 100644
--- a/src/objects/box.cpp
+++ b/src/objects/box.cpp
@@ -29,7 +29,7 @@
#include "../enemies/bosses/turtle_boss.h"
#include "../gui/hud.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/objects/level_entry.cpp b/src/objects/level_entry.cpp
index 157834d..9e6896e 100644
--- a/src/objects/level_entry.cpp
+++ b/src/objects/level_entry.cpp
@@ -26,7 +26,7 @@
#include "../core/i18n.h"
#include "../core/sprite_manager.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/objects/level_exit.cpp b/src/objects/level_exit.cpp
index 9859c4f..f9db23d 100644
--- a/src/objects/level_exit.cpp
+++ b/src/objects/level_exit.cpp
@@ -27,7 +27,7 @@
#include "../core/i18n.h"
#include "../core/filesystem/filesystem.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICombobox.h"
diff --git a/src/objects/sprite.h b/src/objects/sprite.h
index f7f6572..5195f64 100644
--- a/src/objects/sprite.h
+++ b/src/objects/sprite.h
@@ -21,7 +21,7 @@
#include "../video/video.h"
#include "../core/collision.h"
// CEGUI
-#include "CEGUIXMLSerializer.h"
+#include <CEGUI/XMLSerializer.h>
namespace SMC
{
diff --git a/src/objects/star.cpp b/src/objects/star.cpp
index 1b77c2e..4a65a4a 100644
--- a/src/objects/star.cpp
+++ b/src/objects/star.cpp
@@ -20,7 +20,7 @@
#include "../core/i18n.h"
#include "../core/game_core.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/overworld/overworld.cpp b/src/overworld/overworld.cpp
index 3030761..c22e877 100644
--- a/src/overworld/overworld.cpp
+++ b/src/overworld/overworld.cpp
@@ -32,7 +32,7 @@
#include "../core/filesystem/resource_manager.h"
// CEGUI
#include "CEGUIXMLParser.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIExceptions.h"
namespace SMC
diff --git a/src/overworld/overworld.h b/src/overworld/overworld.h
index f5e3f65..b82c62f 100644
--- a/src/overworld/overworld.h
+++ b/src/overworld/overworld.h
@@ -24,8 +24,8 @@
#include "../gui/hud.h"
#include "../audio/random_sound.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/overworld/world_layer.h b/src/overworld/world_layer.h
index f2dba08..ef40f56 100644
--- a/src/overworld/world_layer.h
+++ b/src/overworld/world_layer.h
@@ -21,8 +21,8 @@
#include "../core/obj_manager.h"
#include "../overworld/world_waypoint.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/overworld/world_manager.h b/src/overworld/world_manager.h
index 60713ac..583783c 100644
--- a/src/overworld/world_manager.h
+++ b/src/overworld/world_manager.h
@@ -20,8 +20,8 @@
#include "../core/obj_manager.h"
#include "../core/camera.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/user/preferences.h b/src/user/preferences.h
index 5578bf1..80d88d4 100644
--- a/src/user/preferences.h
+++ b/src/user/preferences.h
@@ -20,8 +20,8 @@
// SDL
#include "SDL.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/user/savegame.h b/src/user/savegame.h
index 045c0ba..c91b02f 100644
--- a/src/user/savegame.h
+++ b/src/user/savegame.h
@@ -18,8 +18,8 @@
#include "../objects/sprite.h"
// CEGUI
-#include "CEGUIXMLHandler.h"
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLHandler.h>
+#include <CEGUI/XMLAttributes.h>
namespace SMC
{
diff --git a/src/video/animation.cpp b/src/video/animation.cpp
index 5e5345b..3d33b89 100644
--- a/src/video/animation.cpp
+++ b/src/video/animation.cpp
@@ -23,7 +23,7 @@
#include "../core/filesystem/filesystem.h"
#include "../input/mouse.h"
// CEGUI
-#include "CEGUIXMLAttributes.h"
+#include <CEGUI/XMLAttributes.h>
#include "CEGUIWindowManager.h"
#include "elements/CEGUIEditbox.h"
#include "elements/CEGUICheckbox.h"
diff --git a/src/video/color.h b/src/video/color.h
index 08d141e..17c06fc 100644
--- a/src/video/color.h
+++ b/src/video/color.h
@@ -19,7 +19,7 @@
// SDL
#include "SDL.h"
// CEGUI
-#include "CEGUIcolour.h"
+#include <CEGUI/Colour.h>
namespace SMC
{
diff --git a/src/video/img_manager.cpp b/src/video/img_manager.cpp
index 8a26485..5ed89b5 100644
--- a/src/video/img_manager.cpp
+++ b/src/video/img_manager.cpp
@@ -17,8 +17,8 @@
#include "../video/renderer.h"
#include "../core/i18n.h"
// CEGUI
-#include "CEGUIWindowManager.h"
-#include "elements/CEGUIProgressBar.h"
+#include <CEGUI/WindowManager.h>
+#include <CEGUI/widgets/ProgressBar.h>
namespace SMC
{
diff --git a/src/video/video.cpp b/src/video/video.cpp
index a6d250e..240e343 100644
--- a/src/video/video.cpp
+++ b/src/video/video.cpp
@@ -32,17 +32,17 @@
// SDL
#include "SDL_opengl.h"
// CEGUI
-#include "CEGUIDefaultResourceProvider.h"
-#include "CEGUIDefaultLogger.h"
-#include "CEGUIExceptions.h"
-#include "CEGUIWindowFactoryManager.h"
-#include "CEGUIImagesetManager.h"
-#include "CEGUIFontManager.h"
-#include "CEGUIWindowManager.h"
-#include "CEGUISchemeManager.h"
-#include "falagard/CEGUIFalWidgetLookManager.h"
-#include "elements/CEGUIProgressBar.h"
-#include "RendererModules/Null/CEGUINullRenderer.h"
+#include <CEGUI/DefaultResourceProvider.h>
+#include <CEGUI/DefaultLogger.h>
+#include <CEGUI/Exceptions.h>
+#include <CEGUI/WindowFactoryManager.h>
+#include <CEGUI/ImagesetManager.h>
+#include <CEGUI/FontManager.h>
+#include <CEGUI/WindowManager.h>
+#include <CEGUI/SchemeManager.h>
+#include <CEGUI/falagard/WidgetLookManager.h>
+#include <CEGUI/widgets/ProgressBar.h>
+#include <CEGUI/RendererModules/Null/Renderer.h>
// png
#include <png.h>
#ifndef PNG_COLOR_TYPE_RGBA
diff --git a/src/video/video.h b/src/video/video.h
index ef62814..221fa42 100644
--- a/src/video/video.h
+++ b/src/video/video.h
@@ -35,8 +35,8 @@
#endif
#include "SDL_syswm.h"
// CEGUI
-#include "CEGUISystem.h"
-#include "RendererModules/OpenGL/CEGUIOpenGLRenderer.h"
+#include <CEGUI/System.h>
+#include <CEGUI/RendererModules/OpenGL/GLRenderer.h>
// boost thread
#include <boost/thread/thread.hpp>
signature.asc
Description: OpenPGP digital signature
