commit: 7145757b5b2a9f353af0fa7f5dbd41e40dd503c0
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
AuthorDate: Fri Jul 13 09:52:47 2018 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Jul 13 20:01:00 2018 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7145757b
media-libs/openal: sync with upstream, bump to 1.18.2-r1
Signed-off-by: Anthony G. Basile <blueness <AT> 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 | 70 ++++++++++++++++++++++
3 files changed, 121 insertions(+)
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index b6ff52c..c336636 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1 +1,2 @@
DIST openal-soft-1.17.2.tar.bz2 486934 SHA256
a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 SHA512
50c20cd3ddada55d91643a79c2894d5a14315d5fc1ed8e870e3d8d3f410e8b7d8da29b838226e7fce37fbeca719ff919b51806f72e4cd529a18fbe8bd68860e3
WHIRLPOOL
e33b9ffdf90b4812c2fb227d7b330ae38d9488f22182036579de41f93c5b0005b06e8a9b7e2e92192adffc2f622eb609fd7092c9596413ce49eae16eada7b491
+DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B
8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8
SHA512
752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
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 0000000..83fc33d
--- /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.k...@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
new file mode 100644
index 0000000..a6f97fb
--- /dev/null
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="http://kcat.strangesoft.net/openal.html";
+SRC_URI="http://kcat.strangesoft.net/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}] )
+ portaudio? (
>=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+DEPEND="${RDEPEND}
+ oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.17.1-types.patch
+ "${FILESDIR}"/${PN}-1.18.2-dont-specify-macros-as-arguments.patch
+)
+
+src_configure() {
+ # -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+ my_configure() {
+ local mycmakeargs=(
+ -DALSOFT_REQUIRE_ALSA=$(usex alsa)
+ -DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+ -DALSOFT_REQUIRE_JACK=$(usex jack)
+ -DALSOFT_REQUIRE_OSS=$(usex oss)
+ -DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+ -DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+ -DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+ -DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+ -DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+ -DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" ||
echo "OFF")
+ -DALSOFT_NO_CONFIG_UTIL=$(usex qt5
"$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+ -DALSOFT_EXAMPLES=OFF
+ )
+
+ use cpu_flags_arm_neon && mycmakeargs+=(
-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
+
+ cmake-utils_src_configure
+ }
+
+ multilib_parallel_foreach_abi my_configure
+}
