Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 16 Apr 2020 09:16:53 +0000 (UTC)
From:      Alexey Dokuchaev <danfe@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r531832 - in head/x11/hsetroot: . files
Message-ID:  <202004160916.03G9GrJ4080392@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: danfe
Date: Thu Apr 16 09:16:53 2020
New Revision: 531832
URL: https://svnweb.freebsd.org/changeset/ports/531832

Log:
  - Update `x11/hsetroot' to version 1.0.5
  - Adds -root parameter, to treat the whole desktop as one display,
    applying the image over the whole, instead of per each display
  - No longer depends on xrandr(1) in the run-time
  
  Found out via:	repology.org

Deleted:
  head/x11/hsetroot/files/patch-outputs__xrandr.c
Modified:
  head/x11/hsetroot/Makefile
  head/x11/hsetroot/distinfo
  head/x11/hsetroot/files/patch-Makefile
  head/x11/hsetroot/files/patch-hsetroot.c

Modified: head/x11/hsetroot/Makefile
==============================================================================
--- head/x11/hsetroot/Makefile	Thu Apr 16 09:16:04 2020	(r531831)
+++ head/x11/hsetroot/Makefile	Thu Apr 16 09:16:53 2020	(r531832)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	hsetroot
-PORTVERSION=	1.0.3
+PORTVERSION=	1.0.5
 CATEGORIES=	x11
 
 MAINTAINER=	danfe@FreeBSD.org
@@ -11,15 +11,14 @@ COMMENT=	Wallpaper manipulation utility for X11
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libImlib2.so:graphics/imlib2
-RUN_DEPENDS=	xrandr:x11/xrandr
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	himdel
 
 USES=		gmake pkgconfig xorg
-USE_XORG=	x11
+USE_XORG=	x11 xinerama
 
-PLIST_FILES=	bin/hsetroot
+PLIST_FILES=	bin/hsetroot bin/hsr-outputs
 PORTDOCS=	README.md
 
 OPTIONS_DEFINE=	DOCS

Modified: head/x11/hsetroot/distinfo
==============================================================================
--- head/x11/hsetroot/distinfo	Thu Apr 16 09:16:04 2020	(r531831)
+++ head/x11/hsetroot/distinfo	Thu Apr 16 09:16:53 2020	(r531832)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1561725415
-SHA256 (himdel-hsetroot-1.0.3_GH0.tar.gz) = ab40a7723080f72bbaf55be546c62f69d5e73d3ccdfa8bb7b6995e8c1798242a
-SIZE (himdel-hsetroot-1.0.3_GH0.tar.gz) = 6509
+TIMESTAMP = 1573816181
+SHA256 (himdel-hsetroot-1.0.5_GH0.tar.gz) = cff5f83b85a21e0c5c8c8eecbd552090bb75d8ac59e27b0bae48046f9cb5a44a
+SIZE (himdel-hsetroot-1.0.5_GH0.tar.gz) = 12878

Modified: head/x11/hsetroot/files/patch-Makefile
==============================================================================
--- head/x11/hsetroot/files/patch-Makefile	Thu Apr 16 09:16:04 2020	(r531831)
+++ head/x11/hsetroot/files/patch-Makefile	Thu Apr 16 09:16:53 2020	(r531832)
@@ -1,22 +1,12 @@
---- Makefile.orig	2019-06-28 12:36:55 UTC
+--- Makefile.orig	2019-11-15 11:09:41 UTC
 +++ Makefile
-@@ -18,16 +18,16 @@ LDFLAGS+=$(shell $(PKG_CONFIG) x11 --libs)
- CFLAGS+=$(shell $(PKG_CONFIG) imlib2 --cflags)
- LDFLAGS+=$(shell $(PKG_CONFIG) imlib2 --libs)
+@@ -30,8 +30,7 @@ hsetroot: hsetroot.o
+ hsr-outputs: hsr-outputs.o
  
-+all: hsetroot
-+
- hsetroot: hsetroot.o outputs_xrandr.o
- 
- hsetroot.o: hsetroot.c outputs.h
- 
--outputs.o: outputs.c outputs.h
--
- outputs_xrandr.o: outputs_xrandr.c outputs.h
- 
- install: hsetroot
--	install -st /usr/local/bin/ hsetroot
+ install: hsetroot hsr-outputs
+-	install -st $(PREFIX)/bin/ hsetroot
+-	install -st $(PREFIX)/bin/ hsr-outputs
 +	$(BSD_INSTALL_PROGRAM) $^ $(DESTDIR)$(PREFIX)/bin
  
  clean:
- 	rm -f hsetroot *.o
+ 	rm -f *.o hsetroot hsr-outputs

Modified: head/x11/hsetroot/files/patch-hsetroot.c
==============================================================================
--- head/x11/hsetroot/files/patch-hsetroot.c	Thu Apr 16 09:16:04 2020	(r531831)
+++ head/x11/hsetroot/files/patch-hsetroot.c	Thu Apr 16 09:16:53 2020	(r531832)
@@ -32,7 +32,7 @@
  
 -  for (int i = 0; i < noutputs; i++) {
 +  for (i = 0; i < noutputs; i++) {
-     OutputInfo o = outputs[i];
+     XineramaScreenInfo o = outputs[i];
      printf("output %d: size(%d, %d) pos(%d, %d)\n", i, o.w, o.h, o.x, o.y);
  
 @@ -229,6 +230,20 @@ load_image(ImageMode mode, const char *arg, int alpha,
@@ -41,16 +41,16 @@
        }
 +    } else if (mode == Sane) {
 +      int newW, newH;
-+      double aspect_w = ((double) o.w) / imgW;
-+      double aspect_h = ((double) o.h) / imgH;
++      double aspect_w = ((double) o.width) / imgW;
++      double aspect_h = ((double) o.height) / imgH;
 +      if (aspect_h < aspect_w) {
 +        // image is taller
-+        newW = o.w;
++        newW = o.width;
 +        newH = (int) (imgH * aspect_w);
 +      } else {
 +        // image is wider
 +        newW = (int) (imgW * aspect_h);
-+        newH = o.h;
++        newH = o.height;
 +      }
 +      imlib_blend_image_onto_image(buffer, 0, 0, 0, imgW, imgH, 0, 0, newW, newH);
      } else {  // Center || Tile

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004160916.03G9GrJ4080392>