From owner-svn-ports-head@freebsd.org Sun Sep 13 01:14:10 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 956443E7A1F; Sun, 13 Sep 2020 01:14:10 +0000 (UTC) (envelope-from wen@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bps2p3QBDz4ksG; Sun, 13 Sep 2020 01:14:10 +0000 (UTC) (envelope-from wen@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 587941DF55; Sun, 13 Sep 2020 01:14:10 +0000 (UTC) (envelope-from wen@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D1EAO2099817; Sun, 13 Sep 2020 01:14:10 GMT (envelope-from wen@FreeBSD.org) Received: (from wen@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D1EA6P099816; Sun, 13 Sep 2020 01:14:10 GMT (envelope-from wen@FreeBSD.org) Message-Id: <202009130114.08D1EA6P099816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: wen set sender to wen@FreeBSD.org using -f From: Wen Heping Date: Sun, 13 Sep 2020 01:14:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548442 - head/databases/py-pg8000 X-SVN-Group: ports-head X-SVN-Commit-Author: wen X-SVN-Commit-Paths: head/databases/py-pg8000 X-SVN-Commit-Revision: 548442 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.33 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: Sun, 13 Sep 2020 01:14:10 -0000 Author: wen Date: Sun Sep 13 01:14:09 2020 New Revision: 548442 URL: https://svnweb.freebsd.org/changeset/ports/548442 Log: - Update to 1.16.5 Modified: head/databases/py-pg8000/Makefile head/databases/py-pg8000/distinfo Modified: head/databases/py-pg8000/Makefile ============================================================================== --- head/databases/py-pg8000/Makefile Sat Sep 12 23:55:12 2020 (r548441) +++ head/databases/py-pg8000/Makefile Sun Sep 13 01:14:09 2020 (r548442) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= pg8000 -PORTVERSION= 1.16.1 +PORTVERSION= 1.16.5 CATEGORIES= databases python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/databases/py-pg8000/distinfo ============================================================================== --- head/databases/py-pg8000/distinfo Sat Sep 12 23:55:12 2020 (r548441) +++ head/databases/py-pg8000/distinfo Sun Sep 13 01:14:09 2020 (r548442) @@ -1,3 +1,3 @@ -TIMESTAMP = 1595233255 -SHA256 (pg8000-1.16.1.tar.gz) = 4e08104b170127d5139c4249d4c5aece0fc15d05315886398f59f845b5eee75c -SIZE (pg8000-1.16.1.tar.gz) = 77346 +TIMESTAMP = 1599953610 +SHA256 (pg8000-1.16.5.tar.gz) = 8af70cdfcc1fadafa32468a6af563e1c0b5271c4dcc99a4490030a128cb295a3 +SIZE (pg8000-1.16.5.tar.gz) = 78932 From owner-svn-ports-head@freebsd.org Sun Sep 13 01:55:27 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 394093E8E70; Sun, 13 Sep 2020 01:55:27 +0000 (UTC) (envelope-from dbaio@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpsyR0jKCz4nCh; Sun, 13 Sep 2020 01:55:27 +0000 (UTC) (envelope-from dbaio@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 EFAC01E4D3; Sun, 13 Sep 2020 01:55:26 +0000 (UTC) (envelope-from dbaio@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D1tQiD024510; Sun, 13 Sep 2020 01:55:26 GMT (envelope-from dbaio@FreeBSD.org) Received: (from dbaio@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D1tQJw024509; Sun, 13 Sep 2020 01:55:26 GMT (envelope-from dbaio@FreeBSD.org) Message-Id: <202009130155.08D1tQJw024509@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: dbaio set sender to dbaio@FreeBSD.org using -f From: "Danilo G. Baio" Date: Sun, 13 Sep 2020 01:55:26 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548443 - head/dns/knot2 X-SVN-Group: ports-head X-SVN-Commit-Author: dbaio X-SVN-Commit-Paths: head/dns/knot2 X-SVN-Commit-Revision: 548443 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.33 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: Sun, 13 Sep 2020 01:55:27 -0000 Author: dbaio Date: Sun Sep 13 01:55:26 2020 New Revision: 548443 URL: https://svnweb.freebsd.org/changeset/ports/548443 Log: dns/knot2: Update to 2.9.6 Changelog: https://www.knot-dns.cz/2020-08-31-version-296.html Remove Python from DOCS option, it is not necessary at this moment. [1] PR: 249169 PR: 243374 [1] Submitted by: Leo Vandewoestijne (maintainer) Reported by: alex_y_xu@yahoo.ca [1] Modified: head/dns/knot2/Makefile head/dns/knot2/distinfo Modified: head/dns/knot2/Makefile ============================================================================== --- head/dns/knot2/Makefile Sun Sep 13 01:14:09 2020 (r548442) +++ head/dns/knot2/Makefile Sun Sep 13 01:55:26 2020 (r548443) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= knot -DISTVERSION= 2.9.5 +DISTVERSION= 2.9.6 CATEGORIES= dns MASTER_SITES= https://secure.nic.cz/files/knot-dns/ \ https://dns.company/downloads/knot-dns/ @@ -79,7 +79,6 @@ DNSTAP_LIB_DEPENDS= libprotobuf-c.so:devel/protobuf-c # in higher line count. Ideally this bug should be fixed upstream. DNSTAP_CPPFLAGS= -I${LOCALBASE}/include -DOCS_USES= python:build DOCS_CONFIGURE_OFF= --disable-documentation FASTPARSER_DESC= Fast zone parser (demanding compilation) Modified: head/dns/knot2/distinfo ============================================================================== --- head/dns/knot2/distinfo Sun Sep 13 01:14:09 2020 (r548442) +++ head/dns/knot2/distinfo Sun Sep 13 01:55:26 2020 (r548443) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592835061 -SHA256 (knot-2.9.5.tar.xz) = 1109a8ba212ff8ddfdbaf44a6f8fc13a2b880a98a9e54c19112ba72a1aacbf76 -SIZE (knot-2.9.5.tar.xz) = 1190872 +TIMESTAMP = 1599955330 +SHA256 (knot-2.9.6.tar.xz) = bf742883c6825b54f19f2dadca2c94fec1ff8bdcf0a52388e2e167937594b2e7 +SIZE (knot-2.9.6.tar.xz) = 1188412 From owner-svn-ports-head@freebsd.org Sun Sep 13 02:06:02 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 D2E0F3E923E; Sun, 13 Sep 2020 02:06:02 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [96.47.72.132]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BptBf5DlGz4ndV; Sun, 13 Sep 2020 02:06:02 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599962762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nzCU0tIYDlDva5LYo+cKtGg0c/YRgnf7Yaa78xy9T3M=; b=kEYz2VH+K9DJK+K4jKUw2OZCOw0vfgCdjeIXxCLOoi6WqkPFzWmJm9s1CLbMpubKTx5qZB ETancEa9XOZ8GlHcUMJFfFfdl/BjY4kBAvOdKGsrKCBBX5dWlMNXU3kSNfq27kqv8Jbmfl 1asAq2EYAo5+CtUSb8IYFGNzi9lsdwdmHjwQAxHQb63aJ9cEoI2v4kXkdyjP6FQHoniTij T6q8JWSMWpuT4OmuhWUVvqsf8FT8WADDvm2IXD2rnGm8A9pWrt3tW9p8ppWn40/Jjg/Xj1 E1sV1ZYkoCPQtNaPz0ROdgV3bmJMdg1+xd+P3o7sJeAFYS9z7aGiDyMFzVTuZA== Received: by freefall.freebsd.org (Postfix, from userid 1033) id A82391C9FB; Sun, 13 Sep 2020 02:06:02 +0000 (UTC) Date: Sun, 13 Sep 2020 02:06:02 +0000 From: Alexey Dokuchaev To: "Danilo G. Baio" Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r548384 - head/devel/py-azure-multiapi-storage Message-ID: <20200913020602.GA64577@FreeBSD.org> References: <202009121754.08CHsQDl022660@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202009121754.08CHsQDl022660@repo.freebsd.org> ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1599962762; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=nzCU0tIYDlDva5LYo+cKtGg0c/YRgnf7Yaa78xy9T3M=; b=vTgFhxyEnVRcyJtNyWRyM1HoKHVP77K1bPEX1+eggkk2Y0zDzQEjlsvDRjYMvtm7/a1zAS pTrCQXSCnIT2oCzWcX65m2IVA4V4BahYNyOTXqk6Jsf8gwqWn2dxGh4yTeX9sCJsfB+04i mpP2XJSsJTdMmnQx3r5apXQqhQB9DhyeCXskKZVIxYXAb/rNNmwr8/Rw1EjzMF+Ka1eTPP BruZXWE0H9cVlO3FJQr4KsbUBaPAQ1UkUjTPCQu3Gm358d8BXN6PapUdtN+dwps2UWw1eB 63GKawMhgh6YHQcWdM35PtSLsZD+FngLG6TIl3695iDxgYShEEOAdaPyfMIeiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1599962762; a=rsa-sha256; cv=none; b=wE1R/yzPTp9rOwieZEfz3iHFhMKINUD8RBUtTUfmLPUSXx3S6teAZQk4Eb8SExyX3H7vYP SLN889Ju+QLWLgKN3QHFetRVcxuTtrJ9ir/+zdNEwhTahFFb06gXoH4gvhwFaXxkRYjo+L +8entqITuW1MncDhLnsTyiCOC9lkMZZUPTP7mbFiJYZb/aWaiv6MzeLRfFBH6uB/JDCz3F VXWt/dsY7SYNlR08lliSrMPRyIkM7tbtNh5kOvmyIctAlOoGJyMBkHsBiGwuJMStchCOEZ 1oNMCvZNF4sO6U9PERi/G7DolOXfHLrG3761OvwVCq5qLzmJUlkqJilow3w/BQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 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: Sun, 13 Sep 2020 02:06:02 -0000 On Sat, Sep 12, 2020 at 05:54:26PM +0000, Danilo G. Baio wrote: > New Revision: 548384 > URL: https://svnweb.freebsd.org/changeset/ports/548384 > > Log: > devel/py-azure-multiapi-storage: Update to 0.4.1 > > ... > +++ head/devel/py-azure-multiapi-storage/Makefile > @@ -1,7 +1,7 @@ > # $FreeBSD$ > > PORTNAME= azure-multiapi-storage > -PORTVERSION= 0.3.5 > +PORTVERSION= 0.4.1 > PORTREVISION= 1 Any reason for port revision not being reset? ./danfe From owner-svn-ports-head@freebsd.org Sun Sep 13 02:48:56 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 C69A53EA17D; Sun, 13 Sep 2020 02:48:56 +0000 (UTC) (envelope-from yuri@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpv884sRbz4q6q; Sun, 13 Sep 2020 02:48:56 +0000 (UTC) (envelope-from yuri@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 8A4371F325; Sun, 13 Sep 2020 02:48:56 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D2mukn055054; Sun, 13 Sep 2020 02:48:56 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D2muMO055053; Sun, 13 Sep 2020 02:48:56 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009130248.08D2muMO055053@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 13 Sep 2020 02:48:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548444 - in head/devel/ispc: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/devel/ispc: . files X-SVN-Commit-Revision: 548444 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.33 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: Sun, 13 Sep 2020 02:48:56 -0000 Author: yuri Date: Sun Sep 13 02:48:55 2020 New Revision: 548444 URL: https://svnweb.freebsd.org/changeset/ports/548444 Log: devel/ispc: Add the patch to fix amd64 architecture detection in CMakeLists.txt Added: head/devel/ispc/files/patch-CMakeLists.txt (contents, props changed) Modified: head/devel/ispc/Makefile Modified: head/devel/ispc/Makefile ============================================================================== --- head/devel/ispc/Makefile Sun Sep 13 01:55:26 2020 (r548443) +++ head/devel/ispc/Makefile Sun Sep 13 02:48:55 2020 (r548444) @@ -4,6 +4,7 @@ PORTNAME= ispc DISTVERSIONPREFIX= v DISTVERSION= 1.14.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -33,7 +34,7 @@ PLIST_FILES= bin/ispc \ do-test: # tests are broken with python-3.6 @cd ${WRKSRC} && ISPC_HOME=${WRKSRC} ./run_tests.py -run-examples: +run-examples: build @[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/tbb package installed" .for e in simple sort mandelbrot stencil @cd ${WRKSRC}/examples/${e} && \ Added: head/devel/ispc/files/patch-CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ispc/files/patch-CMakeLists.txt Sun Sep 13 02:48:55 2020 (r548444) @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2020-09-13 01:22:29 UTC ++++ CMakeLists.txt +@@ -45,7 +45,7 @@ set(ISPC_BUILD TRUE) + project(${PROJECT_NAME}) + + set(X86_HOST FALSE) +-if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "AMD64|86") ++if (${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "amd64|86") + set(X86_HOST TRUE) + endif() + From owner-svn-ports-head@freebsd.org Sun Sep 13 02:49:36 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 E49283EA514; Sun, 13 Sep 2020 02:49:36 +0000 (UTC) (envelope-from loader@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpv8w5s7nz4qV1; Sun, 13 Sep 2020 02:49:36 +0000 (UTC) (envelope-from loader@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 8FA091F24F; Sun, 13 Sep 2020 02:49:36 +0000 (UTC) (envelope-from loader@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D2na9I055206; Sun, 13 Sep 2020 02:49:36 GMT (envelope-from loader@FreeBSD.org) Received: (from loader@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D2naqS055204; Sun, 13 Sep 2020 02:49:36 GMT (envelope-from loader@FreeBSD.org) Message-Id: <202009130249.08D2naqS055204@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: loader set sender to loader@FreeBSD.org using -f From: Fukang Chen Date: Sun, 13 Sep 2020 02:49:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548445 - in head/shells/zsh: . files X-SVN-Group: ports-head X-SVN-Commit-Author: loader X-SVN-Commit-Paths: in head/shells/zsh: . files X-SVN-Commit-Revision: 548445 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.33 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: Sun, 13 Sep 2020 02:49:37 -0000 Author: loader Date: Sun Sep 13 02:49:35 2020 New Revision: 548445 URL: https://svnweb.freebsd.org/changeset/ports/548445 Log: shells/zsh: Fix build with devel/ncurses 6.2 When devel/ncurses is installed in the system, the Zsh configure script detects and uses ${LOCALBASE}/include/ncurses/ncurses.h instead. The patch is obtained from this commit: https://sourceforge.net/p/zsh/code/ci/c6a85163619ed1cee89ab047a0d98108ed46828d/ cc -c -I. -I../../Src -I../../Src -I../../Src/Zle -I. -I/usr/local/include -DBOOL_DEFINED -DLIBICONV_PLUG -DHAVE_CONFIG_H -DMODULE -O2 -pipe -DLIBICONV_PLUG -fstack-protector-strong -fno-strict-aliasing -fPIC -o curses..o curses.c In file included from curses.c:210: ./curses_keys.h:93:15: error: use of undeclared identifier 'KEY_EVENT' {"EVENT", KEY_EVENT}, ^ 1 error generated. *** Error code 1 Reviewed by: koobs Approved by: koobs (ports, mentor) Differential Revision: https://reviews.freebsd.org/D26355 MFH: 2020Q3 (build fix) Added: head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk (contents, props changed) Modified: head/shells/zsh/Makefile Modified: head/shells/zsh/Makefile ============================================================================== --- head/shells/zsh/Makefile Sun Sep 13 02:48:55 2020 (r548444) +++ head/shells/zsh/Makefile Sun Sep 13 02:49:35 2020 (r548445) @@ -88,6 +88,10 @@ SUB_FILES= pkg-message CONFIGURE_ENV+= ac_cv_lib_iconv_libiconv=no .endif +.if ${ncurses_ARGS} == port +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-Src_Modules_curses__keys.awk +.endif + post-patch: # FreeBSD's clock_gettime(2) is in libc, not librt; see PR 167857 @${REINPLACE_CMD} -e '/LIBS/s|-lrt||' ${WRKSRC}/configure Added: head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/shells/zsh/files/extra-patch-Src_Modules_curses__keys.awk Sun Sep 13 02:49:35 2020 (r548445) @@ -0,0 +1,18 @@ +https://sourceforge.net/p/zsh/code/ci/c6a85163619ed1cee89ab047a0d98108ed46828d/ +--- Src/Modules/curses_keys.awk.orig 2017-12-04 14:09:36 UTC ++++ Src/Modules/curses_keys.awk +@@ -12,8 +12,13 @@ BEGIN {nkeydefs = 0} + + END { + printf("static const struct zcurses_namenumberpair keypad_names[] = {\n") +- for (i = 0; i < 0 + nkeydefs; i++) ++ for (i = 0; i < 0 + nkeydefs; i++) { ++ if (name[i] == "EVENT") ++ printf("#ifdef KEY_EVENT\n") + printf(" {\"%s\", KEY_%s},\n", name[i], name[i]) ++ if (name[i] == "EVENT") ++ printf("#endif\n") ++ } + printf(" {NULL, 0}\n") + printf("};\n") + } From owner-svn-ports-head@freebsd.org Sun Sep 13 03:11:23 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 1EEB23EAC56; Sun, 13 Sep 2020 03:11:23 +0000 (UTC) (envelope-from yuri@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpvf275cXz4rc8; Sun, 13 Sep 2020 03:11:22 +0000 (UTC) (envelope-from yuri@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 BE0391F9E9; Sun, 13 Sep 2020 03:11:22 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D3BM05071292; Sun, 13 Sep 2020 03:11:22 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D3BLdB071284; Sun, 13 Sep 2020 03:11:21 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009130311.08D3BLdB071284@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 13 Sep 2020 03:11:21 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548446 - in head/graphics/oidn: . files X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: in head/graphics/oidn: . files X-SVN-Commit-Revision: 548446 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.33 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: Sun, 13 Sep 2020 03:11:23 -0000 Author: yuri Date: Sun Sep 13 03:11:20 2020 New Revision: 548446 URL: https://svnweb.freebsd.org/changeset/ports/548446 Log: graphics/oidn: Update 1.1.0 -> 1.2.3 Added: head/graphics/oidn/files/patch-cmake_oidn__install.cmake (contents, props changed) head/graphics/oidn/files/patch-mkl-dnn_src_common_memory__debug.cpp (contents, props changed) head/graphics/oidn/files/patch-mkl-dnn_src_common_utils.cpp (contents, props changed) Deleted: head/graphics/oidn/files/patch-cmake_install.cmake Modified: head/graphics/oidn/Makefile head/graphics/oidn/distinfo head/graphics/oidn/files/patch-common_thread.cpp head/graphics/oidn/files/patch-common_thread.h head/graphics/oidn/pkg-descr head/graphics/oidn/pkg-plist Modified: head/graphics/oidn/Makefile ============================================================================== --- head/graphics/oidn/Makefile Sun Sep 13 02:49:35 2020 (r548445) +++ head/graphics/oidn/Makefile Sun Sep 13 03:11:20 2020 (r548446) @@ -2,9 +2,10 @@ PORTNAME= oidn DISTVERSIONPREFIX= v -DISTVERSION= 1.1.0 -PORTREVISION= 3 +DISTVERSION= 1.2.3 CATEGORIES= graphics +MASTER_SITES= http://freebsd.org/:weights # bogus URL to make the framework happy, the fetch uses Git URL below +DISTFILES= ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}:weights MAINTAINER= yuri@FreeBSD.org COMMENT= Intel(R) Open Image Denoise library @@ -13,15 +14,20 @@ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn) +ONLY_FOR_ARCHS_REASON= Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn), and ISPC has a limited availability +FETCH_DEPENDS= git:devel/git \ + git-lfs:devel/git-lfs +BUILD_DEPENDS= ispc>=1.14.1:devel/ispc LIB_DEPENDS= libtbb.so:devel/tbb USES= cmake:noninja compiler:c++11-lang python:build USE_GITHUB= yes GH_ACCOUNT= OpenImageDenoise -GH_TUPLE= OpenImageDenoise:oidn-weights:f175104:w/weights \ - OpenImageDenoise:mkl-dnn:096bda1:m/mkl-dnn +GH_TUPLE= \ + OpenImageDenoise:mkl-dnn:603620ba45185e7d91fe112b69287e7d86c64353:m/mkl-dnn +# OpenImageDenoise:oidn-weights:08092e46a1961b13b70e48ad80fa19b452bd4c01:w/weights # replaced with git clone in post-fetch because it needs git-lfs + USE_LDCONFIG= yes OPTIONS_DEFINE= DOCS @@ -29,5 +35,25 @@ OPTIONS_DEFINE= DOCS CMAKE_ARGS+= -DTBB_ROOT:STRING=${LOCALBASE} -DTBB_INCLUDE_DIR:STRING=${LOCALBASE}/include -DPYTHON_EXECUTABLE:STRING=${PYTHON_CMD} DOCSDIR= share/doc/${GH_ACCOUNT} + +WEIGHTS_GIT_URL= https://github.com/OpenImageDenoise/oidn-weights.git +WEIGHTS_GIT_HASH= 08092e46a1961b13b70e48ad80fa19b452bd4c01 + +pre-fetch: + @if [ "${FORCE_FETCH_ALL}" = "true" ] || ! [ -f "${DISTDIR}/${DIST_SUBDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX}" ]; then \ + ${MKDIR} ${DISTDIR}/${DIST_SUBDIR} && \ + cd ${DISTDIR}/${DIST_SUBDIR} && \ + ${ECHO} "==> Fetching the oidn/weights subproject with large LFS files" && \ + git config --global filter.lfs.smudge "git-lfs smudge -- %f" && \ + git clone -q ${WEIGHTS_GIT_URL} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && \ + (cd ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} && git reset -q --hard ${WEIGHTS_GIT_HASH} && ${RM} -r .git) && \ + ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -and -exec ${TOUCH} -h -d 1970-01-01T00:00:00Z {} \; && \ + ${FIND} ${PORTNAME}-weights-${WEIGHTS_GIT_HASH} -print0 | LC_ALL=C ${SORT} -z | \ + ${TAR} czf ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}${EXTRACT_SUFX} --format=bsdtar --gid 0 --uid 0 --options gzip:!timestamp --no-recursion --null -T - && \ + ${RM} -r ${PORTNAME}-weights-${WEIGHTS_GIT_HASH}; \ + fi + +post-extract: + @cd ${WRKSRC} && ${RMDIR} weights && ${LN} -s ${WRKDIR}/${PORTNAME}-weights-${WEIGHTS_GIT_HASH} weights .include Modified: head/graphics/oidn/distinfo ============================================================================== --- head/graphics/oidn/distinfo Sun Sep 13 02:49:35 2020 (r548445) +++ head/graphics/oidn/distinfo Sun Sep 13 03:11:20 2020 (r548446) @@ -1,7 +1,7 @@ -TIMESTAMP = 1571521700 -SHA256 (OpenImageDenoise-oidn-v1.1.0_GH0.tar.gz) = 78674407896d39a26206bd4f080a8a0c3f82f7e4ba4c293d421a8231be4cc977 -SIZE (OpenImageDenoise-oidn-v1.1.0_GH0.tar.gz) = 3431532 -SHA256 (OpenImageDenoise-oidn-weights-f175104_GH0.tar.gz) = 8a93afdc3d826d420196af8348e9b050c5882435e7745606544899b040bb1376 -SIZE (OpenImageDenoise-oidn-weights-f175104_GH0.tar.gz) = 36949154 -SHA256 (OpenImageDenoise-mkl-dnn-096bda1_GH0.tar.gz) = 08c6acdd412b3abc87f3b88734a813b1c93c942dbcee44935807cb432daa864b -SIZE (OpenImageDenoise-mkl-dnn-096bda1_GH0.tar.gz) = 1498472 +TIMESTAMP = 1599950146 +SHA256 (oidn-weights-08092e46a1961b13b70e48ad80fa19b452bd4c01.tar.gz) = 51b6638f22b67581da7c2a877faa2f5d3062bb4e9b9214e5008cb25052748300 +SIZE (oidn-weights-08092e46a1961b13b70e48ad80fa19b452bd4c01.tar.gz) = 37029289 +SHA256 (OpenImageDenoise-oidn-v1.2.3_GH0.tar.gz) = 9ff7f7b5c442bd56be1ae89f8c45ae1972498b854f7175705ff520bb2c5cb25b +SIZE (OpenImageDenoise-oidn-v1.2.3_GH0.tar.gz) = 3410694 +SHA256 (OpenImageDenoise-mkl-dnn-603620ba45185e7d91fe112b69287e7d86c64353_GH0.tar.gz) = 582a5e07027e0bd2b078c11c667bcb9ab06cc955263b95e292c50088ba0ea6ad +SIZE (OpenImageDenoise-mkl-dnn-603620ba45185e7d91fe112b69287e7d86c64353_GH0.tar.gz) = 5800370 Added: head/graphics/oidn/files/patch-cmake_oidn__install.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/oidn/files/patch-cmake_oidn__install.cmake Sun Sep 13 03:11:20 2020 (r548446) @@ -0,0 +1,18 @@ +--- cmake/oidn_install.cmake.orig 2020-09-11 17:36:51 UTC ++++ cmake/oidn_install.cmake +@@ -31,6 +31,7 @@ install(DIRECTORY include/OpenImageDenoise + ## Install documentation + ## ----------------------------------------------------------------------------- + ++if (FALSE) + install( + FILES + ${PROJECT_SOURCE_DIR}/README.md +@@ -43,6 +44,7 @@ install( + DESTINATION ${CMAKE_INSTALL_DOCDIR} + COMPONENT lib + ) ++endif() + + ## ----------------------------------------------------------------------------- + ## Install dependencies: TBB Modified: head/graphics/oidn/files/patch-common_thread.cpp ============================================================================== --- head/graphics/oidn/files/patch-common_thread.cpp Sun Sep 13 02:49:35 2020 (r548445) +++ head/graphics/oidn/files/patch-common_thread.cpp Sun Sep 13 03:11:20 2020 (r548446) @@ -1,24 +1,24 @@ ---- common/thread.cpp.orig 2019-02-18 06:42:30 UTC +--- common/thread.cpp.orig 2020-09-11 17:36:51 UTC +++ common/thread.cpp -@@ -14,6 +14,8 @@ - // limitations under the License. // - // ======================================================================== // +@@ -1,6 +1,8 @@ + // Copyright 2009-2020 Intel Corporation + // SPDX-License-Identifier: Apache-2.0 +#include + #if defined(_MSC_VER) #pragma warning (disable : 4146) // unary minus operator applied to unsigned type, result still unsigned #endif -@@ -132,7 +135,7 @@ namespace oidn { +@@ -120,7 +122,7 @@ namespace oidn { OIDN_WARNING("SetThreadGroupAffinity failed"); } -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) - // -------------------------------------------------------------------------- - // ThreadAffinity - Linux -@@ -176,7 +179,7 @@ namespace oidn { + // --------------------------------------------------------------------------- + // ThreadAffinity: Linux +@@ -165,7 +167,7 @@ namespace oidn { for (size_t i = 0; i < threadIds.size(); ++i) { @@ -27,7 +27,7 @@ CPU_ZERO(&affinity); CPU_SET(threadIds[i], &affinity); -@@ -193,7 +196,7 @@ namespace oidn { +@@ -182,7 +184,7 @@ namespace oidn { const pthread_t thread = pthread_self(); // Save the current affinity @@ -36,7 +36,7 @@ { OIDN_WARNING("pthread_getaffinity_np failed"); oldAffinities[threadIndex] = affinities[threadIndex]; -@@ -201,7 +204,7 @@ namespace oidn { +@@ -190,7 +192,7 @@ namespace oidn { } // Set the new affinity @@ -45,7 +45,7 @@ OIDN_WARNING("pthread_setaffinity_np failed"); } -@@ -213,7 +216,7 @@ namespace oidn { +@@ -202,7 +204,7 @@ namespace oidn { const pthread_t thread = pthread_self(); // Restore the original affinity Modified: head/graphics/oidn/files/patch-common_thread.h ============================================================================== --- head/graphics/oidn/files/patch-common_thread.h Sun Sep 13 02:49:35 2020 (r548445) +++ head/graphics/oidn/files/patch-common_thread.h Sun Sep 13 03:11:20 2020 (r548446) @@ -1,18 +1,19 @@ ---- common/thread.h.orig 2019-02-18 06:37:35 UTC +--- common/thread.h.orig 2020-09-11 17:36:51 UTC +++ common/thread.h -@@ -142,7 +142,9 @@ namespace oidn { +@@ -130,8 +130,10 @@ namespace oidn { void restore(int threadIndex); }; -#elif defined(__linux__) +#elif defined(__linux__) || defined(__FreeBSD__) -+ -+#include - // -------------------------------------------------------------------------- - // ThreadAffinity - Linux -@@ -151,8 +153,8 @@ namespace oidn { - class ThreadAffinity ++#include ++ + // --------------------------------------------------------------------------- + // ThreadAffinity: Linux + // --------------------------------------------------------------------------- +@@ -139,8 +141,8 @@ namespace oidn { + class ThreadAffinity : public Verbose { private: - std::vector affinities; // thread affinities @@ -21,4 +22,4 @@ + std::vector oldAffinities; // original thread affinities public: - ThreadAffinity(int numThreadsPerCore = INT_MAX); + ThreadAffinity(int numThreadsPerCore = INT_MAX, int verbose = 0); Added: head/graphics/oidn/files/patch-mkl-dnn_src_common_memory__debug.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/oidn/files/patch-mkl-dnn_src_common_memory__debug.cpp Sun Sep 13 03:11:20 2020 (r548446) @@ -0,0 +1,11 @@ +--- mkl-dnn/src/common/memory_debug.cpp.orig 2020-09-12 19:21:13 UTC ++++ mkl-dnn/src/common/memory_debug.cpp +@@ -21,7 +21,7 @@ + #include + #endif + +-#if defined __linux__ || defined __APPLE__ ++#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__ + #include + #include + #endif Added: head/graphics/oidn/files/patch-mkl-dnn_src_common_utils.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/oidn/files/patch-mkl-dnn_src_common_utils.cpp Sun Sep 13 03:11:20 2020 (r548446) @@ -0,0 +1,11 @@ +--- mkl-dnn/src/common/utils.cpp.orig 2020-09-12 19:26:27 UTC ++++ mkl-dnn/src/common/utils.cpp +@@ -19,7 +19,7 @@ + #include + #endif + +-#if defined __linux__ || defined __APPLE__ ++#if defined __linux__ || defined __APPLE__ || defined __FreeBSD__ + #include + #endif + Modified: head/graphics/oidn/pkg-descr ============================================================================== --- head/graphics/oidn/pkg-descr Sun Sep 13 02:49:35 2020 (r548445) +++ head/graphics/oidn/pkg-descr Sun Sep 13 03:11:20 2020 (r548446) @@ -12,4 +12,4 @@ orders of magnitude (depending on the desired closenes A simple but flexible C/C++ API ensures that the library can be easily integrated into most existing or new rendering solutions. -WWW: https://openimagedenoise.github.io/ +WWW: https://www.openimagedenoise.org/ Modified: head/graphics/oidn/pkg-plist ============================================================================== --- head/graphics/oidn/pkg-plist Sun Sep 13 02:49:35 2020 (r548445) +++ head/graphics/oidn/pkg-plist Sun Sep 13 03:11:20 2020 (r548446) @@ -1,4 +1,6 @@ -bin/denoise +bin/oidnBenchmark +bin/oidnDenoise +bin/oidnTest include/OpenImageDenoise/oidn.h include/OpenImageDenoise/oidn.hpp include/OpenImageDenoise/version.h @@ -7,7 +9,4 @@ lib/cmake/OpenImageDenoise/OpenImageDenoiseConfig.cmak lib/cmake/OpenImageDenoise/OpenImageDenoiseConfigVersion.cmake lib/libOpenImageDenoise.so lib/libOpenImageDenoise.so.0 -lib/libOpenImageDenoise.so.1.1.0 -%%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md -%%PORTDOCS%%%%DOCSDIR%%/README.md -%%PORTDOCS%%%%DOCSDIR%%/readme.pdf +lib/libOpenImageDenoise.so.1.2.3 From owner-svn-ports-head@freebsd.org Sun Sep 13 03:19:21 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 AEC673EADFE; Sun, 13 Sep 2020 03:19:21 +0000 (UTC) (envelope-from kbowling@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpvqF2pzmz4rm2; Sun, 13 Sep 2020 03:19:21 +0000 (UTC) (envelope-from kbowling@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 43B191F9F8; Sun, 13 Sep 2020 03:19:21 +0000 (UTC) (envelope-from kbowling@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D3JLGv075105; Sun, 13 Sep 2020 03:19:21 GMT (envelope-from kbowling@FreeBSD.org) Received: (from kbowling@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D3JKkK075102; Sun, 13 Sep 2020 03:19:20 GMT (envelope-from kbowling@FreeBSD.org) Message-Id: <202009130319.08D3JKkK075102@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kbowling set sender to kbowling@FreeBSD.org using -f From: Kevin Bowling Date: Sun, 13 Sep 2020 03:19:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548447 - in head/databases/pgsphere: . files X-SVN-Group: ports-head X-SVN-Commit-Author: kbowling X-SVN-Commit-Paths: in head/databases/pgsphere: . files X-SVN-Commit-Revision: 548447 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.33 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: Sun, 13 Sep 2020 03:19:21 -0000 Author: kbowling Date: Sun Sep 13 03:19:20 2020 New Revision: 548447 URL: https://svnweb.freebsd.org/changeset/ports/548447 Log: databases/pgsphere: stop using VLAs to fix PG12 compilation PR: 248657 Reported by: vvd@unislabs.com Obtained from: https://github.com/akorotkov/pgsphere/pull/14 Sponsored by: BBOX.io Added: head/databases/pgsphere/files/ head/databases/pgsphere/files/patch-path.c (contents, props changed) head/databases/pgsphere/files/patch-polygon.c (contents, props changed) Modified: head/databases/pgsphere/Makefile Modified: head/databases/pgsphere/Makefile ============================================================================== --- head/databases/pgsphere/Makefile Sun Sep 13 03:11:20 2020 (r548446) +++ head/databases/pgsphere/Makefile Sun Sep 13 03:19:20 2020 (r548447) @@ -3,7 +3,7 @@ PORTNAME= pgsphere PORTVERSION= 1.1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= databases geography MAINTAINER= sunpoet@FreeBSD.org Added: head/databases/pgsphere/files/patch-path.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgsphere/files/patch-path.c Sun Sep 13 03:19:20 2020 (r548447) @@ -0,0 +1,25 @@ +--- path.c.orig 2019-10-30 10:18:38 UTC ++++ path.c +@@ -513,13 +513,21 @@ spherepath_in(PG_FUNCTION_ARGS) + nelem = get_path_count(); + if (nelem > 1) + { +- SPoint arr[nelem]; ++ SPoint* arr = (SPoint*)malloc(nelem*sizeof(SPoint)); ++ if (arr == NULL) { ++ reset_buffer(); ++ elog(ERROR, "spherepath_in: could not allocate array"); ++ PG_RETURN_NULL(); ++ } + + for (i = 0; i < nelem; i++) + { + get_path_elem(i, &arr[i].lng, &arr[i].lat); + } + path = spherepath_from_array(&arr[0], nelem); ++ ++ //free array ++ free(arr); + } + else + { Added: head/databases/pgsphere/files/patch-polygon.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/pgsphere/files/patch-polygon.c Sun Sep 13 03:19:20 2020 (r548447) @@ -0,0 +1,54 @@ +--- polygon.c.orig 2019-10-30 10:18:38 UTC ++++ polygon.c +@@ -824,13 +824,21 @@ spherepoly_in(PG_FUNCTION_ARGS) + nelem = get_path_count(); + if (nelem > 2) + { +- SPoint arr[nelem]; ++ // allocate arr ++ SPoint* arr = (SPoint *)malloc(nelem * sizeof(SPoint)); ++ if (arr == NULL) { ++ reset_buffer(); ++ elog(ERROR, "spherepoly_in: Could not allocate array."); ++ PG_RETURN_NULL(); ++ } + + for (i = 0; i < nelem; i++) + { + get_path_elem(i, &arr[i].lng, &arr[i].lat); + } + poly = spherepoly_from_array(&arr[0], nelem); ++ // free allocated array ++ free(arr); + } + else + { +@@ -892,11 +900,17 @@ spherepoly_area(PG_FUNCTION_ARGS) + { + SPOLY *poly = PG_GETARG_SPOLY(0); + int32 i; +- SPoint s[poly->npts + 2]; ++ SPoint *s = (SPoint*)malloc((poly->npts+2)*sizeof(SPoint)); ++ //SPoint s[poly->npts + 2]; + SPoint stmp[2]; + SEuler se; + float8 sum = 0.0; + ++ if (s == NULL) { ++ elog(ERROR, "spherepoly_area: Could not allocate array."); ++ PG_RETURN_NULL(); ++ } ++ + memcpy((void *) &s[1], + (void *) &poly->p[0], + poly->npts * sizeof(SPoint)); +@@ -935,6 +949,9 @@ spherepoly_area(PG_FUNCTION_ARGS) + { + sum = 0.0; + } ++ ++ // free array ++ free(s); + + PG_RETURN_FLOAT8(sum); + } From owner-svn-ports-head@freebsd.org Sun Sep 13 04:01:29 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 A122E3EB4DA; Sun, 13 Sep 2020 04:01:29 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpwls2P6Cz4tPR; Sun, 13 Sep 2020 04:01:29 +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 270E820053; Sun, 13 Sep 2020 04:01:29 +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 08D41SLg002097; Sun, 13 Sep 2020 04:01:28 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D41SRD002096; Sun, 13 Sep 2020 04:01:28 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009130401.08D41SRD002096@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 13 Sep 2020 04:01:28 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548448 - head/misc/qtchooser X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/misc/qtchooser X-SVN-Commit-Revision: 548448 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.33 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: Sun, 13 Sep 2020 04:01:29 -0000 Author: danfe Date: Sun Sep 13 04:01:28 2020 New Revision: 548448 URL: https://svnweb.freebsd.org/changeset/ports/548448 Log: Ports Collection no longer offers Qt4 support, make the wording Qt version- agnostic so it won't become inaccurate with every Qt(n+1) vs. Qt(n) cadence. Modified: head/misc/qtchooser/Makefile head/misc/qtchooser/pkg-message Modified: head/misc/qtchooser/Makefile ============================================================================== --- head/misc/qtchooser/Makefile Sun Sep 13 03:19:20 2020 (r548447) +++ head/misc/qtchooser/Makefile Sun Sep 13 04:01:28 2020 (r548448) @@ -2,7 +2,7 @@ PORTNAME= qtchooser PORTVERSION= 66 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= misc MASTER_SITES= QT/official_releases/${PORTNAME} DIST_SUBDIR= KDE/Qt/qtchooser Modified: head/misc/qtchooser/pkg-message ============================================================================== --- head/misc/qtchooser/pkg-message Sun Sep 13 03:19:20 2020 (r548447) +++ head/misc/qtchooser/pkg-message Sun Sep 13 04:01:28 2020 (r548448) @@ -1,12 +1,13 @@ [ { type: install message: < 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 398B33EBFEA; Sun, 13 Sep 2020 04:31:18 +0000 (UTC) (envelope-from lwhsu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpxQG1BQ8z4vTt; Sun, 13 Sep 2020 04:31:18 +0000 (UTC) (envelope-from lwhsu@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 0C1B0206A1; Sun, 13 Sep 2020 04:31:18 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D4VIXm020489; Sun, 13 Sep 2020 04:31:18 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D4VF0J019798; Sun, 13 Sep 2020 04:31:15 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130431.08D4VF0J019798@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 04:31:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548449 - in head/audio/libopenshot-audio: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/audio/libopenshot-audio: . files X-SVN-Commit-Revision: 548449 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.33 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: Sun, 13 Sep 2020 04:31:18 -0000 Author: lwhsu Date: Sun Sep 13 04:31:14 2020 New Revision: 548449 URL: https://svnweb.freebsd.org/changeset/ports/548449 Log: audio/libopenshot-audio: Update to 0.2.0.14 PR: 249270 Submitted by: Tatsuki Makino (maintainer) Added: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_midi__io_juce__MidiDevices.h (contents, props changed) Deleted: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_midi__io_juce__MidiInput.h head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_midi__io_juce__MidiOutput.h head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.h Modified: head/audio/libopenshot-audio/Makefile head/audio/libopenshot-audio/distinfo head/audio/libopenshot-audio/files/patch-CMakeLists.txt head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_files_juce__File.cpp head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__Network.cpp head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__SystemStats.cpp head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__posix__SharedCode.h head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_system_juce__StandardHeader.h head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__events_juce__events.h head/audio/libopenshot-audio/pkg-plist Modified: head/audio/libopenshot-audio/Makefile ============================================================================== --- head/audio/libopenshot-audio/Makefile Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/Makefile Sun Sep 13 04:31:14 2020 (r548449) @@ -2,8 +2,8 @@ PORTNAME= libopenshot-audio DISTVERSIONPREFIX= v -DISTVERSION= 0.2.0-10 -DISTVERSIONSUFFIX= -g7cec182 +DISTVERSION= 0.2.0-14 +DISTVERSIONSUFFIX= -g12ddb3d CATEGORIES= audio multimedia MAINTAINER= tatsuki_makino@hotmail.com Modified: head/audio/libopenshot-audio/distinfo ============================================================================== --- head/audio/libopenshot-audio/distinfo Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/distinfo Sun Sep 13 04:31:14 2020 (r548449) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592884800 -SHA256 (OpenShot-libopenshot-audio-v0.2.0-10-g7cec182_GH0.tar.gz) = dc959ac4eefa139dd6808afce66ac345e270aa5030b95a8f15ad0d5120ab21d9 -SIZE (OpenShot-libopenshot-audio-v0.2.0-10-g7cec182_GH0.tar.gz) = 1711846 +TIMESTAMP = 1599883200 +SHA256 (OpenShot-libopenshot-audio-v0.2.0-14-g12ddb3d_GH0.tar.gz) = 59a9afaca1eb52bb9a89fb3825b9cb45e833b4ecaed785b4e61f2621920bc632 +SIZE (OpenShot-libopenshot-audio-v0.2.0-14-g12ddb3d_GH0.tar.gz) = 1720267 Modified: head/audio/libopenshot-audio/files/patch-CMakeLists.txt ============================================================================== --- head/audio/libopenshot-audio/files/patch-CMakeLists.txt Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-CMakeLists.txt Sun Sep 13 04:31:14 2020 (r548449) @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2020-05-19 10:59:11 UTC +--- CMakeLists.txt.orig 2020-09-11 12:10:25 UTC +++ CMakeLists.txt -@@ -217,8 +217,14 @@ if(UNIX AND NOT APPLE) +@@ -218,8 +218,14 @@ if(UNIX AND NOT APPLE) INTERFACE_INCLUDE_DIRECTORIES ${ALSA_INCLUDE_DIR} INTERFACE_LINK_LIBRARIES ${ALSA_LIBRARIES}) endif() Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_juce__audio__devices.cpp Sun Sep 13 04:31:14 2020 (r548449) @@ -1,4 +1,4 @@ ---- JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.cpp.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.cpp.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_audio_devices/juce_audio_devices.cpp @@ -119,7 +119,7 @@ #endif @@ -9,7 +9,7 @@ #if JUCE_ALSA /* Got an include error here? If so, you've either not got ALSA installed, or you've not got your paths set up correctly to find its header files. -@@ -212,7 +212,7 @@ +@@ -211,7 +211,7 @@ #endif //============================================================================== Added: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_midi__io_juce__MidiDevices.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__audio__devices_midi__io_juce__MidiDevices.h Sun Sep 13 04:31:14 2020 (r548449) @@ -0,0 +1,20 @@ +--- JuceLibraryCode/modules/juce_audio_devices/midi_io/juce_MidiDevices.h.orig 2020-09-11 12:10:25 UTC ++++ JuceLibraryCode/modules/juce_audio_devices/midi_io/juce_MidiDevices.h +@@ -108,7 +108,7 @@ class JUCE_API MidiInput final (public) + */ + static std::unique_ptr openDevice (const String& deviceIdentifier, MidiInputCallback* callback); + +- #if JUCE_LINUX || JUCE_MAC || JUCE_IOS || DOXYGEN ++ #if JUCE_BSD || JUCE_LINUX || JUCE_MAC || JUCE_IOS || DOXYGEN + /** This will try to create a new midi input device (only available on Linux, macOS and iOS). + + This will attempt to create a new midi input device with the specified name for other +@@ -264,7 +264,7 @@ class JUCE_API MidiOutput final : private Thread (p + */ + static std::unique_ptr openDevice (const String& deviceIdentifier); + +- #if JUCE_LINUX || JUCE_MAC || JUCE_IOS || DOXYGEN ++ #if JUCE_BSD || JUCE_LINUX || JUCE_MAC || JUCE_IOS || DOXYGEN + /** This will try to create a new midi output device (only available on Linux, macOS and iOS). + + This will attempt to create a new midi output device with the specified name that other Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_files_juce__File.cpp ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_files_juce__File.cpp Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_files_juce__File.cpp Sun Sep 13 04:31:14 2020 (r548449) @@ -1,6 +1,6 @@ ---- JuceLibraryCode/modules/juce_core/files/juce_File.cpp.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/files/juce_File.cpp.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/files/juce_File.cpp -@@ -211,7 +211,7 @@ String File::addTrailingSeparator (const String& path) +@@ -231,7 +231,7 @@ String File::addTrailingSeparator (const String& path) } //============================================================================== @@ -9,7 +9,7 @@ #define NAMES_ARE_CASE_SENSITIVE 1 #endif -@@ -953,7 +953,7 @@ bool File::createSymbolicLink (const File& linkFileToC +@@ -973,7 +973,7 @@ bool File::createSymbolicLink (const File& linkFileToC linkFileToCreate.deleteFile(); } Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_juce__core.cpp Sun Sep 13 04:31:14 2020 (r548449) @@ -1,6 +1,6 @@ ---- JuceLibraryCode/modules/juce_core/juce_core.cpp.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/juce_core.cpp.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/juce_core.cpp -@@ -66,7 +66,7 @@ +@@ -64,7 +64,7 @@ #endif #else @@ -9,7 +9,7 @@ #include #include #include -@@ -74,7 +74,7 @@ +@@ -72,7 +72,7 @@ #include #endif @@ -18,12 +18,12 @@ #include #include #include -@@ -209,7 +209,7 @@ - #include "native/juce_win32_Threads.cpp" +@@ -207,7 +207,7 @@ + #include "native/juce_win32_Threads.cpp" //============================================================================== -#elif JUCE_LINUX +#elif JUCE_BSD || JUCE_LINUX - #include "native/juce_linux_CommonFile.cpp" - #include "native/juce_linux_Files.cpp" - #include "native/juce_linux_Network.cpp" + #include "native/juce_linux_CommonFile.cpp" + #include "native/juce_linux_Files.cpp" + #include "native/juce_linux_Network.cpp" Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__BasicNativeHeaders.h Sun Sep 13 04:31:14 2020 (r548449) @@ -1,11 +1,11 @@ ---- JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/native/juce_BasicNativeHeaders.h -@@ -261,6 +261,8 @@ - #include +@@ -272,6 +272,8 @@ #include #include -+ #include + #include + #include ++ #include //============================================================================== #elif JUCE_ANDROID Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__Network.cpp ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__Network.cpp Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__Network.cpp Sun Sep 13 04:31:14 2020 (r548449) @@ -1,8 +1,8 @@ ---- JuceLibraryCode/modules/juce_core/native/juce_linux_Network.cpp.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/native/juce_linux_Network.cpp.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/native/juce_linux_Network.cpp -@@ -34,6 +34,14 @@ void MACAddress::findAllAddresses (Array& +@@ -35,6 +35,14 @@ void MACAddress::findAllAddresses (Array& { - for (struct ifaddrs* i = addrs; i != nullptr; i = i->ifa_next) + for (auto* i = addrs; i != nullptr; i = i->ifa_next) { +#if JUCE_BSD + if (i->ifa_addr->sa_family != AF_LINK) { @@ -15,7 +15,7 @@ struct ifreq ifr; strcpy (ifr.ifr_name, i->ifa_name); ifr.ifr_addr.sa_family = AF_INET; -@@ -41,6 +49,7 @@ void MACAddress::findAllAddresses (Array& +@@ -42,6 +50,7 @@ void MACAddress::findAllAddresses (Array& if (ioctl (s, SIOCGIFHWADDR, &ifr) == 0) { MACAddress ma ((const uint8*) ifr.ifr_hwaddr.sa_data); Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__SystemStats.cpp ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__SystemStats.cpp Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__linux__SystemStats.cpp Sun Sep 13 04:31:14 2020 (r548449) @@ -1,6 +1,6 @@ ---- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/native/juce_linux_SystemStats.cpp -@@ -87,10 +87,13 @@ int SystemStats::getCpuSpeedInMegahertz() +@@ -91,10 +91,13 @@ int SystemStats::getCpuSpeedInMegahertz() int SystemStats::getMemorySizeInMegabytes() { @@ -14,17 +14,17 @@ return 0; } -@@ -134,8 +137,13 @@ static String getLocaleValue (nl_item key) +@@ -139,8 +142,13 @@ static String getLocaleValue (nl_item key) return result; } +#if JUCE_BSD -+String SystemStats::getUserLanguage() { return String::fromUTF8(""); } -+String SystemStats::getUserRegion() { return String::fromUTF8(""); } ++String SystemStats::getUserLanguage() { return String(); } ++String SystemStats::getUserRegion() { return String(); } +#else - String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } - String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } + String SystemStats::getUserLanguage() { return getLocaleValue (_NL_IDENTIFICATION_LANGUAGE); } + String SystemStats::getUserRegion() { return getLocaleValue (_NL_IDENTIFICATION_TERRITORY); } +#endif - String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } + String SystemStats::getDisplayLanguage() { return getUserLanguage() + "-" + getUserRegion(); } //============================================================================== Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__posix__SharedCode.h ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__posix__SharedCode.h Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_native_juce__posix__SharedCode.h Sun Sep 13 04:31:14 2020 (r548449) @@ -1,6 +1,6 @@ ---- JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/native/juce_posix_SharedCode.h -@@ -148,7 +148,7 @@ void JUCE_CALLTYPE Process::terminate() +@@ -59,7 +59,7 @@ void JUCE_CALLTYPE Process::terminate() } @@ -9,7 +9,16 @@ bool Process::setMaxNumberOfFileHandles (int newMaxNumber) noexcept { rlimit lim; -@@ -987,6 +987,8 @@ void JUCE_CALLTYPE Thread::setCurrentThreadName (const +@@ -253,7 +253,7 @@ uint64 File::getFileIdentifier() const + + static bool hasEffectiveRootFilePermissions() + { +- #if JUCE_LINUX ++ #if JUCE_BSD || JUCE_LINUX + return geteuid() == 0; + #else + return false; +@@ -924,6 +924,8 @@ void JUCE_CALLTYPE Thread::setCurrentThreadName (const { [[NSThread currentThread] setName: juceStringToNS (name)]; } @@ -18,20 +27,20 @@ #elif JUCE_LINUX || JUCE_ANDROID #if ((JUCE_LINUX && (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012) \ || JUCE_ANDROID && __ANDROID_API__ >= 9) -@@ -1040,14 +1042,20 @@ void JUCE_CALLTYPE Thread::yield() +@@ -977,14 +979,20 @@ void JUCE_CALLTYPE Thread::yield() void JUCE_CALLTYPE Thread::setCurrentThreadAffinityMask (uint32 affinityMask) { #if SUPPORT_AFFINITIES -+ #if JUCE_BSD ++ #if JUCE_BSD + cpuset_t affinity; -+ #else ++ #else cpu_set_t affinity; -+ #endif ++ #endif CPU_ZERO (&affinity); for (int i = 0; i < 32; ++i) - if ((affinityMask & (1 << i)) != 0) - CPU_SET (i, &affinity); + if ((affinityMask & (uint32) (1 << i)) != 0) + CPU_SET ((size_t) i, &affinity); - #if (! JUCE_ANDROID) && ((! JUCE_LINUX) || ((__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2004)) + #if JUCE_BSD Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_system_juce__StandardHeader.h ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_system_juce__StandardHeader.h Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__core_system_juce__StandardHeader.h Sun Sep 13 04:31:14 2020 (r548449) @@ -1,7 +1,7 @@ ---- JuceLibraryCode/modules/juce_core/system/juce_StandardHeader.h.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_core/system/juce_StandardHeader.h.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_core/system/juce_StandardHeader.h -@@ -72,7 +72,7 @@ - #include +@@ -80,7 +80,7 @@ + #endif #endif -#if JUCE_LINUX Modified: head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__events_juce__events.h ============================================================================== --- head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__events_juce__events.h Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/files/patch-JuceLibraryCode_modules_juce__events_juce__events.h Sun Sep 13 04:31:14 2020 (r548449) @@ -1,6 +1,6 @@ ---- JuceLibraryCode/modules/juce_events/juce_events.h.orig 2019-04-17 16:56:20 UTC +--- JuceLibraryCode/modules/juce_events/juce_events.h.orig 2020-09-11 12:10:25 UTC +++ JuceLibraryCode/modules/juce_events/juce_events.h -@@ -89,7 +89,7 @@ +@@ -90,7 +90,7 @@ #include "interprocess/juce_ConnectedChildProcess.h" #include "interprocess/juce_NetworkServiceDiscovery.h" Modified: head/audio/libopenshot-audio/pkg-plist ============================================================================== --- head/audio/libopenshot-audio/pkg-plist Sun Sep 13 04:01:28 2020 (r548448) +++ head/audio/libopenshot-audio/pkg-plist Sun Sep 13 04:31:14 2020 (r548449) @@ -47,9 +47,8 @@ include/libopenshot-audio/juce_audio_devices/audio_io/ include/libopenshot-audio/juce_audio_devices/audio_io/juce_AudioIODeviceType.h include/libopenshot-audio/juce_audio_devices/audio_io/juce_SystemAudioVolume.h include/libopenshot-audio/juce_audio_devices/juce_audio_devices.h -include/libopenshot-audio/juce_audio_devices/midi_io/juce_MidiInput.h +include/libopenshot-audio/juce_audio_devices/midi_io/juce_MidiDevices.h include/libopenshot-audio/juce_audio_devices/midi_io/juce_MidiMessageCollector.h -include/libopenshot-audio/juce_audio_devices/midi_io/juce_MidiOutput.h include/libopenshot-audio/juce_audio_devices/native/juce_MidiDataConcatenator.h include/libopenshot-audio/juce_audio_devices/native/juce_ios_Audio.h include/libopenshot-audio/juce_audio_devices/sources/juce_AudioSourcePlayer.h @@ -207,7 +206,6 @@ include/libopenshot-audio/juce_core/memory/juce_WeakRe include/libopenshot-audio/juce_core/misc/juce_ConsoleApplication.h include/libopenshot-audio/juce_core/misc/juce_Result.h include/libopenshot-audio/juce_core/misc/juce_RuntimePermissions.h -include/libopenshot-audio/juce_core/misc/juce_StdFunctionCompat.h include/libopenshot-audio/juce_core/misc/juce_Uuid.h include/libopenshot-audio/juce_core/misc/juce_WindowsRegistry.h include/libopenshot-audio/juce_core/native/juce_BasicNativeHeaders.h @@ -272,6 +270,7 @@ include/libopenshot-audio/juce_core/time/juce_Performa include/libopenshot-audio/juce_core/time/juce_RelativeTime.h include/libopenshot-audio/juce_core/time/juce_Time.h include/libopenshot-audio/juce_core/unit_tests/juce_UnitTest.h +include/libopenshot-audio/juce_core/unit_tests/juce_UnitTestCategories.h include/libopenshot-audio/juce_core/xml/juce_XmlDocument.h include/libopenshot-audio/juce_core/xml/juce_XmlElement.h include/libopenshot-audio/juce_core/zip/juce_GZIPCompressorOutputStream.h From owner-svn-ports-head@freebsd.org Sun Sep 13 04:42:20 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 93B2D3EC9E9; Sun, 13 Sep 2020 04:42:20 +0000 (UTC) (envelope-from lwhsu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpxg03LTSz3S5r; Sun, 13 Sep 2020 04:42:20 +0000 (UTC) (envelope-from lwhsu@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 56BD620AE1; Sun, 13 Sep 2020 04:42:20 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D4gKwO030013; Sun, 13 Sep 2020 04:42:20 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D4gJPV029903; Sun, 13 Sep 2020 04:42:19 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130442.08D4gJPV029903@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 04:42:19 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548450 - in head/net-im/prosody: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/net-im/prosody: . files X-SVN-Commit-Revision: 548450 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.33 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: Sun, 13 Sep 2020 04:42:20 -0000 Author: lwhsu Date: Sun Sep 13 04:42:19 2020 New Revision: 548450 URL: https://svnweb.freebsd.org/changeset/ports/548450 Log: net-im/prosody: Do not use prosodyctl in init script * Apply shebangfix. * Update init script to directly control the Prosody daemon as using prosodyctl has been deprecated. [1] * Add pkg-message to clearly state that setting the pidfile option in prosody.cfg.lua is required. * Fix pkg-message formatting. [1] https://blog.prosody.im/prosody-0.11.6-released/ PR: 249276 Submitted by: Thomas Morper (maintainer) Modified: head/net-im/prosody/Makefile head/net-im/prosody/files/prosody.in head/net-im/prosody/pkg-message Modified: head/net-im/prosody/Makefile ============================================================================== --- head/net-im/prosody/Makefile Sun Sep 13 04:31:14 2020 (r548449) +++ head/net-im/prosody/Makefile Sun Sep 13 04:42:19 2020 (r548450) @@ -3,6 +3,7 @@ PORTNAME= prosody PORTVERSION= 0.11.6 +PORTREVISION= 1 CATEGORIES= net-im MASTER_SITES= https://prosody.im/downloads/source/ @@ -19,7 +20,8 @@ RUN_DEPENDS= ${LUA_REFMODLIBDIR}/socket/core.so:net/lu ${LUA_REFMODLIBDIR}/bit.so:devel/lua-bitop@${LUA_FLAVOR} LIB_DEPENDS= libidn.so:dns/libidn -USES= compiler:c11 cpe gmake lua:52 ssl +USES= compiler:c11 cpe gmake lua:52 shebangfix ssl +SHEBANG_FILES= prosody prosodyctl tools/migration/prosody-migrator.lua LUA_PREMK= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= --prefix="${PREFIX}" \ @@ -43,7 +45,7 @@ GROUPS= ${USERS} USE_RC_SUBR= prosody SUB_FILES= pkg-deinstall -SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} +SUB_LIST= USERS=${USERS} GROUPS=${GROUPS} LUA_PREFIX=${LUA_PREFIX} LUA_CMD=${LUA_CMD} PLIST_SUB= PROSODY_USER=${USERS} \ PROSODY_USER_regex=\b${USERS}\b \ PROSODY_GROUP=${GROUPS} \ Modified: head/net-im/prosody/files/prosody.in ============================================================================== --- head/net-im/prosody/files/prosody.in Sun Sep 13 04:31:14 2020 (r548449) +++ head/net-im/prosody/files/prosody.in Sun Sep 13 04:42:19 2020 (r548450) @@ -16,25 +16,16 @@ name="prosody" rcvar="prosody_enable" -command="%%PREFIX%%/bin/prosodyctl" +command="%%PREFIX%%/bin/prosody" +command_args="-D" +command_interpreter="%%LUA_PREFIX%%/bin/%%LUA_CMD%%" +extra_commands="reload" +prosody_user="%%USERS%%" +prosody_group="%%GROUPS%%" load_rc_config $name prosody_enable=${prosody_enable:-"NO"} pidfile=${prosody_pidfile:-"/var/run/prosody/prosody.pid"} - -extra_commands="reload" -start_cmd="prosody_cmd start" -stop_cmd="prosody_cmd stop" -reload_cmd="prosody_cmd reload" -restart_cmd="prosody_cmd restart" -status_cmd="prosody_cmd status" - -export PATH="%%PREFIX%%/bin:$PATH" - -prosody_cmd() -{ - $command $1 -} run_rc_command "$1" Modified: head/net-im/prosody/pkg-message ============================================================================== --- head/net-im/prosody/pkg-message Sun Sep 13 04:31:14 2020 (r548449) +++ head/net-im/prosody/pkg-message Sun Sep 13 04:42:19 2020 (r548450) @@ -1,12 +1,20 @@ [ { type: install message: < 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 801A63ED19E; Sun, 13 Sep 2020 05:17:06 +0000 (UTC) (envelope-from yuri@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpyR62Qppz3SmX; Sun, 13 Sep 2020 05:17:06 +0000 (UTC) (envelope-from yuri@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 32EA620FA9; Sun, 13 Sep 2020 05:17:06 +0000 (UTC) (envelope-from yuri@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D5H62h048365; Sun, 13 Sep 2020 05:17:06 GMT (envelope-from yuri@FreeBSD.org) Received: (from yuri@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D5H55B048363; Sun, 13 Sep 2020 05:17:05 GMT (envelope-from yuri@FreeBSD.org) Message-Id: <202009130517.08D5H55B048363@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: yuri set sender to yuri@FreeBSD.org using -f From: Yuri Victorovich Date: Sun, 13 Sep 2020 05:17:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548451 - head/security/py-ospd X-SVN-Group: ports-head X-SVN-Commit-Author: yuri X-SVN-Commit-Paths: head/security/py-ospd X-SVN-Commit-Revision: 548451 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.33 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: Sun, 13 Sep 2020 05:17:06 -0000 Author: yuri Date: Sun Sep 13 05:17:05 2020 New Revision: 548451 URL: https://svnweb.freebsd.org/changeset/ports/548451 Log: security/py-ospd: Update 2.0.1 -> 20.8.1 Modified: head/security/py-ospd/Makefile head/security/py-ospd/distinfo Modified: head/security/py-ospd/Makefile ============================================================================== --- head/security/py-ospd/Makefile Sun Sep 13 04:42:19 2020 (r548450) +++ head/security/py-ospd/Makefile Sun Sep 13 05:17:05 2020 (r548451) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= ospd -DISTVERSION= 2.0.1 +DISTVERSION= 20.8.1 CATEGORIES= security net python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -13,8 +13,10 @@ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}deprecated>0:devel/py-deprecated@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}paramiko>0:security/py-paramiko@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}psutil>0:sysutils/py-psutil@${PY_FLAVOR} USES= python USE_PYTHON= distutils autoplist Modified: head/security/py-ospd/distinfo ============================================================================== --- head/security/py-ospd/distinfo Sun Sep 13 04:42:19 2020 (r548450) +++ head/security/py-ospd/distinfo Sun Sep 13 05:17:05 2020 (r548451) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589849199 -SHA256 (ospd-2.0.1.tar.gz) = 024493dfee8a8b714958786444c956674628f4b2968cd0da1d11bf2fb65a55d7 -SIZE (ospd-2.0.1.tar.gz) = 66646 +TIMESTAMP = 1599973768 +SHA256 (ospd-20.8.1.tar.gz) = 71cff4cc0f54b28737e92e11d9184a1742182ed3114a2dcbfc1dd19200c300a6 +SIZE (ospd-20.8.1.tar.gz) = 93390 From owner-svn-ports-head@freebsd.org Sun Sep 13 05:56:28 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 EDE563EDEC7; Sun, 13 Sep 2020 05:56:28 +0000 (UTC) (envelope-from jbeich@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpzJX66Njz3VPN; Sun, 13 Sep 2020 05:56:28 +0000 (UTC) (envelope-from jbeich@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 B65FC21359; Sun, 13 Sep 2020 05:56:28 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D5uSxX072572; Sun, 13 Sep 2020 05:56:28 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D5uRBE072567; Sun, 13 Sep 2020 05:56:27 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202009130556.08D5uRBE072567@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 Sep 2020 05:56:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548452 - in head/graphics: . dssim X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics: . dssim X-SVN-Commit-Revision: 548452 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.33 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: Sun, 13 Sep 2020 05:56:29 -0000 Author: jbeich Date: Sun Sep 13 05:56:27 2020 New Revision: 548452 URL: https://svnweb.freebsd.org/changeset/ports/548452 Log: graphics/dssim: add new port This tool computes (dis)similarity between two or more PNG images using an algorithm approximating human vision. Comparison is done in L*a*b* color space (D65 white point, sRGB gamma) using a multi-scale variant of the SSIM algorithm. Features: - Supports alpha channel - Supports gamma correction - No OpenCV or MATLAB needed: - DSSIM version 1.x uses C (C99) and libpng or Cocoa on macOS. - DSSIM version 2.x is easy to build with Rust https://kornel.ski/dssim Added: head/graphics/dssim/ head/graphics/dssim/Makefile (contents, props changed) head/graphics/dssim/distinfo (contents, props changed) head/graphics/dssim/pkg-descr (contents, props changed) head/graphics/dssim/pkg-plist (contents, props changed) Modified: head/graphics/Makefile (contents, props changed) Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sun Sep 13 05:17:05 2020 (r548451) +++ head/graphics/Makefile Sun Sep 13 05:56:27 2020 (r548452) @@ -141,6 +141,7 @@ SUBDIR += drm-legacy-kmod SUBDIR += drm_info SUBDIR += dspdfviewer + SUBDIR += dssim SUBDIR += duhdraw SUBDIR += dynamechs SUBDIR += ebsynth Added: head/graphics/dssim/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dssim/Makefile Sun Sep 13 05:56:27 2020 (r548452) @@ -0,0 +1,31 @@ +# $FreeBSD$ + +PORTNAME= dssim +DISTVERSION= 1.3.3-15 +DISTVERSIONSUFFIX= -gcb6b383 +CATEGORIES= graphics + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Image similarity comparison simulating human perception + +LICENSE= AGPLv3+ +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libpng.so:graphics/png + +USES= meson pkgconfig +USE_GITHUB= yes +GH_ACCOUNT= kornelski + +OPTIONS_DEFINE= JPEG +OPTIONS_DEFAULT=JPEG + +JPEG_USES= jpeg +JPEG_MESON_ENABLED= jpeg + +post-patch: +# Extract (snapshot) version from the port instead of meson.build + @${REINPLACE_CMD} "/^[[:space:]]*version : /s/'.*'/'${PORTVERSION}'/" \ + ${WRKSRC}/meson.build + +.include Added: head/graphics/dssim/distinfo ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dssim/distinfo Sun Sep 13 05:56:27 2020 (r548452) @@ -0,0 +1,3 @@ +TIMESTAMP = 1599972446 +SHA256 (kornelski-dssim-1.3.3-15-gcb6b383_GH0.tar.gz) = e4e7a89bd0b154e3ca8c54659047b73a696b521a5b127a36f662847d3da4a2be +SIZE (kornelski-dssim-1.3.3-15-gcb6b383_GH0.tar.gz) = 36273 Added: head/graphics/dssim/pkg-descr ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dssim/pkg-descr Sun Sep 13 05:56:27 2020 (r548452) @@ -0,0 +1,12 @@ +This tool computes (dis)similarity between two or more PNG images +using an algorithm approximating human vision. + +Comparison is done in L*a*b* color space (D65 white point, sRGB gamma) +using a multi-scale variant of the SSIM algorithm. + +Features: +- Supports alpha channel +- Supports gamma correction +- No OpenCV or MATLAB needed: uses C (C99) and libpng + +WWW: https://kornel.ski/dssim Added: head/graphics/dssim/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/dssim/pkg-plist Sun Sep 13 05:56:27 2020 (r548452) @@ -0,0 +1,6 @@ +bin/dssim +include/dssim.h +lib/libdssim-lib.so +lib/libdssim-lib.so.1 +lib/libdssim-lib.so.1.1 +libdata/pkgconfig/dssim.pc From owner-svn-ports-head@freebsd.org Sun Sep 13 05:56:39 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 B0AB73EDEC8; Sun, 13 Sep 2020 05:56:39 +0000 (UTC) (envelope-from jbeich@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpzJj03D8z3VLQ; Sun, 13 Sep 2020 05:56:36 +0000 (UTC) (envelope-from jbeich@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 6E4A12169E; Sun, 13 Sep 2020 05:56:36 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D5uaRb072788; Sun, 13 Sep 2020 05:56:36 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D5uZ8F072779; Sun, 13 Sep 2020 05:56:35 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202009130556.08D5uZ8F072779@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 Sep 2020 05:56:35 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548453 - in head/graphics: . dssim libdssim X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics: . dssim libdssim X-SVN-Commit-Revision: 548453 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.33 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: Sun, 13 Sep 2020 05:56:39 -0000 Author: jbeich Date: Sun Sep 13 05:56:34 2020 New Revision: 548453 URL: https://svnweb.freebsd.org/changeset/ports/548453 Log: graphics/dssim: update to 2.11.3 (rust) Changes: https://github.com/kornelski/dssim/compare/cb6b383...c66fb04 Added: head/graphics/libdssim/ head/graphics/libdssim/Makefile (contents, props changed) head/graphics/libdssim/pkg-plist (contents, props changed) Deleted: head/graphics/dssim/pkg-plist Modified: head/graphics/Makefile (contents, props changed) head/graphics/dssim/Makefile (contents, props changed) head/graphics/dssim/distinfo (contents, props changed) head/graphics/dssim/pkg-descr (contents, props changed) Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sun Sep 13 05:56:27 2020 (r548452) +++ head/graphics/Makefile Sun Sep 13 05:56:34 2020 (r548453) @@ -435,6 +435,7 @@ SUBDIR += libchamplain SUBDIR += libdmtx SUBDIR += libdrm + SUBDIR += libdssim SUBDIR += libecwj2 SUBDIR += libemf SUBDIR += libepoxy Modified: head/graphics/dssim/Makefile ============================================================================== --- head/graphics/dssim/Makefile Sun Sep 13 05:56:27 2020 (r548452) +++ head/graphics/dssim/Makefile Sun Sep 13 05:56:34 2020 (r548453) @@ -1,9 +1,12 @@ # $FreeBSD$ PORTNAME= dssim -DISTVERSION= 1.3.3-15 -DISTVERSIONSUFFIX= -gcb6b383 +DISTVERSION= 2.11.3 +PORTREVISION?= 0 CATEGORIES= graphics +MASTER_SITES= CRATESIO +# XXX Teach USES=cargo to have proper default +DISTFILES= ${CARGO_DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} MAINTAINER= jbeich@FreeBSD.org COMMENT= Image similarity comparison simulating human perception @@ -11,21 +14,62 @@ COMMENT= Image similarity comparison simulating human LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE -LIB_DEPENDS= libpng.so:graphics/png +USES= cargo +PLIST_FILES?= bin/${PORTNAME} -USES= meson pkgconfig -USE_GITHUB= yes -GH_ACCOUNT= kornelski - -OPTIONS_DEFINE= JPEG -OPTIONS_DEFAULT=JPEG - -JPEG_USES= jpeg -JPEG_MESON_ENABLED= jpeg - -post-patch: -# Extract (snapshot) version from the port instead of meson.build - @${REINPLACE_CMD} "/^[[:space:]]*version : /s/'.*'/'${PORTVERSION}'/" \ - ${WRKSRC}/meson.build +CARGO_CRATES= adler-0.2.3 \ + arrayvec-0.5.1 \ + autocfg-1.0.0 \ + bytemuck-1.2.0 \ + cc-1.0.58 \ + cfg-if-0.1.10 \ + crc32fast-1.2.0 \ + crossbeam-deque-0.7.3 \ + crossbeam-epoch-0.8.2 \ + crossbeam-queue-0.2.3 \ + crossbeam-utils-0.7.2 \ + dssim-core-2.11.3 \ + dunce-1.0.1 \ + either-1.5.3 \ + flate2-1.0.17 \ + foreign-types-0.5.0 \ + foreign-types-macros-0.2.1 \ + foreign-types-shared-0.3.0 \ + getopts-0.2.21 \ + hermit-abi-0.1.15 \ + imgref-1.7.0 \ + itertools-0.9.0 \ + jobserver-0.1.21 \ + lazy_static-1.4.0 \ + lcms2-5.3.1 \ + lcms2-sys-3.1.4 \ + libc-0.2.72 \ + load_image-2.12.1 \ + lodepng-3.2.1 \ + maybe-uninit-2.0.0 \ + memoffset-0.5.5 \ + miniz_oxide-0.4.1 \ + mozjpeg-0.8.19 \ + mozjpeg-sys-0.10.8 \ + nasm-rs-0.1.7 \ + num-0.2.1 \ + num-bigint-0.2.6 \ + num-complex-0.2.4 \ + num-integer-0.1.43 \ + num-iter-0.1.41 \ + num-rational-0.2.4 \ + num-traits-0.2.12 \ + num_cpus-1.13.0 \ + pkg-config-0.3.18 \ + proc-macro2-1.0.18 \ + quote-1.0.7 \ + rayon-1.3.1 \ + rayon-core-1.7.1 \ + rexif-0.5.0 \ + rgb-0.8.20 \ + scopeguard-1.1.0 \ + syn-1.0.34 \ + unicode-width-0.1.8 \ + unicode-xid-0.2.1 .include Modified: head/graphics/dssim/distinfo ============================================================================== --- head/graphics/dssim/distinfo Sun Sep 13 05:56:27 2020 (r548452) +++ head/graphics/dssim/distinfo Sun Sep 13 05:56:34 2020 (r548453) @@ -1,3 +1,111 @@ -TIMESTAMP = 1599972446 -SHA256 (kornelski-dssim-1.3.3-15-gcb6b383_GH0.tar.gz) = e4e7a89bd0b154e3ca8c54659047b73a696b521a5b127a36f662847d3da4a2be -SIZE (kornelski-dssim-1.3.3-15-gcb6b383_GH0.tar.gz) = 36273 +TIMESTAMP = 1598277341 +SHA256 (rust/crates/dssim-2.11.3.tar.gz) = ccf63d56cce067886bfb0431c8a50ae54ea978fe835e582ccb286b678c57da3e +SIZE (rust/crates/dssim-2.11.3.tar.gz) = 20655 +SHA256 (rust/crates/adler-0.2.3.tar.gz) = ee2a4ec343196209d6594e19543ae87a39f96d5534d7174822a3ad825dd6ed7e +SIZE (rust/crates/adler-0.2.3.tar.gz) = 12168 +SHA256 (rust/crates/arrayvec-0.5.1.tar.gz) = cff77d8686867eceff3105329d4698d96c2391c176d5d03adc90c7389162b5b8 +SIZE (rust/crates/arrayvec-0.5.1.tar.gz) = 26816 +SHA256 (rust/crates/autocfg-1.0.0.tar.gz) = f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d +SIZE (rust/crates/autocfg-1.0.0.tar.gz) = 12870 +SHA256 (rust/crates/bytemuck-1.2.0.tar.gz) = 37fa13df2292ecb479ec23aa06f4507928bef07839be9ef15281411076629431 +SIZE (rust/crates/bytemuck-1.2.0.tar.gz) = 17957 +SHA256 (rust/crates/cc-1.0.58.tar.gz) = f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518 +SIZE (rust/crates/cc-1.0.58.tar.gz) = 52896 +SHA256 (rust/crates/cfg-if-0.1.10.tar.gz) = 4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822 +SIZE (rust/crates/cfg-if-0.1.10.tar.gz) = 7933 +SHA256 (rust/crates/crc32fast-1.2.0.tar.gz) = ba125de2af0df55319f41944744ad91c71113bf74a4646efff39afe1f6842db1 +SIZE (rust/crates/crc32fast-1.2.0.tar.gz) = 39161 +SHA256 (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285 +SIZE (rust/crates/crossbeam-deque-0.7.3.tar.gz) = 19888 +SHA256 (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace +SIZE (rust/crates/crossbeam-epoch-0.8.2.tar.gz) = 39283 +SHA256 (rust/crates/crossbeam-queue-0.2.3.tar.gz) = 774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570 +SIZE (rust/crates/crossbeam-queue-0.2.3.tar.gz) = 14753 +SHA256 (rust/crates/crossbeam-utils-0.7.2.tar.gz) = c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8 +SIZE (rust/crates/crossbeam-utils-0.7.2.tar.gz) = 34338 +SHA256 (rust/crates/dssim-core-2.11.3.tar.gz) = 462c6cf1cb98d8f7dc5f7a5878e9f05e6be51086370f7f162e446a62ebfab0cb +SIZE (rust/crates/dssim-core-2.11.3.tar.gz) = 26211 +SHA256 (rust/crates/dunce-1.0.1.tar.gz) = b2641c4a7c0c4101df53ea572bffdc561c146f6c2eb09e4df02bc4811e3feeb4 +SIZE (rust/crates/dunce-1.0.1.tar.gz) = 7988 +SHA256 (rust/crates/either-1.5.3.tar.gz) = bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3 +SIZE (rust/crates/either-1.5.3.tar.gz) = 12278 +SHA256 (rust/crates/flate2-1.0.17.tar.gz) = 766d0e77a2c1502169d4a93ff3b8c15a71fd946cd0126309752104e5f3c46d94 +SIZE (rust/crates/flate2-1.0.17.tar.gz) = 74154 +SHA256 (rust/crates/foreign-types-0.5.0.tar.gz) = d737d9aa519fb7b749cbc3b962edcf310a8dd1f4b67c91c4f83975dbdd17d965 +SIZE (rust/crates/foreign-types-0.5.0.tar.gz) = 7824 +SHA256 (rust/crates/foreign-types-macros-0.2.1.tar.gz) = 63f713f8b2aa9e24fec85b0e290c56caee12e3b6ae0aeeda238a75b28251afd6 +SIZE (rust/crates/foreign-types-macros-0.2.1.tar.gz) = 7673 +SHA256 (rust/crates/foreign-types-shared-0.3.0.tar.gz) = 7684cf33bb7f28497939e8c7cf17e3e4e3b8d9a0080ffa4f8ae2f515442ee855 +SIZE (rust/crates/foreign-types-shared-0.3.0.tar.gz) = 5894 +SHA256 (rust/crates/getopts-0.2.21.tar.gz) = 14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5 +SIZE (rust/crates/getopts-0.2.21.tar.gz) = 18457 +SHA256 (rust/crates/hermit-abi-0.1.15.tar.gz) = 3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9 +SIZE (rust/crates/hermit-abi-0.1.15.tar.gz) = 9597 +SHA256 (rust/crates/imgref-1.7.0.tar.gz) = d8767843be7909b5b3ffd9b52cdc042882b94e2cfe0c00abc4ce1c301cb1fcae +SIZE (rust/crates/imgref-1.7.0.tar.gz) = 60376 +SHA256 (rust/crates/itertools-0.9.0.tar.gz) = 284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b +SIZE (rust/crates/itertools-0.9.0.tar.gz) = 96429 +SHA256 (rust/crates/jobserver-0.1.21.tar.gz) = 5c71313ebb9439f74b00d9d2dcec36440beaf57a6aa0623068441dd7cd81a7f2 +SIZE (rust/crates/jobserver-0.1.21.tar.gz) = 21228 +SHA256 (rust/crates/lazy_static-1.4.0.tar.gz) = e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646 +SIZE (rust/crates/lazy_static-1.4.0.tar.gz) = 10443 +SHA256 (rust/crates/lcms2-5.3.1.tar.gz) = d58ec166f11ed510d5f602c45bac0a9441bf4f3c8ea3046a35311303ea2fc4f0 +SIZE (rust/crates/lcms2-5.3.1.tar.gz) = 27496 +SHA256 (rust/crates/lcms2-sys-3.1.4.tar.gz) = bb7d2f71158c0c27e642fa8a60e6dac6cb31216cab818c6454f8ec39717771a4 +SIZE (rust/crates/lcms2-sys-3.1.4.tar.gz) = 268184 +SHA256 (rust/crates/libc-0.2.72.tar.gz) = a9f8082297d534141b30c8d39e9b1773713ab50fdbe4ff30f750d063b3bfd701 +SIZE (rust/crates/libc-0.2.72.tar.gz) = 478292 +SHA256 (rust/crates/load_image-2.12.1.tar.gz) = d326645af741a5a6f07d792c8acde0352106ce995c4215ad321e5181ad1e1250 +SIZE (rust/crates/load_image-2.12.1.tar.gz) = 418366 +SHA256 (rust/crates/lodepng-3.2.1.tar.gz) = 1d6face0280146377ad4959c588399014554f2875e953fdec135655ca769e1da +SIZE (rust/crates/lodepng-3.2.1.tar.gz) = 45007 +SHA256 (rust/crates/maybe-uninit-2.0.0.tar.gz) = 60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00 +SIZE (rust/crates/maybe-uninit-2.0.0.tar.gz) = 11809 +SHA256 (rust/crates/memoffset-0.5.5.tar.gz) = c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f +SIZE (rust/crates/memoffset-0.5.5.tar.gz) = 7318 +SHA256 (rust/crates/miniz_oxide-0.4.1.tar.gz) = 4d7559a8a40d0f97e1edea3220f698f78b1c5ab67532e49f68fde3910323b722 +SIZE (rust/crates/miniz_oxide-0.4.1.tar.gz) = 46117 +SHA256 (rust/crates/mozjpeg-0.8.19.tar.gz) = e48f720b666d5a659335383a7e4ed0f5a20e50eddf58e53bb91185bb197cc8b4 +SIZE (rust/crates/mozjpeg-0.8.19.tar.gz) = 13953 +SHA256 (rust/crates/mozjpeg-sys-0.10.8.tar.gz) = 36788b7750db9e75b4af447b3ee644a8489e860813f88542aa0c383b08d50415 +SIZE (rust/crates/mozjpeg-sys-0.10.8.tar.gz) = 2221012 +SHA256 (rust/crates/nasm-rs-0.1.7.tar.gz) = fea4fa2ba8f650120445ddcf137d8a6370ff01d55f00e6b29e0ab01b7c846464 +SIZE (rust/crates/nasm-rs-0.1.7.tar.gz) = 9008 +SHA256 (rust/crates/num-0.2.1.tar.gz) = b8536030f9fea7127f841b45bb6243b27255787fb4eb83958aa1ef9d2fdc0c36 +SIZE (rust/crates/num-0.2.1.tar.gz) = 9082 +SHA256 (rust/crates/num-bigint-0.2.6.tar.gz) = 090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304 +SIZE (rust/crates/num-bigint-0.2.6.tar.gz) = 87275 +SHA256 (rust/crates/num-complex-0.2.4.tar.gz) = b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95 +SIZE (rust/crates/num-complex-0.2.4.tar.gz) = 24679 +SHA256 (rust/crates/num-integer-0.1.43.tar.gz) = 8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b +SIZE (rust/crates/num-integer-0.1.43.tar.gz) = 21966 +SHA256 (rust/crates/num-iter-0.1.41.tar.gz) = 7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f +SIZE (rust/crates/num-iter-0.1.41.tar.gz) = 10198 +SHA256 (rust/crates/num-rational-0.2.4.tar.gz) = 5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef +SIZE (rust/crates/num-rational-0.2.4.tar.gz) = 21694 +SHA256 (rust/crates/num-traits-0.2.12.tar.gz) = ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611 +SIZE (rust/crates/num-traits-0.2.12.tar.gz) = 43807 +SHA256 (rust/crates/num_cpus-1.13.0.tar.gz) = 05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3 +SIZE (rust/crates/num_cpus-1.13.0.tar.gz) = 14704 +SHA256 (rust/crates/pkg-config-0.3.18.tar.gz) = d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33 +SIZE (rust/crates/pkg-config-0.3.18.tar.gz) = 14674 +SHA256 (rust/crates/proc-macro2-1.0.18.tar.gz) = beae6331a816b1f65d04c45b078fd8e6c93e8071771f41b8163255bbd8d7c8fa +SIZE (rust/crates/proc-macro2-1.0.18.tar.gz) = 36252 +SHA256 (rust/crates/quote-1.0.7.tar.gz) = aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37 +SIZE (rust/crates/quote-1.0.7.tar.gz) = 25170 +SHA256 (rust/crates/rayon-1.3.1.tar.gz) = 62f02856753d04e03e26929f820d0a0a337ebe71f849801eea335d464b349080 +SIZE (rust/crates/rayon-1.3.1.tar.gz) = 151292 +SHA256 (rust/crates/rayon-core-1.7.1.tar.gz) = e92e15d89083484e11353891f1af602cc661426deb9564c298b270c726973280 +SIZE (rust/crates/rayon-core-1.7.1.tar.gz) = 58437 +SHA256 (rust/crates/rexif-0.5.0.tar.gz) = b18541ee0a90d5ba60c094fd70b8d31cb903d6bc75cdba0f795507077bf6c1dd +SIZE (rust/crates/rexif-0.5.0.tar.gz) = 23732 +SHA256 (rust/crates/rgb-0.8.20.tar.gz) = 90ef54b45ae131327a88597e2463fee4098ad6c88ba7b6af4b3987db8aad4098 +SIZE (rust/crates/rgb-0.8.20.tar.gz) = 14960 +SHA256 (rust/crates/scopeguard-1.1.0.tar.gz) = d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd +SIZE (rust/crates/scopeguard-1.1.0.tar.gz) = 11470 +SHA256 (rust/crates/syn-1.0.34.tar.gz) = 936cae2873c940d92e697597c5eee105fb570cd5689c695806f672883653349b +SIZE (rust/crates/syn-1.0.34.tar.gz) = 205051 +SHA256 (rust/crates/unicode-width-0.1.8.tar.gz) = 9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3 +SIZE (rust/crates/unicode-width-0.1.8.tar.gz) = 16732 +SHA256 (rust/crates/unicode-xid-0.2.1.tar.gz) = f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564 +SIZE (rust/crates/unicode-xid-0.2.1.tar.gz) = 14392 Modified: head/graphics/dssim/pkg-descr ============================================================================== --- head/graphics/dssim/pkg-descr Sun Sep 13 05:56:27 2020 (r548452) +++ head/graphics/dssim/pkg-descr Sun Sep 13 05:56:34 2020 (r548453) @@ -7,6 +7,6 @@ using a multi-scale variant of the SSIM algorithm. Features: - Supports alpha channel - Supports gamma correction -- No OpenCV or MATLAB needed: uses C (C99) and libpng +- No OpenCV or MATLAB needed: uses safe Rust without external dependencies WWW: https://kornel.ski/dssim Added: head/graphics/libdssim/Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libdssim/Makefile Sun Sep 13 05:56:34 2020 (r548453) @@ -0,0 +1,27 @@ +# $FreeBSD$ + +PORTREVISION= 0 +PKGNAMEPREFIX= lib + +MASTERDIR= ${.CURDIR}/../dssim +PLIST= ${.CURDIR}/pkg-plist + +BUILD_DEPENDS= cargo-cbuild:devel/cargo-c + +PLIST_FILES= # empty +PLIST_SUB= VERSION=${DISTVERSION:C/-.*//} + +do-build: + @${CARGO_CARGO_RUN} cbuild \ + ${CARGO_BUILD_ARGS} + +do-install: + @${CARGO_CARGO_RUN} cinstall \ + --destdir "${STAGEDIR}" \ + --prefix "${PREFIX}" \ + ${CARGO_BUILD_ARGS} + +post-install: + @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/*.so + +.include "${MASTERDIR}/Makefile" Added: head/graphics/libdssim/pkg-plist ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/libdssim/pkg-plist Sun Sep 13 05:56:34 2020 (r548453) @@ -0,0 +1,6 @@ +include/dssim/dssim.h +lib/libdssim.a +lib/libdssim.so +lib/libdssim.so.2 +lib/libdssim.so.%%VERSION%% +libdata/pkgconfig/dssim.pc From owner-svn-ports-head@freebsd.org Sun Sep 13 06:10:57 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 E30D53EE427; Sun, 13 Sep 2020 06:10:57 +0000 (UTC) (envelope-from tcberner@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpzdF5kVZz3WLW; Sun, 13 Sep 2020 06:10:57 +0000 (UTC) (envelope-from tcberner@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 A99162154C; Sun, 13 Sep 2020 06:10:57 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D6AvQX082521; Sun, 13 Sep 2020 06:10:57 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D6Av3J082518; Sun, 13 Sep 2020 06:10:57 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202009130610.08D6Av3J082518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 13 Sep 2020 06:10:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548454 - in head/textproc/zxing-cpp: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/textproc/zxing-cpp: . files X-SVN-Commit-Revision: 548454 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.33 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: Sun, 13 Sep 2020 06:10:58 -0000 Author: tcberner Date: Sun Sep 13 06:10:56 2020 New Revision: 548454 URL: https://svnweb.freebsd.org/changeset/ports/548454 Log: textproc/zxing-cpp: update to 1.1.1 Deleted: head/textproc/zxing-cpp/files/ Modified: head/textproc/zxing-cpp/Makefile head/textproc/zxing-cpp/distinfo head/textproc/zxing-cpp/pkg-plist Modified: head/textproc/zxing-cpp/Makefile ============================================================================== --- head/textproc/zxing-cpp/Makefile Sun Sep 13 05:56:34 2020 (r548453) +++ head/textproc/zxing-cpp/Makefile Sun Sep 13 06:10:56 2020 (r548454) @@ -3,7 +3,7 @@ PORTNAME= zxing-cpp DISTVERSIONPREFIX= v -DISTVERSION= 1.1.0 +DISTVERSION= 1.1.1 CATEGORIES= textproc MAINTAINER= kde@FreeBSD.org Modified: head/textproc/zxing-cpp/distinfo ============================================================================== --- head/textproc/zxing-cpp/distinfo Sun Sep 13 05:56:34 2020 (r548453) +++ head/textproc/zxing-cpp/distinfo Sun Sep 13 06:10:56 2020 (r548454) @@ -1,3 +1,3 @@ -TIMESTAMP = 1596285987 -SHA256 (nu-book-zxing-cpp-v1.1.0_GH0.tar.gz) = 283574a817a6efdb38e4f0480fb7697e9b1f90b55d6b16e92e1a2d2af9c43506 -SIZE (nu-book-zxing-cpp-v1.1.0_GH0.tar.gz) = 128856890 +TIMESTAMP = 1599976990 +SHA256 (nu-book-zxing-cpp-v1.1.1_GH0.tar.gz) = e595b3fa2ec320beb0b28f6af56b1141853257c2611686685639cebb3b248c86 +SIZE (nu-book-zxing-cpp-v1.1.1_GH0.tar.gz) = 128925736 Modified: head/textproc/zxing-cpp/pkg-plist ============================================================================== --- head/textproc/zxing-cpp/pkg-plist Sun Sep 13 05:56:34 2020 (r548453) +++ head/textproc/zxing-cpp/pkg-plist Sun Sep 13 06:10:56 2020 (r548454) @@ -172,5 +172,5 @@ lib/cmake/ZXing/ZXingTargets-%%CMAKE_BUILD_TYPE%%.cmak lib/cmake/ZXing/ZXingTargets.cmake lib/libZXing.so lib/libZXing.so.1 -lib/libZXing.so.1.1.0 +lib/libZXing.so.1.1.1 libdata/pkgconfig/zxing.pc From owner-svn-ports-head@freebsd.org Sun Sep 13 06:20:17 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 5BE3C3EE154; Sun, 13 Sep 2020 06:20:17 +0000 (UTC) (envelope-from tcberner@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpzr11qWsz3WdX; Sun, 13 Sep 2020 06:20:17 +0000 (UTC) (envelope-from tcberner@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 2200121B1D; Sun, 13 Sep 2020 06:20:17 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D6KHqd085415; Sun, 13 Sep 2020 06:20:17 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D6KGnv085412; Sun, 13 Sep 2020 06:20:16 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202009130620.08D6KGnv085412@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 13 Sep 2020 06:20:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548455 - in head/x11-toolkits/qt5-gtkplatform: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: in head/x11-toolkits/qt5-gtkplatform: . files X-SVN-Commit-Revision: 548455 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.33 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: Sun, 13 Sep 2020 06:20:17 -0000 Author: tcberner Date: Sun Sep 13 06:20:16 2020 New Revision: 548455 URL: https://svnweb.freebsd.org/changeset/ports/548455 Log: x11-toolkits/qt5-gtkplatform: fix build with modern Qt - update to the last commit in the repo which adds support for the Qt in ports - deprecate as upstream abandonned the project Approved by: Greg V (maintainer) Differential Revision: https://reviews.freebsd.org/D26415 Deleted: head/x11-toolkits/qt5-gtkplatform/files/ Modified: head/x11-toolkits/qt5-gtkplatform/Makefile head/x11-toolkits/qt5-gtkplatform/distinfo head/x11-toolkits/qt5-gtkplatform/pkg-plist Modified: head/x11-toolkits/qt5-gtkplatform/Makefile ============================================================================== --- head/x11-toolkits/qt5-gtkplatform/Makefile Sun Sep 13 06:10:56 2020 (r548454) +++ head/x11-toolkits/qt5-gtkplatform/Makefile Sun Sep 13 06:20:16 2020 (r548455) @@ -1,7 +1,8 @@ # $FreeBSD$ PORTNAME= gtkplatform -DISTVERSION= 0.2.2 +DISTVERSION= 0.2.4-11 +DISTVERSIONSUFFIX= -g1149f4f CATEGORIES= x11-toolkits PKGNAMEPREFIX= qt5- @@ -11,6 +12,9 @@ COMMENT= GTK platform backend for Qt 5 LICENSE= LGPL3 GPLv2+ LICENSE_COMB= dual +DEPRECATED= Archived upstream +EXPIRATION_DATE= 2021-04-15 + LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \ libinput.so:x11/libinput \ @@ -28,7 +32,8 @@ USE_GL= gl egl USE_GITHUB= yes GH_ACCOUNT= CrimsonAS -BROKEN= Does not build with Qt 5.14 +pre-configure: + cd ${WRKSRC} && syncqt.pl -module QtGtkExtras -version 0.2.4 post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/qt5/plugins/platforms/libqgtk.so Modified: head/x11-toolkits/qt5-gtkplatform/distinfo ============================================================================== --- head/x11-toolkits/qt5-gtkplatform/distinfo Sun Sep 13 06:10:56 2020 (r548454) +++ head/x11-toolkits/qt5-gtkplatform/distinfo Sun Sep 13 06:20:16 2020 (r548455) @@ -1,3 +1,3 @@ -TIMESTAMP = 1515330807 -SHA256 (CrimsonAS-gtkplatform-0.2.2_GH0.tar.gz) = 09110aa247cf7c01fc84d2f35d02b2f9c582a7b04cbff6de0a5afb2a22eae809 -SIZE (CrimsonAS-gtkplatform-0.2.2_GH0.tar.gz) = 61045 +TIMESTAMP = 1599927925 +SHA256 (CrimsonAS-gtkplatform-0.2.4-11-g1149f4f_GH0.tar.gz) = c1c90b46be42a0fa07a89b92b20acedbba7161c88d95b11c518221011bb3a7e3 +SIZE (CrimsonAS-gtkplatform-0.2.4-11-g1149f4f_GH0.tar.gz) = 62925 Modified: head/x11-toolkits/qt5-gtkplatform/pkg-plist ============================================================================== --- head/x11-toolkits/qt5-gtkplatform/pkg-plist Sun Sep 13 06:10:56 2020 (r548454) +++ head/x11-toolkits/qt5-gtkplatform/pkg-plist Sun Sep 13 06:20:16 2020 (r548455) @@ -1,3 +1,21 @@ +%%QT_INCDIR%%/QtGtkExtras/QGtkHeaderBar +%%QT_INCDIR%%/QtGtkExtras/QGtkRefPtr +%%QT_INCDIR%%/QtGtkExtras/QtGtkExtras +%%QT_INCDIR%%/QtGtkExtras/QtGtkExtrasDepends +%%QT_INCDIR%%/QtGtkExtras/QtGtkExtrasVersion +%%QT_INCDIR%%/QtGtkExtras/qgtkextrasglobal.h +%%QT_INCDIR%%/QtGtkExtras/qgtkheaderbar.h +%%QT_INCDIR%%/QtGtkExtras/qgtkrefptr.h +%%QT_INCDIR%%/QtGtkExtras/qtgtkextrasversion.h lib/cmake/Qt5Gui/Qt5Gui_QGtkIntegrationPlugin.cmake +%%QT_LIBDIR%%/libQt5GtkExtras.prl +%%QT_LIBDIR%%/libQt5GtkExtras.so +%%QT_LIBDIR%%/libQt5GtkExtras.so.5 +%%QT_LIBDIR%%/libQt5GtkExtras.so.5.9 +%%QT_LIBDIR%%/libQt5GtkExtras.so.5.9.0 +%%DEBUG%%%%QT_LIBDIR%%/libQt5GtkExtras.so.5.9.0.debug +%%QT_MKSPECDIR%%/modules/qt_lib_gtkextras.pri +%%QT_MKSPECDIR%%/modules/qt_lib_gtkextras_private.pri %%QT_PLUGINDIR%%/platforms/libqgtk.so %%DEBUG%%%%QT_PLUGINDIR%%/platforms/libqgtk.so.debug +libdata/pkgconfig/Qt5GtkExtras.pc From owner-svn-ports-head@freebsd.org Sun Sep 13 06:21:46 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 31DBA3EE74D; Sun, 13 Sep 2020 06:21:46 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bpzsk0cndz3WNv; Sun, 13 Sep 2020 06:21:46 +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 ECBA821938; Sun, 13 Sep 2020 06:21:45 +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 08D6LjhV090521; Sun, 13 Sep 2020 06:21:45 GMT (envelope-from danfe@FreeBSD.org) Received: (from danfe@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D6Ljct090518; Sun, 13 Sep 2020 06:21:45 GMT (envelope-from danfe@FreeBSD.org) Message-Id: <202009130621.08D6Ljct090518@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: danfe set sender to danfe@FreeBSD.org using -f From: Alexey Dokuchaev Date: Sun, 13 Sep 2020 06:21:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548456 - head/graphics/seexpr X-SVN-Group: ports-head X-SVN-Commit-Author: danfe X-SVN-Commit-Paths: head/graphics/seexpr X-SVN-Commit-Revision: 548456 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.33 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: Sun, 13 Sep 2020 06:21:46 -0000 Author: danfe Date: Sun Sep 13 06:21:44 2020 New Revision: 548456 URL: https://svnweb.freebsd.org/changeset/ports/548456 Log: While upstream development of SeExpr had apparently stalled, update the port to unofficial version 3.4.4.0-alpha.1 prepared by the KDE project, which contains a number of important bugfixes and supports translations. This is required for upcoming update of Krita to version 4.4.0. While here, actualize the WWW line in the port description. Requested by: tcberner Modified: head/graphics/seexpr/Makefile head/graphics/seexpr/distinfo head/graphics/seexpr/pkg-descr head/graphics/seexpr/pkg-plist Modified: head/graphics/seexpr/Makefile ============================================================================== --- head/graphics/seexpr/Makefile Sun Sep 13 06:20:16 2020 (r548455) +++ head/graphics/seexpr/Makefile Sun Sep 13 06:21:44 2020 (r548456) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= seexpr -PORTVERSION= 3.0.1 -DISTVERSIONPREFIX= v -PORTREVISION= 1 +DISTVERSION= 3.4.4.0-alpha.1 CATEGORIES= graphics math +MASTER_SITES= https://files.kde.org/krita/build/dependencies/ MAINTAINER= danfe@FreeBSD.org COMMENT= Embeddable expression evaluation language @@ -14,10 +13,6 @@ LICENSE= APACHE20 LIB_DEPENDS= libpng.so:graphics/png -USE_GITHUB= yes -GH_ACCOUNT= wdas -GH_PROJECT= SeExpr - USES= bison cmake compiler:c++11-lang gl qt:5 USE_GL= gl glu USE_LDCONFIG= yes @@ -25,13 +20,25 @@ USE_QT= buildtools_build qmake_build core gui opengl MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40 -OPTIONS_DEFINE= LLVM PYTHON +OPTIONS_DEFINE= ANIMCURVE DEEPWATER LLVM NLS PYTHON +OPTIONS_DEFAULT= DEEPWATER OPTIONS_SUB= yes +ANIMCURVE_DESC= Build controls for animation curves +ANIMCURVE_CMAKE_ON= -DENABLE_ANIMCURVE:BOOL=TRUE +ANIMCURVE_BROKEN= error: use of undeclared identifier 'animlib' + +DEEPWATER_DESC= Build controls for deep water spectrum +DEEPWATER_CMAKE_ON= -DENABLE_DEEPWATER:BOOL=TRUE + LLVM_DESC= Build with LLVM ${LLVM_DEFAULT:C/.$$//} backend LLVM_LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} LLVM_CMAKE_OFF= -DENABLE_LLVM_BACKEND:BOOL=FALSE +NLS_USES= kde:5 +NLS_USE= KDE=ecm_build +NLS_CMAKE_OFF= -DBUILD_TRANSLATIONS:BOOL=FALSE + PYTHON_LIB_DEPENDS= ${PY_BOOST} PYTHON_USES= pyqt:5 python PYTHON_USE= PYQT=core_build,sip_build,widgets_build @@ -43,11 +50,16 @@ CMAKE_ARGS+= -DENABLE_SSE4:BOOL=FALSE .endif post-patch: + @${REINPLACE_CMD} -e '/addError/s/raw\.str()/ErrorCode::Unknown,\ + { & }/' ${WRKSRC}/src/SeExpr2/Evaluator.h @${REINPLACE_CMD} -e '//d' ${WRKSRC}/src/SeExpr2/Platform.h @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ ${WRKSRC}/CMakeLists.txt .if !defined(WITH_DEBUG) @${REINPLACE_CMD} -e 's/-g //' ${WRKSRC}/CMakeLists.txt .endif + +post-install: + @${RMDIR} ${STAGEDIR}${PREFIX}/include/SeExpr2/generated .include Modified: head/graphics/seexpr/distinfo ============================================================================== --- head/graphics/seexpr/distinfo Sun Sep 13 06:20:16 2020 (r548455) +++ head/graphics/seexpr/distinfo Sun Sep 13 06:21:44 2020 (r548456) @@ -1,3 +1,3 @@ -TIMESTAMP = 1570122938 -SHA256 (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 1e4cd35e6d63bd3443e1bffe723dbae91334c2c94a84cc590ea8f1886f96f84e -SIZE (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 903297 +TIMESTAMP = 1599312456 +SHA256 (seexpr-3.4.4.0-alpha.1.tar.gz) = dee9067e94ac3bfdf6ecacfa79601d032a00af371cd10d0adc1f704b58d66fd5 +SIZE (seexpr-3.4.4.0-alpha.1.tar.gz) = 932992 Modified: head/graphics/seexpr/pkg-descr ============================================================================== --- head/graphics/seexpr/pkg-descr Sun Sep 13 06:20:16 2020 (r548455) +++ head/graphics/seexpr/pkg-descr Sun Sep 13 06:21:44 2020 (r548456) @@ -10,4 +10,4 @@ Major features: * Simple to embed in any program * High-level UI components to manipulate and visualize expressions -WWW: http://www.disneyanimation.com/technology/seexpr.html +WWW: https://wdas.github.io/SeExpr/ Modified: head/graphics/seexpr/pkg-plist ============================================================================== --- head/graphics/seexpr/pkg-plist Sun Sep 13 06:20:16 2020 (r548455) +++ head/graphics/seexpr/pkg-plist Sun Sep 13 06:21:44 2020 (r548456) @@ -6,6 +6,7 @@ bin/imageSynthPaint3d2 include/SeExpr2/Context.h include/SeExpr2/ContextUtils.h include/SeExpr2/Curve.h +include/SeExpr2/ErrorCode.h include/SeExpr2/Evaluator.h include/SeExpr2/ExprBuiltins.h include/SeExpr2/ExprConfig.h @@ -30,10 +31,14 @@ include/SeExpr2/Platform.h include/SeExpr2/SeContext.h include/SeExpr2/SeExprMacros.h include/SeExpr2/StringUtils.h +include/SeExpr2/Timer.h include/SeExpr2/UI/BasicExpression.h include/SeExpr2/UI/ControlSpec.h +include/SeExpr2/UI/Debug.h include/SeExpr2/UI/Editable.h include/SeExpr2/UI/EditableExpression.h +include/SeExpr2/UI/ErrorMessages.h +include/SeExpr2/UI/ExprAddDialog.h include/SeExpr2/UI/ExprBrowser.h include/SeExpr2/UI/ExprColorCurve.h include/SeExpr2/UI/ExprColorSwatch.h @@ -41,20 +46,17 @@ include/SeExpr2/UI/ExprCompletionModel.h include/SeExpr2/UI/ExprControl.h include/SeExpr2/UI/ExprControlCollection.h include/SeExpr2/UI/ExprCurve.h -include/SeExpr2/UI/ExprDeepWater.h -include/SeExpr2/UI/ExprDialog.h +%%DEEPWATER%%include/SeExpr2/UI/ExprDeepWater.h include/SeExpr2/UI/ExprEditor.h include/SeExpr2/UI/ExprFileDialog.h -include/SeExpr2/UI/ExprGrapher2d.h include/SeExpr2/UI/ExprHelp.h include/SeExpr2/UI/ExprHighlighter.h include/SeExpr2/UI/ExprPopupDoc.h include/SeExpr2/UI/ExprShortEdit.h include/SeExpr2/UI/ExprSpecType.h -include/SeExpr2/UI/generated/ExprSpecParser.tab.h +include/SeExpr2/UI/ExprTextEdit.h include/SeExpr2/VarBlock.h include/SeExpr2/Vec.h -include/SeExpr2/generated/ExprParser.tab.h include/SeExpr2/parser/ASTNode.h include/SeExpr2/parser/SeExprLex.h include/SeExpr2/parser/SeExprParse.h @@ -104,8 +106,19 @@ share/SeExpr2/expressions/raytrace.se share/SeExpr2/expressions/sinc.se share/SeExpr2/utils/eval share/SeExpr2/utils/listVar +share/cmake/SeExpr2/SeExpr2Targets-%%CMAKE_BUILD_TYPE%%.cmake +share/cmake/SeExpr2/SeExpr2Targets.cmake share/cmake/SeExpr2/seexpr2-config.cmake share/cmake/SeExpr2/seexpr2-version.cmake +%%NLS%%share/locale/ca/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/ca@valencia/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/es/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/fr/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/nl/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/nn/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/pt/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/pt_BR/LC_MESSAGES/seexpr2_qt.qm +%%NLS%%share/locale/uk/LC_MESSAGES/seexpr2_qt.qm share/test/SeExpr2/BlockTests share/test/SeExpr2/VarBlockExample share/test/SeExpr2/dirtSimple From owner-svn-ports-head@freebsd.org Sun Sep 13 06:23:17 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 6A67B3EE167; Sun, 13 Sep 2020 06:23:17 +0000 (UTC) (envelope-from jbeich@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BpzvT2CbDz3Wrb; Sun, 13 Sep 2020 06:23:17 +0000 (UTC) (envelope-from jbeich@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 2F20421CFD; Sun, 13 Sep 2020 06:23:17 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D6NHvm091485; Sun, 13 Sep 2020 06:23:17 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D6NG81091482; Sun, 13 Sep 2020 06:23:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202009130623.08D6NG81091482@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 13 Sep 2020 06:23:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548457 - in head: . graphics graphics/dssim graphics/libdssim X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: . graphics graphics/dssim graphics/libdssim X-SVN-Commit-Revision: 548457 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.33 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: Sun, 13 Sep 2020 06:23:17 -0000 Author: jbeich Date: Sun Sep 13 06:23:16 2020 New Revision: 548457 URL: https://svnweb.freebsd.org/changeset/ports/548457 Log: graphics/libdssim: drop in favor of CARGO_CRATES $ cat /usr/local/include/dssim/dssim.h #define DSSIM_MAJOR 2 #define DSSIM_MINOR 11 #define DSSIM_PATCH 3 #include #include #include #include $ nm -D /usr/local/lib/libdssim.so w _Jv_RegisterClasses U _Unwind_GetDataRelBase U _Unwind_GetIPInfo U _Unwind_GetLanguageSpecificData U _Unwind_GetRegionStart U _Unwind_GetTextRelBase U _Unwind_SetGR U _Unwind_SetIP w __cxa_finalize 0000000000003920 T rust_eh_personality $ cat /usr/local/libdata/pkgconfig/dssim.pc prefix=/usr/local exec_prefix=${prefix} libdir=${exec_prefix}/lib includedir=${prefix}/include Name: dssim Description: Tool that measures structural similarity between images using a multi-scale variant of the SSIM algorithm. Version: 2.11.3 Libs: -L${libdir} -ldssim Cflags: -I${includedir}/dssim Libs.private: -lexecinfo -lpthread -lgcc_s -lc -lm -lrt -lpthread -lutil -lutil Deleted: head/graphics/libdssim/ Modified: head/MOVED head/graphics/Makefile (contents, props changed) head/graphics/dssim/Makefile (contents, props changed) Modified: head/MOVED ============================================================================== --- head/MOVED Sun Sep 13 06:21:44 2020 (r548456) +++ head/MOVED Sun Sep 13 06:23:16 2020 (r548457) @@ -15428,3 +15428,4 @@ x11-wm/e-module-rmb||2020-09-09|Removed x11-wm/e-module-wlan||2020-09-09|Removed x11-wm/e-modules||2020-09-09|Removed net/frr6|net/frr7|2020-09-10|Has expired: Uses deprecated version of python and upstream no longer maintained +graphics/libdssim||2020-09-13|Removed: C API is empty, only usable from Rust Modified: head/graphics/Makefile ============================================================================== --- head/graphics/Makefile Sun Sep 13 06:21:44 2020 (r548456) +++ head/graphics/Makefile Sun Sep 13 06:23:16 2020 (r548457) @@ -435,7 +435,6 @@ SUBDIR += libchamplain SUBDIR += libdmtx SUBDIR += libdrm - SUBDIR += libdssim SUBDIR += libecwj2 SUBDIR += libemf SUBDIR += libepoxy Modified: head/graphics/dssim/Makefile ============================================================================== --- head/graphics/dssim/Makefile Sun Sep 13 06:21:44 2020 (r548456) +++ head/graphics/dssim/Makefile Sun Sep 13 06:23:16 2020 (r548457) @@ -2,7 +2,6 @@ PORTNAME= dssim DISTVERSION= 2.11.3 -PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= CRATESIO # XXX Teach USES=cargo to have proper default @@ -15,7 +14,7 @@ LICENSE= AGPLv3+ LICENSE_FILE= ${WRKSRC}/LICENSE USES= cargo -PLIST_FILES?= bin/${PORTNAME} +PLIST_FILES= bin/${PORTNAME} CARGO_CRATES= adler-0.2.3 \ arrayvec-0.5.1 \ From owner-svn-ports-head@freebsd.org Sun Sep 13 06:23:55 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 A33D73EE4FD; Sun, 13 Sep 2020 06:23:55 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1O1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4BpzwB5r42z3X5L; Sun, 13 Sep 2020 06:23:54 +0000 (UTC) (envelope-from tcberner@gmail.com) Received: by mail-ed1-f50.google.com with SMTP id w1so14509758edr.3; Sat, 12 Sep 2020 23:23:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=g9OKqYvuoLPecyzpsiaOrIlLC55E9Ob8e+9FkM8sytw=; b=KrkPCbu1KKkrEaARQfUvaCvXpqBSGqwvAQ0AvGrjEyhx1jeFaPKBdwNYYpox+Cnuxk k0WYGzy0S5zjfOcyFFUKPUa2T9jwMeCSxoaiPUt0Qtl33SZAa7TmsQsGonVUKEDXv5FW +osgtaVUExPC2m2Z8iOGbIQQUSEbk0gPjTM6qSl/0EeM7DVEpdvUf2zhLhtB0tyreZ98 yj735GgB+kqZ4vUO3sA1jfjAybUKnU58Kimh57NQnPXvT0rf+/Ka+K6hqWYtqRjurHog btmyRb3X7ySM1KWGHlkvm9KU+z9dTvcP6lnWGjP5TFp6uNW5sIJt9RTaqLbHEt291Miz hE7g== X-Gm-Message-State: AOAM532R44uc39CQqP6z8+c76H6towHCnBtTwKUhC1M4obPzl0uZhmef qpR2gC46pDaf5A+0LLrIT525DuWldRFqwA== X-Google-Smtp-Source: ABdhPJxRK4ciH4ib5CmfTc+rpPORvaimLJS7JILiISgCHWjCnkOmiWr0xb69M6hbPe1VVYW+hzqK0A== X-Received: by 2002:a05:6402:16c9:: with SMTP id r9mr11171884edx.27.1599978232667; Sat, 12 Sep 2020 23:23:52 -0700 (PDT) Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com. [209.85.208.46]) by smtp.gmail.com with ESMTPSA id f21sm6301751edw.83.2020.09.12.23.23.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 12 Sep 2020 23:23:52 -0700 (PDT) Received: by mail-ed1-f46.google.com with SMTP id ay8so14448408edb.8; Sat, 12 Sep 2020 23:23:52 -0700 (PDT) X-Received: by 2002:aa7:dd16:: with SMTP id i22mr11611451edv.335.1599978232126; Sat, 12 Sep 2020 23:23:52 -0700 (PDT) MIME-Version: 1.0 References: <202009130621.08D6Ljct090518@repo.freebsd.org> In-Reply-To: <202009130621.08D6Ljct090518@repo.freebsd.org> From: "Tobias C. Berner" Date: Sun, 13 Sep 2020 08:23:41 +0200 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: svn commit: r548456 - head/graphics/seexpr To: Alexey Dokuchaev Cc: ports-committers , svn-ports-all , svn-ports-head Content-Type: text/plain; charset="UTF-8" X-Rspamd-Queue-Id: 4BpzwB5r42z3X5L X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; REPLY(-4.00)[] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 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: Sun, 13 Sep 2020 06:23:55 -0000 Thanks! mfg Tobias On Sun, 13 Sep 2020 at 08:21, Alexey Dokuchaev wrote: > > Author: danfe > Date: Sun Sep 13 06:21:44 2020 > New Revision: 548456 > URL: https://svnweb.freebsd.org/changeset/ports/548456 > > Log: > While upstream development of SeExpr had apparently stalled, update the > port to unofficial version 3.4.4.0-alpha.1 prepared by the KDE project, > which contains a number of important bugfixes and supports translations. > > This is required for upcoming update of Krita to version 4.4.0. While > here, actualize the WWW line in the port description. > > Requested by: tcberner > > Modified: > head/graphics/seexpr/Makefile > head/graphics/seexpr/distinfo > head/graphics/seexpr/pkg-descr > head/graphics/seexpr/pkg-plist > > Modified: head/graphics/seexpr/Makefile > ============================================================================== > --- head/graphics/seexpr/Makefile Sun Sep 13 06:20:16 2020 (r548455) > +++ head/graphics/seexpr/Makefile Sun Sep 13 06:21:44 2020 (r548456) > @@ -2,10 +2,9 @@ > # $FreeBSD$ > > PORTNAME= seexpr > -PORTVERSION= 3.0.1 > -DISTVERSIONPREFIX= v > -PORTREVISION= 1 > +DISTVERSION= 3.4.4.0-alpha.1 > CATEGORIES= graphics math > +MASTER_SITES= https://files.kde.org/krita/build/dependencies/ > > MAINTAINER= danfe@FreeBSD.org > COMMENT= Embeddable expression evaluation language > @@ -14,10 +13,6 @@ LICENSE= APACHE20 > > LIB_DEPENDS= libpng.so:graphics/png > > -USE_GITHUB= yes > -GH_ACCOUNT= wdas > -GH_PROJECT= SeExpr > - > USES= bison cmake compiler:c++11-lang gl qt:5 > USE_GL= gl glu > USE_LDCONFIG= yes > @@ -25,13 +20,25 @@ USE_QT= buildtools_build qmake_build core gui opengl > > MAKE_JOBS_UNSAFE= yes # https://github.com/wdas/seexpr/issues/40 > > -OPTIONS_DEFINE= LLVM PYTHON > +OPTIONS_DEFINE= ANIMCURVE DEEPWATER LLVM NLS PYTHON > +OPTIONS_DEFAULT= DEEPWATER > OPTIONS_SUB= yes > > +ANIMCURVE_DESC= Build controls for animation curves > +ANIMCURVE_CMAKE_ON= -DENABLE_ANIMCURVE:BOOL=TRUE > +ANIMCURVE_BROKEN= error: use of undeclared identifier 'animlib' > + > +DEEPWATER_DESC= Build controls for deep water spectrum > +DEEPWATER_CMAKE_ON= -DENABLE_DEEPWATER:BOOL=TRUE > + > LLVM_DESC= Build with LLVM ${LLVM_DEFAULT:C/.$$//} backend > LLVM_LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} > LLVM_CMAKE_OFF= -DENABLE_LLVM_BACKEND:BOOL=FALSE > > +NLS_USES= kde:5 > +NLS_USE= KDE=ecm_build > +NLS_CMAKE_OFF= -DBUILD_TRANSLATIONS:BOOL=FALSE > + > PYTHON_LIB_DEPENDS= ${PY_BOOST} > PYTHON_USES= pyqt:5 python > PYTHON_USE= PYQT=core_build,sip_build,widgets_build > @@ -43,11 +50,16 @@ CMAKE_ARGS+= -DENABLE_SSE4:BOOL=FALSE > .endif > > post-patch: > + @${REINPLACE_CMD} -e '/addError/s/raw\.str()/ErrorCode::Unknown,\ > + { & }/' ${WRKSRC}/src/SeExpr2/Evaluator.h > @${REINPLACE_CMD} -e '//d' ${WRKSRC}/src/SeExpr2/Platform.h > @${REINPLACE_CMD} -e '/pkgconfig/s/share/libdata/' \ > ${WRKSRC}/CMakeLists.txt > .if !defined(WITH_DEBUG) > @${REINPLACE_CMD} -e 's/-g //' ${WRKSRC}/CMakeLists.txt > .endif > + > +post-install: > + @${RMDIR} ${STAGEDIR}${PREFIX}/include/SeExpr2/generated > > .include > > Modified: head/graphics/seexpr/distinfo > ============================================================================== > --- head/graphics/seexpr/distinfo Sun Sep 13 06:20:16 2020 (r548455) > +++ head/graphics/seexpr/distinfo Sun Sep 13 06:21:44 2020 (r548456) > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1570122938 > -SHA256 (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 1e4cd35e6d63bd3443e1bffe723dbae91334c2c94a84cc590ea8f1886f96f84e > -SIZE (wdas-SeExpr-v3.0.1_GH0.tar.gz) = 903297 > +TIMESTAMP = 1599312456 > +SHA256 (seexpr-3.4.4.0-alpha.1.tar.gz) = dee9067e94ac3bfdf6ecacfa79601d032a00af371cd10d0adc1f704b58d66fd5 > +SIZE (seexpr-3.4.4.0-alpha.1.tar.gz) = 932992 > > Modified: head/graphics/seexpr/pkg-descr > ============================================================================== > --- head/graphics/seexpr/pkg-descr Sun Sep 13 06:20:16 2020 (r548455) > +++ head/graphics/seexpr/pkg-descr Sun Sep 13 06:21:44 2020 (r548456) > @@ -10,4 +10,4 @@ Major features: > * Simple to embed in any program > * High-level UI components to manipulate and visualize expressions > > -WWW: http://www.disneyanimation.com/technology/seexpr.html > +WWW: https://wdas.github.io/SeExpr/ > > Modified: head/graphics/seexpr/pkg-plist > ============================================================================== > --- head/graphics/seexpr/pkg-plist Sun Sep 13 06:20:16 2020 (r548455) > +++ head/graphics/seexpr/pkg-plist Sun Sep 13 06:21:44 2020 (r548456) > @@ -6,6 +6,7 @@ bin/imageSynthPaint3d2 > include/SeExpr2/Context.h > include/SeExpr2/ContextUtils.h > include/SeExpr2/Curve.h > +include/SeExpr2/ErrorCode.h > include/SeExpr2/Evaluator.h > include/SeExpr2/ExprBuiltins.h > include/SeExpr2/ExprConfig.h > @@ -30,10 +31,14 @@ include/SeExpr2/Platform.h > include/SeExpr2/SeContext.h > include/SeExpr2/SeExprMacros.h > include/SeExpr2/StringUtils.h > +include/SeExpr2/Timer.h > include/SeExpr2/UI/BasicExpression.h > include/SeExpr2/UI/ControlSpec.h > +include/SeExpr2/UI/Debug.h > include/SeExpr2/UI/Editable.h > include/SeExpr2/UI/EditableExpression.h > +include/SeExpr2/UI/ErrorMessages.h > +include/SeExpr2/UI/ExprAddDialog.h > include/SeExpr2/UI/ExprBrowser.h > include/SeExpr2/UI/ExprColorCurve.h > include/SeExpr2/UI/ExprColorSwatch.h > @@ -41,20 +46,17 @@ include/SeExpr2/UI/ExprCompletionModel.h > include/SeExpr2/UI/ExprControl.h > include/SeExpr2/UI/ExprControlCollection.h > include/SeExpr2/UI/ExprCurve.h > -include/SeExpr2/UI/ExprDeepWater.h > -include/SeExpr2/UI/ExprDialog.h > +%%DEEPWATER%%include/SeExpr2/UI/ExprDeepWater.h > include/SeExpr2/UI/ExprEditor.h > include/SeExpr2/UI/ExprFileDialog.h > -include/SeExpr2/UI/ExprGrapher2d.h > include/SeExpr2/UI/ExprHelp.h > include/SeExpr2/UI/ExprHighlighter.h > include/SeExpr2/UI/ExprPopupDoc.h > include/SeExpr2/UI/ExprShortEdit.h > include/SeExpr2/UI/ExprSpecType.h > -include/SeExpr2/UI/generated/ExprSpecParser.tab.h > +include/SeExpr2/UI/ExprTextEdit.h > include/SeExpr2/VarBlock.h > include/SeExpr2/Vec.h > -include/SeExpr2/generated/ExprParser.tab.h > include/SeExpr2/parser/ASTNode.h > include/SeExpr2/parser/SeExprLex.h > include/SeExpr2/parser/SeExprParse.h > @@ -104,8 +106,19 @@ share/SeExpr2/expressions/raytrace.se > share/SeExpr2/expressions/sinc.se > share/SeExpr2/utils/eval > share/SeExpr2/utils/listVar > +share/cmake/SeExpr2/SeExpr2Targets-%%CMAKE_BUILD_TYPE%%.cmake > +share/cmake/SeExpr2/SeExpr2Targets.cmake > share/cmake/SeExpr2/seexpr2-config.cmake > share/cmake/SeExpr2/seexpr2-version.cmake > +%%NLS%%share/locale/ca/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/ca@valencia/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/es/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/fr/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/nl/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/nn/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/pt/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/pt_BR/LC_MESSAGES/seexpr2_qt.qm > +%%NLS%%share/locale/uk/LC_MESSAGES/seexpr2_qt.qm > share/test/SeExpr2/BlockTests > share/test/SeExpr2/VarBlockExample > share/test/SeExpr2/dirtSimple From owner-svn-ports-head@freebsd.org Sun Sep 13 07:07:52 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 B85853EF1D8; Sun, 13 Sep 2020 07:07:52 +0000 (UTC) (envelope-from rhurlin@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bq0tw4Bkjz3YJ2; Sun, 13 Sep 2020 07:07:52 +0000 (UTC) (envelope-from rhurlin@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 735B222369; Sun, 13 Sep 2020 07:07:52 +0000 (UTC) (envelope-from rhurlin@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D77qAT015986; Sun, 13 Sep 2020 07:07:52 GMT (envelope-from rhurlin@FreeBSD.org) Received: (from rhurlin@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D77qRn015984; Sun, 13 Sep 2020 07:07:52 GMT (envelope-from rhurlin@FreeBSD.org) Message-Id: <202009130707.08D77qRn015984@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rhurlin set sender to rhurlin@FreeBSD.org using -f From: Rainer Hurling Date: Sun, 13 Sep 2020 07:07:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548458 - head/graphics/py-visvis X-SVN-Group: ports-head X-SVN-Commit-Author: rhurlin X-SVN-Commit-Paths: head/graphics/py-visvis X-SVN-Commit-Revision: 548458 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.33 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: Sun, 13 Sep 2020 07:07:52 -0000 Author: rhurlin Date: Sun Sep 13 07:07:51 2020 New Revision: 548458 URL: https://svnweb.freebsd.org/changeset/ports/548458 Log: graphics/py-visvis: Update to 1.12.4 - Fixes some issues for CI. - Sort LIB_DEPENDS, RUN_DEPENDS order - Remove RUN_DEPENDS for py27 flavor Approved by: tcberner (mentor) Differential Revision: https://reviews.freebsd.org/D26411 Modified: head/graphics/py-visvis/Makefile head/graphics/py-visvis/distinfo Modified: head/graphics/py-visvis/Makefile ============================================================================== --- head/graphics/py-visvis/Makefile Sun Sep 13 06:23:16 2020 (r548457) +++ head/graphics/py-visvis/Makefile Sun Sep 13 07:07:51 2020 (r548458) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= visvis -PORTVERSION= 1.12.3 -PORTREVISION= 1 +PORTVERSION= 1.12.4 CATEGORIES= graphics python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,10 +13,11 @@ COMMENT= Object oriented approach to visualization of LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/license.txt +LIB_DEPENDS= libfltk.so:x11-toolkits/fltk RUN_DEPENDS= ${PYNUMPY} \ + ${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}PyOpenGL>=0:graphics/py-PyOpenGL@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyside2>=0:devel/pyside2@${PY_FLAVOR} -LIB_DEPENDS= libfltk.so:x11-toolkits/fltk USES= gl python:3.5+ pyqt:5 USE_GL= gl @@ -27,12 +27,4 @@ USE_WX= 3.0+ NO_ARCH= yes -.include - -.if ${PYTHON_REL} >= 3400 -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}imageio>=0:graphics/py-imageio@${PY_FLAVOR} -.else -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}imageio24>=0:graphics/py-imageio24@${PY_FLAVOR} -.endif - -.include +.include Modified: head/graphics/py-visvis/distinfo ============================================================================== --- head/graphics/py-visvis/distinfo Sun Sep 13 06:23:16 2020 (r548457) +++ head/graphics/py-visvis/distinfo Sun Sep 13 07:07:51 2020 (r548458) @@ -1,3 +1,3 @@ -TIMESTAMP = 1586285539 -SHA256 (visvis-1.12.3.tar.gz) = fb1bc3380c559a0c7bab30a8e5cd117d34e8b442488ef6654d1ef17f9116619d -SIZE (visvis-1.12.3.tar.gz) = 5074497 +TIMESTAMP = 1599887932 +SHA256 (visvis-1.12.4.tar.gz) = 0806d45e1829ad8e53db21487ada041c16eea8c7363390a7339316fba3ce2d93 +SIZE (visvis-1.12.4.tar.gz) = 5074422 From owner-svn-ports-head@freebsd.org Sun Sep 13 07:14:24 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 31AB33EF4F3; Sun, 13 Sep 2020 07:14:24 +0000 (UTC) (envelope-from lwhsu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bq12S0d8jz3Yxf; Sun, 13 Sep 2020 07:14:24 +0000 (UTC) (envelope-from lwhsu@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 EDFD82252F; Sun, 13 Sep 2020 07:14:23 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D7ENx7022334; Sun, 13 Sep 2020 07:14:23 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D7EMww022328; Sun, 13 Sep 2020 07:14:22 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130714.08D7EMww022328@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 07:14:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548459 - in head/multimedia/libopenshot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/multimedia/libopenshot: . files X-SVN-Commit-Revision: 548459 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.33 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: Sun, 13 Sep 2020 07:14:24 -0000 Author: lwhsu Date: Sun Sep 13 07:14:22 2020 New Revision: 548459 URL: https://svnweb.freebsd.org/changeset/ports/548459 Log: multimedia/libopenshot: Update to 0.2.5.172 PR: 249271 Submitted by: Tatsuki Makino (maintainer) Modified: head/multimedia/libopenshot/Makefile head/multimedia/libopenshot/distinfo head/multimedia/libopenshot/files/patch-src_CMakeLists.txt head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp head/multimedia/libopenshot/pkg-plist Modified: head/multimedia/libopenshot/Makefile ============================================================================== --- head/multimedia/libopenshot/Makefile Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/Makefile Sun Sep 13 07:14:22 2020 (r548459) @@ -2,9 +2,8 @@ PORTNAME= libopenshot DISTVERSIONPREFIX= v -DISTVERSION= 0.2.5-106 -DISTVERSIONSUFFIX= -g517f289 -PORTREVISION= 1 +DISTVERSION= 0.2.5-172 +DISTVERSIONSUFFIX= -gac8966a CATEGORIES= multimedia PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} Modified: head/multimedia/libopenshot/distinfo ============================================================================== --- head/multimedia/libopenshot/distinfo Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/distinfo Sun Sep 13 07:14:22 2020 (r548459) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592888400 -SHA256 (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = e8cce2ce90a16798519522cb0bca21a8b1367bca3608694552d951bf03350aaa -SIZE (OpenShot-libopenshot-v0.2.5-106-g517f289_GH0.tar.gz) = 10303100 +TIMESTAMP = 1599886800 +SHA256 (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = d90d146d167108eab98dbf1aadce564267c2f6741e2836501e25f3037f4b3b9c +SIZE (OpenShot-libopenshot-v0.2.5-172-gac8966a_GH0.tar.gz) = 10305575 Modified: head/multimedia/libopenshot/files/patch-src_CMakeLists.txt ============================================================================== --- head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/files/patch-src_CMakeLists.txt Sun Sep 13 07:14:22 2020 (r548459) @@ -1,7 +1,7 @@ ---- src/CMakeLists.txt.orig 2020-06-18 10:04:32 UTC +--- src/CMakeLists.txt.orig 2020-09-11 02:37:02 UTC +++ src/CMakeLists.txt -@@ -361,7 +361,13 @@ if (TARGET RESVG::resvg) - set(CMAKE_SWIG_FLAGS "-DUSE_RESVG=1") +@@ -384,7 +384,13 @@ if (TARGET RESVG::resvg) + endif() +find_library(EXECINFO_LIBRARY NAMES execinfo) @@ -13,4 +13,4 @@ + # Link remaining dependency libraries target_link_libraries(openshot PUBLIC - ${LIBOPENSHOT_AUDIO_LIBRARIES} + ${LIBOPENSHOT_AUDIO_LIBRARIES} Modified: head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/files/patch-src_FFmpegReader.cpp Sun Sep 13 07:14:22 2020 (r548459) @@ -1,6 +1,6 @@ ---- src/FFmpegReader.cpp.orig 2020-02-10 17:52:00 UTC +--- src/FFmpegReader.cpp.orig 2020-09-11 02:37:02 UTC +++ src/FFmpegReader.cpp -@@ -162,7 +162,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon +@@ -165,7 +165,7 @@ static enum AVPixelFormat get_hw_dec_format(AVCodecCon for (p = pix_fmts; *p != AV_PIX_FMT_NONE; p++) { switch (*p) { @@ -9,7 +9,7 @@ // Linux pix formats case AV_PIX_FMT_VAAPI: hw_de_av_pix_fmt_global = AV_PIX_FMT_VAAPI; -@@ -318,7 +318,7 @@ void FFmpegReader::Open() { +@@ -321,7 +321,7 @@ void FFmpegReader::Open() { pCodecCtx->get_format = get_hw_dec_format; if (adapter_num < 3 && adapter_num >=0) { @@ -18,7 +18,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); adapter_ptr = adapter; i_decoder_hw = openshot::Settings::Instance()->HARDWARE_DECODER; -@@ -381,11 +381,13 @@ void FFmpegReader::Open() { +@@ -384,11 +384,13 @@ void FFmpegReader::Open() { } // Check if it is there and writable Modified: head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp ============================================================================== --- head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/files/patch-src_FFmpegWriter.cpp Sun Sep 13 07:14:22 2020 (r548459) @@ -1,4 +1,4 @@ ---- src/FFmpegWriter.cpp.orig 2020-06-18 10:04:32 UTC +--- src/FFmpegWriter.cpp.orig 2020-09-11 02:37:02 UTC +++ src/FFmpegWriter.cpp @@ -172,7 +172,7 @@ void FFmpegWriter::SetVideoOptions(bool has_video, std AVCodec *new_codec; @@ -21,7 +21,7 @@ #else // not ffmpeg 3 new_codec = avcodec_find_encoder_by_name(codec.c_str()); #endif // HAVE_HW_ACCEL -@@ -554,6 +554,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -556,6 +556,7 @@ void FFmpegWriter::SetOption(StreamType stream, std::s else { av_opt_set_int(c->priv_data, "crf", std::min(std::stoi(value),63), 0); } @@ -29,7 +29,7 @@ case AV_CODEC_ID_HEVC : c->bit_rate = 0; if (strstr(info.vcodec.c_str(), "svt_hevc") != NULL) { -@@ -562,6 +563,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s +@@ -564,6 +565,8 @@ void FFmpegWriter::SetOption(StreamType stream, std::s av_opt_set_int(c->priv_data, "forced-idr",1,0); } break; @@ -38,7 +38,7 @@ } #endif } else { -@@ -1447,7 +1450,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1456,7 +1459,7 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_num = openshot::Settings::Instance()->HW_EN_DEVICE_SET; fprintf(stderr, "\n\nEncodiing Device Nr: %d\n", adapter_num); if (adapter_num < 3 && adapter_num >=0) { @@ -47,7 +47,7 @@ snprintf(adapter,sizeof(adapter),"/dev/dri/renderD%d", adapter_num+128); // Maybe 127 is better because the first card would be 1?! adapter_ptr = adapter; -@@ -1455,17 +1458,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS +@@ -1464,17 +1467,21 @@ void FFmpegWriter::open_video(AVFormatContext *oc, AVS adapter_ptr = NULL; #elif defined(__APPLE__) adapter_ptr = NULL; Modified: head/multimedia/libopenshot/pkg-plist ============================================================================== --- head/multimedia/libopenshot/pkg-plist Sun Sep 13 07:07:51 2020 (r548458) +++ head/multimedia/libopenshot/pkg-plist Sun Sep 13 07:14:22 2020 (r548459) @@ -51,6 +51,7 @@ include/libopenshot/QtHtmlReader.h include/libopenshot/QtImageReader.h include/libopenshot/QtPlayer.h include/libopenshot/QtTextReader.h +include/libopenshot/QtUtilities.h include/libopenshot/ReaderBase.h include/libopenshot/RendererBase.h include/libopenshot/Settings.h From owner-svn-ports-head@freebsd.org Sun Sep 13 07:14:56 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 B34E13EF73C; Sun, 13 Sep 2020 07:14:56 +0000 (UTC) (envelope-from lwhsu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bq1344bV6z3Ykh; Sun, 13 Sep 2020 07:14:56 +0000 (UTC) (envelope-from lwhsu@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 8029E221C9; Sun, 13 Sep 2020 07:14:56 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D7Eura022545; Sun, 13 Sep 2020 07:14:56 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D7Etop022540; Sun, 13 Sep 2020 07:14:55 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130714.08D7Etop022540@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 07:14:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548460 - in head/multimedia/openshot: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/multimedia/openshot: . files X-SVN-Commit-Revision: 548460 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.33 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: Sun, 13 Sep 2020 07:14:56 -0000 Author: lwhsu Date: Sun Sep 13 07:14:55 2020 New Revision: 548460 URL: https://svnweb.freebsd.org/changeset/ports/548460 Log: multimedia/openshot: update to 2.5.1.369 PR: 249272 Submitted by: Tatsuki Makino (maintainer) Modified: head/multimedia/openshot/Makefile head/multimedia/openshot/distinfo head/multimedia/openshot/files/patch-src_classes_info.py head/multimedia/openshot/files/patch-src_windows_main__window.py head/multimedia/openshot/files/patch-src_windows_preferences.py head/multimedia/openshot/pkg-plist Modified: head/multimedia/openshot/Makefile ============================================================================== --- head/multimedia/openshot/Makefile Sun Sep 13 07:14:22 2020 (r548459) +++ head/multimedia/openshot/Makefile Sun Sep 13 07:14:55 2020 (r548460) @@ -3,8 +3,8 @@ PORTNAME= openshot DISTVERSIONPREFIX= v -DISTVERSION= 2.5.1-236 -DISTVERSIONSUFFIX= -g18e52fc3 +DISTVERSION= 2.5.1-369 +DISTVERSIONSUFFIX= -gcc1735bd CATEGORIES= multimedia MAINTAINER= tatsuki_makino@hotmail.com Modified: head/multimedia/openshot/distinfo ============================================================================== --- head/multimedia/openshot/distinfo Sun Sep 13 07:14:22 2020 (r548459) +++ head/multimedia/openshot/distinfo Sun Sep 13 07:14:55 2020 (r548460) @@ -1,3 +1,3 @@ -TIMESTAMP = 1592888400 -SHA256 (OpenShot-openshot-qt-v2.5.1-236-g18e52fc3_GH0.tar.gz) = 64ada401743f15ba1af6f856c3a649ee3ed230ab560de9db6edaa6bb0d55e1a8 -SIZE (OpenShot-openshot-qt-v2.5.1-236-g18e52fc3_GH0.tar.gz) = 64019270 +TIMESTAMP = 1599886800 +SHA256 (OpenShot-openshot-qt-v2.5.1-369-gcc1735bd_GH0.tar.gz) = 353e1c816c864c9f7b6ef6fe24f3551b56c6545b39241010fdc0070b7d546645 +SIZE (OpenShot-openshot-qt-v2.5.1-369-gcc1735bd_GH0.tar.gz) = 64299206 Modified: head/multimedia/openshot/files/patch-src_classes_info.py ============================================================================== --- head/multimedia/openshot/files/patch-src_classes_info.py Sun Sep 13 07:14:22 2020 (r548459) +++ head/multimedia/openshot/files/patch-src_classes_info.py Sun Sep 13 07:14:55 2020 (r548460) @@ -1,6 +1,6 @@ ---- src/classes/info.py.orig 2020-06-15 23:50:00 UTC +--- src/classes/info.py.orig 2020-09-11 19:59:04 UTC +++ src/classes/info.py -@@ -151,6 +151,7 @@ SETUP = { +@@ -155,6 +155,7 @@ SETUP = { "License :: OSI Approved :: GNU General Public License (GPL)", "Operating System :: OS Independent", "Operating System :: POSIX :: Linux", Modified: head/multimedia/openshot/files/patch-src_windows_main__window.py ============================================================================== --- head/multimedia/openshot/files/patch-src_windows_main__window.py Sun Sep 13 07:14:22 2020 (r548459) +++ head/multimedia/openshot/files/patch-src_windows_main__window.py Sun Sep 13 07:14:55 2020 (r548460) @@ -1,6 +1,6 @@ ---- src/windows/main_window.py.orig 2020-06-15 23:50:00 UTC +--- src/windows/main_window.py.orig 2020-09-11 19:59:04 UTC +++ src/windows/main_window.py -@@ -257,6 +257,8 @@ class MainWindow(QMainWindow, updates.UpdateWatcher): +@@ -256,6 +256,8 @@ class MainWindow(QMainWindow, updates.UpdateWatcher): # Format last log line based on OS (since each OS can be formatted differently) if platform.system() == "Darwin": last_log_line = "mac-%s" % last_log_line[58:].strip() Modified: head/multimedia/openshot/files/patch-src_windows_preferences.py ============================================================================== --- head/multimedia/openshot/files/patch-src_windows_preferences.py Sun Sep 13 07:14:22 2020 (r548459) +++ head/multimedia/openshot/files/patch-src_windows_preferences.py Sun Sep 13 07:14:55 2020 (r548460) @@ -1,15 +1,15 @@ ---- src/windows/preferences.py.orig 2020-06-15 23:50:00 UTC +--- src/windows/preferences.py.orig 2020-09-11 19:59:04 UTC +++ src/windows/preferences.py @@ -293,7 +293,7 @@ class Preferences(QDialog): value_list.remove(value_item) - elif os_platform == "Windows" and v not in ("0", "3", "4", "7"): + elif os_platform == "Windows" and v not in ("0", "3", "4"): value_list.remove(value_item) -- elif os_platform == "Linux" and v not in ("0", "1", "2", "6", "7"): -+ elif (os_platform == "FreeBSD" or os_platform == "Linux") and v not in ("0", "1", "2", "6", "7"): +- elif os_platform == "Linux" and v not in ("0", "1", "2", "6"): ++ elif (os_platform == "FreeBSD" or os_platform == "Linux") and v not in ("0", "1", "2", "6"): value_list.remove(value_item) # Remove hardware mode items which cannot decode the example video -@@ -305,6 +305,7 @@ class Preferences(QDialog): +@@ -307,6 +307,7 @@ class Preferences(QDialog): # Replace %s dropdown values for hardware acceleration if param["setting"] in ("graca_number_en", "graca_number_de"): Modified: head/multimedia/openshot/pkg-plist ============================================================================== --- head/multimedia/openshot/pkg-plist Sun Sep 13 07:14:22 2020 (r548459) +++ head/multimedia/openshot/pkg-plist Sun Sep 13 07:14:55 2020 (r548460) @@ -155,6 +155,8 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/logger_libopenshot.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/metrics.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/metrics.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/openshot_rc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/openshot_rc.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/project_data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/project_data.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/classes/__pycache__/qt_types.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc @@ -230,6 +232,7 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/classes/logger.py %%PYTHON_SITELIBDIR%%/openshot_qt/classes/logger_libopenshot.py %%PYTHON_SITELIBDIR%%/openshot_qt/classes/metrics.py +%%PYTHON_SITELIBDIR%%/openshot_qt/classes/openshot_rc.py %%PYTHON_SITELIBDIR%%/openshot_qt/classes/project_data.py %%PYTHON_SITELIBDIR%%/openshot_qt/classes/qt_types.py %%PYTHON_SITELIBDIR%%/openshot_qt/classes/query.py @@ -1198,339 +1201,7 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/emojis/data/openmoji.json %%PYTHON_SITELIBDIR%%/openshot_qt/emojis/optimize-emojis.py %%PYTHON_SITELIBDIR%%/openshot_qt/images/AboutLogo.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/AudioThumbnail.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/AudioThumbnail.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/AUTHORS -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/CONTRIBUTORS -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/COPYING -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/address-book-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/appointment-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/bookmark-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/dialog-apply.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-open-recent.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-open.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-print-preview.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-print.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-properties.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-revert.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-save-as.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/document-save.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-clear.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-copy.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-cut.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-delete.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-paste.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-redo.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-select-all.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/edit-undo.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/folder-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/get-hot-new-stuff.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-bottom.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-down.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-first.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-home.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-last.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-next.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-previous.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-top.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/go-up.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/gtk-edit.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/gtk-info.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/help-about.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/help-contents.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/help-hint.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/im-message-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/list-add.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/list-remove.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/locked.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-forward.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-mark-important.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-mark-read.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-mark-unread.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-message-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-read.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-replied.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-reply-all.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-reply-sender.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-send-receive.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/mail-send.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-eject.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-import-audio-cd.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-playback-pause.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-playback-start.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-playback-stop.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-record.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-seek-backward.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-seek-forward.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-skip-backward.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/media-skip-forward.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/object-flip-horizontal.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/object-flip-vertical.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/object-inverse.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/object-rotate-left.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/object-rotate-right.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-available-locked.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-available.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-broken.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-downgrade.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-install.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-installed-locked.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-installed-outdated.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-installed-updated.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-purge.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-reinstall.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-remove.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/package-upgrade.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/process-stop.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/stock_folder_properties.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/system-lock-screen.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/system-log-out.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/system-restart-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/system-shutdown-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/system-shutdown-restart-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/system-shutdown.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/tab-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/tag-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/transform-move.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/view-fullscreen.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/view-list-details.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/view-list-icons.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/view-refresh.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/view-restore.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/window-close.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/window-new.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/zoom-best-fit.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/zoom-in.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/16/zoom-out.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/add_marker.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/arrow.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/camera-photo-symbolic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/center-on-playhead.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/lock.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/razor_line_with_razor.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/razor_line_with_razor.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/snap.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/actions/custom/snapshot.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/accessories-calculator.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/accessories-dictionary.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/accessories-text-editor.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/addressbook.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/application-community.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/clock.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/evolution-calendar.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/evolution-mail.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/evolution-memos.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/evolution-tasks.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/gconf-editor.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/gksu-root-terminal.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/gnome-control-centre.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/gnome-do-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/gnome-panel-force-quit.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/gnome-session-hibernate.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/internet-feed-reader.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/invest-applet.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/lpi-bug.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/lpi-help.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/nm-vpn-lock.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/preferences-desktop-accessibility.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/preferences-desktop-locale.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/preferences-desktop-sound.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/preferences-desktop-theme.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/preferences-system-windows.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/session-properties.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/stock_keyring.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/system-file-manager.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/system-software-install.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/system-software-update.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/system-upgrade.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/system-users.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/tomboy-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/ubiquity.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/user-info.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/utilities-terminal.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/apps/16/wmtweaks.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/application-community.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/applications-accessories.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/applications-development.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/applications-games.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/applications-graphics.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/applications-internet.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/applications-office.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/categories/16/preferences-desktop.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/audio-input-microphone.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/camera-web.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/computer.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/drive-harddisk.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/drive-removable-media-usb.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/drive-removable-media.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/gnome-dev-harddisk-1394.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/gnome-dev-harddisk-usb.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/input-keyboard.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/media-optical.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/multimedia-player-ipod-touch.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/nm-device-wired.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/phone-motorola-droid.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/devices/16/phone.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-msword.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-vnd.ms-access.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-vnd.ms-excel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-vnd.ms-powerpoint.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-x-bittorrent.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-x-cd-image.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-x-flash-video.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-x-sln.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/application-x-trash.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/audio-x-generic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/font-x-generic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/gnome-mime-application-pdf.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/image-x-generic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-database.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-drawing-template.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-drawing.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-formula.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-master-document.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-presentation-template.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-presentation.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-spreadsheet-template.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-spreadsheet.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-text-template.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-text.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/libreoffice-oasis-web-template.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/package-x-generic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/text-html.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/text-x-generic-template.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/text-x-generic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/text-x-install.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/text-x-preview.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/text-x-script.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/video-x-generic.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/x-office-document.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/x-office-drawing.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/mimes/16/x-office-spreadsheet.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/bookmark-missing.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-documents.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-download.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-music.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-pictures.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-publicshare.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-remote.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-saved-search.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-templates.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-video.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder-visiting.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/folder.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/mail-sent.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/start-here.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/user-desktop.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/user-home.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/user-trash-full.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/places/16/user-trash.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/aptdaemon-add.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-output-none-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-high-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-high.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-high.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-low-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-low.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-low.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-medium-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-medium.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-medium.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-muted-blocked-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-muted-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-muted.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-muted.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/audio-volume-zero-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/battery_third_fourth.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/battery_two_thirds.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/bluetooth-active.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/bluetooth-disabled.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/bluetooth-paired.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/dialog-error.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/dialog-warning.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-ac-adapter.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-000-charging.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-000.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-020-charging.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-020.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-040-charging.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-040.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-060-charging.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-060.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-080-charging.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-080.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-100-charging.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-100.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-charged.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-battery-missing.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-inhibit.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-mouse-000.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-mouse-020.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-mouse-040.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-mouse-060.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-mouse-080.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-mouse-100.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-phone-000.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-phone-020.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-phone-040.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-phone-060.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-phone-080.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gpm-phone-100.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/gtk-dialog-authentication-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/ibus-keyboard.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/image-missing.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/locked.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-device-wireless.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-device-wwan.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-no-connection.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-signal-00.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-signal-100.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-signal-25.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-signal-50.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/nm-signal-75.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/rhythmbox-notplaying.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/rhythmbox-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/system-file-manager-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/task-due.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/task-past-due.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/transmission-tray-icon.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-available-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-available.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-away-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-busy-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-busy.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-idle-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-idle.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-invisible-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-invisible.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-offline-panel.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/user-offline.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-clear-night.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-clear.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-clouds-night.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-clouds.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-few-clouds-night.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-few-clouds.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-fog.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-overcast.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-severe-alert.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-showers-scattered.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-showers.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-snow.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/status/16/weather-storm.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/stock/16/stock_insert-note.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/stock/16/stock_notes.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/stock/16/stock_person.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/stock/16/stock_task.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Humanity/stock/16/stock_todo.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/Makefile -%%PYTHON_SITELIBDIR%%/openshot_qt/images/README -%%PYTHON_SITELIBDIR%%/openshot_qt/images/__pycache__/openshot_rc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc -%%PYTHON_SITELIBDIR%%/openshot_qt/images/__pycache__/openshot_rc.cpython-%%PYTHON_SUFFIX%%.pyc -%%PYTHON_SITELIBDIR%%/openshot_qt/images/bitcoin-icon.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/blender.svg %%PYTHON_SITELIBDIR%%/openshot_qt/images/cache/1F004.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/cache/1F0CF.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/cache/1F300.png @@ -2962,45 +2633,11 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/images/cache/wipe_left_to_right.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/cache/wipe_right_to_left.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/cache/wipe_top_to_bottom.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_hand.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_move.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_resize_bdiag.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_resize_fdiag.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_resize_x.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_resize_y.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_rotate.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_shear_x.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/cursor_shear_y.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/cursors.svg %%PYTHON_SITELIBDIR%%/openshot_qt/images/fonts/Ubuntu-R.ttf -%%PYTHON_SITELIBDIR%%/openshot_qt/images/gen-hw-icons.sh -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-dx.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-none.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-nvdec.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-nvenc.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-qsv.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-vaapi.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-vdpau.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-accel-vtb.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/hw-template.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/keyframe-0.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/keyframe-1.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/keyframe-2.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/keyframe-icons.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/kickstarter-icon.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/mask.png %%PYTHON_SITELIBDIR%%/openshot_qt/images/masks.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/openshot-ad.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/openshot-logo.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/openshot.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/openshot.qrc -%%PYTHON_SITELIBDIR%%/openshot_qt/images/openshot.svg -%%PYTHON_SITELIBDIR%%/openshot_qt/images/openshot_rc.py %%PYTHON_SITELIBDIR%%/openshot_qt/images/overlay.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/patreon-icon.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/paypal-icon.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/python-icon.png -%%PYTHON_SITELIBDIR%%/openshot_qt/images/star-icon.png %%PYTHON_SITELIBDIR%%/openshot_qt/language/Makefile %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot/OpenShot.pot %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot/OpenShot_blender.pot @@ -3042,6 +2679,7 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_fr_CA.qm %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_fy.qm %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_gaa.qm +%%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_gd.qm %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_gl.qm %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_he.qm %%PYTHON_SITELIBDIR%%/openshot_qt/language/OpenShot_hi.qm @@ -3263,6 +2901,9 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/timeline/js/directives/track.js %%PYTHON_SITELIBDIR%%/openshot_qt/timeline/js/directives/transition.js %%PYTHON_SITELIBDIR%%/openshot_qt/timeline/js/functions.js +%%PYTHON_SITELIBDIR%%/openshot_qt/timeline/js/mixin_webengine.js +%%PYTHON_SITELIBDIR%%/openshot_qt/timeline/js/mixin_webkit.js +%%PYTHON_SITELIBDIR%%/openshot_qt/timeline/js/qwebchannel.js %%PYTHON_SITELIBDIR%%/openshot_qt/timeline/media/css/bootstrap.min.css %%PYTHON_SITELIBDIR%%/openshot_qt/timeline/media/css/debug.css %%PYTHON_SITELIBDIR%%/openshot_qt/timeline/media/css/jquery-ui.css @@ -3883,6 +3524,8 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/find_file.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/properties_tableview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/properties_tableview.cpython-%%PYTHON_SUFFIX%%.pyc +%%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/timeline_mixins.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/timeline_mixins.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/timeline_webview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/timeline_webview.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/__pycache__/titles_listview.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc @@ -3904,6 +3547,7 @@ bin/openshot-qt %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/files_treeview.py %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/find_file.py %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/properties_tableview.py +%%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/timeline_mixins.py %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/timeline_webview.py %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/titles_listview.py %%PYTHON_SITELIBDIR%%/openshot_qt/windows/views/transitions_listview.py From owner-svn-ports-head@freebsd.org Sun Sep 13 07:22:32 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 E241F3EF65E; Sun, 13 Sep 2020 07:22:32 +0000 (UTC) (envelope-from lwhsu@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bq1Cr5gvZz3ZKV; Sun, 13 Sep 2020 07:22:32 +0000 (UTC) (envelope-from lwhsu@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 A64A6225C9; Sun, 13 Sep 2020 07:22:32 +0000 (UTC) (envelope-from lwhsu@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D7MWZH028868; Sun, 13 Sep 2020 07:22:32 GMT (envelope-from lwhsu@FreeBSD.org) Received: (from lwhsu@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D7MVe7028858; Sun, 13 Sep 2020 07:22:31 GMT (envelope-from lwhsu@FreeBSD.org) Message-Id: <202009130722.08D7MVe7028858@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: lwhsu set sender to lwhsu@FreeBSD.org using -f From: Li-Wen Hsu Date: Sun, 13 Sep 2020 07:22:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548461 - in head/net/pichi: . files X-SVN-Group: ports-head X-SVN-Commit-Author: lwhsu X-SVN-Commit-Paths: in head/net/pichi: . files X-SVN-Commit-Revision: 548461 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.33 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: Sun, 13 Sep 2020 07:22:32 -0000 Author: lwhsu Date: Sun Sep 13 07:22:30 2020 New Revision: 548461 URL: https://svnweb.freebsd.org/changeset/ports/548461 Log: net/pichi: Update to 1.3.1 PR: 249043 Submitted by: Pichi (maintainer) Added: head/net/pichi/files/patch-cmake_Configure.cmake (contents, props changed) head/net/pichi/files/patch-src_api_egress__manager.cpp (contents, props changed) head/net/pichi/files/patch-src_api_vos.cpp (contents, props changed) head/net/pichi/files/patch-src_net_spawn.cpp (contents, props changed) Deleted: head/net/pichi/files/patch-server_main.cpp head/net/pichi/files/patch-test_endpoint.cpp head/net/pichi/files/patch-test_method.cpp head/net/pichi/files/patch-test_utils.hpp Modified: head/net/pichi/Makefile head/net/pichi/distinfo head/net/pichi/files/patch-include_pichi_config.hpp.in head/net/pichi/pkg-plist Modified: head/net/pichi/Makefile ============================================================================== --- head/net/pichi/Makefile Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/Makefile Sun Sep 13 07:22:30 2020 (r548461) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME= pichi -DISTVERSION= 1.3.0 +DISTVERSION= 1.3.1 CATEGORIES= net MAINTAINER= pichi@elude.in Modified: head/net/pichi/distinfo ============================================================================== --- head/net/pichi/distinfo Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/distinfo Sun Sep 13 07:22:30 2020 (r548461) @@ -1,3 +1,3 @@ -TIMESTAMP = 1554899633 -SHA256 (pichi-router-pichi-1.3.0_GH0.tar.gz) = f5686a1e7c98d9c9eca88d88af53b85648ceeff9aa33bf2b1d95a09462d74d1c -SIZE (pichi-router-pichi-1.3.0_GH0.tar.gz) = 2066723 +TIMESTAMP = 1599981725 +SHA256 (pichi-router-pichi-1.3.1_GH0.tar.gz) = be1dc4d501387ef3524697ac804bec3ceb235a0c323ef8901532f04b0fab5cac +SIZE (pichi-router-pichi-1.3.1_GH0.tar.gz) = 2068432 Added: head/net/pichi/files/patch-cmake_Configure.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-cmake_Configure.cmake Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,26 @@ +--- cmake/Configure.cmake.orig 1970-01-01 00:00:00 UTC ++++ cmake/Configure.cmake +@@ -104,6 +104,14 @@ else () + set(DEPRECATED_RFC2818_CLASS OFF) + endif () + ++if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND ++ CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "11.0.0") ++ # From clang 11.0.0, using std::allocator triggers -Wdeprecated-declarations ++ set(DEPRECATED_ALLOCATOR_VOID ON) ++else () ++ set(DEPRECATED_ALLOCATOR_VOID OFF) ++endif () ++ + # TODO check_cxx_compiler_flag command always gets failed when generating for iOS + if (IOS) + set(DISABLE_SHORTEN_64_TO_32_WARNING ON) +@@ -125,6 +133,7 @@ if (BUILD_SERVER) + check_function_exists("close" HAS_CLOSE) + endif () + +-configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in ${CMAKE_BINARY_DIR}/include/pichi/config.hpp) ++configure_file(${CMAKE_SOURCE_DIR}/include/pichi/config.hpp.in ++ ${CMAKE_BINARY_DIR}/include/pichi/config.hpp) + + message(STATUS "Generating config.hpp - done") Modified: head/net/pichi/files/patch-include_pichi_config.hpp.in ============================================================================== --- head/net/pichi/files/patch-include_pichi_config.hpp.in Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/files/patch-include_pichi_config.hpp.in Sun Sep 13 07:22:30 2020 (r548461) @@ -1,18 +1,63 @@ --- include/pichi/config.hpp.in.orig 1970-01-01 00:00:00 UTC +++ include/pichi/config.hpp.in -@@ -42,6 +42,15 @@ +@@ -25,7 +25,7 @@ + #pragma clang diagnostic ignored "-Wreturn-std-move" + #include + #pragma clang diagnostic pop +-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ ++#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ + + #cmakedefine DISABLE_SHORTEN_64_TO_32_WARNING + #if defined(DISABLE_SHORTEN_64_TO_32_WARNING) && defined(__clang__) +@@ -33,7 +33,7 @@ + #pragma clang diagnostic ignored "-Wshorten-64-to-32" + #include + #pragma clang diagnostic pop +-#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ ++#endif // NO_RETURN_STD_MOVE_FOR_BOOST_ASIO && __clang__ + + #cmakedefine DISABLE_C4702_FOR_BEAST_FIELDS + #if defined(DISABLE_C4702_FOR_BEAST_FIELDS) && defined(_MSC_VER) +@@ -41,7 +41,7 @@ + #pragma warning(disable : 4702) + #include #pragma warning(pop) - #endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER +-#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER ++#endif // DISABLE_C4702_FOR_BEAST_FIELDS && _MSC_VER -+#ifdef __clang__ -+#if !__has_feature(c_atomic) + #ifdef __clang__ + #if !__has_feature(c_atomic) +@@ -49,18 +49,28 @@ + #pragma clang diagnostic ignored "-Wc11-extensions" + #include + #pragma clang diagnostic pop +-#endif // !__has_feature(c_atomic) +-#endif // __clang__ ++#endif // !__has_feature(c_atomic) ++#endif // __clang__ + ++#cmakedefine DEPRECATED_ALLOCATOR_VOID ++#if defined(DEPRECATED_ALLOCATOR_VOID) && defined(__clang__) +#pragma clang diagnostic push -+#pragma clang diagnostic ignored "-Wc11-extensions" -+#include ++#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++#include ++#include ++#include +#pragma clang diagnostic pop -+#endif // !__has_feature(c_atomic) -+#endif // __clang__ ++#endif // DEPRECATED_ALLOCATOR_VOID && __clang__ + #cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@" #ifdef CMAKE_INSTALL_PREFIX + #define PICHI_PREFIX CMAKE_INSTALL_PREFIX +-#else // CMAKE_INSTALL_PREFIX ++#else // CMAKE_INSTALL_PREFIX + #error "CMAKE_INSTALL_PREFIX not defined" +-#endif // CMAKE_INSTALL_PREFIX ++#endif // CMAKE_INSTALL_PREFIX + + #cmakedefine ENABLE_TLS + #cmakedefine BUILD_TEST + +-#endif // PICHI_CONFIG_H ++#endif // PICHI_CONFIG_H Added: head/net/pichi/files/patch-src_api_egress__manager.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-src_api_egress__manager.cpp Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,26 @@ +--- src/api/egress_manager.cpp.orig 1970-01-01 00:00:00 UTC ++++ src/api/egress_manager.cpp +@@ -1,5 +1,6 @@ +-#include + #include ++// Include config.hpp first ++#include + + using namespace std; + +@@ -9,7 +10,7 @@ void EgressManager::update(string const& name, EgressV + { + #ifndef ENABLE_TLS + assertFalse(vo.tls_.has_value() && *vo.tls_, PichiError::SEMANTIC_ERROR, "TLS not supported"); +-#endif // ENABLE_TLS ++#endif // ENABLE_TLS + c_[name] = move(vo); + } + +@@ -25,4 +26,4 @@ EgressManager::ConstIterator EgressManager::end() cons + + EgressManager::ConstIterator EgressManager::find(string_view name) const { return c_.find(name); } + +-} // namespace pichi::api +\ No newline at end of file ++} // namespace pichi::api Added: head/net/pichi/files/patch-src_api_vos.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-src_api_vos.cpp Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,65 @@ +--- src/api/vos.cpp.orig 1970-01-01 00:00:00 UTC ++++ src/api/vos.cpp +@@ -1,3 +1,5 @@ ++#include ++// Include config.hpp first + #include + #include + #include +@@ -57,7 +59,7 @@ static decltype(auto) keyFile_ = "key_file"; + static decltype(auto) destinations_ = "destinations"; + static decltype(auto) balance_ = "balance"; + +-} // namespace IngressVOKey ++} // namespace IngressVOKey + + namespace EgressVOKey { + +@@ -73,7 +75,7 @@ static decltype(auto) tls_ = "tls"; + static decltype(auto) insecure_ = "insecure"; + static decltype(auto) caFile_ = "ca_file"; + +-} // namespace EgressVOKey ++} // namespace EgressVOKey + + namespace RuleVOKey { + +@@ -84,20 +86,20 @@ static decltype(auto) pattern_ = "pattern"; + static decltype(auto) domain_ = "domain"; + static decltype(auto) country_ = "country"; + +-} // namespace RuleVOKey ++} // namespace RuleVOKey + + namespace RouteVOKey { + + static decltype(auto) default_ = "default"; + static decltype(auto) rules_ = "rules"; + +-} // namespace RouteVOKey ++} // namespace RouteVOKey + + namespace ErrorVOKey { + + static decltype(auto) message_ = "message"; + +-} // namespace ErrorVOKey ++} // namespace ErrorVOKey + + namespace msg { + +@@ -129,7 +131,7 @@ static auto const TOO_LONG_NAME_PASSWORD = "Name or pa + static auto const MISSING_DESTINATIONS_FIELD = "Missiong destinations field"sv; + static auto const MISSING_BALANCE_FIELD = "Missiong balance field"sv; + +-} // namespace msg ++} // namespace msg + + static DelayMode parseDelayMode(json::Value const& v) + { +@@ -683,4 +685,4 @@ template <> RouteVO parse(json::Value const& v) + return rvo; + } + +-} // namespace pichi::api ++} // namespace pichi::api Added: head/net/pichi/files/patch-src_net_spawn.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/pichi/files/patch-src_net_spawn.cpp Sun Sep 13 07:22:30 2020 (r548461) @@ -0,0 +1,14 @@ +--- src/net/spawn.cpp.orig 1970-01-01 00:00:00 UTC ++++ src/net/spawn.cpp +@@ -1,3 +1,5 @@ ++#include ++// Include config.hpp first + #include + #include + #include +@@ -28,4 +30,4 @@ void logException(std::exception_ptr eptr) noexcept + + void stubHandler(std::exception_ptr, asio::yield_context) noexcept {} + +-} // namespace pichi::net ++} // namespace pichi::net Modified: head/net/pichi/pkg-plist ============================================================================== --- head/net/pichi/pkg-plist Sun Sep 13 07:14:55 2020 (r548460) +++ head/net/pichi/pkg-plist Sun Sep 13 07:22:30 2020 (r548461) @@ -37,7 +37,7 @@ bin/pichi %%DEVEL%%include/pichi/net/spawn.hpp %%DEVEL%%include/pichi/net/ssaead.hpp %%DEVEL%%include/pichi/net/ssstream.hpp +%%DEVEL%%include/pichi/net/stream.hpp %%DEVEL%%include/pichi/net/tunnel.hpp -%%DEVEL%%include/pichi/test/socket.hpp %%DEVEL%%include/pichi/uri.hpp %%DEVEL%%include/pichi.h From owner-svn-ports-head@freebsd.org Sun Sep 13 07:35:48 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 C124D3EFC8F; Sun, 13 Sep 2020 07:35:48 +0000 (UTC) (envelope-from tcberner@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bq1W84dXWz3Zkw; Sun, 13 Sep 2020 07:35:48 +0000 (UTC) (envelope-from tcberner@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 825EE2290F; Sun, 13 Sep 2020 07:35:48 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D7Zm7E035071; Sun, 13 Sep 2020 07:35:48 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D7ZmoW035069; Sun, 13 Sep 2020 07:35:48 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202009130735.08D7ZmoW035069@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 13 Sep 2020 07:35:48 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548462 - head/multimedia/py-mlt X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/multimedia/py-mlt X-SVN-Commit-Revision: 548462 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.33 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: Sun, 13 Sep 2020 07:35:48 -0000 Author: tcberner Date: Sun Sep 13 07:35:47 2020 New Revision: 548462 URL: https://svnweb.freebsd.org/changeset/ports/548462 Log: multimedia/py-mlt: build with python3, remove deprecation Modified: head/multimedia/py-mlt/Makefile head/multimedia/py-mlt/pkg-plist Modified: head/multimedia/py-mlt/Makefile ============================================================================== --- head/multimedia/py-mlt/Makefile Sun Sep 13 07:22:30 2020 (r548461) +++ head/multimedia/py-mlt/Makefile Sun Sep 13 07:35:47 2020 (r548462) @@ -5,10 +5,7 @@ PORTREVISION= 0 CATEGORIES= multimedia python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DEPRECATED= Uses deprecated version of python -EXPIRATION_DATE= 2020-09-15 - -USES= python:2.7 shebangfix +USES= gettext-runtime python:3.5+ shebangfix USE_PYTHON= flavors MASTERDIR= ${.CURDIR:H}/mlt SLAVEPORT= swig Python @@ -31,8 +28,10 @@ do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${INSTALL_LIB} ${INSTALL_WRKSRC}/_mlt.so ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} ${INSTALL_SCRIPT} ${INSTALL_WRKSRC}/mlt.py ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} - @cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -c 'import mlt' - @cd ${STAGEDIR}${PYTHON_SITELIBDIR} && ${PYTHON_CMD} -Oc 'import mlt' + ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py -d \ + ${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} + ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py -d \ + ${PYTHONPREFIX_SITELIBDIR} -f ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} Modified: head/multimedia/py-mlt/pkg-plist ============================================================================== --- head/multimedia/py-mlt/pkg-plist Sun Sep 13 07:22:30 2020 (r548461) +++ head/multimedia/py-mlt/pkg-plist Sun Sep 13 07:35:47 2020 (r548462) @@ -1,4 +1,4 @@ +%%PYTHON_SITELIBDIR%%/__pycache__/mlt.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc +%%PYTHON_SITELIBDIR%%/__pycache__/mlt.cpython-%%PYTHON_SUFFIX%%.pyc %%PYTHON_SITELIBDIR%%/_mlt.so %%PYTHON_SITELIBDIR%%/mlt.py -%%PYTHON_SITELIBDIR%%/mlt.pyc -%%PYTHON_SITELIBDIR%%/mlt.pyo From owner-svn-ports-head@freebsd.org Sun Sep 13 07:44:57 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 1D6673EFCBB; Sun, 13 Sep 2020 07:44:57 +0000 (UTC) (envelope-from tcberner@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4Bq1jh751Gz3ZqG; Sun, 13 Sep 2020 07:44:56 +0000 (UTC) (envelope-from tcberner@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 D705322C5D; Sun, 13 Sep 2020 07:44:56 +0000 (UTC) (envelope-from tcberner@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08D7iuYO041222; Sun, 13 Sep 2020 07:44:56 GMT (envelope-from tcberner@FreeBSD.org) Received: (from tcberner@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08D7iuXC041220; Sun, 13 Sep 2020 07:44:56 GMT (envelope-from tcberner@FreeBSD.org) Message-Id: <202009130744.08D7iuXC041220@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tcberner set sender to tcberner@FreeBSD.org using -f From: "Tobias C. Berner" Date: Sun, 13 Sep 2020 07:44:56 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r548463 - head/multimedia/gstreamer1-validate X-SVN-Group: ports-head X-SVN-Commit-Author: tcberner X-SVN-Commit-Paths: head/multimedia/gstreamer1-validate X-SVN-Commit-Revision: 548463 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.33 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: Sun, 13 Sep 2020 07:44:57 -0000 Author: tcberner Date: Sun Sep 13 07:44:56 2020 New Revision: 548463 URL: https://svnweb.freebsd.org/changeset/ports/548463 Log: multimedia/gstramer1-validate: switch to python3, remove deprecation Modified: head/multimedia/gstreamer1-validate/Makefile head/multimedia/gstreamer1-validate/pkg-plist Modified: head/multimedia/gstreamer1-validate/Makefile ============================================================================== --- head/multimedia/gstreamer1-validate/Makefile Sun Sep 13 07:35:47 2020 (r548462) +++ head/multimedia/gstreamer1-validate/Makefile Sun Sep 13 07:44:56 2020 (r548463) @@ -17,13 +17,14 @@ LICENSE= LGPL21+ LICENSE_FILE= ${WRKSRC}/COPYING USES= compiler:c11 gettext-runtime gmake gnome libtool pathfix \ - pkgconfig python:2.7 shebangfix tar:xz + pkgconfig python shebangfix tar:xz SHEBANG_FILES= tools/gst-validate-launcher.in USE_LDCONFIG= yes GNU_CONFIGURE= yes USE_GNOME= cairo gdkpixbuf2 gtk30 introspection:build USE_GSTREAMER1= yes INSTALL_TARGET= install-strip +USE_PYTHON= noflavors PLIST_SUB= VERSION=1.0 SOVERSION=0.1601.0 Modified: head/multimedia/gstreamer1-validate/pkg-plist ============================================================================== --- head/multimedia/gstreamer1-validate/pkg-plist Sun Sep 13 07:35:47 2020 (r548462) +++ head/multimedia/gstreamer1-validate/pkg-plist Sun Sep 13 07:44:56 2020 (r548463) @@ -30,51 +30,53 @@ include/gstreamer-%%VERSION%%/lib/validate/vid