[PR PATCH] xsecurelock: Add mpv/mplayer savers

[PR PATCH] xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 482 bytes --]

There is a new pull request by SevereOverfl0w against master on the void-packages repository

https://github.com/SevereOverfl0w/void-packages xsecurelock-video-saver
https://github.com/void-linux/void-packages/pull/17805

xsecurelock: Add mpv/mplayer savers
Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.

A patch file from https://github.com/void-linux/void-packages/pull/17805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xsecurelock-video-saver-17805.patch --]
[-- Type: text/x-diff, Size: 1210 bytes --]

From cfcf7824f132c825324333fe3cdfed85c52befbc Mon Sep 17 00:00:00 2001
From: Dominic Monroe <iam@dominic.io>
Date: Thu, 26 Dec 2019 22:30:49 +0000
Subject: [PATCH] xsecurelock: Add mpv/mplayer savers

Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.
---
 srcpkgs/xsecurelock/template | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index d0c4503d11d..ea6bba32f7a 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,13 +1,14 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
 version=1.5.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login"
 hostmakedepends="pkg-config automake"
 makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel
  libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel
- libXxf86misc-devel pam-devel"
+ libXxf86misc-devel pam-devel
+ mpv mplayer"
 short_desc="X11 screen locker designed with the primary goal of security"
 maintainer="Sean R. Lang <srlang@ncsu.edu>"
 license="Apache-2.0"

Re: [PR PATCH] [Updated] xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

There is an updated pull request by SevereOverfl0w against master on the void-packages repository

https://github.com/SevereOverfl0w/void-packages xsecurelock-video-saver
https://github.com/void-linux/void-packages/pull/17805

xsecurelock: Add mpv/mplayer savers
Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.

A patch file from https://github.com/void-linux/void-packages/pull/17805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xsecurelock-video-saver-17805.patch --]
[-- Type: text/x-diff, Size: 1072 bytes --]

From ce00d832c198ca8d3bedd844009f4754351f6509 Mon Sep 17 00:00:00 2001
From: Dominic Monroe <iam@dominic.io>
Date: Thu, 26 Dec 2019 22:30:49 +0000
Subject: [PATCH] xsecurelock: Add mpv/mplayer savers

Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.
---
 srcpkgs/xsecurelock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index d0c4503d11d..0adaf5518e8 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,10 +1,10 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
 version=1.5.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login"
-hostmakedepends="pkg-config automake"
+hostmakedepends="pkg-config automake mpv mplayer"
 makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel
  libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel
  libXxf86misc-devel pam-devel"

Re: xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 230 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/17805#issuecomment-569437450

Comment:
Can this be done with `-with-mpv=/usr/bin/mpv` instead of adding extra `hostmakedepends`?

Re: xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 231 bytes --]

New comment by Duncaen on void-packages repository

https://github.com/void-linux/void-packages/pull/17805#issuecomment-569437450

Comment:
Can this be done with `--with-mpv=/usr/bin/mpv` instead of adding extra `hostmakedepends`?

Re: xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 168 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/17805#issuecomment-569437739

Comment:
right... aka autoconf cache

Re: xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 235 bytes --]

New comment by xtraeme on void-packages repository

https://github.com/void-linux/void-packages/pull/17805#issuecomment-569438287

Comment:
We've been using this for maybe 15 years or even more in pkgsrc... xbps-src is millenial stuff

Re: [PR PATCH] [Updated] xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

There is an updated pull request by SevereOverfl0w against master on the void-packages repository

https://github.com/SevereOverfl0w/void-packages xsecurelock-video-saver
https://github.com/void-linux/void-packages/pull/17805

xsecurelock: Add mpv/mplayer savers
Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.

A patch file from https://github.com/void-linux/void-packages/pull/17805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xsecurelock-video-saver-17805.patch --]
[-- Type: text/x-diff, Size: 1015 bytes --]

From ae5b762970752f2dec9c518b32647933f638b0cd Mon Sep 17 00:00:00 2001
From: Dominic Monroe <iam@dominic.io>
Date: Thu, 26 Dec 2019 22:30:49 +0000
Subject: [PATCH] xsecurelock: Add mpv/mplayer/htpasswd support

