[Widelands-dev] [PPA widelands-dev-widelands-daily] widelands_17-ppa0-bzr6601+trunk+~saucy1_source.changes rejected
Rejected: File widelands_17-ppa0-bzr6601+trunk+~saucy1.tar.gz already exists in PPA named widelands-daily for Widelands Developers, but uploaded version has different contents. See more information about this error in https://help.launchpad.net/Packaging/UploadErrors. Files specified in DSC are broken or missing, skipping package unpack verification. === If you don't understand why your files were rejected please send an email to launchpad-us...@lists.launchpad.net for help (requires membership). -- https://launchpad.net/~widelands-dev/+archive/widelands-daily You are receiving this email because you are the uploader of the above PPA package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [PPA widelands-dev-widelands-daily] widelands_17-ppa0-bzr6601+trunk+~lucid1_source.changes rejected
Rejected: File widelands_17-ppa0-bzr6601+trunk+~lucid1.tar.gz already exists in PPA named widelands-daily for Widelands Developers, but uploaded version has different contents. See more information about this error in https://help.launchpad.net/Packaging/UploadErrors. Files specified in DSC are broken or missing, skipping package unpack verification. === If you don't understand why your files were rejected please send an email to launchpad-us...@lists.launchpad.net for help (requires membership). -- https://launchpad.net/~widelands-dev/+archive/widelands-daily You are receiving this email because you are the uploader of the above PPA package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [PPA widelands-dev-widelands-daily] widelands_17-ppa0-bzr6601+trunk+~raring1_source.changes rejected
Rejected: File widelands_17-ppa0-bzr6601+trunk+~raring1.tar.gz already exists in PPA named widelands-daily for Widelands Developers, but uploaded version has different contents. See more information about this error in https://help.launchpad.net/Packaging/UploadErrors. Files specified in DSC are broken or missing, skipping package unpack verification. === If you don't understand why your files were rejected please send an email to launchpad-us...@lists.launchpad.net for help (requires membership). -- https://launchpad.net/~widelands-dev/+archive/widelands-daily You are receiving this email because you are the uploader of the above PPA package. ___ Mailing list: https://launchpad.net/~widelands-dev Post to : widelands-dev@lists.launchpad.net Unsubscribe : https://launchpad.net/~widelands-dev More help : https://help.launchpad.net/ListHelp
[Widelands-dev] [Merge] lp:~qcumber-some/widelands/bug1098263 into lp:widelands
Jens Beyer (Qcumber-some) has proposed merging
lp:~qcumber-some/widelands/bug1098263 into lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1098263 in widelands: Widelands does not start if PC has OpenGL
problems
https://bugs.launchpad.net/widelands/+bug/1098263
For more details, see:
https://code.launchpad.net/~qcumber-some/widelands/bug1098263/+merge/174275
Ok, I tried to fix this.
The reason I had to split the init function is that the GL_EXTENSIONS seems to
be available only late in the game (it looks like glewInit() does provide it).
Problem now is that it looks like we are leaking a sdlsurface instance there
(check the TODO), or not? I am not sure.
And I am not sure if I found all possible paths in the code.
Please review thoroughly ;-)
--
https://code.launchpad.net/~qcumber-some/widelands/bug1098263/+merge/174275
Your team Widelands Developers is requested to review the proposed merge of
lp:~qcumber-some/widelands/bug1098263 into lp:widelands.
=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc 2013-03-09 14:41:03 +
+++ src/graphic/graphic.cc 2013-07-11 19:21:43 +
@@ -149,6 +149,9 @@
log(Graphics: FULLSCREEN ENABLED\n);
#ifdef USE_OPENGL
+ bool use_arb = true;
+ const char * extensions;
+
if (0 != (sdlsurface-flags SDL_OPENGL)) {
// We have successful opened an opengl screen. Print some information
// about opengl and set the rendering capabilities.
@@ -160,9 +163,35 @@
throw wexception(glewInit returns %i: Broken OpenGL installation., err);
}
+ extensions = reinterpret_castconst char *(glGetString (GL_EXTENSIONS));
+
+ if (strstr(extensions, GL_ARB_framebuffer_object) != 0) {
+ use_arb = true;
+ } else if (strstr(extensions, GL_EXT_framebuffer_object) != 0) {
+ use_arb = false;
+ }
+ else {
+ log
+ (Graphics: Neither GL_ARB_framebuffer_object or GL_EXT_framebuffer_object supported!
+ Switching off OpenGL!\n
+ );
+ flags = ~SDL_OPENGL;
+ m_fallback_settings_in_effect = true;
+
+ //TODO Do we have a leak of the old sdlsurface instance here?!
+ sdlsurface = SDL_SetVideoMode
+ (FALLBACK_GRAPHICS_WIDTH, FALLBACK_GRAPHICS_HEIGHT, FALLBACK_GRAPHICS_DEPTH, flags);
+ m_fallback_settings_in_effect = true;
+ if (!sdlsurface)
+throw wexception
+(Graphics: could not set video mode: %s, SDL_GetError());
+ }
+ }
+
+ if (0 != (sdlsurface-flags SDL_OPENGL)) {
+ // We now really have a working opengl screen...
g_opengl = true;
-
GLboolean glBool;
glGetBooleanv(GL_DOUBLEBUFFER, glBool);
log
@@ -193,8 +222,6 @@
(Graphics: OpenGL: Version %d.%d \%s\\n,
m_caps.gl.major_version, m_caps.gl.minor_version, str);
- const char * extensions = reinterpret_castconst char *(glGetString (GL_EXTENSIONS));
-
m_caps.gl.tex_power_of_two =
(m_caps.gl.major_version 2) and
(strstr(extensions, GL_ARB_texture_non_power_of_two) == 0);
@@ -287,7 +314,7 @@
SDL_GL_SwapBuffers();
glEnable(GL_TEXTURE_2D);
- GLSurfaceTexture::Initialize();
+ GLSurfaceTexture::Initialize(use_arb);
}
=== modified file 'src/graphic/render/gl_surface_texture.cc'
--- src/graphic/render/gl_surface_texture.cc 2013-02-10 18:47:18 +
+++ src/graphic/render/gl_surface_texture.cc 2013-07-11 19:21:43 +
@@ -30,27 +30,25 @@
/**
* Initial global resources needed for fast offscreen rendering.
*/
-void GLSurfaceTexture::Initialize() {
- const char * extensions = reinterpret_castconst char *(glGetString (GL_EXTENSIONS));
+void GLSurfaceTexture::Initialize(bool use_arb) {
+ use_arb_ = use_arb;
// Generate the framebuffer for Offscreen rendering.
bool fbs = false;
- if (strstr(extensions, GL_ARB_framebuffer_object) != 0) {
+ if (use_arb) {
fbs = true;
- use_arb_ = true;
glGenFramebuffers(1, gl_framebuffer_id_);
glBindFramebuffer(GL_FRAMEBUFFER, 0);
- } else if (strstr(extensions, GL_EXT_framebuffer_object) != 0) {
+ } else {
fbs = true;
- use_arb_ = false;
glGenFramebuffersEXT(1, gl_framebuffer_id_);
glBindFramebufferEXT(GL_FRAMEBUFFER, 0);
}
if (!fbs) {
throw wexception
- (No support for GL_ARB_framebuffer_object or GL_ARB_framebuffer_object
- in OpenGL implementation. One of these is needed for Widelands in OpenGL mode. You can
- try launching Widelands with --opengl=0.);
+ (Could not initialize framebuffer for OpenGL. Your video card reported
+ sufficient capabilities, but it did not work. You can
+ try launching Widelands with --opengl=0.);
}
}
=== modified file 'src/graphic/render/gl_surface_texture.h'
--- src/graphic/render/gl_surface_texture.h 2013-02-10 17:39:24 +
+++ src/graphic/render/gl_surface_texture.h 2013-07-11 19:21:43 +
@@ -27,7 +27,7 @@
public:
// Call this once before using any instance of this class and Cleanup once
// before the program exits.
- static void Initialize();
+ static void Initialize(bool use_arb);
static void Cleanup();
GLSurfaceTexture(SDL_Surface *
[Widelands-dev] [Merge] lp:~charlyghislain/widelands/portdock-fix into lp:widelands
SirVer has proposed merging lp:~charlyghislain/widelands/portdock-fix into
lp:widelands.
Requested reviews:
Widelands Developers (widelands-dev)
Related bugs:
Bug #1199653 in widelands: Unseen port crashes the game when saving
https://bugs.launchpad.net/widelands/+bug/1199653
For more details, see:
https://code.launchpad.net/~charlyghislain/widelands/portdock-fix/+merge/174335
--
https://code.launchpad.net/~charlyghislain/widelands/portdock-fix/+merge/174335
Your team Widelands Developers is requested to review the proposed merge of
lp:~charlyghislain/widelands/portdock-fix into lp:widelands.
=== modified file 'src/logic/instances.h'
--- src/logic/instances.h 2013-07-09 05:40:36 +
+++ src/logic/instances.h 2013-07-12 04:48:29 +
@@ -104,6 +104,7 @@
* \todo move this to another header??
*/
extern Map_Object_Descr g_flag_descr;
+extern Map_Object_Descr g_portdock_descr;
/**
* \par Notes on Map_Object
=== modified file 'src/map_io/widelands_map_players_view_data_packet.cc'
--- src/map_io/widelands_map_players_view_data_packet.cc 2013-07-09 09:04:48 +
+++ src/map_io/widelands_map_players_view_data_packet.cc 2013-07-12 04:48:29 +
@@ -48,7 +48,7 @@
#define UNSEEN_TIMES_CURRENT_PACKET_VERSION 1
#define UNSEEN_TIMES_FILENAME_TEMPLATE DIRNAME_TEMPLATE /unseen_times_%u
-#define NODE_IMMOVABLE_KINDS_CURRENT_PACKET_VERSION 1
+#define NODE_IMMOVABLE_KINDS_CURRENT_PACKET_VERSION 2
#define NODE_IMMOVABLE_KINDS_FILENAME_TEMPLATE DIRNAME_TEMPLATE /node_immovable_kinds_%u
#define NODE_IMMOVABLES_CURRENT_PACKET_VERSION 2
@@ -60,7 +60,7 @@
#define TERRAINS_CURRENT_PACKET_VERSION 1
#define TERRAINS_FILENAME_TEMPLATE DIRNAME_TEMPLATE /terrains_%u
-#define TRIANGLE_IMMOVABLE_KINDS_CURRENT_PACKET_VERSION 1
+#define TRIANGLE_IMMOVABLE_KINDS_CURRENT_PACKET_VERSION 2
#define TRIANGLE_IMMOVABLE_KINDS_FILENAME_TEMPLATE DIRNAME_TEMPLATE /triangle_immovable_kinds_%u
#define TRIANGLE_IMMOVABLES_CURRENT_PACKET_VERSION 2
@@ -112,7 +112,7 @@
inline static Map_Object_Data read_unseen_immovable
(const Editor_Game_Base egbase,
- BitInBuffer2 immovable_kinds_file,
+ BitInBuffer4 immovable_kinds_file,
FileReadimmovables_file,
uint8_t version
)
@@ -139,6 +139,8 @@
}
}
break;
+ case 4: // The player sees a port dock
+ m.map_object_descr = g_portdock_descr; break;
default:
throw game_data_error(Unknown immovable-kind type %d, immovable_kinds_file.get());
break;
@@ -348,7 +350,7 @@
// Read the player's knowledge about all fields
OPEN_INPUT_FILE
- (BitInBuffer2, node_immovable_kinds_file,
+ (BitInBuffer4, node_immovable_kinds_file,
node_immovable_kinds_filename,
NODE_IMMOVABLE_KINDS_FILENAME_TEMPLATE,
NODE_IMMOVABLE_KINDS_CURRENT_PACKET_VERSION);
@@ -368,7 +370,7 @@
TERRAINS_FILENAME_TEMPLATE, TERRAINS_CURRENT_PACKET_VERSION);
OPEN_INPUT_FILE
- (BitInBuffer2, triangle_immovable_kinds_file,
+ (BitInBuffer4, triangle_immovable_kinds_file,
triangle_immovable_kinds_filename,
TRIANGLE_IMMOVABLE_KINDS_FILENAME_TEMPLATE,
TRIANGLE_IMMOVABLE_KINDS_CURRENT_PACKET_VERSION);
@@ -726,7 +728,7 @@
inline static void write_unseen_immovable
(Map_Object_Data const * map_object_data,
- BitOutBuffer2 immovable_kinds_file, FileWrite immovables_file)
+ BitOutBuffer4 immovable_kinds_file, FileWrite immovables_file)
{
Map_Object_Descr const * const map_object_descr = map_object_data-map_object_descr;
const Player::Constructionsite_Information csi = map_object_data-csi;
@@ -759,7 +761,8 @@
immovables_file.Unsigned32(csi.totaltime);
immovables_file.Unsigned32(csi.completedtime);
}
- }
+ } else if (map_object_descr == g_portdock_descr)
+ immovable_kind = 4;
else
{
// We should never get here.. debugging code until assert(false)
@@ -793,11 +796,11 @@
iterate_players_existing_const(plnum, nr_players, egbase, player)
if (const Player::Field * const player_fields = player-m_fields) {
FileWrite unseen_times_file;
- BitOutBuffer2 node_immovable_kinds_file;
+ BitOutBuffer4 node_immovable_kinds_file;
FileWritenode_immovables_file;
BitOutBuffer2roads_file;
BitOutBuffer4 terrains_file;
- BitOutBuffer2 triangle_immovable_kinds_file;
+ BitOutBuffer4 triangle_immovable_kinds_file;
FileWritetriangle_immovables_file;
FileWrite owners_file;
BitOutBuffer1 surveys_file;
___
Mailing list: https://launchpad.net/~widelands-dev
Post to : widelands-dev@lists.launchpad.net
Unsubscribe : https://launchpad.net/~widelands-dev
More help : https://help.launchpad.net/ListHelp
