diff options
Diffstat (limited to 'media-libs/openal')
| -rw-r--r-- | media-libs/openal/Manifest | 3 | ||||
| -rw-r--r-- | media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch | 50 | ||||
| -rw-r--r-- | media-libs/openal/openal-1.18.2-r1.ebuild | 4 |
3 files changed, 56 insertions, 1 deletions
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest index a7c1987d6280..f78e39baf881 100644 --- a/media-libs/openal/Manifest +++ b/media-libs/openal/Manifest @@ -1,3 +1,4 @@ +AUX openal-1.18.2-dont-specify-macros-as-arguments.patch 2072 BLAKE2B b42ed02e6be499198c2fbfb212a47a3c08aba72a63699e725f504b18662086335513a0a177fa85f2dd019d65b18074ea5e7b19348e34dbf17bcce208fe96ba11 SHA512 e28b2ad70c35fd7018491cba84f33bcd5e6d6dd9944d47ad4cbba5852663d436be16a901e3e643b48f5e29d72d5b154c79ce83cd291075ff4ad272a1c77a2fb4 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d -EBUILD openal-1.18.2-r1.ebuild 2021 BLAKE2B 44489eef1d525bcd7a2e7c46f3cf356d922497fa3d07edd2854e4a0e00288db938373e9a6dbf86782b3327579cf248d6c071a60bf3d053b79fa672b5f8452231 SHA512 fb5f6f3895c9c73733604e3d5331825323e11a9a5aa966efcd59da5497b41b86af2b35b0e712ee34b3e1a05bb53455d6efa6b4b68e5fb2b87e196b296411e04e +EBUILD openal-1.18.2-r1.ebuild 2101 BLAKE2B 83cff184faf5b02db58bae5c56cc833bdf86a4908befc02079fc0915331e1b512c7c2aa61345829e55f7c9b07d8f2846fe3fc0c708420e5887b3e5b8145be683 SHA512 5388d9b1be607efd03d180c355703160ea02aebbed1fc0116ae174bc3d09ec0640a2082ce9fd41fb80643e2eebf6f43a3ac4b6cfcab65ca69f165e933c319ea9 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894 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 000000000000..83fc33d0a332 --- /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 <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") diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild index ffa1242cc0c4..f9fc8923f875 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() { |