Hello community, here is the log from the commit of package slop for openSUSE:Factory checked in at 2015-09-03 18:05:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/slop (Old) and /work/SRC/openSUSE:Factory/.slop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "slop" Changes: -------- --- /work/SRC/openSUSE:Factory/slop/slop.changes 2015-07-14 17:45:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.slop.new/slop.changes 2015-09-03 18:13:03.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 3 06:46:53 UTC 2015 - [email protected] + +- Update to 4.2.19, announce message is here: + + https://github.com/naelstrof/slop/releases/tag/v4.2.19 + +------------------------------------------------------------------- Old: ---- slop-4.2.18.tar.gz New: ---- slop-4.2.19.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ slop.spec ++++++ --- /var/tmp/diff_new_pack.qXuvvR/_old 2015-09-03 18:13:05.000000000 +0200 +++ /var/tmp/diff_new_pack.qXuvvR/_new 2015-09-03 18:13:05.000000000 +0200 @@ -18,7 +18,7 @@ # See also http://en.opensuse.org/openSUSE:Specfile_guidelines Name: slop -Version: 4.2.18 +Version: 4.2.19 Release: 0 Summary: Query for a selection from the user and print the region to stdout License: GPL-3.0+ ++++++ slop-4.2.18.tar.gz -> slop-4.2.19.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slop-4.2.18/CMakeLists.txt new/slop-4.2.19/CMakeLists.txt --- old/slop-4.2.18/CMakeLists.txt 2015-07-12 19:21:08.000000000 +0200 +++ new/slop-4.2.19/CMakeLists.txt 2015-08-25 00:14:38.000000000 +0200 @@ -3,7 +3,7 @@ project( "slop" ) set( slop_VERSION_MAJOR 4 ) set( slop_VERSION_MINOR 2 ) -set( slop_VERSION_PATCH 18 ) +set( slop_VERSION_PATCH 19 ) set( CMAKE_OPENGL_SUPPORT FALSE CACHE BOOL "Whether or not to compile with OpenGL, shaders, magnification, and theming support." ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slop-4.2.18/README.md new/slop-4.2.19/README.md --- old/slop-4.2.18/README.md 2015-07-12 19:21:08.000000000 +0200 +++ new/slop-4.2.19/README.md 2015-08-25 00:14:38.000000000 +0200 @@ -43,15 +43,9 @@ For those of you who don't want eval to be an integral part of slop (Could be dangerous if I were evil!): You can change the output format and parse it manually like so: ```bash #!/bin/bash -slopoutput=$(slop -f "%x %y %w %h %g $i") -X=$(echo $slopoutput | awk '{print $1}') -Y=$(echo $slopoutput | awk '{print $2}') -W=$(echo $slopoutput | awk '{print $3}') -H=$(echo $slopoutput | awk '{print $4}') -G=$(echo $slopoutput | awk '{print $5}') -ID=$(echo $slopoutput | awk '{print $6}') -maim -g $G -i $ID -ffmpeg -f x11grab -s "$W"x"$H" -i :0.0+$X,$Y -f alsa -i pulse ~/myfile.webm +read -r X Y W H G ID < <(slop -f "%x %y %w %h %g %i") +maim -g "$G" -i "$ID" +ffmpeg -f x11grab -s "$W"x"$H" -i ":0.0+$X,$Y" -f alsa -i pulse ~/myfile.webm ``` ## Lets see some action @@ -121,7 +115,7 @@ help ---- ```text -slop v4.2.18 +slop v4.2.19 Copyright (C) 2014 Dalton Nell, Slop Contributors (https://github.com/naelstrof/slop/graphs/contributors) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slop-4.2.18/src/main.cpp new/slop-4.2.19/src/main.cpp --- old/slop-4.2.18/src/main.cpp 2015-07-12 19:21:08.000000000 +0200 +++ new/slop-4.2.19/src/main.cpp 2015-08-25 00:14:38.000000000 +0200 @@ -54,6 +54,11 @@ } int printSelection( std::string format, bool cancelled, int x, int y, int w, int h, int window ) { + //Impossible to select nothing + if (!cancelled) { + w += 1; + h += 1; + } size_t pos = 0; while ( ( pos = format.find( "%", pos ) ) != std::string::npos ) { if ( pos + 1 > format.size() ) { @@ -253,7 +258,9 @@ bool decorations = !options.nodecorations_flag; bool themeon = (bool)options.theme_given; std::string theme = options.theme_arg; +#ifdef OPENGL_ENABLED bool shadergiven = (bool)options.shader_given; +#endif std::string shader = options.shader_arg; struct timespec start, time; int xoffset = 0; @@ -274,12 +281,14 @@ } std::string format = options.format_arg; bool magenabled = options.magnify_flag; +#ifdef OPENGL_ENABLED float magstrength = options.magstrength_arg; if ( options.magpixels_arg < 0 ) { fprintf( stderr, "Error: --magpixels < 0, it's an unsigned integer you twat. Stop trying to underflow me!\n" ); return EXIT_FAILURE; } unsigned int magpixels = (unsigned int)options.magpixels_arg; +#endif cmdline_parser_free( &options ); #ifndef OPENGL_ENABLED if ( opengl || themeon || magenabled ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/slop-4.2.18/src/shader.hpp new/slop-4.2.19/src/shader.hpp --- old/slop-4.2.18/src/shader.hpp 2015-07-12 19:21:08.000000000 +0200 +++ new/slop-4.2.19/src/shader.hpp 2015-08-25 00:14:38.000000000 +0200 @@ -6,9 +6,11 @@ #include <string> #include <cstdio> #include <vector> +#ifdef OPENGL_ENABLED #include <glm/glm.hpp> #include <glm/gtc/type_ptr.hpp> #include <GL/glew.h> +#endif #include <string> #include <fstream> #include <streambuf> @@ -25,9 +27,11 @@ void unbind(); void setParameter( std::string name, int foo ); void setParameter( std::string name, float foo ); +#ifdef OPENGL_ENABLED void setParameter( std::string name, glm::mat4 foo ); void setParameter( std::string name, glm::vec4 foo ); void setParameter( std::string name, glm::vec2 foo ); +#endif void setAttribute( std::string name, unsigned int buffer, unsigned int stepsize ); int m_type; private:
