LogoopenSUSE Build Service > Projects
Sign Up | Log In

View File psychosynth-build-paths.patch of Package psychosynth (Project games)

--- configure.orig
+++ configure
@@ -16985,12 +16985,12 @@
     pkg_cv_CEGUI_CFLAGS="$CEGUI_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI >= 0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "CEGUI >= 0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI-0 >= 0.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "CEGUI-0 >= 0.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CEGUI_CFLAGS=`$PKG_CONFIG --cflags "CEGUI >= 0.7" 2>/dev/null`
+  pkg_cv_CEGUI_CFLAGS=`$PKG_CONFIG --cflags "CEGUI-0 >= 0.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17002,12 +17002,12 @@
     pkg_cv_CEGUI_LIBS="$CEGUI_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI >= 0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "CEGUI >= 0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI-0 >= 0.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "CEGUI-0 >= 0.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CEGUI_LIBS=`$PKG_CONFIG --libs "CEGUI >= 0.7" 2>/dev/null`
+  pkg_cv_CEGUI_LIBS=`$PKG_CONFIG --libs "CEGUI-0 >= 0.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17028,9 +17028,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CEGUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "CEGUI >= 0.7" 2>&1`
+	        CEGUI_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "CEGUI-O >= 0.7" 2>&1`
         else
-	        CEGUI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "CEGUI >= 0.7" 2>&1`
+	        CEGUI_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "CEGUI-0 >= 0.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CEGUI_PKG_ERRORS" >&5
@@ -17057,12 +17057,12 @@
     pkg_cv_CEGUIOGRE_CFLAGS="$CEGUIOGRE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI-OGRE >= 0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "CEGUI-OGRE >= 0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI-0-OGRE >= 0.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "CEGUI-0-OGRE >= 0.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CEGUIOGRE_CFLAGS=`$PKG_CONFIG --cflags "CEGUI-OGRE >= 0.7" 2>/dev/null`
+  pkg_cv_CEGUIOGRE_CFLAGS=`$PKG_CONFIG --cflags "CEGUI-0-OGRE >= 0.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17074,12 +17074,12 @@
     pkg_cv_CEGUIOGRE_LIBS="$CEGUIOGRE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI-OGRE >= 0.7\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "CEGUI-OGRE >= 0.7") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"CEGUI-0-OGRE >= 0.7\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "CEGUI-0-OGRE >= 0.7") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_CEGUIOGRE_LIBS=`$PKG_CONFIG --libs "CEGUI-OGRE >= 0.7" 2>/dev/null`
+  pkg_cv_CEGUIOGRE_LIBS=`$PKG_CONFIG --libs "CEGUI-0-OGRE >= 0.7" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -17100,9 +17100,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        CEGUIOGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "CEGUI-OGRE >= 0.7" 2>&1`
+	        CEGUIOGRE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "CEGUI-0-OGRE >= 0.7" 2>&1`
         else
-	        CEGUIOGRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "CEGUI-OGRE >= 0.7" 2>&1`
+	        CEGUIOGRE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "CEGUI-0-OGRE >= 0.7" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$CEGUIOGRE_PKG_ERRORS" >&5
--- src/gui3d/psychosynth_3d.hpp.orig
+++ src/gui3d/psychosynth_3d.hpp
@@ -26,7 +26,7 @@
 #include <OGRE/Ogre.h>
 #include <cstddef> // CEGUI bugfix.
 #include <CEGUI/CEGUI.h>
-#include <CEGUI/RendererModules/Ogre/CEGUIOgreRenderer.h>
+#include <CEGUI/RendererModules/Ogre/Renderer.h>
 
 #include <psynth/version.hpp>
 #include <psynth/base/timer.hpp>