From nobody Mon Nov 15 13:03:02 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C05061839A5E; Mon, 15 Nov 2021 13:03:02 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ht8WB4Fgpz3nhx; Mon, 15 Nov 2021 13:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 721E419EC4; Mon, 15 Nov 2021 13:03:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AFD32Kt025710; Mon, 15 Nov 2021 13:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AFD32so025709; Mon, 15 Nov 2021 13:03:02 GMT (envelope-from git) Date: Mon, 15 Nov 2021 13:03:02 GMT Message-Id: <202111151303.1AFD32so025709@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 33430a73003c - main - multimedia/onevpl: move python module to standard place List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33430a73003c3fdd110c64094caae5918c85de22 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=33430a73003c3fdd110c64094caae5918c85de22 commit 33430a73003c3fdd110c64094caae5918c85de22 Author: Jan Beich AuthorDate: 2021-11-15 13:00:22 +0000 Commit: Jan Beich CommitDate: 2021-11-15 13:00:55 +0000 multimedia/onevpl: move python module to standard place Traceback (most recent call last): File "/usr/local/share/oneVPL/examples/preview/python/hello-vpp-py/hello-vpp.py", line 21, in import pyvpl ModuleNotFoundError: No module named 'pyvpl' --- multimedia/onevpl/Makefile | 2 ++ multimedia/onevpl/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/multimedia/onevpl/Makefile b/multimedia/onevpl/Makefile index f390a2b5aa1f..e3911ac2ea58 100644 --- a/multimedia/onevpl/Makefile +++ b/multimedia/onevpl/Makefile @@ -31,6 +31,8 @@ PYTHON_BUILD_DEPENDS= pybind11>0:devel/pybind11 PYTHON_CMAKE_BOOL= BUILD_PYTHON_BINDING post-patch: + @${REINPLACE_CMD} -e 's/python/&${PYTHON_VER}/' \ + ${WRKSRC}/preview/python/binding/CMakeLists.txt @${REINPLACE_CMD} -e '/pkgconfig/s,FULL_LIBDIR},PREFIX}/libdata,' \ ${WRKSRC}/dispatcher/CMakeLists.txt @${REINPLACE_CMD} -e 's,/usr,${PREFIX},' \ diff --git a/multimedia/onevpl/pkg-plist b/multimedia/onevpl/pkg-plist index 5e90b23839fa..6acf53c668ee 100644 --- a/multimedia/onevpl/pkg-plist +++ b/multimedia/onevpl/pkg-plist @@ -51,7 +51,7 @@ lib/libvpl.so lib/libvpl.so.2 lib/libvpl.so.2.5 lib/oneVPL/libvpl_wayland.so -%%PYTHON%%lib/python/pyvpl%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON%%%%PYTHON_LIBDIR%%/pyvpl%%PYTHON_EXT_SUFFIX%%.so libdata/pkgconfig/vpl.pc %%DATADIR%%/env/vars.sh %%DATADIR%%/examples/content/cars_128x96.h265