Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-libs/openal/files/, media-libs/openal/
Date: Mon, 16 Jul 2018 23:12:52
Message-Id: 1531512060.7145757b5b2a9f353af0fa7f5dbd41e40dd503c0.blueness@gentoo
1 commit: 7145757b5b2a9f353af0fa7f5dbd41e40dd503c0
2 Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz>
3 AuthorDate: Fri Jul 13 09:52:47 2018 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 13 20:01:00 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=7145757b
7
8 media-libs/openal: sync with upstream, bump to 1.18.2-r1
9
10 Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
11
12 media-libs/openal/Manifest | 1 +
13 ...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 ++++++++++++++++
14 media-libs/openal/openal-1.18.2-r1.ebuild | 70 ++++++++++++++++++++++
15 3 files changed, 121 insertions(+)
16
17 diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
18 index b6ff52c..c336636 100644
19 --- a/media-libs/openal/Manifest
20 +++ b/media-libs/openal/Manifest
21 @@ -1 +1,2 @@
22 DIST openal-soft-1.17.2.tar.bz2 486934 SHA256 a341f8542f1f0b8c65241a17da13d073f18ec06658e1a1606a8ecc8bbc2b3314 SHA512 50c20cd3ddada55d91643a79c2894d5a14315d5fc1ed8e870e3d8d3f410e8b7d8da29b838226e7fce37fbeca719ff919b51806f72e4cd529a18fbe8bd68860e3 WHIRLPOOL e33b9ffdf90b4812c2fb227d7b330ae38d9488f22182036579de41f93c5b0005b06e8a9b7e2e92192adffc2f622eb609fd7092c9596413ce49eae16eada7b491
23 +DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
24
25 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
26 new file mode 100644
27 index 0000000..83fc33d
28 --- /dev/null
29 +++ b/media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch
30 @@ -0,0 +1,50 @@
31 +From cae4b1a062b53dd25eba7caa41622be730106749 Mon Sep 17 00:00:00 2001
32 +From: Chris Robinson <chris.kcat@×××××.com>
33 +Date: Wed, 28 Mar 2018 14:34:58 -0700
34 +Subject: [PATCH] Don't specify macros as arguments to CHECK_INCLUDE_FILE(S)
35 +
36 +---
37 + CMakeLists.txt | 15 +++++++++++++--
38 + 1 file changed, 13 insertions(+), 2 deletions(-)
39 +
40 +diff --git a/CMakeLists.txt b/CMakeLists.txt
41 +index df1dfe63..07454f15 100644
42 +--- a/CMakeLists.txt
43 ++++ b/CMakeLists.txt
44 +@@ -577,7 +577,12 @@ ENDIF()
45 +
46 +
47 + # Check if we have Windows headers
48 +-CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H -D_WIN32_WINNT=0x0502)
49 ++SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
50 ++SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
51 ++CHECK_INCLUDE_FILE(windows.h HAVE_WINDOWS_H)
52 ++SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
53 ++UNSET(OLD_REQUIRED_DEFINITIONS)
54 ++
55 + IF(NOT HAVE_WINDOWS_H)
56 + CHECK_SYMBOL_EXISTS(gettimeofday sys/time.h HAVE_GETTIMEOFDAY)
57 + IF(NOT HAVE_GETTIMEOFDAY)
58 +@@ -975,8 +980,11 @@ OPTION(ALSOFT_REQUIRE_WINMM "Require Windows Multimedia backend" OFF)
59 + OPTION(ALSOFT_REQUIRE_DSOUND "Require DirectSound backend" OFF)
60 + OPTION(ALSOFT_REQUIRE_WASAPI "Require WASAPI backend" OFF)
61 + IF(HAVE_WINDOWS_H)
62 ++ SET(OLD_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS})
63 ++ SET(CMAKE_REQUIRED_DEFINITIONS ${CMAKE_REQUIRED_DEFINITIONS} -D_WIN32_WINNT=0x0502)
64 ++
65 + # Check MMSystem backend
66 +- CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H -D_WIN32_WINNT=0x0502)
67 ++ CHECK_INCLUDE_FILES("windows.h;mmsystem.h" HAVE_MMSYSTEM_H)
68 + IF(HAVE_MMSYSTEM_H)
69 + CHECK_SHARED_FUNCTION_EXISTS(waveOutOpen "windows.h;mmsystem.h" winmm "" HAVE_LIBWINMM)
70 + IF(HAVE_LIBWINMM)
71 +@@ -1013,6 +1021,9 @@ IF(HAVE_WINDOWS_H)
72 + SET(ALC_OBJS ${ALC_OBJS} Alc/backends/wasapi.c)
73 + ENDIF()
74 + ENDIF()
75 ++
76 ++ SET(CMAKE_REQUIRED_DEFINITIONS ${OLD_REQUIRED_DEFINITIONS})
77 ++ UNSET(OLD_REQUIRED_DEFINITIONS)
78 + ENDIF()
79 + IF(ALSOFT_REQUIRE_WINMM AND NOT HAVE_WINMM)
80 + MESSAGE(FATAL_ERROR "Failed to enabled required WinMM backend")
81
82 diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
83 new file mode 100644
84 index 0000000..a6f97fb
85 --- /dev/null
86 +++ b/media-libs/openal/openal-1.18.2-r1.ebuild
87 @@ -0,0 +1,70 @@
88 +# Copyright 1999-2018 Gentoo Foundation
89 +# Distributed under the terms of the GNU General Public License v2
90 +
91 +EAPI=6
92 +
93 +inherit cmake-multilib
94 +
95 +MY_P="${PN}-soft-${PV}"
96 +
97 +DESCRIPTION="A software implementation of the OpenAL 3D audio API"
98 +HOMEPAGE="http://kcat.strangesoft.net/openal.html"
99 +SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
100 +
101 +LICENSE="LGPL-2+"
102 +SLOT="0"
103 +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
104 +IUSE="
105 + alsa coreaudio debug jack oss portaudio pulseaudio qt5
106 + cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
107 + cpu_flags_arm_neon
108 +"
109 +
110 +RDEPEND="
111 + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
112 + jack? ( virtual/jack[${MULTILIB_USEDEP}] )
113 + portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
114 + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
115 + qt5? (
116 + dev-qt/qtcore:5
117 + dev-qt/qtgui:5
118 + dev-qt/qtwidgets:5
119 + )
120 +"
121 +DEPEND="${RDEPEND}
122 + oss? ( virtual/os-headers )"
123 +
124 +S="${WORKDIR}/${MY_P}"
125 +
126 +DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
127 +
128 +PATCHES=(
129 + "${FILESDIR}"/${PN}-1.17.1-types.patch
130 + "${FILESDIR}"/${PN}-1.18.2-dont-specify-macros-as-arguments.patch
131 +)
132 +
133 +src_configure() {
134 + # -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
135 + my_configure() {
136 + local mycmakeargs=(
137 + -DALSOFT_REQUIRE_ALSA=$(usex alsa)
138 + -DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
139 + -DALSOFT_REQUIRE_JACK=$(usex jack)
140 + -DALSOFT_REQUIRE_OSS=$(usex oss)
141 + -DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
142 + -DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
143 + -DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
144 + -DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
145 + -DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
146 + -DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
147 + -DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
148 + -DALSOFT_EXAMPLES=OFF
149 + )
150 +
151 + use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
152 +
153 + cmake-utils_src_configure
154 + }
155 +
156 + multilib_parallel_foreach_abi my_configure
157 +}