---
 srcpkgs/xsecurelock/template | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index d0c4503d11d..1f6f8030721 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,9 +1,9 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
 version=1.5.1
-revision=1
+revision=2
 build_style=gnu-configure
-configure_args="--with-pam-service-name=system-local-login"
+configure_args="--with-pam-service-name=system-local-login --with-mpv=/usr/bin/mpv --with-mplayer=/usr/bin/mplayer --with-htpasswd=/usr/bin/htpasswd"
 hostmakedepends="pkg-config automake"
 makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel
  libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel

Re: xsecurelock: Add mpv/mplayer savers

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 417 bytes --]

New comment by SevereOverfl0w on void-packages repository

https://github.com/void-linux/void-packages/pull/17805#issuecomment-569663655

Comment:
I didn't realize that it wasn't actually checking for file support.  I've switched to using the --with, and also added htpasswd because that one was obvious.  xscreensaver was not obvious to me, so I'll leave that to someone else who has the desire to get that working.

Re: [PR PATCH] [Updated] xsecurelock: Add mpv/mplayer savers

[SevereOverfl0w]

[-- Attachment #1: Type: text/plain, Size: 487 bytes --]

There is an updated pull request by SevereOverfl0w against master on the void-packages repository

https://github.com/SevereOverfl0w/void-packages xsecurelock-video-saver
https://github.com/void-linux/void-packages/pull/17805

xsecurelock: Add mpv/mplayer savers
Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.

A patch file from https://github.com/void-linux/void-packages/pull/17805.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-xsecurelock-video-saver-17805.patch --]
[-- Type: text/x-diff, Size: 1148 bytes --]

From 27bfe36da1c7f5bba147c4c1a5a023882d6f460a Mon Sep 17 00:00:00 2001
From: Dominic Monroe <iam@dominic.io>
Date: Thu, 26 Dec 2019 22:30:49 +0000
Subject: [PATCH] xsecurelock: Add mplayer/htpasswd support

---
 srcpkgs/xsecurelock/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/xsecurelock/template b/srcpkgs/xsecurelock/template
index d367d7bc51c..cdf947a93ef 100644
--- a/srcpkgs/xsecurelock/template
+++ b/srcpkgs/xsecurelock/template
@@ -1,11 +1,14 @@
 # Template file for 'xsecurelock'
 pkgname=xsecurelock
 version=1.7.0
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--with-pam-service-name=system-local-login
- --with-xscreensaver=/usr/libexec/xscreensaver"
-hostmakedepends="pkg-config automake mpv xscreensaver"
+ --with-xscreensaver=/usr/libexec/xscreensaver
+ --with-mpv=/usr/bin/mpv
+ --with-mplayer=/usr/bin/mplayer
+ --with-htpasswd=/usr/bin/htpasswd"
+hostmakedepends="pkg-config automake"
 makedepends="libX11-devel libXcomposite-devel libXext-devel libXfixes-devel
  libXft-devel libXmu-devel libXrandr-devel libXScrnSaver-devel
  libXxf86misc-devel pam-devel"

Re: xsecurelock: Add mpv/mplayer savers

[SevereOverfl0w]

[-- Attachment #1: Type: text/plain, Size: 252 bytes --]

New comment by SevereOverfl0w on void-packages repository

https://github.com/void-linux/void-packages/pull/17805#issuecomment-631680749

Comment:
I've updated the template to:

- No longer depend on mpv for mpv support
- Support mplayer & htpasswd

Re: [PR PATCH] [Merged]: xsecurelock: Add mplayer/htpasswd support

[sgn]

[-- Attachment #1: Type: text/plain, Size: 307 bytes --]

There's a merged pull request on the void-packages repository

xsecurelock: Add mplayer/htpasswd support
https://github.com/void-linux/void-packages/pull/17805

Description:
Add as build dependencies allows the makefile to detect mpv/mplayer
location, and will then include them as optional runtime savers.