diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-06-16 21:23:20 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-06-16 21:23:20 +0100 |
commit | fab849d1daed0ba7f2ac497d07985c3dbb692543 (patch) | |
tree | 10baa743a5340b42ad538dd19d48669ccac209b1 /media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch | |
parent | 73c318acdaf6f8309d68bd266051e6dd1f1bd787 (diff) |
gentoo resync : 16.06.2019
Diffstat (limited to 'media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch')
-rw-r--r-- | media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch | 50 |
1 files changed, 0 insertions, 50 deletions
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 83fc33d0a332..000000000000 --- 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 <chris.kcat@gmail.com> -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") |