* [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
@ 2019-05-13 0:18 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-13 0:18 UTC (permalink / raw
To: gentoo-commits
commit: 63693f492ce2f5b840008fcda7530cb268fc6b53
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 12 21:25:39 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 00:17:43 2019 +0000
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 <asturm <AT> 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 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
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..00000000000
--- 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")
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..00000000000
--- 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}] )
- 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.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
-}
diff --git a/media-libs/openal/openal-1.19.0.ebuild b/media-libs/openal/openal-1.19.0.ebuild
deleted file mode 100644
index c79250a4e7e..00000000000
--- a/media-libs/openal/openal-1.19.0.ebuild
+++ /dev/null
@@ -1,67 +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 ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
- alsa coreaudio debug jack oss portaudio pulseaudio sdl 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
- )
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
- # -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
- my_configure() {
- local mycmakeargs=(
- -DALSOFT_BACKEND_SDL2=$(usex sdl)
- -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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
@ 2024-12-21 10:54 Miroslav Šulc
0 siblings, 0 replies; 5+ messages in thread
From: Miroslav Šulc @ 2024-12-21 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 7dfdaca896b571fd8aceb162eedb756f8ff7f0ba
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 21 10:53:34 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Dec 21 10:53:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7dfdaca8
media-libs/openal: dropped obsolete 1.23.1-r1 & 1.24.0
Bug: https://bugs.gentoo.org/946706
Closes: https://bugs.gentoo.org/915607
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/openal/Manifest | 2 -
.../openal/files/openal-1.23.1-gcc15-cstdint.patch | 32 --------
media-libs/openal/openal-1.23.1-r1.ebuild | 91 ----------------------
media-libs/openal/openal-1.24.0.ebuild | 87 ---------------------
4 files changed, 212 deletions(-)
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index 562cb5ddd905..851acadd4dae 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,3 +1 @@
-DIST openal-soft-1.23.1.tar.bz2 699330 BLAKE2B 214eb5c6714f8beec711fbebb60725fb06daf77bcb62b14125ff3bc11ebe97365893a36652819bcde92d3714bb2a7ec2ac119a1f439a74fea56f65c7574f2c95 SHA512 0d40577cd27040dc8814c15bacc310a0ce1c98e084f0a37db9f66899265df42ea61ac672efba7445e495849c25b9ba5b086f43320a38965f6ee74081b2896819
-DIST openal-soft-1.24.0.tar.bz2 763289 BLAKE2B 44eaec7e7a0896928ce67b0b0ef6938c39122c36bd08e74c34fe2d085e6c369f70d7bb762c421fb4bec3ad4fdb2734d6dacf188844ac7309f0f0433c88800abb SHA512 f3e9f7a2729688092a77413bce3191b874bb898c80defc620754ce85ed079446f2b0cfe1b81846606357515e40f1c1fd035f0f64e9d9ce4f861b873f54d3a3e7
DIST openal-soft-1.24.1.tar.bz2 991155 BLAKE2B 7fbf0e63a46a5f2eacee00bcc28746ded5b950aba580ae041825d3b47a33be757668faad5e7c3eced8983416f4a946dc7bddba69699a56470ace0d6ff6e3762c SHA512 1d2d17c94708b0a63a965b26ad960fe6f2201db2c729b6ba564dd0c2b50f0b1d0733c4448b0d2d1b3e22436fb2d7daf5f285071b7234511e3eb4abfe5fa1f223
diff --git a/media-libs/openal/files/openal-1.23.1-gcc15-cstdint.patch b/media-libs/openal/files/openal-1.23.1-gcc15-cstdint.patch
deleted file mode 100644
index ce4ceb455b2f..000000000000
--- a/media-libs/openal/files/openal-1.23.1-gcc15-cstdint.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Fixed exhaustively upstream in https://github.com/kcat/openal-soft/commit/64f8e8347f7ed3f98917fae7587f4d72b54c28ef
-but doesn't apply cleanly, so do a minimal fix here.
---- a/alc/alu.h
-+++ b/alc/alu.h
-@@ -2,6 +2,7 @@
- #define ALU_H
-
- #include <bitset>
-+#include <cstdint>
-
- #include "aloptional.h"
-
---- a/core/mixer/defs.h
-+++ b/core/mixer/defs.h
-@@ -2,6 +2,7 @@
- #define CORE_MIXER_DEFS_H
-
- #include <array>
-+#include <cstdint>
- #include <stdlib.h>
-
- #include "alspan.h"
---- a/core/uhjfilter.h
-+++ b/core/uhjfilter.h
-@@ -2,6 +2,7 @@
- #define CORE_UHJFILTER_H
-
- #include <array>
-+#include <cstdint>
-
- #include "almalloc.h"
- #include "alspan.h"
diff --git a/media-libs/openal/openal-1.23.1-r1.ebuild b/media-libs/openal/openal-1.23.1-r1.ebuild
deleted file mode 100644
index d30f7ef3e23c..000000000000
--- a/media-libs/openal/openal-1.23.1-r1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# False positives because of REQUIRE vs BACKEND options() (conditionally set)
-# See bug #809314
-CMAKE_WARN_UNUSED_CLI=no
-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"
-S="${WORKDIR}"/${MY_P}
-
-# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
-# Some components are under BSD
-LICENSE="LGPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="
- alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5
- cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
- cpu_flags_arm_neon
-"
-
-# PipeWire:
-# - See bug #863200 for PipeWire minimum version
-# - PW is in DEPEND although not linked against because we need configure to
-# find it anyway, but no :=.
-RDEPEND="
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- pipewire? ( media-video/pipewire[${MULTILIB_USEDEP}] )
- portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
- ${RDEPEND}
- oss? ( virtual/os-headers )
-"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-1.23.1-gcc15-cstdint.patch
-)
-
-multilib_src_configure() {
- local mycmakeargs=(
- # See bug #809314 for getting both options for backends
- -DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
- -DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
- -DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
- -DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
- -DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
- -DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
- -DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
- -DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
- -DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
-
- -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)
- # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
- -DALSOFT_EXAMPLES=OFF
- )
-
- # Avoid unused variable warnings, bug #738240
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -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)
- )
- elif use arm || use arm64 ; then
- mycmakeargs+=(
- -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
-
- cmake_src_configure
-}
diff --git a/media-libs/openal/openal-1.24.0.ebuild b/media-libs/openal/openal-1.24.0.ebuild
deleted file mode 100644
index cb3f3789eddd..000000000000
--- a/media-libs/openal/openal-1.24.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# False positives because of REQUIRE vs BACKEND options() (conditionally set)
-# See bug #809314
-CMAKE_WARN_UNUSED_CLI=no
-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"
-S="${WORKDIR}"/${MY_P}
-
-# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
-# Some components are under BSD
-LICENSE="LGPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="
- alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5
- cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
- cpu_flags_arm_neon
-"
-
-# PipeWire:
-# - See bug #863200 for PipeWire minimum version
-# - PW is in DEPEND although not linked against because we need configure to
-# find it anyway, but no :=.
-RDEPEND="
- alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
- jack? ( virtual/jack[${MULTILIB_USEDEP}] )
- pipewire? ( media-video/pipewire[${MULTILIB_USEDEP}] )
- portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
- pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- )
- sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
- sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
- ${RDEPEND}
- oss? ( virtual/os-headers )
-"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-multilib_src_configure() {
- local mycmakeargs=(
- # See bug #809314 for getting both options for backends
- -DALSOFT_{BACKEND,REQUIRE}_ALSA=$(usex alsa)
- -DALSOFT_{BACKEND,REQUIRE}_COREAUDIO=$(usex coreaudio)
- -DALSOFT_{BACKEND,REQUIRE}_JACK=$(usex jack)
- -DALSOFT_{BACKEND,REQUIRE}_OSS=$(usex oss)
- -DALSOFT_{BACKEND,REQUIRE}_PIPEWIRE=$(usex pipewire)
- -DALSOFT_{BACKEND,REQUIRE}_PORTAUDIO=$(usex portaudio)
- -DALSOFT_{BACKEND,REQUIRE}_PULSEAUDIO=$(usex pulseaudio)
- -DALSOFT_{BACKEND,REQUIRE}_SDL2=$(usex sdl)
- -DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
-
- -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)
- # EXAMPLES=OFF to avoid FFmpeg dependency, bug #481670
- -DALSOFT_EXAMPLES=OFF
- )
-
- # Avoid unused variable warnings, bug #738240
- if use amd64 || use x86 ; then
- mycmakeargs+=(
- -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)
- )
- elif use arm || use arm64 ; then
- mycmakeargs+=(
- -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
- )
- fi
-
- cmake_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
@ 2019-06-12 13:01 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-06-12 13:01 UTC (permalink / raw
To: gentoo-commits
commit: 8e374d523d61930a4a4f10119e21d95690cba395
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 12 11:03:10 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Jun 12 13:01:37 2019 +0000
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 <asturm <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 | 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 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
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..00000000000
--- 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")
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..00000000000
--- 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}] )
- 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.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
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
@ 2019-05-13 5:10 Andreas Sturmlechner
0 siblings, 0 replies; 5+ messages in thread
From: Andreas Sturmlechner @ 2019-05-13 5:10 UTC (permalink / raw
To: gentoo-commits
commit: bac0df297d04b791c198ae1f5d2e27425b1c0fc7
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon May 13 05:02:21 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon May 13 05:10:01 2019 +0000
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 <asturm <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 | 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 356a3f12bbe284bfac71f4f2a9f83d084083a832012222e73743042ac27812cf051c12b0ddcf53c010ff77e44ae2e9033cea9b9324d316a22a59a154307a64a4
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 00000000000..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 <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
new file mode 100644
index 00000000000..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}] )
+ 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.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
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/
@ 2018-05-27 16:04 Aaron Bauman
0 siblings, 0 replies; 5+ messages in thread
From: Aaron Bauman @ 2018-05-27 16:04 UTC (permalink / raw
To: gentoo-commits
commit: 8f64e41d8e6798e5c3d5b6c8ceb4bdb71f93c00b
Author: Marty E. Plummer <hanetzer <AT> startmail <DOT> com>
AuthorDate: Thu Apr 12 12:04:09 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Sun May 27 16:03:52 2018 +0000
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 00000000000..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 <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 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() {
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2024-12-21 10:54 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-13 0:18 [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2024-12-21 10:54 Miroslav Šulc
2019-06-12 13:01 Andreas Sturmlechner
2019-05-13 5:10 Andreas Sturmlechner
2018-05-27 16:04 Aaron Bauman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox