[gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
commit: 8e374d523d61930a4a4f10119e21d95690cba395 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 12 11:03:10 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Jun 12 13:01:37 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e374d52 media-libs/openal: Drop 1.18.2-r1 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/openal/Manifest | 1 - ...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 media-libs/openal/openal-1.18.2-r1.ebuild | 69 -- 3 files changed, 120 deletions(-) diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index a3ff15cf536..398ae788b0a 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1,2 +1 @@ -DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a83201e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 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 deleted file mode 100644 index 83fc33d0a33..000 --- a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index ccc0f0929a4..000 --- a/media-libs/openal/openal-1.18.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib - -MY_P="${PN}-soft-${PV}" - -DESCRIPTION="A software implementation of the OpenAL 3D audio API" -HOMEPAGE="https://www.openal-soft.org/"; -SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"; - -LICENSE="LGPL-2+" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE=" - alsa coreaudio debug jack oss portaudio pulseaudio qt5 - cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 - cpu_flags_arm_neon -" - -RDEPEND=" - alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) - jack? ( virtual/jack[${MULTILIB_USEDEP}] ) -
[gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
commit: bac0df297d04b791c198ae1f5d2e27425b1c0fc7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon May 13 05:02:21 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 13 05:10:01 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bac0df29 media-libs/openal: Re-add 1.18.2-r1... Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/openal/Manifest | 1 + ...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 media-libs/openal/openal-1.18.2-r1.ebuild | 69 ++ 3 files changed, 120 insertions(+) diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index 398ae788b0a..a3ff15cf536 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1 +1,2 @@ +DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a83201e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 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 000..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 new file mode 100644 index 000..ccc0f0929a4 --- /dev/null +++ b/media-libs/openal/openal-1.18.2-r1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-multilib + +MY_P="${PN}-soft-${PV}" + +DESCRIPTION="A software implementation of the OpenAL 3D audio API" +HOMEPAGE="https://www.openal-soft.org/"; +SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"; + +LICENSE="LGPL-2+" +SLOT="0" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" +IUSE=" + alsa coreaudio debug jack oss portaudio pulseaudio qt5 + cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 + cpu_flags_arm_neon +" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) +
[gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
commit: 63693f492ce2f5b840008fcda7530cb268fc6b53 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 12 21:25:39 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon May 13 00:17:43 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63693f49 media-libs/openal: Drop 1.18.2-r1 and 1.19.0 Closes: https://bugs.gentoo.org/681400 Package-Manager: Portage-2.3.66, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner gentoo.org> media-libs/openal/Manifest | 2 - ...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 media-libs/openal/openal-1.18.2-r1.ebuild | 69 -- media-libs/openal/openal-1.19.0.ebuild | 67 - 4 files changed, 188 deletions(-) diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index 235e7fdacc4..398ae788b0a 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1,3 +1 @@ -DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d -DIST openal-soft-1.19.0.tar.bz2 575163 BLAKE2B 492166cccdfb0d5f35a2d731d2194ab844d89e7754ee636fc00969abe68026d9ffa1ce05c1b75f1c465ba413e1d16c1aee7e0dc86e24c97cbacb29353de20b73 SHA512 5fb8f54f271b36970f29335952173300dde15a798b4ac60e8167143b5806ed3178cc4f400e1d8da4354c2c3f57f28c90064e61740264b70d7c605d7d1b4273b3 DIST openal-soft-1.19.1.tar.bz2 577310 BLAKE2B f6ed5b2bce1bfcaa7f8085375d5d3e3323ea2f03896ba871fe3ec247e6e1bf524a9c5180399b0f0908aa69756a1f2ee8095f14a69e6a7eac55a25cc7c2ac545b SHA512 356a3f12bbe284bfac71f4f2a9f83d084083a83201e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4 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 deleted file mode 100644 index 83fc33d0a33..000 --- a/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch +++ /dev/null @@ -1,50 +0,0 @@ -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 deleted file mode 100644 index ccc0f0929a4..000 --- a/media-libs/openal/openal-1.18.2-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit cmake-multilib - -MY_P="${PN}-soft-${PV}" - -DESCRIPTION="A software implementation of the OpenAL 3D audio API" -HOMEPAGE="https://www.openal-soft.org/"; -SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"; - -LICEN
[gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
commit: 8f64e41d8e6798e5c3d5b6c8ceb4bdb71f93c00b Author: Marty E. Plummer startmail com> AuthorDate: Thu Apr 12 12:04:09 2018 + Commit: Aaron Bauman gentoo org> CommitDate: Sun May 27 16:03:52 2018 + 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 000..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() {