Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7886162c8a7a2bb2abc8a990f741007e1dead690)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Vlad Glagolev <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7886162c8a7a2bb2abc8a990f741007e1dead690)
  • Date: Sat, 20 Aug 2016 20:48:58 +0000

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

ChangeLog | 4 ++++
graphics/maim/BUILD | 2 ++
graphics/maim/DEPENDS | 4 +++-
graphics/maim/DETAILS | 4 ++--
graphics/maim/HISTORY | 5 +++++
utils/slop/BUILD | 1 +
utils/slop/DEPENDS | 15 +++++++++++++++
utils/slop/DETAILS | 17 +++++++++++++++++
utils/slop/HISTORY | 3 +++
utils/slop/PRE_BUILD | 6 ++++++
utils/slop/gl-opt.patch | 26 ++++++++++++++++++++++++++
11 files changed, 84 insertions(+), 3 deletions(-)

New commits:
commit 7886162c8a7a2bb2abc8a990f741007e1dead690
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

maim: => 3.4.47

commit d037ab07902b7e2e6c62b3a2ffca827f517a4e38
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

slop: new spell, queries for a selection from the user and prints the
region to stdout

diff --git a/ChangeLog b/ChangeLog
index c08a628..c7ee676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * utils/slop: new spell, queries for a selection from the user and
+ prints the region to stdout
+
2016-08-18 Vlad Glagolev <stealth AT sourcemage.org>
* utils/yad: new spell, create graphical dialogs from shell scripts

diff --git a/graphics/maim/BUILD b/graphics/maim/BUILD
index e013b8d..2652efb 100755
--- a/graphics/maim/BUILD
+++ b/graphics/maim/BUILD
@@ -1 +1,3 @@
+OPTS="-DCMAKE_INSTALL_MANDIR=${INSTALL_ROOT}/usr/share/man ${OPTS}" &&
+
cmake_build
diff --git a/graphics/maim/DEPENDS b/graphics/maim/DEPENDS
index 2b735ba..222a59f 100755
--- a/graphics/maim/DEPENDS
+++ b/graphics/maim/DEPENDS
@@ -2,4 +2,6 @@ depends cmake &&
depends imlib2 &&
depends libx11 &&
depends libxrandr &&
-depends libxfixes
+depends libxfixes &&
+
+suggest_depends slop "" "" "for region selection support"
diff --git a/graphics/maim/DETAILS b/graphics/maim/DETAILS
index c127c24..e69fb9a 100755
--- a/graphics/maim/DETAILS
+++ b/graphics/maim/DETAILS
@@ -1,8 +1,8 @@
SPELL=maim
- VERSION=3.3.41
+ VERSION=3.4.47
SOURCE=$SPELL-$VERSION.tar.gz

SOURCE_URL[0]=https://github.com/naelstrof/$SPELL/archive/v$VERSION/$SOURCE
-
SOURCE_HASH=sha512:2e533c6c1b153b65e57ba8fa72d72f7fb7d40c3c483f75fda25166c41eb4c8079ea2f42b78cef649de5a53eb15e48291a03ab7ad0a9f2d9bc0c3860540ebff81
+
SOURCE_HASH=sha512:4b21f8ad8f9f2f19693d5c489f5e815133e1b8308653c52934cdb8a3d8ae38732733a5ffb5527b44db49f59c3818a9bc83840ced5db71807a68277d0dcc03392
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
WEB_SITE=https://github.com/naelstrof/maim
LICENSE[0]=GPL
diff --git a/graphics/maim/HISTORY b/graphics/maim/HISTORY
index deb97bc..26bbba2 100644
--- a/graphics/maim/HISTORY
+++ b/graphics/maim/HISTORY
@@ -1,3 +1,8 @@
+2016-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: updated spell to 3.4.47
+ * DEPENDS: added slop suggest dep
+ * BUILD: corrected man path
+
2014-12-04 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.3.41

