From de7ab2b44605253b573d9eea6e2f077d9c9e54cd Mon Sep 17 00:00:00 2001 From: kenmays Date: Fri, 17 Dec 2021 08:48:17 -0800 Subject: [PATCH] openal: fixed build (#6370) * openal: fixed build * openal: fixed build * openal: added more tools * openal: fixed for GCC2 --- media-libs/openal/openal-1.13.0.recipe | 17 ++++++------- media-libs/openal/openal-1.21.1.recipe | 24 +++++++++++++++---- .../openal/patches/openal-1.13.0.patchset | 8 +++---- .../openal/patches/openal-1.21.1.patchset | 16 ++++++------- 4 files changed, 40 insertions(+), 25 deletions(-) diff --git a/media-libs/openal/openal-1.13.0.recipe b/media-libs/openal/openal-1.13.0.recipe index 2d1f982db..82972f093 100644 --- a/media-libs/openal/openal-1.13.0.recipe +++ b/media-libs/openal/openal-1.13.0.recipe @@ -8,14 +8,14 @@ HOMEPAGE="https://www.openal-soft.org/" COPYRIGHT="1999-2000 Loki Software 2005-2011 OpenAL Soft team" LICENSE="GNU LGPL v2.1" -REVISION="4" -SOURCE_URI="https://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2" -CHECKSUM_SHA256="dc735b8b2ab21f6ec54b4262f150a7e0527ae42aa975a1965b9342df1520443c" -SOURCE_DIR="openal-soft-1.13" -PATCHES="openal-1.13.0.patchset" +REVISION="5" +SOURCE_URI="https://github.com/kcat/openal-soft/archive/refs/tags/openal-soft-1.13.tar.gz" +#SOURCE_URI="https://kcat.strangesoft.net/openal-releases/openal-soft-1.13.tar.bz2" +CHECKSUM_SHA256="6f39476853c1b21ea841401b7f15bc3ed6b6c738b0a840de076a2865eb7751f9" +SOURCE_DIR="openal-soft-openal-soft-1.13" +PATCHES="openal-$portVersion.patchset" -ARCHITECTURES="all" -SECONDARY_ARCHITECTURES="x86_gcc2 x86" +ARCHITECTURES="x86_gcc2" PROVIDES=" openal$secondaryArchSuffix = $portVersion compat >= 1 @@ -48,7 +48,8 @@ BUILD_PREREQUIRES=" BUILD() { cd build - cmake .. -DCMAKE_INSTALL_PREFIX=$prefix -DBIN_DIR="$relativeBinDir" \ + cmake .. -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=$prefix -DBIN_DIR="$relativeBinDir" \ -DLIB_SUFFIX="/${secondaryArchSuffix/_/}" make $jobArgs } diff --git a/media-libs/openal/openal-1.21.1.recipe b/media-libs/openal/openal-1.21.1.recipe index 71f25d15f..d865336ce 100644 --- a/media-libs/openal/openal-1.21.1.recipe +++ b/media-libs/openal/openal-1.21.1.recipe @@ -8,9 +8,9 @@ HOMEPAGE="https://www.openal-soft.org/" COPYRIGHT="1999-2000 Loki Software 2005-2021 OpenAL Soft team" LICENSE="GNU LGPL v2.1" -REVISION="3" -SOURCE_URI="https://www.openal-soft.org/openal-releases/openal-soft-$portVersion.tar.bz2" -CHECKSUM_SHA256="c8ad767e9a3230df66756a21cc8ebf218a9d47288f2514014832204e666af5d8" +REVISION="4" +SOURCE_URI="https://github.com/kcat/openal-soft/archive/refs/tags/1.21.1.tar.gz" +CHECKSUM_SHA256="8ac17e4e3b32c1af3d5508acfffb838640669b4274606b7892aa796ca9d7467f" SOURCE_DIR="openal-soft-$portVersion" PATCHES="openal-$portVersion.patchset" ADDITIONAL_FILES="openal.rdef.in" @@ -46,11 +46,20 @@ REQUIRES_devel=" PROVIDES_tools=" openal${secondaryArchSuffix}_tools = $portVersion - cmd:openal_info$commandSuffix - cmd:alsoft_config$commandSuffix + cmd:alconvolve$commandSuffix + cmd:alhrtf$commandSuffix + cmd:allatency$commandSuffix + cmd:alloopback$commandSuffix + cmd:almultireverb$commandSuffix + cmd:alplay$commandSuffix cmd:alrecord$commandSuffix + cmd:alreverb$commandSuffix + cmd:alsoft_config$commandSuffix + cmd:alstream$commandSuffix + cmd:alstreamcb$commandSuffix cmd:altonegen$commandSuffix cmd:makehrtf$commandSuffix + cmd:openal_info$commandSuffix " REQUIRES_tools=" @@ -59,6 +68,8 @@ REQUIRES_tools=" lib:libQt5Core$secondaryArchSuffix lib:libQt5Gui$secondaryArchSuffix lib:libQt5Widgets$secondaryArchSuffix + lib:libsndfile$secondaryArchSuffix + lib:libz$secondaryArchSuffix " BUILD_REQUIRES=" @@ -66,6 +77,8 @@ BUILD_REQUIRES=" devel:libQt5Core$secondaryArchSuffix devel:libQt5Gui$secondaryArchSuffix devel:libQt5Widgets$secondaryArchSuffix + devel:libsndfile$secondaryArchSuffix + devel:libz$secondaryArchSuffix " BUILD_PREREQUIRES=" cmd:cmake @@ -80,6 +93,7 @@ BUILD() mkdir -p build cd build cmake .. $cmakeDirArgs \ + -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_INSTALL_BINDIR=$commandBinDir make $jobArgs diff --git a/media-libs/openal/patches/openal-1.13.0.patchset b/media-libs/openal/patches/openal-1.13.0.patchset index 34727f596..b5d0d453c 100644 --- a/media-libs/openal/patches/openal-1.13.0.patchset +++ b/media-libs/openal/patches/openal-1.13.0.patchset @@ -1,4 +1,4 @@ -From b755a676e918041fe3320e5e6bfa061b3b892994 Mon Sep 17 00:00:00 2001 +From f9cf9b6da3439abdd20bfaf1e551f7816e27d00e Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 28 Jan 2014 09:17:21 +0100 Subject: applying patch openal-1.13.patch @@ -326,10 +326,10 @@ index 3c1e7e6..27a19cf 100644 #cmakedefine HAVE_DSOUND -- -1.8.3.4 +2.30.2 -From af8af1218c33e188372b600c4c0bfefc616b43e6 Mon Sep 17 00:00:00 2001 +From 17480d08d0d63cd2abd238a646156e3470a50f33 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 28 Jan 2014 09:22:49 +0100 Subject: Make bin directory a variable. @@ -366,5 +366,5 @@ index ffbe13b..a060122 100644 ARCHIVE DESTINATION "lib${LIB_SUFFIX}" ) -- -1.8.3.4 +2.30.2 diff --git a/media-libs/openal/patches/openal-1.21.1.patchset b/media-libs/openal/patches/openal-1.21.1.patchset index 7e1e4b911..844d64213 100644 --- a/media-libs/openal/patches/openal-1.21.1.patchset +++ b/media-libs/openal/patches/openal-1.21.1.patchset @@ -1,4 +1,4 @@ -From e620c50e70f63a6fbff8b10acfdd63ec5d6ff762 Mon Sep 17 00:00:00 2001 +From 453d72b6e17c0cc1400b0e7d4fe27e88cf0a5a9b Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 24 Feb 2021 14:13:58 +1000 Subject: Add Haiku backend @@ -563,10 +563,10 @@ index a28204e..c37065c 100644 #cmakedefine HAVE_DLFCN_H -- -2.30.0 +2.30.2 -From cd504bbfac14776f8f06b8fc69a9d4ce0d3b9d5d Mon Sep 17 00:00:00 2001 +From 59521430981d3f09f38aa7e7692b2f1504d02cfc Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 24 Feb 2021 17:06:13 +1000 Subject: Move config file to settings dir @@ -665,10 +665,10 @@ index 8e6c7be..5454a3f 100644 QByteArray base = qgetenv("XDG_DATA_HOME"); if(base.isEmpty()) -- -2.30.0 +2.30.2 -From 151b903b657123d747527e3f231efa4c1793c6fd Mon Sep 17 00:00:00 2001 +From 0e7a1708d56020c66f5d68f580e93762ca4494ba Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Wed, 24 Feb 2021 18:14:20 +1000 Subject: Add missing include @@ -687,10 +687,10 @@ index 0052a64..0159c0e 100644 #include #include -- -2.30.0 +2.30.2 -From 46088757c5fddd671e2b1d7c79ca8e02075e62e4 Mon Sep 17 00:00:00 2001 +From 005b08261b2a4dd1dee7ef0e6a96ddaa070586f6 Mon Sep 17 00:00:00 2001 From: Gerasim Troeglazov <3dEyes@gmail.com> Date: Sat, 27 Feb 2021 23:49:01 +1000 Subject: Move create/delete BSoundPlayer to play()/stop() funcs @@ -818,5 +818,5 @@ index 0159c0e..08ebf48 100644 throw al::backend_exception{al::backend_error::NoDevice, "Failed to create BMediaRecorder"}; -- -2.30.0 +2.30.2