From nobody Mon Nov 15 07:25:47 2021 X-Original-To: dev-commits-ports-all@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 44BAE185DD06; Mon, 15 Nov 2021 07:25:48 +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 4Ht1241TRgz4VlJ; Mon, 15 Nov 2021 07:25:48 +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 064DC15D49; Mon, 15 Nov 2021 07:25:48 +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 1AF7Plq8074626; Mon, 15 Nov 2021 07:25:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AF7Pl34074625; Mon, 15 Nov 2021 07:25:47 GMT (envelope-from git) Date: Mon, 15 Nov 2021 07:25:47 GMT Message-Id: <202111150725.1AF7Pl34074625@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 7fa3c7cc2f9f - main - emulators/wine-devel: Account for bundled jpeg library List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fa3c7cc2f9f74ea2206acdd024ecec542529923 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fa3c7cc2f9f74ea2206acdd024ecec542529923 commit 7fa3c7cc2f9f74ea2206acdd024ecec542529923 Author: Gerald Pfeifer AuthorDate: 2021-11-15 07:25:19 +0000 Commit: Gerald Pfeifer CommitDate: 2021-11-15 07:25:19 +0000 emulators/wine-devel: Account for bundled jpeg library Since version 6.20 Wine bundles its own copy of a jpeg library. The --with-jpeg configure option became a no-op, so remove it, and also remove the dependency on our own port via USES=jpeg. Approved by: maintainer (pre-approval) --- emulators/wine-devel/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 3c13f30c605e..01ecdda5125f 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,6 +2,7 @@ PORTNAME= wine DISTVERSION= 6.21 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ @@ -111,8 +112,8 @@ V4L_LIB_DEPENDS= libv4l2.so:multimedia/libv4l WINEMAKER_RUN_DEPENDS= p5-XML-LibXML>0:textproc/p5-XML-LibXML -X11_CONFIGURE_WITH= x fontconfig freetype jpeg opengl vkd3d xinerama xinput2 xrandr xrender -X11_USES= gl jpeg xorg +X11_CONFIGURE_WITH= x fontconfig freetype opengl vkd3d xinerama xinput2 xrandr xrender +X11_USES= gl xorg X11_USE= GL=glu XORG=x11,xext,xcomposite,xcursor,xi,xinerama,xrandr,xrender X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 \