diff --git a/utils/slop/BUILD b/utils/slop/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/utils/slop/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/utils/slop/DEPENDS b/utils/slop/DEPENDS
new file mode 100755
index 0000000..413f520
--- /dev/null
+++ b/utils/slop/DEPENDS
@@ -0,0 +1,15 @@
+depends cmake &&
+depends imlib2 &&
+depends libx11 &&
+depends libxext &&
+
+optional_depends OPENGL \
+ "-DCMAKE_OPENGL_SUPPORT=ON" \
+ "-DCMAKE_OPENGL_SUPPORT=OFF" \
+ "for OpenGL support (also requires GLEW)" &&
+
+if is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
+ depends libxrender &&
+ depends libxrandr &&
+ depends glew
+fi
diff --git a/utils/slop/DETAILS b/utils/slop/DETAILS
new file mode 100755
index 0000000..3b1a718
--- /dev/null
+++ b/utils/slop/DETAILS
@@ -0,0 +1,17 @@
+ SPELL=slop
+ VERSION=4.3.21
+ SOURCE=${SPELL}-${VERSION}.tar.gz
+
SOURCE_URL[0]=https://github.com/naelstrof/${SPELL}/archive/v${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:4489a108883b785eb5dda368a06ea0b7c61e3afeefdeb421f211e01e3cb7eb20836200197abc755be653f086fcd3b8647a460dacf15062fe2cd44438b4f54b68
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+ WEB_SITE=https://github.com/naelstrof/slop
+ LICENSE[0]=GPL
+ ENTERED=20160820
+ SHORT="queries for a selection from the user and prints the
region to stdout"
+cat << EOF
+slop (Select Operation) is an application that queries for a selection from
the
+user and prints the region to stdout. It grabs the mouse and turns it into a
+crosshair, lets the user click and drag to make a selection (or click on a
+window) while drawing a pretty box around it, then finally prints the
+selection's dimensions to stdout.
+EOF
diff --git a/utils/slop/HISTORY b/utils/slop/HISTORY
new file mode 100644
index 0000000..dac398e
--- /dev/null
+++ b/utils/slop/HISTORY
@@ -0,0 +1,3 @@
+2016-08-20 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS, DEPENDS, {PRE_,}BUILD, gl-opt.patch: created spell, version
+ 4.3.21
diff --git a/utils/slop/PRE_BUILD b/utils/slop/PRE_BUILD
new file mode 100755
index 0000000..c3d4388
--- /dev/null
+++ b/utils/slop/PRE_BUILD
@@ -0,0 +1,6 @@
+default_pre_build &&
+cd "${SOURCE_DIRECTORY}" &&
+
+if ! is_depends_enabled ${SPELL} $(get_spell_provider ${SPELL} OPENGL); then
+ patch -p0 < "${SPELL_DIRECTORY}/gl-opt.patch"
+fi
diff --git a/utils/slop/gl-opt.patch b/utils/slop/gl-opt.patch
new file mode 100644
index 0000000..fbb0dd9
--- /dev/null
+++ b/utils/slop/gl-opt.patch
@@ -0,0 +1,26 @@
+--- CMakeLists.txt.orig 2015-11-13 14:35:52.000000000 -0500
++++ CMakeLists.txt 2016-08-20 15:36:20.418931196 -0400
+@@ -106,11 +106,6 @@
+ find_package( Imlib2 REQUIRED )
+ find_package( X11 REQUIRED )
+ find_package( XExt REQUIRED )
+-find_package( OpenGL REQUIRED )
+-find_package( GLX REQUIRED )
+-find_package( XRender REQUIRED )
+-find_package( XRandr REQUIRED )
+-find_package( GLEW REQUIRED )
+ # This library is needed only for Ubuntu it seems, some platforms don't even
+ # ship with it. I couldn't find a way to do a test compile to check if librt
+ # was needed, so instead I just didn't mark it as REQUIRED.
+@@ -124,6 +119,11 @@
+ "${XEXT_INCLUDE_DIR}" )
+
+ if ( CMAKE_OPENGL_SUPPORT )
++find_package( OpenGL REQUIRED )
++find_package( GLX REQUIRED )
++find_package( XRender REQUIRED )
++find_package( XRandr REQUIRED )
++find_package( GLEW REQUIRED )
+ include_directories( "${IMLIB2_INCLUDE_DIR}"
+ "${XRANDR_INCLUDE_DIR}"
+ "${OPENGL_INCLUDE_DIR}"



  • [SM-Commit] GIT changes to master grimoire by Vlad Glagolev (7886162c8a7a2bb2abc8a990f741007e1dead690), Vlad Glagolev, 08/20/2016

Archive powered by MHonArc 2.6.24.

Top of Page