[audacity-freeworld: 2/2] drop patch
by Leigh Scott
commit 0dabbb176fe7cea4a8136f715ceadc173e57f925
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Nov 18 10:09:27 2023 +0000
drop patch
audacity-3.4.0-fix-build.patch | 26 --------------------------
1 file changed, 26 deletions(-)
1 year
[audacity-freeworld/f38] 3.4.2
by Leigh Scott
commit 2d75f6d1b459e9e841c01686db9340a1d7acde1e
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Nov 18 10:04:50 2023 +0000
3.4.2
.gitignore | 2 ++
audacity-3.4.0-fix-build.patch | 23 +++++++++++++++++++----
audacity-freeworld.spec | 12 ++++++++----
clang_fix.patch | 11 +++++++++++
sources | 2 +-
5 files changed, 41 insertions(+), 9 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 0903372..7c9aa0d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,5 @@
/Audacity-3.3.2.tar.gz
/Audacity-3.3.3.tar.gz
/Audacity-3.4.0.tar.gz
+/Audacity-3.4.1.tar.gz
+/Audacity-3.4.2.tar.gz
diff --git a/audacity-3.4.0-fix-build.patch b/audacity-3.4.0-fix-build.patch
index bdda5cb..ab00a3b 100644
--- a/audacity-3.4.0-fix-build.patch
+++ b/audacity-3.4.0-fix-build.patch
@@ -1,11 +1,26 @@
+From bd2ef6d1bf7302964742ed307861ab51bc19f65c Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <dmitry(a)crsib.me>
+Date: Mon, 6 Nov 2023 13:14:20 +0300
+Subject: [PATCH] Fixes the GCC build when targeting ARM CPUs with NEON support
+
+---
+ libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h b/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
+index 7bc3c3d49533..7bf36aceda57 100644
--- a/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
+++ b/libraries/lib-time-and-pitch/StaffPad/SimdTypes_neon.h
-@@ -45,7 +45,7 @@ struct float_x4
+@@ -44,8 +44,11 @@ struct float_x4
+ s.n128_f32[1] = v1;
s.n128_f32[2] = v2;
s.n128_f32[3] = v3;
- #else
-- s = {v0, v1, v2, v3};
-+ s = float32x4_t{v0, v1, v2, v3};
+-#else
++#elif __clang__
+ s = {v0, v1, v2, v3};
++#else
++ float f[4] = {v0, v1, v2, v3};
++ s = vld1q_f32(f);
#endif
}
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 0fdbfa7..2828320 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -1,10 +1,10 @@
%global __requires_exclude ^lib-.*.so
%global __provides_exclude ^lib-.*.so
-#global toolchain clang
+%global toolchain clang
Name: audacity-freeworld
-Version: 3.4.0
+Version: 3.4.2
Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
@@ -23,11 +23,11 @@ Patch0: audacity-2.4.2-fix-portmidi-as-system.patch
Patch1: audacity-2.4.2-fix-libmp3lame-as-system.patch
Patch2: audacity-non-x86.patch
Patch3: audacity-3.2.1-compile.patch
-Patch4: audacity-3.4.0-fix-build.patch
+Patch4: clang_fix.patch
BuildRequires: cmake
BuildRequires: gettext-devel
-BuildRequires: gcc-c++
+BuildRequires: clang
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
@@ -56,6 +56,7 @@ BuildRequires: portaudio-devel >= 19-16
BuildRequires: portmidi-devel
BuildRequires: rapidjson-devel
BuildRequires: serd-devel
+BuildRequires: shared-mime-info
BuildRequires: sord-devel
BuildRequires: soundtouch-devel
BuildRequires: soxr-devel
@@ -160,6 +161,9 @@ rm -f %{buildroot}%{_prefix}/%{realname}
%license LICENSE.txt
%changelog
+* Fri Nov 17 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.2-1
+- 3.4.2
+
* Fri Nov 03 2023 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.0-1
- 3.4.0
diff --git a/clang_fix.patch b/clang_fix.patch
new file mode 100644
index 0000000..0105fe9
--- /dev/null
+++ b/clang_fix.patch
@@ -0,0 +1,11 @@
+--- a/src/ListNavigationPanel.h
++++ b/src/ListNavigationPanel.h
+@@ -13,8 +13,6 @@
+ #include <wx/window.h>
+ #include <wx/containr.h>
+
+-extern template class WXDLLIMPEXP_CORE wxNavigationEnabled<wxWindow>;
+-
+ #include "ListNavigationEnabled.h"
+
+ //!Focusable widget container.
diff --git a/sources b/sources
index 787994f..7166df4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (Audacity-3.4.0.tar.gz) = 1fff66d3199591fed24a7b7a7ea3cb8b2a381c4f16d15a67949f2631a2e5ff2cac28a599b3ce28b0812de70f4984dfa51d37b3bed4e8f75deb4d5006817998d4
+SHA512 (Audacity-3.4.2.tar.gz) = a4a3bc68e46988e5538edbe6d8f42428b69e3f294b8d65337600e6806b516100d20a92135954f073c863d29767b904b781bd3a09cec40b8a85ee4463f52e1759
1 year
[buildsys-build-rpmfusion/el8] rebuild for kernel 4.18.0-513.5.1.el8_9
by Nicolas Chauvet
commit 9ff69d93bad5781f70e1ac313cebffc00dab70e0
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Nov 16 23:10:58 2023 +0100
rebuild for kernel 4.18.0-513.5.1.el8_9
buildsys-build-rpmfusion-kerneldevpkgs-current | 8 ++++----
buildsys-build-rpmfusion.spec | 5 ++++-
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/buildsys-build-rpmfusion-kerneldevpkgs-current b/buildsys-build-rpmfusion-kerneldevpkgs-current
index e0f761b..b7e7921 100644
--- a/buildsys-build-rpmfusion-kerneldevpkgs-current
+++ b/buildsys-build-rpmfusion-kerneldevpkgs-current
@@ -1,4 +1,4 @@
-4.18.0-477.10.1.el8_8
-4.18.0-477.10.1.el8_8smp
-4.18.0-477.10.1.el8_8PAE
-4.18.0-477.10.1.el8_8lpae
+4.18.0-513.5.1.el8_9
+4.18.0-513.5.1.el8_9smp
+4.18.0-513.5.1.el8_9PAE
+4.18.0-513.5.1.el8_9lpae
diff --git a/buildsys-build-rpmfusion.spec b/buildsys-build-rpmfusion.spec
index 2e6fe0e..d92ff4b 100644
--- a/buildsys-build-rpmfusion.spec
+++ b/buildsys-build-rpmfusion.spec
@@ -3,7 +3,7 @@
Name: buildsys-build-%{repo}
Epoch: 11
Version: 30
-Release: 12%{?dist}
+Release: 13%{?dist}
Summary: Tools and files used by the %{repo} buildsys
License: MIT
@@ -77,6 +77,9 @@ sed -i 's|^default_prefix=.*|default_prefix=%{_datadir}/%{name}/|' \
%changelog
+* Thu Nov 16 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 11:30-13
+- rebuild for kernel 4.18.0-513.5.1.el8_9
+
* Wed May 17 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 11:30-12
- rebuild for kernel 4.18.0-477.10.1.el8_8
1 year
[obs-studio-freeworld] sync with Fedora
by Dominik Mierzejewski
commit b0d0033c63355e32b307f721a0a3765770a8261f
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Thu Nov 16 19:19:34 2023 +0100
sync with Fedora
...ntly-reference-the-software-H264-encoder-.patch | 0
...Add-initial-support-for-the-OpenH264-H.26.patch | 0
...ort-for-OpenH264-as-the-worst-case-fallba.patch | 0
obs-studio-UI-use-fdk-aac-by-default.patch | 36 ++++
...studio-deps-Add-license-declaration-files.patch | 218 ---------------------
obs-studio-freeworld.spec | 18 +-
...io-obs-qsv11-Add-license-declaration-file.patch | 79 --------
obs-studio-websocket-use-system-qrcodegencpp.patch | 107 ----------
8 files changed, 46 insertions(+), 412 deletions(-)
---
diff --git a/0001-UI-Consistently-reference-the-software-H264-encoder-.patch b/0101-UI-Consistently-reference-the-software-H264-encoder-.patch
similarity index 100%
rename from 0001-UI-Consistently-reference-the-software-H264-encoder-.patch
rename to 0101-UI-Consistently-reference-the-software-H264-encoder-.patch
diff --git a/0002-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch b/0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
similarity index 100%
rename from 0002-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
rename to 0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
diff --git a/0003-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch b/0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
similarity index 100%
rename from 0003-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
rename to 0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
diff --git a/obs-studio-UI-use-fdk-aac-by-default.patch b/obs-studio-UI-use-fdk-aac-by-default.patch
new file mode 100644
index 0000000..5f9d1e1
--- /dev/null
+++ b/obs-studio-UI-use-fdk-aac-by-default.patch
@@ -0,0 +1,36 @@
+From 841fd01b7a529b7c1d0e0a509190a26eb1220d5a Mon Sep 17 00:00:00 2001
+From: Neal Gompa <neal(a)gompa.dev>
+Date: Thu, 4 May 2023 13:52:01 -0400
+Subject: [PATCH] UI: Default to fdk-aac for AAC when auto-configuring settings
+
+We always have the FDK-AAC codec available, and it's a better
+codec anyway.
+---
+ UI/window-basic-auto-config-test.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/UI/window-basic-auto-config-test.cpp b/UI/window-basic-auto-config-test.cpp
+index c791c8b8b..7dabfd93f 100644
+--- a/UI/window-basic-auto-config-test.cpp
++++ b/UI/window-basic-auto-config-test.cpp
+@@ -202,7 +202,7 @@ void AutoConfigTestPage::TestBandwidthThread()
+ (wiz->x264Available ? "obs_x264" : "ffmpeg_openh264"),
+ "test_h264", nullptr, nullptr);
+ OBSEncoderAutoRelease aencoder = obs_audio_encoder_create(
+- "ffmpeg_aac", "test_aac", nullptr, 0, nullptr);
++ "libfdk_aac", "test_aac", nullptr, 0, nullptr);
+ OBSServiceAutoRelease service = obs_service_create(
+ serverType, "test_service", nullptr, nullptr);
+
+@@ -572,7 +572,7 @@ bool AutoConfigTestPage::TestSoftwareEncoding()
+ (wiz->x264Available ? "obs_x264" : "ffmpeg_openh264"),
+ "test_h264", nullptr, nullptr);
+ OBSEncoderAutoRelease aencoder = obs_audio_encoder_create(
+- "ffmpeg_aac", "test_aac", nullptr, 0, nullptr);
++ "libfdk_aac", "test_aac", nullptr, 0, nullptr);
+ OBSOutputAutoRelease output =
+ obs_output_create("null_output", "null", nullptr, nullptr);
+
+--
+2.40.0
+
diff --git a/obs-studio-freeworld.spec b/obs-studio-freeworld.spec
index e15736b..51317b8 100644
--- a/obs-studio-freeworld.spec
+++ b/obs-studio-freeworld.spec
@@ -25,12 +25,12 @@
Name: obs-studio-freeworld
Version: 30.0.0
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Open Broadcaster Software Studio -- Freeworld plugins
# OBS itself is GPL-2.0-or-later, while various plugin dependencies are of various other licenses
# The licenses for those dependencies are captured with the bundled provides statements
-License: GPL-2.0-or-later and ISC and MIT and BSD-1-Clause and BSD-2-Clause and BSD-3-Clause and BSL-1.0 and LGPL-2.1-or-later and CC0-1.0 and (CC0-1.0 or OpenSSL or Apache-2.0) and LicenseRef-Fedora-Public-Domain and (BSD-3-Clause or GPL-2.0-only)
+License: GPL-2.0-or-later and MIT and BSD-1-Clause and BSD-2-Clause and BSD-3-Clause and BSL-1.0 and LGPL-2.1-or-later and CC0-1.0 and (CC0-1.0 or OpenSSL or Apache-2.0) and LicenseRef-Fedora-Public-Domain and (BSD-3-Clause or GPL-2.0-only)
URL: https://obsproject.com/
%if 0%{?snapdate}
Source0: https://github.com/obsproject/obs-studio/archive/%{commit}/%{origname}-%{...
@@ -43,14 +43,16 @@ Source1: https://github.com/obsproject/obs-websocket/archive/%{obswebsock
# Proposed upstream
## From: https://github.com/obsproject/obs-studio/pull/8529
-Patch0101: 0001-UI-Consistently-reference-the-software-H264-encoder-.patch
-Patch0102: 0002-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
-Patch0103: 0003-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
+Patch0101: 0101-UI-Consistently-reference-the-software-H264-encoder-.patch
+Patch0102: 0102-obs-ffmpeg-Add-initial-support-for-the-OpenH264-H.26.patch
+Patch0103: 0103-UI-Add-support-for-OpenH264-as-the-worst-case-fallba.patch
# Downstream Fedora patches
## Downgrade to CMake 3.20 for RHEL 9 compatibility
Patch1001: obs-studio-30-cmake-3.20.patch
+## Use fdk-aac by default
+Patch1002: obs-studio-UI-use-fdk-aac-by-default.patch
BuildRequires: gcc
@@ -130,8 +132,6 @@ Provides: bundled(blake2)
Provides: bundled(json11)
## License: MIT
Provides: bundled(libcaption)
-## License: ISC
-Provides: bundled(libff)
## License: BSD-1-Clause
Provides: bundled(uthash)
## License: BSD-3-Clause
@@ -244,7 +244,6 @@ cp deps/libcaption/LICENSE.txt .fedora-rpm/licenses/deps/libcaption-LICENSE.txt
cp plugins/obs-qsv11/QSV11-License-Clarification-Email.txt .fedora-rpm/licenses/plugins/QSV11-License-Clarification-Email.txt
cp deps/uthash/uthash/LICENSE .fedora-rpm/licenses/deps/uthash-LICENSE
cp deps/blake2/LICENSE.blake2 .fedora-rpm/licenses/deps/
-#cp deps/libff/LICENSE.libff .fedora-rpm/licenses/deps/
cp deps/media-playback/LICENSE.media-playback .fedora-rpm/licenses/deps/
cp libobs/graphics/libnsgif/LICENSE.libnsgif .fedora-rpm/licenses/deps/
cp libobs/util/simde/LICENSE.simde .fedora-rpm/licenses/deps/
@@ -290,6 +289,9 @@ mv preserve/%{_prefix} %{buildroot}
%changelog
+* Thu Nov 16 2023 Dominik Mierzejewski <dominik(a)greysector.net> - 30.0.0-2
+- sync with Fedora
+
* Wed Nov 15 2023 Nicolas Chauvet <kwizart(a)gmail.com> - 30.0.0-1
- Update to 30.0.0
1 year
[unrar/f37] Update to 7.0.3
by Leigh Scott
Summary of changes:
12e82e2... Update to 7.0.3 (*)
(*) This commit already existed in another branch; no separate mail sent
1 year