From owner-dev-commits-ports-all@freebsd.org Thu Jul 15 06:54:45 2021 Return-Path: Delivered-To: dev-commits-ports-all@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 D4C8765FAA0; Thu, 15 Jul 2021 06:54:45 +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 4GQQ915VqKz3GM2; Thu, 15 Jul 2021 06:54:45 +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 A581225218; Thu, 15 Jul 2021 06:54:45 +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 16F6sj1C086286; Thu, 15 Jul 2021 06:54:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16F6sjN6086285; Thu, 15 Jul 2021 06:54:45 GMT (envelope-from git) Date: Thu, 15 Jul 2021 06:54:45 GMT Message-Id: <202107150654.16F6sjN6086285@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kevin Bowling Subject: git: fac2bc519518 - main - graphics/libGLU: Switch to meson build MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fac2bc519518fc6072e1d042b12cca44afb63568 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 15 Jul 2021 06:54:45 -0000 The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/ports/commit/?id=fac2bc519518fc6072e1d042b12cca44afb63568 commit fac2bc519518fc6072e1d042b12cca44afb63568 Author: Kevin Bowling AuthorDate: 2021-07-15 06:53:16 +0000 Commit: Kevin Bowling CommitDate: 2021-07-15 06:53:16 +0000 graphics/libGLU: Switch to meson build Fixes an issue I caused with pkgconfig https://gitlab.freedesktop.org/mesa/glu/-/commit/225e00a14a9200f11253775a7c7778c1c29c8b23 PR: 256997 --- graphics/libGLU/Makefile | 11 ++++++----- graphics/libGLU/files/patch-meson.build | 8 ++++++++ 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/graphics/libGLU/Makefile b/graphics/libGLU/Makefile index 3f332cd6d995..82797034880a 100644 --- a/graphics/libGLU/Makefile +++ b/graphics/libGLU/Makefile @@ -2,6 +2,7 @@ PORTNAME= libGLU PORTVERSION= 9.0.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/glu/ \ https://mesa.freedesktop.org/archive/glu/ @@ -10,12 +11,12 @@ DISTNAME= glu-${PORTVERSION} MAINTAINER= x11@FreeBSD.org COMMENT= OpenGL utility library -USES= gl libtool pathfix pkgconfig tar:xz -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --disable-static \ - --enable-libglvnd -INSTALL_TARGET= install-strip +USES= gl libtool meson pathfix pkgconfig tar:xz + USE_GL= opengl USE_LDCONFIG= yes +INSTALL_TARGET= install-strip +MESON_ARGS= -Ddefault_library=shared + .include diff --git a/graphics/libGLU/files/patch-meson.build b/graphics/libGLU/files/patch-meson.build new file mode 100644 index 000000000000..8337df10f0fe --- /dev/null +++ b/graphics/libGLU/files/patch-meson.build @@ -0,0 +1,8 @@ +--- meson.build.orig 2021-07-09 05:00:19 UTC ++++ meson.build +@@ -34,4 +34,5 @@ pkgconf.generate( + libglu, + name : 'glu', + description : 'Mesa OpenGL Utility Library', ++ requires: dep_gl + )