Hello community, here is the log from the commit of package gource for openSUSE:Factory checked in at 2017-07-17 09:10:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gource (Old) and /work/SRC/openSUSE:Factory/.gource.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "gource" Mon Jul 17 09:10:54 2017 rev:9 rq:510113 version:0.44 Changes: -------- --- /work/SRC/openSUSE:Factory/gource/gource.changes 2017-02-03 17:41:25.529072292 +0100 +++ /work/SRC/openSUSE:Factory/.gource.new/gource.changes 2017-07-17 09:10:55.781868392 +0200 @@ -1,0 +2,12 @@ +Thu Jul 13 09:28:11 UTC 2017 - astie...@suse.com + +- update to 0.44: + * Fixed crash when taking a screenshot with an odd resolution + * Fixed type deduction compilation error with newer versions of GCC + * Documentation improvements +- drop svn-gource, gource has buil-t in svn support +- drop cvs-exp.pl +- drop gource-0.43-gcc6.patch, no longer required +- drop boost_ppc64le.patch, not being built for it + +------------------------------------------------------------------- Old: ---- boost_ppc64le.patch cvs-exp.pl gource-0.43-gcc6.patch gource-0.43.tar.gz svn-gource.py New: ---- gource-0.44.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gource.spec ++++++ --- /var/tmp/diff_new_pack.TzTtbz/_old 2017-07-17 09:10:56.385783330 +0200 +++ /var/tmp/diff_new_pack.TzTtbz/_new 2017-07-17 09:10:56.389782766 +0200 @@ -17,24 +17,13 @@ Name: gource -Version: 0.43 +Version: 0.44 Release: 0 Summary: Software version control visualization tool License: GPL-3.0+ Group: Productivity/Graphics/Visualization/Graph -Url: https://code.google.com/p/gource/ +Url: http://gource.io/ Source: https://github.com/acaudwell/Gource/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz -Source1: http://gource.googlecode.com/files/cvs-exp.pl -Source2: https://raw.githubusercontent.com/acaudwell/Gource/gource-%{version}/contrib/svn-gource.py -Patch0: boost_ppc64le.patch -# PATCH-FIX-UPSTREAM fix no matching function for call to 'max(double, float)' -Patch1: gource-0.43-gcc6.patch -BuildRequires: automake -%if 0%{?suse_version} > 1325 -BuildRequires: libboost_filesystem-devel -%else -BuildRequires: boost-devel >= 1.46 -%endif BuildRequires: gcc-c++ BuildRequires: glew-devel BuildRequires: glm-devel >= 0.9.3 @@ -44,7 +33,11 @@ BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libpng) >= 1.2 Requires: freefont -BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?suse_version} > 1325 +BuildRequires: libboost_filesystem-devel +%else +BuildRequires: boost-devel >= 1.46 +%endif %if 0%{?suse_version} >= 1310 BuildRequires: pkgconfig(SDL2_image) >= 2.0 BuildRequires: pkgconfig(sdl2) >= 2.0 @@ -66,11 +59,8 @@ %prep %setup -q -%patch0 -p1 -%patch1 -p1 %build -autoreconf -fi %configure \ --with-tinyxml=yes \ @@ -79,16 +69,11 @@ %install %make_install -install %{SOURCE1} %{buildroot}%{_bindir}/cvs-exp -install %{SOURCE2} %{buildroot}%{_bindir}/svn-gource %files -%defattr(-,root,root) %doc COPYING ChangeLog README THANKS %{_mandir}/man1/* %{_bindir}/gource -%{_bindir}/cvs-exp -%{_bindir}/svn-gource %{_datadir}/gource/ %changelog ++++++ gource-0.43.tar.gz -> gource-0.44.tar.gz ++++++ ++++ 2114 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/ChangeLog new/gource-0.44/ChangeLog --- old/gource-0.43/ChangeLog 2014-10-16 04:23:34.000000000 +0200 +++ new/gource-0.44/ChangeLog 2016-07-28 02:53:40.000000000 +0200 @@ -1,3 +1,8 @@ +0.44: + * Fixed crash when taking a screenshot with an odd resolution. + * Fixed type deduction compilation error with newer versions of GCC. + * Documentation improvements. + 0.43: * Updated boost autoconf macros to fix multi-arch detection. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/README new/gource-0.44/README --- old/gource-0.43/README 2014-10-16 04:23:22.000000000 +0200 +++ new/gource-0.44/README 2016-07-28 02:53:40.000000000 +0200 @@ -5,7 +5,7 @@ Copyright (C) 2009 Andrew Caudwell - http://gource.googlecode.com/ + http://gource.io Contents ======== @@ -220,7 +220,7 @@ Time users take to come to a halt. --user-scale SCALE - Change scale of users. + Change scale of user avatars. --camera-mode MODE Camera mode (overview,track). @@ -347,14 +347,14 @@ See the guide on the homepage for examples of recording videos with Gource: - http://code.google.com/p/gource/wiki/Videos + https://github.com/acaudwell/Gource/wiki/Videos More Information: Visit the Gource homepage for guides and examples of using Gource with various version control systems: - http://code.google.com/p/gource/ + http://gource.io Interface: @@ -377,12 +377,18 @@ (V) Toggle camera mode (C) Displays Gource logo - (K) Toggle file extension key. + (K) Toggle file extension key (M) Toggle mouse visibility - (N) Jump forward in time to next log entry. - (S) Randomize colours. - (+-) Adjust simulation speed. - (<>) Adjust time scale. + (N) Jump forward in time to next log entry + (S) Randomize colours + (D) Toggle directory name display mode + (F) Toggle file name display mode + (U) Toggle user name display mode + (G) Toggle display of users + (T) Toggle display of directory tree edges + (R) Toggle display of root directory edges + (+-) Adjust simulation speed + (<>) Adjust time scale (TAB) Cycle through visible users (F12) Screenshot (Alt+Enter) Fullscreen toggle diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/build-aux/compile new/gource-0.44/build-aux/compile --- old/gource-0.43/build-aux/compile 2014-10-16 04:23:34.000000000 +0200 +++ new/gource-0.44/build-aux/compile 2016-07-28 02:53:40.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/build-aux/missing new/gource-0.44/build-aux/missing --- old/gource-0.43/build-aux/missing 2014-10-16 04:23:34.000000000 +0200 +++ new/gource-0.44/build-aux/missing 2016-07-28 02:53:40.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/configure.ac new/gource-0.44/configure.ac --- old/gource-0.43/configure.ac 2014-10-16 04:23:27.000000000 +0200 +++ new/gource-0.44/configure.ac 2016-07-28 02:53:40.000000000 +0200 @@ -3,7 +3,7 @@ AC_PREREQ(2.61) -AC_INIT(Gource, 0.43, [acaudw...@gmail.com]) +AC_INIT(Gource, 0.44, [acaudw...@gmail.com]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/main.h]) AM_INIT_AUTOMAKE([dist-bzip2 foreign subdir-objects]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/data/gource.1 new/gource-0.44/data/gource.1 --- old/gource-0.43/data/gource.1 2014-10-16 04:23:28.000000000 +0200 +++ new/gource-0.44/data/gource.1 2016-07-28 02:53:40.000000000 +0200 @@ -186,7 +186,7 @@ Time users take to come to a halt. .TP \fB\-\-user\-scale SCALE\fR -Change scale of users. +Change scale of user avatars. .TP \fB\-\-camera\-mode MODE\fR Camera mode (overview,track). @@ -323,14 +323,14 @@ See the guide on the homepage for examples of recording videos with Gource: .ti 10 -http://code.google.com/p/gource/wiki/Videos +https://github.com/acaudwell/Gource/wiki/Videos .SS More Information Visit the Gource homepage for guides and examples of using Gource with various version control systems: .ti 10 -http://code.google.com/p/gource/ +http://gource.io .SH INTERFACE The time shown in the top left of the screen is set initially from the first log entry read and is incremented according to the simulation speed (\-\-seconds\-per\-day). @@ -360,6 +360,18 @@ .ti 10 (S) Randomize colours .ti 10 +(D) Toggle directory name display mode +.ti 10 +(F) Toggle file name display mode +.ti 10 +(U) Toggle user name display mode +.ti 10 +(G) Toggle display of users +.ti 10 +(T) Toggle display of directory tree edges +.ti 10 +(R) Toggle display of root directory edges +.ti 10 (+-) Adjust simulation speed .ti 10 (<>) Adjust time scale @@ -375,7 +387,7 @@ .nf Written by Andrew Caudwell - Project Homepage: http://gource.googlecode.com/ + Project Homepage: http://gource.io .SH COPYRIGHT .nf Copyright (C) 2009 Andrew Caudwell (acaudw...@gmail.com) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/mousecursor.cpp new/gource-0.44/src/core/mousecursor.cpp --- old/gource-0.43/src/core/mousecursor.cpp 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/mousecursor.cpp 2016-07-28 02:53:40.000000000 +0200 @@ -34,20 +34,20 @@ timeout = 3.0f; idle = timeout; scrollwheel = 0; - + left_click = false; right_click = false; middle_click = false; - + sdl_default_cursor = SDL_GetCursor(); - - + + Uint8 data[4*32]; Uint8 mask[4*32]; - + memset(data, 0, sizeof(data)); memset(mask, 0, sizeof(mask)); - + sdl_hidden_cursor = SDL_CreateCursor(data, mask, 32, 32, 0, 0); } @@ -78,6 +78,17 @@ else SDL_SetCursor(sdl_hidden_cursor); } } +const vec2& MouseCursor::getPos() const { + return mousepos; +} + +const vec2& MouseCursor::getRelativePos() const { + return rel; +} + +void MouseCursor::updateRelativePos(const vec2& rel) { + this->rel = rel; +} void MouseCursor::leftClick(bool click) { left_click = click; @@ -96,7 +107,7 @@ } bool MouseCursor::rightClick() const { - return right_click; + return right_click; } bool MouseCursor::middleClick() const { @@ -124,7 +135,7 @@ } int MouseCursor::scrollWheel() const { - return scrollwheel; + return scrollwheel; } bool MouseCursor::isSystemCursor() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/mousecursor.h new/gource-0.44/src/core/mousecursor.h --- old/gource-0.43/src/core/mousecursor.h 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/mousecursor.h 2016-07-28 02:53:40.000000000 +0200 @@ -33,15 +33,16 @@ class MouseCursor { vec2 mousepos; + vec2 rel; bool hidden; bool system_cursor; float idle; float timeout; - + int scrollwheel; - + SDL_Cursor* sdl_default_cursor; SDL_Cursor* sdl_hidden_cursor; @@ -53,8 +54,9 @@ public: MouseCursor(); ~MouseCursor(); - - vec2 getPos() const { return mousepos; } + + const vec2& getPos() const; + const vec2& getRelativePos() const; void leftClick(bool click); void rightClick(bool click); @@ -63,14 +65,14 @@ bool leftClick() const; bool rightClick() const; bool middleClick() const; - + bool leftButtonPressed() const; bool rightButtonPressed() const; bool bothPressed() const; bool buttonPressed() const; int scrollWheel() const; - + bool isHidden() const; bool isSystemCursor()const; bool isVisible() const; @@ -80,6 +82,7 @@ void resetButtonState(); + void updateRelativePos(const vec2& rel); void updatePos(const vec2& pos); void showCursor(bool show); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/png_writer.cpp new/gource-0.44/src/core/png_writer.cpp --- old/gource-0.43/src/core/png_writer.cpp 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/png_writer.cpp 2016-07-28 02:53:40.000000000 +0200 @@ -74,6 +74,7 @@ void PNGWriter::capture(std::vector<char>& buffer) { GLenum pixel_format = components == 4 ? GL_RGBA : GL_RGB; + glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, display.width, display.height, pixel_format, GL_UNSIGNED_BYTE, &(buffer[0])); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/ppm.cpp new/gource-0.44/src/core/ppm.cpp --- old/gource-0.43/src/core/ppm.cpp 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/ppm.cpp 2016-07-28 02:53:40.000000000 +0200 @@ -96,6 +96,7 @@ char* next_pixel_ptr = (pixels_shared_ptr == pixels1) ? pixels2 : pixels1; // copy pixels - now the right way up + glPixelStorei(GL_PACK_ALIGNMENT, 1); glReadPixels(0, 0, display.width, display.height, GL_RGB, GL_UNSIGNED_BYTE, next_pixel_ptr); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/shader.cc new/gource-0.44/src/core/shader.cc --- old/gource-0.43/src/core/shader.cc 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/shader.cc 2016-07-28 02:53:40.000000000 +0200 @@ -28,10 +28,7 @@ #include <boost/format.hpp> #include <stdarg.h> -#ifdef USE_MGL_NAMESPACE -#define GL_GLEXT_PROTOTYPES -#include "../MGL/osmesa.h" -#else +#ifndef USE_MGL_NAMESPACE #include "gl.h" #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/shader_common.cpp new/gource-0.44/src/core/shader_common.cpp --- old/gource-0.43/src/core/shader_common.cpp 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/shader_common.cpp 2016-07-28 02:53:40.000000000 +0200 @@ -1061,6 +1061,7 @@ delete it->second; } uniforms.clear(); + uniform_list.clear(); if(vertex_shader != 0) delete vertex_shader; if(geometry_shader != 0) delete geometry_shader; @@ -1124,6 +1125,7 @@ } uniforms[uniform->getName()] = uniform; + uniform_list.push_back(uniform); } ShaderUniform* AbstractShader::getUniform(const std::string& name) { @@ -1336,10 +1338,8 @@ } -void AbstractShader::getUniforms(std::list<ShaderUniform*>& uniform_list) { - for(std::map<std::string, ShaderUniform*>::iterator it= uniforms.begin(); it!=uniforms.end();it++) { - uniform_list.push_back(it->second); - } +const std::list<ShaderUniform*>& AbstractShader::getUniforms() { + return uniform_list; } void AbstractShader::applyUniforms() { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/core/shader_common.h new/gource-0.44/src/core/shader_common.h --- old/gource-0.43/src/core/shader_common.h 2014-10-16 04:23:24.000000000 +0200 +++ new/gource-0.44/src/core/shader_common.h 2016-07-28 02:53:40.000000000 +0200 @@ -363,6 +363,7 @@ class AbstractShader : public Resource { protected: std::map<std::string, ShaderUniform*> uniforms; + std::list<ShaderUniform*> uniform_list; std::map<std::string,std::string> substitutions; std::string prefix; @@ -405,7 +406,7 @@ void setDynamicCompile(bool dynamic_compile); bool needsCompile(); - void getUniforms(std::list<ShaderUniform*>& uniform_list); + const std::list<ShaderUniform*>& getUniforms(); void applyUniforms(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/dirnode.cpp new/gource-0.44/src/dirnode.cpp --- old/gource-0.43/src/dirnode.cpp 2014-10-16 04:23:22.000000000 +0200 +++ new/gource-0.44/src/dirnode.cpp 2016-07-28 02:53:40.000000000 +0200 @@ -582,7 +582,7 @@ //this->dir_radius_sqrt = sqrt(dir_radius); //dir_radius_sqrt is not used // this->parent_radius = std::max(1.0, parent_circ / PI); - this->parent_radius = std::max(1.0, sqrt(total_file_area) * gGourceDirPadding); + this->parent_radius = std::max(1.0f, (float) sqrt(total_file_area) * gGourceDirPadding); } float RDirNode::distanceToParent() const{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/gource.cpp new/gource-0.44/src/gource.cpp --- old/gource-0.43/src/gource.cpp 2014-10-16 04:23:23.000000000 +0200 +++ new/gource-0.44/src/gource.cpp 2016-07-28 02:53:40.000000000 +0200 @@ -696,11 +696,11 @@ idle_time = gGourceSettings.auto_skip_seconds; } - if (e->keysym.sym == SDLK_t) { + if (e->keysym.sym == SDLK_y) { gGourceQuadTreeDebug = !gGourceQuadTreeDebug; } - if (e->keysym.sym == SDLK_y) { + if (e->keysym.sym == SDLK_t) { gGourceSettings.hide_tree = !gGourceSettings.hide_tree; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/gource-0.43/src/gource_settings.h new/gource-0.44/src/gource_settings.h --- old/gource-0.43/src/gource_settings.h 2014-10-16 04:23:23.000000000 +0200 +++ new/gource-0.44/src/gource_settings.h 2016-07-28 02:53:40.000000000 +0200 @@ -18,7 +18,7 @@ #ifndef GOURCE_SETTINGS_H #define GOURCE_SETTINGS_H -#define GOURCE_VERSION "0.43" +#define GOURCE_VERSION "0.44" #include "core/texture.h" #include "core/settings.h"
