From owner-svn-ports-head@freebsd.org Thu Apr 16 09:16:54 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9F8CF2B7838; Thu, 16 Apr 2020 09:16:54 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 492ts23mcMz4FS3; Thu, 16 Apr 2020 09:16:54 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7CA6066DC; Thu, 16 Apr 2020 09:16:54 +0000 (UTC) (envelope-from danfe@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 03G9GsB7080396; Thu, 16 Apr 2020 09:16:54 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03G9GrJ4080392; Thu, 16 Apr 2020 09:16:53 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202004160916.03G9GrJ4080392@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Thu, 16 Apr 2020 09:16:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531832 - in head/x11/hsetroot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: in head/x11/hsetroot: . files X-SVN-Commit-Revision: 531832 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 16 Apr 2020 09:16:54 -0000 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