From owner-svn-ports-all@freebsd.org Tue Apr 30 16:24:56 2019 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2638515970B7; Tue, 30 Apr 2019 16:24:56 +0000 (UTC) (envelope-from tobik@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) server-signature RSA-PSS (4096 bits) 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 C09F681E13; Tue, 30 Apr 2019 16:24:55 +0000 (UTC) (envelope-from tobik@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 9ACFFC482; Tue, 30 Apr 2019 16:24:55 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x3UGOt2i041200; Tue, 30 Apr 2019 16:24:55 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x3UGOt9F041199; Tue, 30 Apr 2019 16:24:55 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201904301624.x3UGOt9F041199@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Tue, 30 Apr 2019 16:24:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r500502 - head/Mk/Uses X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: head/Mk/Uses X-SVN-Commit-Revision: 500502 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: C09F681E13 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.999,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.96)[-0.963,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 30 Apr 2019 16:24:56 -0000 Author: tobik Date: Tue Apr 30 16:24:55 2019 New Revision: 500502 URL: https://svnweb.freebsd.org/changeset/ports/500502 Log: Mk/Uses/openal.mk: Drop support for the OpenAL Sample Implementation Prepare for audio/openal removal. PR: 236971 Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D19766 Modified: head/Mk/Uses/openal.mk Modified: head/Mk/Uses/openal.mk ============================================================================== --- head/Mk/Uses/openal.mk Tue Apr 30 16:14:04 2019 (r500501) +++ head/Mk/Uses/openal.mk Tue Apr 30 16:24:55 2019 (r500502) @@ -4,83 +4,27 @@ # # Feature: openal # Usage: USES=openal or USES=openal:ARGS -# Valid ARGS: al, soft (default), si, alut +# Valid ARGS: al, soft (default), alut # -# User-specified OpenAL wish: -# Usage: WANT_OPENAL=ARG -# Valid ARG: soft (default), si -# # MAINTAINER: portmgr@FreeBSD.org .if !defined(_INCLUDE_USES_OPENAL_MK) _INCLUDE_USES_OPENAL_MK= yes -_valid_ARGS= al si soft alut - -_si_DEPENDS= libopenal.so.0:audio/openal -_soft_DEPENDS= libopenal.so.1:audio/openal-soft -_alut_DEPENDS= libalut.so.0:audio/freealut - -_OPENAL_LIBS= si soft -_DEFAULT_OPENAL= soft - -.if exists(${LOCALBASE}/lib/libopenal.a) -_HAVE_OPENAL= si -.elif exists(${LOCALBASE}/bin/openal-info) -_HAVE_OPENAL= soft -.endif - -# Be friendly .if empty(openal_ARGS) -openal_ARGS= ${_DEFAULT_OPENAL} +openal_ARGS= soft .endif -# Sanity checks -.if defined(WANT_OPENAL) && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${WANT_OPENAL} -IGNORE= OpenAL mismatch: ${_HAVE_OPENAL} is installed, but ${WANT_OPENAL} desired +.if !empty(openal_ARGS:Nal:Nsoft:Nalut) +IGNORE= has unknown USES=openal arguments: ${openal_ARGS:Nal:Nsoft:Nalut} .endif -.for _arg in ${openal_ARGS} -. if ! ${_valid_ARGS:M${_arg}} -IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] is not recognized -. endif -. if ${_OPENAL_LIBS:M${_arg}} && ${openal_ARGS:Mal} -IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: argument [${_arg}] cannot be used together with al -. endif -. if ${_OPENAL_LIBS:M${_arg}} && defined(_HAVE_OPENAL) && ${_HAVE_OPENAL} != ${_arg} -IGNORE= OpenAL mismatch: port wants to use ${_arg} while you have ${_HAVE_OPENAL} -. endif -. if ${_OPENAL_LIBS:M${_arg}} && defined(WANT_OPENAL) && ${WANT_OPENAL} != ${_arg} -IGNORE= OpenAL mismatch: port wants to use ${_arg} while you wish to use ${WANT_OPENAL} -. endif -. if ${_OPENAL_LIBS:M${_arg}} -. for _carg in ${_OPENAL_LIBS:N${_arg}} -. if ${openal_ARGS:M${_carg}} -IGNORE= Incorrect 'USES+= openal:${openal_ARGS}' usage: arguments [${_arg}] and [${_carg}] cannot be used together -. endif -. endfor -. endif -.endfor +_OPENAL_al_DEPENDS= libopenal.so.1:audio/openal-soft +_OPENAL_soft_DEPENDS= libopenal.so.1:audio/openal-soft +_OPENAL_alut_DEPENDS= libalut.so.0:audio/freealut -# Proceed -_USE_OPENAL= - -.if ${openal_ARGS:Mal} -.if defined(_HAVE_OPENAL) -_USE_OPENAL= ${_HAVE_OPENAL} -.elif defined(WANT_OPENAL) -_USE_OPENAL= ${WANT_OPENAL} -.else -_USE_OPENAL= ${_DEFAULT_OPENAL} -.endif -.endif - -.for _arg in ${openal_ARGS:Nal} -_USE_OPENAL+= ${_arg} -.endfor - -.for _arg in ${_USE_OPENAL} -LIB_DEPENDS+= ${_${_arg}_DEPENDS} +.for _arg in ${openal_ARGS} +LIB_DEPENDS+= ${_OPENAL_${_arg}_DEPENDS} .endfor .endif