From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 45CE9138334 for ; Wed, 12 Jun 2019 13:02:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BFC6E09BA; Wed, 12 Jun 2019 13:02:03 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 327EEE09BA for ; Wed, 12 Jun 2019 13:02:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DACCA345F5B for ; Wed, 12 Jun 2019 13:02:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B24C0617 for ; Wed, 12 Jun 2019 13:01:59 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1560344497.8e374d523d61930a4a4f10119e21d95690cba395.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/openal/, media-libs/openal/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/openal/Manifest media-libs/openal/files/openal-1.18.2-dont-specify-macros-as-arguments.patch media-libs/openal/openal-1.18.2-r1.ebuild X-VCS-Directories: media-libs/openal/ media-libs/openal/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8e374d523d61930a4a4f10119e21d95690cba395 X-VCS-Branch: master Date: Wed, 12 Jun 2019 13:01:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d7a707a0-190f-463c-8be6-5b443cd40765 X-Archives-Hash: 63bf5b2254b1ed1d310dab88e7d060cd commit: 8e374d523d61930a4a4f10119e21d95690cba395 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Jun 12 11:03:10 2019 +0000 Commit: Andreas Sturmlechner gentoo 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 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 -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 -}