From nobody Sun Nov 17 12:47:33 2024 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 4XrrBY61wKz5cbb8; Sun, 17 Nov 2024 12:47:33 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XrrBY5H5sz4JVg; Sun, 17 Nov 2024 12:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731847653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZiwWqivYHyfsnuE4oteCBbPAU+v+wMOa1QvDFpdqDE=; b=jUpIMRR/0jXJX72A8PtxbOqoY8CaFk0EkZRAdaOoVmcs6H6odSj1QGXguul4VlKgejVMHN SYvXmTgmT+oo/iWJgJmjeMHWpxorIn5PlJ5K17PjEdV5M2haROQuSNEYdZRo2Qf8XIvulP +JN1/QgepEH/tQni1YOQWiNary9b3Q0e0cz4rm1pD/60jImSJVrDnVlXG66wSAYct3uHum O21vXAhW0T6fiMriR6LnUCFt789XBLUkS9wEjPA+mBONCD8d53FlAgcELFRT/p/yW37WiF dF8WaZ4KXum3iCfT7lTvGT2B2/5hbFZDXDGa/o/PynuySyRkKYRi0xMEq0qbnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731847653; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MZiwWqivYHyfsnuE4oteCBbPAU+v+wMOa1QvDFpdqDE=; b=aORRHH4TL6jZVc3XU+5XiIn8HEMxZ1u6ZeerCDJ6bOnJyu/R+BVAYNxudDagQVRx2QVHeN CI73uj/ucHjhqVfIEIjMmVhjjpr7WTT5PzhvJd8A2AIf/UDKCMt1yQFiSgJv8MJ4ex209m l9zMqGgaAsE4JqhhyLZBM7bxL6y+hWSyVyMzLzN+rjjde52lOR9fTxaZgAxZXlyQlGbuYV qpR0gUJkEvWUzDYcH9j/s08ZhhmayHvlSskgLn47ZujSLt6//ojqPgLjA5rdqPFLBYQMAP SUDE5a6whNtkQTyXbpn1M+J1M58+Rz8m0El/u+Jt+ou551nyKGvnfYcBEm7aFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731847653; a=rsa-sha256; cv=none; b=e2VvhnowIWXmIbEWD/TYJ4TVI53iYjti3XjS8O9PNG80JEVXd4l5aVI9XjSeeMs1WTy2SC zHXOz5frwUTKMjxyTaHFlRme3amtNeJl+oqU+YU81bj0e1ToaBaL2x4CNElG/2QihtrpYG pBj1jm/MOsC9jwM2Ljwtp33o2hJNkHAk3QB80jDb+4yBa6BOUNUkazAWtlMEQxvvsEj7O+ 6sXwtK75AdTyB0VUZZs+BKZlut4+nf+cl0ufqZJrhDxEr8tpkU4vCLUO6j457bsW9Vo6ju ZWratDSGjoDqRqcuaqTLS97KD8lA4epxnyZltgJWfylPgtYU6ZhdFL805aMy2A== 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 4XrrBY4tPzzsKR; Sun, 17 Nov 2024 12:47:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AHClXA1085996; Sun, 17 Nov 2024 12:47:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AHClX3t085993; Sun, 17 Nov 2024 12:47:33 GMT (envelope-from git) Date: Sun, 17 Nov 2024 12:47:33 GMT Message-Id: <202411171247.4AHClX3t085993@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 65282872b7e3 - main - devel/allegro: Fix build with CMake >= 3.31.0 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 65282872b7e34c008ca3448412055b589120807a Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=65282872b7e34c008ca3448412055b589120807a commit 65282872b7e34c008ca3448412055b589120807a Author: Jason E. Hale AuthorDate: 2024-11-17 12:09:45 +0000 Commit: Jason E. Hale CommitDate: 2024-11-17 12:47:22 +0000 devel/allegro: Fix build with CMake >= 3.31.0 For some reason, the check for XDGAQueryExtension in Xxf86dga was failing in previous versions of CMake, but it now succeeds, which is the expected result. It's an oversimplified check, however, that just adds the library name without path if found. Just using raw data from pkg_check_modules() results in a similar problem, which this project does. The ALSA option already had the usual workaround for this scenario (USES+=localbase:ldflags) in place, but the JACK option did not. Build would fail if the JACK option was enabled, but not ALSA even in previous versions of CMake. This version of allegro is ancient, so just elevate the workaround to the port level. PR: 282725 --- devel/allegro/Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile index 22b8cb9c0d54..8a2fa8291c0b 100644 --- a/devel/allegro/Makefile +++ b/devel/allegro/Makefile @@ -17,7 +17,7 @@ LIB_DEPENDS= libogg.so:audio/libogg \ libpng.so:graphics/png \ libvorbis.so:audio/libvorbis -USES= cmake gl pkgconfig xorg +USES= cmake gl localbase:ldflags pkgconfig xorg USE_GL= gl glu USE_LDCONFIG= yes USE_XORG= ice sm x11 xcursor xext xpm xxf86dga xxf86vm @@ -41,7 +41,6 @@ OPTIONS_MULTI_AUDIO= ALSA JACK OSS SNDIO OPTIONS_SUB= yes ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib -ALSA_USES= localbase:ldflags ALSA_CMAKE_BOOL= WANT_ALSA JACK_LIB_DEPENDS= libjack.so:audio/jack