CVS commit: pkgsrc/x11

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Jul 28 15:19:59 UTC 2018

Modified Files:
        pkgsrc/x11: Makefile
Added Files:
        pkgsrc/x11/slop: DESCR Makefile PLIST buildlink3.mk distinfo
        pkgsrc/x11/slop/patches: patch-src_framebuffer.cpp patch-src_shader.hpp

Log Message:
x11/slop: Import slop-7.4

slop (Select Operation) is an X11 application that queries for a screen
area selection from the user and prints the region to stdout.


To generate a diff of this commit:
cvs rdiff -u -r1.823 -r1.824 pkgsrc/x11/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/slop/DESCR pkgsrc/x11/slop/Makefile \
    pkgsrc/x11/slop/PLIST pkgsrc/x11/slop/buildlink3.mk \
    pkgsrc/x11/slop/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/slop/patches/patch-src_framebuffer.cpp \
    pkgsrc/x11/slop/patches/patch-src_shader.hpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/Makefile
diff -u pkgsrc/x11/Makefile:1.823 pkgsrc/x11/Makefile:1.824
--- pkgsrc/x11/Makefile:1.823   Tue Jun 12 00:19:17 2018
+++ pkgsrc/x11/Makefile Sat Jul 28 15:19:59 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.823 2018/06/12 00:19:17 youri Exp $
+# $NetBSD: Makefile,v 1.824 2018/07/28 15:19:59 nia Exp $
 #
 
 COMMENT=       Packages to support the X window system
@@ -416,6 +416,7 @@ SUBDIR+=    sessreg
 SUBDIR+=       setxkbmap
 SUBDIR+=       slim
 SUBDIR+=       slock
+SUBDIR+=       slop
 SUBDIR+=       space_dapp
 SUBDIR+=       speyes
 SUBDIR+=       ssystem

Added files:

Index: pkgsrc/x11/slop/DESCR
diff -u /dev/null pkgsrc/x11/slop/DESCR:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/DESCR       Sat Jul 28 15:19:59 2018
@@ -0,0 +1,2 @@
+slop (Select Operation) is an X11 application that queries for a screen
+area selection from the user and prints the region to stdout.
Index: pkgsrc/x11/slop/Makefile
diff -u /dev/null pkgsrc/x11/slop/Makefile:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/Makefile    Sat Jul 28 15:19:59 2018
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile,v 1.1 2018/07/28 15:19:59 nia Exp $
+
+DISTNAME=      slop-7.4
+CATEGORIES=    x11
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=naelstrof/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
+
+MAINTAINER=    nia%NetBSD.org@localhost
+HOMEPAGE=      https://github.com/naelstrof/slop
+COMMENT=       X display selection tool
+LICENSE=       gnu-gpl-v3
+
+EXTRACT_USING= bsdtar
+
+USE_TOOLS+=    pkg-config
+USE_LANGUAGES= c c++
+USE_CMAKE=     yes
+
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/glm/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../textproc/icu/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/x11/slop/PLIST
diff -u /dev/null pkgsrc/x11/slop/PLIST:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/PLIST       Sat Jul 28 15:19:59 2018
@@ -0,0 +1,6 @@
+@comment $NetBSD: PLIST,v 1.1 2018/07/28 15:19:59 nia Exp $
+bin/slop
+include/slop.hpp
+lib/libslopy.so
+lib/libslopy.so.${PKGVERSION}
+man/man1/slop.1
Index: pkgsrc/x11/slop/buildlink3.mk
diff -u /dev/null pkgsrc/x11/slop/buildlink3.mk:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/buildlink3.mk       Sat Jul 28 15:19:59 2018
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2018/07/28 15:19:59 nia Exp $
+
+BUILDLINK_TREE+=       slop
+
+.if !defined(SLOP_BUILDLINK3_MK)
+SLOP_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.slop+=   slop>=7.4
+BUILDLINK_PKGSRCDIR.slop?=     ../../x11/slop
+
+.include "../../graphics/glew/buildlink3.mk"
+.include "../../graphics/MesaLib/buildlink3.mk"
+.include "../../x11/libX11/buildlink3.mk"
+.include "../../x11/libXext/buildlink3.mk"
+.include "../../x11/libXrender/buildlink3.mk"
+.endif # SLOP_BUILDLINK3_MK
+
+BUILDLINK_TREE+=       -slop
Index: pkgsrc/x11/slop/distinfo
diff -u /dev/null pkgsrc/x11/slop/distinfo:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/distinfo    Sat Jul 28 15:19:59 2018
@@ -0,0 +1,8 @@
+$NetBSD: distinfo,v 1.1 2018/07/28 15:19:59 nia Exp $
+
+SHA1 (slop-7.4.tar.gz) = 0e1d3c1d1996d743eb4067ee90b55fcce009906f
+RMD160 (slop-7.4.tar.gz) = fa1fe48b3d12f4d17be27d9bf4f586fb2edf49e5
+SHA512 (slop-7.4.tar.gz) = 13d09c2c9f05760ee0a273edb6d40da8a87989d3f071a8c868a0c7e535ba89b9eb934c79d56212cd689687f86e3683cef1b749ef7b37be3805ea8eb05c796e58
+Size (slop-7.4.tar.gz) = 50079 bytes
+SHA1 (patch-src_framebuffer.cpp) = 19abfe6d4a93808fb024b2ca36ca70ce351d1ff2
+SHA1 (patch-src_shader.hpp) = 0c0c2b5d1e431d5097ac9c72814e6421d3e7afff

Index: pkgsrc/x11/slop/patches/patch-src_framebuffer.cpp
diff -u /dev/null pkgsrc/x11/slop/patches/patch-src_framebuffer.cpp:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/patches/patch-src_framebuffer.cpp   Sat Jul 28 15:19:59 2018
@@ -0,0 +1,11 @@
+$NetBSD: patch-src_framebuffer.cpp,v 1.1 2018/07/28 15:19:59 nia Exp $
+
+error: 'XDestroyImage' was not declared in this scope
+
+--- src/framebuffer.cpp.orig   2018-04-23 07:56:02.000000000 +0000
++++ src/framebuffer.cpp
+@@ -1,3 +1,4 @@
++#include <X11/Xutil.h>
+ #include "framebuffer.hpp"
+ 
+ slop::Framebuffer::Framebuffer( int w, int h ) {
Index: pkgsrc/x11/slop/patches/patch-src_shader.hpp
diff -u /dev/null pkgsrc/x11/slop/patches/patch-src_shader.hpp:1.1
--- /dev/null   Sat Jul 28 15:19:59 2018
+++ pkgsrc/x11/slop/patches/patch-src_shader.hpp        Sat Jul 28 15:19:59 2018
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_shader.hpp,v 1.1 2018/07/28 15:19:59 nia Exp $
+
+Don't introduce an unneeded dependency on egl support.
+
+--- src/shader.hpp.orig        2018-04-23 07:56:02.000000000 +0000
++++ src/shader.hpp
+@@ -29,7 +29,6 @@
+ #include <GL/glew.h>
+ #include <glm/glm.hpp>
+ #include <glm/gtc/type_ptr.hpp>
+-#include <EGL/egl.h>
+ #include <GL/gl.h>
+ 
+ #include "resource.hpp"