From owner-svn-ports-all@freebsd.org Sat Apr 14 10:08:23 2018 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 0413BF91BD8; Sat, 14 Apr 2018 10:08:23 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id AAA276EB8D; Sat, 14 Apr 2018 10:08:22 +0000 (UTC) (envelope-from adridg@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 A516126D77; Sat, 14 Apr 2018 10:08:22 +0000 (UTC) (envelope-from adridg@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3EA8Mwu062394; Sat, 14 Apr 2018 10:08:22 GMT (envelope-from adridg@FreeBSD.org) Received: (from adridg@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3EA8MJ8062393; Sat, 14 Apr 2018 10:08:22 GMT (envelope-from adridg@FreeBSD.org) Message-Id: <201804141008.w3EA8MJ8062393@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: adridg set sender to adridg@FreeBSD.org using -f From: Adriaan de Groot Date: Sat, 14 Apr 2018 10:08:22 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467303 - head/audio/kwave/files X-SVN-Group: ports-head X-SVN-Commit-Author: adridg X-SVN-Commit-Paths: head/audio/kwave/files X-SVN-Commit-Revision: 467303 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 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: Sat, 14 Apr 2018 10:08:23 -0000 Author: adridg Date: Sat Apr 14 10:08:22 2018 New Revision: 467303 URL: https://svnweb.freebsd.org/changeset/ports/467303 Log: Pre-emptively fix audio/kwave before CMake 3.11. The newer CMake respects CMAKE_REQUIRED_LIBRARIES in places that older CMake code doesn't expect. Temporarily reset to empty for that. No effect on CMake 3.10, which didn't use that variable in CHECK_INCLUDE_FILES anyway. Reported by: antoine (via exp-run) Approved by: tcberner (mentor, implicit) Added: head/audio/kwave/files/patch-plugins_codec__ogg_CMakeLists.txt (contents, props changed) Added: head/audio/kwave/files/patch-plugins_codec__ogg_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/audio/kwave/files/patch-plugins_codec__ogg_CMakeLists.txt Sat Apr 14 10:08:22 2018 (r467303) @@ -0,0 +1,23 @@ +In CMake 3.11, CHECK_INCLUDE_FILES() respects CMAKE_REQUIRED_LIBRARIES, +which this module doesn't expect. Temporarily reset the required libraries +while finding the headers. + +--- plugins/codec_ogg/CMakeLists.txt.orig 2018-03-01 22:57:03 UTC ++++ plugins/codec_ogg/CMakeLists.txt +@@ -95,6 +95,8 @@ IF (WITH_OGG_OPUS OR WITH_OGG_VORBIS) + ${VORBISENC_LIBRARIES} + ) + ++ SET(_vorbis_CMR ${CMAKE_REQUIRED_LIBRARIES}) ++ SET(CMAKE_REQUIRED_LIBRARIES ) + CHECK_INCLUDE_FILES( + "vorbis/codec.h;vorbis/vorbisenc.h" + HAVE_OGG_VORBIS_HEADERS +@@ -102,6 +104,7 @@ IF (WITH_OGG_OPUS OR WITH_OGG_VORBIS) + IF (NOT HAVE_OGG_VORBIS_HEADERS) + MESSAGE(FATAL_ERROR "ogg vorbis header files are missing") + ENDIF (NOT HAVE_OGG_VORBIS_HEADERS) ++ SET(CMAKE_REQUIRED_LIBRARIES ${_vorbis_CMR}) + + + SET(HAVE_OGG_VORBIS ON CACHE BOOL "enable Vorbis codec")