From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0248A138330 for ; Sun, 27 May 2018 16:04:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id AEF10E0908; Sun, 27 May 2018 16:04:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6E9AEE0908 for ; Sun, 27 May 2018 16:04:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4733A335CCA for ; Sun, 27 May 2018 16:04:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5F52040 for ; Sun, 27 May 2018 16:04:14 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1527437032.8f64e41d8e6798e5c3d5b6c8ceb4bdb71f93c00b.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch media-libs/openal/openal-1.18.2-r1.ebuild X-VCS-Directories: media-libs/openal/ media-libs/openal/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 8f64e41d8e6798e5c3d5b6c8ceb4bdb71f93c00b X-VCS-Branch: master Date: Sun, 27 May 2018 16:04:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 795e8dd9-f303-4148-9c1e-debd0c0b4c46 X-Archives-Hash: df0425b4b1388f3db70c0d7ea52f08b5 commit: 8f64e41d8e6798e5c3d5b6c8ceb4bdb71f93c00b Author: Marty E. Plummer startmail com> AuthorDate: Thu Apr 12 12:04:09 2018 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Sun May 27 16:03:52 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f64e41d media-libs/openal: fix mingw-w64 build Added an upstream patch which fixes an issue when using crossdev to build for mingw-w64: CMake Error at /usr/share/cmake/Modules/CheckIncludeFiles.cmake:63 (message): Unknown arguments: -D_WIN32_WINNT=0x0502 Call Stack (most recent call first): CMakeLists.txt:968 (CHECK_INCLUDE_FILES) Package-Manager: Portage-2.3.28, Repoman-2.3.9 Closes: https://github.com/gentoo/gentoo/pull/7952 ...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 ++++++++++++++++++++++ media-libs/openal/openal-1.18.2-r1.ebuild | 4 ++ 2 files changed, 54 insertions(+) diff --git a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch new file mode 100644 index 00000000000..83fc33d0a33 --- /dev/null +++ b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch @@ -0,0 +1,50 @@ +From cae4b1a062b53dd25eba7caa41622be730106749 Mon Sep 17 00:00:00 2001 +From: Chris Robinson +Date: Wed, 28 Mar 2018 14:34:58 -0700 +Subject: [PATCH] Don't specify macros as arguments to CHECK_INCLUDE_FILE(S) + +--- + CMakeLists.txt | 15 +++++++++++++-- + 1 file changed, 13 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index df1dfe63..07454f15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -577,7 +577,12 @@ ENDIF() + + + # Check if we have Windows headers +-CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H -D_WIN32_WINNT=0x0502) ++SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) ++SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502) ++CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H) ++SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS}) ++UNSET(OLD_REQUIRED_DEFINITIONS) ++ + IF(NOT HAVE_WINDOWS_H) + CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY) + IF(NOT HAVE_GETTIMEOFDAY) +@@ -975,8 +980,11 @@ OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF) + OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF) + OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF) + IF(HAVE_WINDOWS_H) ++ SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS}) ++ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502) ++ + # Check MMSystem backend +- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502) ++ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H) + IF(HAVE_MMSYSTEM_H) + CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM) + IF(HAVE_LIBWINMM) +@@ -1013,6 +1021,9 @@ IF(HAVE_WINDOWS_H) + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/wasapi.c) + ENDIF() + ENDIF() ++ ++ SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS}) ++ UNSET(OLD_REQUIRED_DEFINITIONS) + ENDIF() + IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM) + MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend") diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild index ffa1242cc0c..f9fc8923f87 100644 --- a/media-libs/openal/openal-1.18.2-r1.ebuild +++ b/media-libs/openal/openal-1.18.2-r1.ebuild @@ -38,6 +38,10 @@ S="${WORKDIR}/${MY_P}" DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README ) +PATCHES=( + "${FILESDIR}"/${PN}-1.18.2-dont-specify-macros-as-arguments.patch +) + src_configure() { # -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670 my_configure() {