Conan/conan-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-981] qt package (!15)

Browse Source 
Co-authored-by: aleksandr.vodyanov <aleksandr.vodyanov@avroid.tech>
Reviewed-on: https://git.avroid.tech/Conan/conan_build/pulls/15
This commit is contained in:
Aleksandr Vodyanov
2025-02-13 12:25:48 +03:00
parent 60445ac09e
commit 3759e1163f
228 changed files with 16106 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
recipes/openal-soft/all/patches/1.22.2-0001-fix-al-optional-in-if-compile-error.patch Normal file
View File

@@ -0,0 +1,47 @@
From 650a6d49e9a511d005171940761f6dd6b440ee66 Mon Sep 17 00:00:00 2001
From: Chris Robinson <chris.kcat@gmail.com>
Date: Mon, 18 Jul 2022 11:10:27 -0700
Subject: [PATCH] Declare variables closer to where they're used
---
alc/backends/alsa.cpp | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/alc/backends/alsa.cpp b/alc/backends/alsa.cpp
index 9c78b6c6a..b6efeaba1 100644
--- a/alc/backends/alsa.cpp
+++ b/alc/backends/alsa.cpp
@@ -623,7 +623,6 @@ int AlsaPlayback::mixerNoMMapProc()
void AlsaPlayback::open(const char *name)
{
- al::optional<std::string> driveropt;
const char *driver{"default"};
if(name)
{
@@ -640,7 +639,7 @@ void AlsaPlayback::open(const char *name)
else
{
name = alsaDevice;
- if(bool{driveropt = ConfigValueStr(nullptr, "alsa", "device")})
+ if(auto driveropt = ConfigValueStr(nullptr, "alsa", "device"))
driver = driveropt->c_str();
}
TRACE("Opening device \"%s\"\n", driver);
@@ -896,7 +895,6 @@ AlsaCapture::~AlsaCapture()
void AlsaCapture::open(const char *name)
{
- al::optional<std::string> driveropt;
const char *driver{"default"};
if(name)
{
@@ -913,7 +911,7 @@ void AlsaCapture::open(const char *name)
else
{
name = alsaDevice;
- if(bool{driveropt = ConfigValueStr(nullptr, "alsa", "capture")})
+ if(auto driveropt = ConfigValueStr(nullptr, "alsa", "capture"))
driver = driveropt->c_str();
}

15
recipes/openal-soft/all/patches/1.22.2-0002-fix-pulseaudio-find-package-vars.patch Normal file
View File

@@ -0,0 +1,15 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1984ac9..75e904d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1051,8 +1051,8 @@ if(PULSEAUDIO_FOUND)
set(HAVE_PULSEAUDIO 1)
set(BACKENDS "${BACKENDS} PulseAudio${IS_LINKED},")
set(ALC_OBJS ${ALC_OBJS} alc/backends/pulseaudio.cpp alc/backends/pulseaudio.h)
- add_backend_libs(${PULSEAUDIO_LIBRARIES})
- set(INC_PATHS ${INC_PATHS} ${PULSEAUDIO_INCLUDE_DIRS})
+ add_backend_libs(${PULSEAUDIO_LIBRARY})
+ set(INC_PATHS ${INC_PATHS} ${PULSEAUDIO_INCLUDE_DIR})
endif()
endif()
if(ALSOFT_REQUIRE_PULSEAUDIO AND NOT HAVE_PULSEAUDIO)