commit: 8a068a74ce195b481e3bbffe820bcc4a03c8514c
Author: Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Mon Apr 20 22:38:04 2020 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Apr 22 21:38:17 2020 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=8a068a74
Upstream changed to C++, in-tree version compiles OK.
>>> Completed installing media-libs/openal-1.19.1 into
>>> /var/tmp/portage/media-libs/openal-1.19.1/image/
>>> media-libs/openal-1.19.1 merged.
Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>
media-libs/openal/Manifest | 1 -
media-libs/openal/files/openal-1.17.1-types.patch | 35 -----------
...l-1.18.2-dont-specify-macros-as-arguments.patch | 50 ----------------
media-libs/openal/metadata.xml | 8 ---
media-libs/openal/openal-1.18.2-r1.ebuild | 70 ----------------------
5 files changed, 164 deletions(-)
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
deleted file mode 100644
index 05af4b2..0000000
--- a/media-libs/openal/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B
8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8
SHA512
752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
diff --git a/media-libs/openal/files/openal-1.17.1-types.patch
b/media-libs/openal/files/openal-1.17.1-types.patch
deleted file mode 100644
index c702ca7..0000000
--- a/media-libs/openal/files/openal-1.17.1-types.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -Naurw openal-soft-1.17.1.orig/Alc/backends/alsa.c
openal-soft-1.17.1/Alc/backends/alsa.c
---- openal-soft-1.17.1.orig/Alc/backends/alsa.c 2016-01-04
12:07:41.460891285 -0800
-+++ openal-soft-1.17.1/Alc/backends/alsa.c 2016-01-04 12:29:56.971867369
-0800
-@@ -23,6 +23,7 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <memory.h>
-+#include <sys/types.h>
-
- #include "alMain.h"
- #include "alu.h"
-diff -Naurw openal-soft-1.17.1.orig/CMakeLists.txt
openal-soft-1.17.1/CMakeLists.txt
---- openal-soft-1.17.1.orig/CMakeLists.txt 2016-01-04 12:07:41.462891285
-0800
-+++ openal-soft-1.17.1/CMakeLists.txt 2016-01-04 12:55:30.281839910 -0800
-@@ -112,6 +112,20 @@
- UNSET(OLD_REQUIRED_FLAGS)
- ENDIF()
-
-+# Check if _GNU_SOURCE needs to be set.
-+CHECK_TYPE_SIZE(u_int8_t HAVE_TYPES_DEFAULT)
-+IF(NOT HAVE_TYPES_DEFAULT)
-+ SET(OLD_REQUIRED_FLAGS ${CMAKE_REQUIRED_FLAGS})
-+ SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -D_GNU_SOURCE")
-+ CHECK_TYPE_SIZE(u_int8_t HAVE_TYPES_POSIX)
-+ IF(NOT HAVE_TYPES_POSIX)
-+ SET(CMAKE_REQUIRED_FLAGS ${OLD_REQUIRED_FLAGS})
-+ ELSE()
-+ ADD_DEFINITIONS(-D_GNU_SOURCE)
-+ ENDIF()
-+ UNSET(OLD_REQUIRED_FLAGS)
-+ENDIF()
-+
- # Set defines for large file support
- CHECK_FILE_OFFSET_BITS()
- IF(_FILE_OFFSET_BITS)
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 83fc33d..0000000
---
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.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/metadata.xml b/media-libs/openal/metadata.xml
deleted file mode 100644
index ee7258a..0000000
--- a/media-libs/openal/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="project">
- <email>so...@gentoo.org</email>
- <name>Gentoo Sound project</name>
- </maintainer>
-</pkgmetadata>
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 e8614b2..0000000
--- a/media-libs/openal/openal-1.18.2-r1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# 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="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-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
-}
