[audacity-freeworld/f35] 3.0.5
by Leigh Scott
Summary of changes:
546cacf... 3.0.5 (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 1 month
[wireguard-kmod/el8] Again
by Nicolas Chauvet
commit d3eb9036a76b20c3e603bc913e2a43dc1ddcd1a1
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 14 10:47:20 2021 +0200
Again
wireguard-kmod.spec | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 0868ef4..89a428a 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -40,11 +40,13 @@ This package contains the kmod module for WireGuard.
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
%setup -q -c -T -a 0
+(cd wireguard-linux-compat-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+)
for kernel_version in %{?kernel_versions} ; do
- %patch0 -p1
- %patch1 -p1
- %patch2 -p1
cp -a wireguard-linux-compat-%{version} _kmod_build_${kernel_version%%___*}
done
3 years, 1 month
[audacity-freeworld] 3.0.5
by Leigh Scott
commit 546cacf16087a9b20c90d5763927ce51afb571ae
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Oct 14 09:24:02 2021 +0100
3.0.5
.gitignore | 1 +
0001-Adds-an-option-to-disable-Conan.patch | 283 +++++++++++++++++++++
0001-Fixes-wxwidgets-fixup-script.patch | 37 +++
...braries-required-by-the-optional-features.patch | 64 +++++
Fixes-GCC11-compatibility.patch | 16 ++
audacity-freeworld.spec | 76 +++---
find-jack.patch | 22 --
permissions-fix.patch | 11 -
sources | 3 +-
system-wx.patch | 29 ---
10 files changed, 438 insertions(+), 104 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a9e9606..dcac5c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
/audacity-wxWidgets.tar.gz
/audacity-minsrc-3.0.2.tar.xz
/audacity-wxWidgets-2.4.2.tar.gz
+/Audacity-3.0.5.tar.gz
diff --git a/0001-Adds-an-option-to-disable-Conan.patch b/0001-Adds-an-option-to-disable-Conan.patch
new file mode 100644
index 0000000..3a82c70
--- /dev/null
+++ b/0001-Adds-an-option-to-disable-Conan.patch
@@ -0,0 +1,283 @@
+From 1968e81c79d21dafbc47c07214cac45865c58ac1 Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <vedenko(a)gmail.com>
+Date: Fri, 18 Jun 2021 20:26:26 +0300
+Subject: [PATCH] Adds an option to disable Conan
+
+---
+ BUILDING.md | 5 +
+ CMakeLists.txt | 8 +-
+ .../cmake-modules/AudacityDependencies.cmake | 156 ++++++++++--------
+ 3 files changed, 102 insertions(+), 67 deletions(-)
+
+diff --git a/BUILDING.md b/BUILDING.md
+index 62f6a0d62..7acd4ebec 100644
+--- a/BUILDING.md
++++ b/BUILDING.md
+@@ -187,3 +187,8 @@ $ docker run --rm -v ${pwd}:/audacity/audacity/ -v ${pwd}/../build/linux-system:
+ ```
+
+ To find system packages, we rely on `pkg-config`. There are several packages that have broken `*.pc` or do not use `pkg-config` at all. For the docker image - we handle this issue by installing the correct [`pc` files](linux/build-environment/pkgconfig/).
++
++### Disabling Conan
++
++Conan can be disabled completely using `-Daudacity_conan_enabled=Off` during the configuration.
++This option implies `-Daudacity_obey_system_dependencies=On` and disables `local` for packages that are managed with Conan.
+\ No newline at end of file
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index f6f52118b..014c3dfcb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -138,6 +138,12 @@ include( AudacityFunctions )
+
+ set_from_env(AUDACITY_ARCH_LABEL) # e.g. x86_64
+
++# Allow user to globally set the library preference
++cmd_option( ${_OPT}conan_enabled
++ "Use Conan package manager for 3d party dependencies"
++ On
++)
++
+ # Allow user to globally set the library preference
+ cmd_option( ${_OPT}lib_preference
+ "Library preference [system (if available), local]"
+@@ -510,7 +516,7 @@ resolve_conan_dependencies()
+
+ add_subdirectory( "help" )
+ if(${_OPT}has_crashreports)
+-add_subdirectory( "crashreports" )
++ add_subdirectory( "crashreports" )
+ endif()
+ add_subdirectory( "images" )
+ add_subdirectory( "libraries" )
+diff --git a/cmake-proxies/cmake-modules/AudacityDependencies.cmake b/cmake-proxies/cmake-modules/AudacityDependencies.cmake
+index 8fad83465..8d0cbb05c 100644
+--- a/cmake-proxies/cmake-modules/AudacityDependencies.cmake
++++ b/cmake-proxies/cmake-modules/AudacityDependencies.cmake
+@@ -1,10 +1,13 @@
+ # Load Conan
+-include( conan )
+
+-conan_add_remote(NAME audacity
+- URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
+- VERIFY_SSL True
+-)
++if( ${_OPT}conan_enabled )
++ include( conan )
++
++ conan_add_remote(NAME audacity
++ URL https://artifactory.audacityteam.org/artifactory/api/conan/conan-local
++ VERIFY_SSL True
++ )
++endif()
+
+ set( CONAN_BUILD_REQUIRES )
+ set( CONAN_REQUIRES )
+@@ -13,23 +16,29 @@ set( CONAN_ONLY_DEBUG_RELEASE )
+ set( CONAN_CONFIG_OPTIONS )
+ set( CONAN_RESOLVE_LIST )
+
+-# Add a Conan dependency
+-# Example usage:
+-# add_conan_lib(
+-# wxWdidget
+-# wxwidgets/3.1.3-audacity
+-# OPTION_NAME wxwidgets
+-# SYMBOL WXWIDGET
+-# REQUIRED
+-# ALWAYS_ALLOW_CONAN_FALLBACK
+-# PKG_CONFIG "wxwidgets >= 3.1.3"
+-# FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
+-# INTERFACE_NAME wxwidgets::wxwidgets
+-# HAS_ONLY_DEBUG_RELEASE
+-# CONAN_OPTIONS
+-# wxwidgets:shared=True
+-# )
++#[[
++Add a Conan dependency
++
++Example usage:
++
++add_conan_lib(
++ wxWdidget
++ wxwidgets/3.1.3-audacity
++ OPTION_NAME wxwidgets
++ SYMBOL WXWIDGET
++ REQUIRED
++ ALWAYS_ALLOW_CONAN_FALLBACK
++ PKG_CONFIG "wxwidgets >= 3.1.3"
++ FIND_PACKAGE_OPTIONS COMPONENTS adv base core html qa xml
++ INTERFACE_NAME wxwidgets::wxwidgets
++ HAS_ONLY_DEBUG_RELEASE
++ CONAN_OPTIONS
++ wxwidgets:shared=True
++)
+
++PKG_CONFIG accepts a list of possible package configurations.
++add_conan_lib will iterate over it one by one until the library is found.
++]]
+
+ function (add_conan_lib package conan_package_name )
+ # Extract the list of packages from the function args
+@@ -54,6 +63,8 @@ function (add_conan_lib package conan_package_name )
+ set( list_mode on )
+ set( allow_find_package on )
+ set( current_var "find_package_options" )
++ elseif ( opt STREQUAL "ALLOW_FIND_PACKAGE" )
++ set ( allow_find_package on )
+ elseif ( opt STREQUAL "CONAN_OPTIONS" )
+ set( list_mode on )
+ set( current_var "conan_package_options" )
+@@ -93,14 +104,23 @@ function (add_conan_lib package conan_package_name )
+
+ set( option_desc "local" )
+
+- if( pkg_config_options OR allow_find_package )
++ if( pkg_config_options OR allow_find_package OR NOT ${_OPT}conan_enabled )
+ set( sysopt "system" )
+ string( PREPEND option_desc "system (if available), " )
+- set( default "${${_OPT}lib_preference}" )
++
++ if( ${_OPT}conan_enabled )
++ set( default "${${_OPT}lib_preference}" )
++ else()
++ set( default "system" )
++ endif()
+ else()
+ set( default "local" )
+ endif()
+
++ if( ${_OPT}conan_enabled )
++ set( localopt "local" )
++ endif()
++
+ if( NOT required )
+ set( reqopt "off" )
+ string( APPEND option_desc ", off" )
+@@ -109,7 +129,7 @@ function (add_conan_lib package conan_package_name )
+ cmd_option( ${option_name}
+ "Use ${option_name_base} library [${option_desc}]"
+ "${default}"
+- STRINGS ${sysopt} "local" ${reqopt}
++ STRINGS ${sysopt} ${localopt} ${reqopt}
+ )
+
+ # Early bail out
+@@ -129,26 +149,28 @@ function (add_conan_lib package conan_package_name )
+ return()
+ endif()
+
+- if( ${option_name} STREQUAL "system" )
++ if( ${option_name} STREQUAL "system" OR NOT ${_OPT}conan_enabled )
+ if( pkg_config_options )
+- pkg_check_modules( PKG_${package} ${pkg_config_options} )
++ foreach(variant ${pkg_config_options})
++ pkg_check_modules( PKG_${package} ${variant} )
+
+- if( PKG_${package}_FOUND )
+- message( STATUS "Using '${package}' system library" )
+-
+- # Create the target interface library
+- add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
+-
+- # Retrieve the package information
+- get_package_interface( PKG_${package} )
++ if( PKG_${package}_FOUND )
++ message( STATUS "Using '${package}' system library" )
+
+- # And add it to our target
+- target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
+- target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
+-
+- message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
+- return()
+- endif()
++ # Create the target interface library
++ add_library( ${interface_name} INTERFACE IMPORTED GLOBAL)
++
++ # Retrieve the package information
++ get_package_interface( PKG_${package} )
++
++ # And add it to our target
++ target_include_directories( ${interface_name} INTERFACE ${INCLUDES} )
++ target_link_libraries( ${interface_name} INTERFACE ${LIBRARIES} )
++
++ message(STATUS "Added inteface ${interface_name} ${INCLUDES} ${LIBRARIES}")
++ return()
++ endif()
++ endforeach()
+ endif()
+
+ if( allow_find_package )
+@@ -160,7 +182,7 @@ function (add_conan_lib package conan_package_name )
+ endif()
+ endif()
+
+- if( system_only )
++ if( system_only OR NOT ${_OPT}conan_enabled )
+ message( FATAL_ERROR "Failed to find the system package ${package}" )
+ else()
+ set( ${option_name} "local" )
+@@ -237,34 +259,36 @@ function ( _conan_install build_type )
+ endfunction()
+
+ macro( resolve_conan_dependencies )
+- message(STATUS
+- "Executing Conan: \
+- REQUIRES ${CONAN_REQUIRES}
+- GENERATORS cmake_find_package_multi
+- BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
+- ${CONAN_CONFIG_OPTIONS}
+- OPTIONS ${CONAN_PACKAGE_OPTIONS}
+- ")
+-
+- if(MSVC OR XCODE)
+- foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
+- _conan_install(${TYPE})
+- endforeach()
+- else()
+- _conan_install(${CMAKE_BUILD_TYPE})
+- endif()
++ if( ${_OPT}conan_enabled )
++ message(STATUS
++ "Executing Conan: \
++ REQUIRES ${CONAN_REQUIRES}
++ GENERATORS cmake_find_package_multi
++ BUILD_REQUIRES ${CONAN_BUILD_REQUIRES}
++ ${CONAN_CONFIG_OPTIONS}
++ OPTIONS ${CONAN_PACKAGE_OPTIONS}
++ ")
++
++ if(MSVC OR XCODE)
++ foreach(TYPE ${CMAKE_CONFIGURATION_TYPES})
++ _conan_install(${TYPE})
++ endforeach()
++ else()
++ _conan_install(${CMAKE_BUILD_TYPE})
++ endif()
+
+- list( REMOVE_DUPLICATES CONAN_REQUIRES )
++ list( REMOVE_DUPLICATES CONAN_REQUIRES )
+
+- foreach( package ${CONAN_RESOLVE_LIST} )
+- message(STATUS "Resolving Conan library ${package}")
++ foreach( package ${CONAN_RESOLVE_LIST} )
++ message(STATUS "Resolving Conan library ${package}")
+
+- find_package(${package} CONFIG)
++ find_package(${package} CONFIG)
+
+- if (NOT ${package}_FOUND)
+- message( FATAL_ERROR "Failed to find the conan package ${package}" )
+- endif()
+- endforeach()
++ if (NOT ${package}_FOUND)
++ message( FATAL_ERROR "Failed to find the conan package ${package}" )
++ endif()
++ endforeach()
++ endif()
+
+ file(GLOB dependency_helpers "${AUDACITY_MODULE_PATH}/dependencies/*.cmake")
+
+--
+2.26.2
+
diff --git a/0001-Fixes-wxwidgets-fixup-script.patch b/0001-Fixes-wxwidgets-fixup-script.patch
new file mode 100644
index 0000000..a1a4b72
--- /dev/null
+++ b/0001-Fixes-wxwidgets-fixup-script.patch
@@ -0,0 +1,37 @@
+From 65886f5c2c568572602f6d82f4717508cb720f10 Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <vedenko(a)gmail.com>
+Date: Fri, 18 Jun 2021 20:29:22 +0300
+Subject: [PATCH] Fixes wxwidgets fixup script
+
+---
+ .../cmake-modules/dependencies/wxwidgets.cmake | 10 +++++++++-
+ 1 file changed, 9 insertions(+), 1 deletion(-)
+
+diff --git a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+index 2def9ae85..4b35e8947 100644
+--- a/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
++++ b/cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+@@ -1,4 +1,10 @@
+-if( ${_OPT}use_wxwidgets STREQUAL "system" )
++if( ${_OPT}use_wxwidgets STREQUAL "system" OR NOT ${_OPT}conan_enabled )
++ # DV: find_package will be scoped, as FindwxWidgets.cmake is rather outdated.
++ # Still - let's perform the sanity check first.
++ if( NOT wxWidgets_FOUND )
++ find_package( wxWidgets REQUIRED COMPONENTS adv base core html qa xml net )
++ endif()
++
+ if( NOT TARGET wxwidgets::wxwidgets )
+ add_library( wxwidgets::wxwidgets INTERFACE IMPORTED GLOBAL)
+ endif()
+@@ -74,6 +80,8 @@ if( ${_OPT}use_wxwidgets STREQUAL "system" )
+
+ set( toolkit "${wxWidgets_LIBRARIES}" )
+
++ message(STATUS "Trying to retrieve GTK version from ${toolkit}")
++
+ if( "${toolkit}" MATCHES ".*gtk2.*" )
+ set( gtk gtk+-2.0 )
+ set( glib glib-2.0 )
+--
+2.26.2
+
diff --git a/0001-Scope-libraries-required-by-the-optional-features.patch b/0001-Scope-libraries-required-by-the-optional-features.patch
new file mode 100644
index 0000000..7493d57
--- /dev/null
+++ b/0001-Scope-libraries-required-by-the-optional-features.patch
@@ -0,0 +1,64 @@
+From eb2df2c0f68f3086085001207ff17a12a2523e9f Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <vedenko(a)gmail.com>
+Date: Fri, 18 Jun 2021 20:26:58 +0300
+Subject: [PATCH] Scope libraries, required by the optional features
+
+---
+ cmake-proxies/CMakeLists.txt | 27 +++++++++++++++------------
+ 1 file changed, 15 insertions(+), 12 deletions(-)
+
+Index: b/cmake-proxies/CMakeLists.txt
+===================================================================
+--- a/cmake-proxies/CMakeLists.txt 2021-08-18 12:21:37.000000000 +0200
++++ b/cmake-proxies/CMakeLists.txt 2021-08-26 08:14:23.274727098 +0200
+@@ -87,6 +87,7 @@ add_conan_lib(
+ REQUIRED
+ INTERFACE_NAME libmp3lame::libmp3lame
+ PKG_CONFIG "lame >= 3.100"
++ ALLOW_FIND_PACKAGE
+ )
+
+ add_conan_lib(
+@@ -113,16 +114,16 @@ else()
+ set ( curl_ssl "openssl" )
+ endif ()
+
+-add_conan_lib(
+- ThreadPool
+- threadpool/20140926
+- REQUIRED
+- ALWAYS_ALLOW_CONAN_FALLBACK
+-)
+-
+ if( ${_OPT}has_networking )
+
+ add_conan_lib(
++ ThreadPool
++ threadpool/20140926
++ REQUIRED
++ ALWAYS_ALLOW_CONAN_FALLBACK
++ )
++
++ add_conan_lib(
+ CURL
+ libcurl/7.75.0
+ REQUIRED
+@@ -148,11 +149,13 @@ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwi
+ )
+ endif()
+
+-add_conan_lib(
+- RapidJSON
+- rapidjson/1.1.0
+- REQUIRED
+-)
++if( ${_OPT}has_sentry_reporting )
++ add_conan_lib(
++ RapidJSON
++ rapidjson/1.1.0
++ REQUIRED
++ )
++endif()
+
+ set_conan_vars_to_parent()
+
diff --git a/Fixes-GCC11-compatibility.patch b/Fixes-GCC11-compatibility.patch
new file mode 100644
index 0000000..fd74b92
--- /dev/null
+++ b/Fixes-GCC11-compatibility.patch
@@ -0,0 +1,16 @@
+From: Dave Plater davejplater(a)gmail.com
+ Date: Fri 27 Aug 15:03:07 SAST 2021
+ Subject: [PATCH] Fix build by adding #include <limits>
+
+ ---Index: b/libraries/lib-utility/MemoryX.h
+===================================================================
+--- a/libraries/lib-utility/MemoryX.h 2021-08-18 12:21:37.000000000 +0200
++++ b/libraries/lib-utility/MemoryX.h 2021-08-27 07:52:26.723479327 +0200
+@@ -10,6 +10,7 @@
+ #endif
+
+ #include <functional>
++#include <limits>
+
+ /*
+ * ArrayOf<X>
diff --git a/audacity-freeworld.spec b/audacity-freeworld.spec
index 675ceeb..6e6ca8d 100644
--- a/audacity-freeworld.spec
+++ b/audacity-freeworld.spec
@@ -1,8 +1,6 @@
# Disable rpath checking until upstream fixes the rpath: https://github.com/audacity/audacity/issues/1008
%global __brp_check_rpaths %{nil}
-%global __requires_exclude ^libwx_baseu-3.1.so|^libwx_baseu_net-3.1.so|^libwx_baseu_xml-3.1.so|^libwx_gtk2u_core-3.1.so|^libwx_gtk2u_html-3.1.so|^libwx_gtk2u_qa-3.1.so
-
# Compile options:
# invoke with: rpmbuild --with ffmpeg --with local_ffmpeg audacity.spec to use local ffmpeg
%bcond_without ffmpeg
@@ -13,8 +11,8 @@
Name: audacity-freeworld
-Version: 3.0.2
-Release: 3%{?dist}
+Version: 3.0.5
+Release: 1%{?dist}
Summary: Multitrack audio editor
License: GPLv2
URL: http://audacity.sourceforge.net
@@ -22,11 +20,7 @@ URL: http://audacity.sourceforge.net
%define realname audacity
Conflicts: %{realname}
-Source0: http://www.fosshub.com/Audacity.html/%{realname}-minsrc-%{version}.tar.xz
-# For alpha git snapshots for testing use the github archive as upstream source:
-#Source0: https://github.com/audacity/#{realname}/archive/#{commit0}/#{realname}-#{...
-# ie wget https://github.com/audacity/audacity/archive/ecdb1d81c9312789c6233aba2190...
-Source1: https://github.com/audacity/wxWidgets/archive/Audacity-2.4.2.tar.gz#/%{re...
+Source0: https://github.com/audacity/audacity/archive/Audacity-%{version}.tar.gz
%define tartopdir audacity-minsrc-%{version}
@@ -34,32 +28,24 @@ Source1: https://github.com/audacity/wxWidgets/archive/Audacity-2.4.2.tar.gz#/%{
# manual can be installed from the base Fedora Audacity package.
-# Remove the pathetic wxwidgets check
-Patch0: system-wx.patch
# Fix portmidi detection from cmake
-Patch1: audacity-2.4.2-fix-portmidi-as-system.patch
+Patch0: audacity-2.4.2-fix-portmidi-as-system.patch
# Fix libmp3lame detection from cmake
-Patch2: audacity-2.4.2-fix-libmp3lame-as-system.patch
-# Fix CMake find of the Jack module (RHBZ 1972963) - Remove for 3.0.3 (backported from master branch - https://github.com/audacity/audacity/commit/b4b5cc812483b311627bba48e26b9...)
-Patch3: find-jack.patch
-# Fix CVE-2020-1867 - Remove for 3.0.3 (backported from https://github.com/audacity/audacity/pull/700)
-Patch4: permissions-fix.patch
+Patch1: audacity-2.4.2-fix-libmp3lame-as-system.patch
+Patch2: 0001-Adds-an-option-to-disable-Conan.patch
+Patch3: 0001-Scope-libraries-required-by-the-optional-features.patch
+Patch4: 0001-Fixes-wxwidgets-fixup-script.patch
+Patch5: Fixes-GCC11-compatibility.patch
BuildRequires: cmake
BuildRequires: gettext-devel
-
-%if 0%{?rhel} == 7
-BuildRequires: devtoolset-7-toolchain, devtoolset-7-libatomic-devel
-%endif
-BuildRequires: gcc
BuildRequires: gcc-c++
-
BuildRequires: alsa-lib-devel
BuildRequires: desktop-file-utils
BuildRequires: expat-devel
BuildRequires: flac-devel
BuildRequires: git
-BuildRequires: gtk2-devel
+BuildRequires: gtk3-devel
BuildRequires: jack-audio-connection-kit-devel
BuildRequires: ladspa-devel
BuildRequires: lame-devel
@@ -70,6 +56,7 @@ BuildRequires: taglib-devel
BuildRequires: twolame-devel
BuildRequires: libogg-devel
BuildRequires: libsndfile-devel
+BuildRequires: libuuid-devel
BuildRequires: libvorbis-devel
BuildRequires: libX11-devel
BuildRequires: libXext-devel
@@ -86,6 +73,7 @@ BuildRequires: soxr-devel
BuildRequires: sratom-devel
BuildRequires: suil-devel
BuildRequires: vamp-plugin-sdk-devel >= 2.0
+BuildRequires: wxGTK-devel
BuildRequires: zip
BuildRequires: zlib-devel
BuildRequires: python3
@@ -113,29 +101,35 @@ This build has support for mp3 and ffmpeg import/export.
%prep
-%setup -q -n %{tartopdir}
-mkdir -p %{_vpath_builddir}/cmake-proxies/wxWidgets/wxwidgets
-tar -xf %{SOURCE1} -C %{_vpath_builddir}/cmake-proxies/wxWidgets/wxwidgets --strip 1
+%setup -q -n %{realname}-Audacity-%{version}
-%patch0 -p0
+%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p0
+%patch4 -p1
+%patch5 -p1
+
+# Make sure we use the system versions.
+rm -rf lib-src/{expat,libvamp,libsoxr,ffmpeg,lame}/
+
+#Included in src/AboutDialog.cpp but not supplied
+touch include/RevisionIdent.h
%build
-%if 0%{?rhel} == 7
-export WX_CONFIG=wx-config-3.0
-%endif
-%if 0%{?rhel} == 7
-. /opt/rh/devtoolset-7/enable
-%endif
# fix system lame detection
export PKG_CONFIG_PATH=$(pwd):$PKG_CONFIG_PATH
+export CFLAGS="%{optflags} -fno-strict-aliasing -ggdb $(wx-config --cflags)"
+export CXXFLAGS="$CFLAGS -std=gnu++11"
%cmake \
+ -DCMAKE_MODULE_LINKER_FLAGS:STRING="$(wx-config --libs)" \
+ -DCMAKE_SHARED_LINKER_FLAGS:STRING="$(wx-config --libs)" \
+ -Daudacity_conan_enabled=Off \
+ -Daudacity_has_networking:BOOL=Off \
+ -Daudacity_lib_preference:STRING=system \
-Daudacity_use_sndfile=system \
-Daudacity_use_soxr=system \
-Daudacity_use_lame=system \
@@ -155,9 +149,8 @@ export PKG_CONFIG_PATH=$(pwd):$PKG_CONFIG_PATH
-Daudacity_use_ffmpeg=linked \
%endif
%else
- -Daudacity_use_fmmpeg=off \
+ -Daudacity_use_fmmpeg=off
%endif
- -Daudacity_use_wxwidgets=local
%cmake_build
@@ -173,7 +166,7 @@ if appstream-util --help | grep -q replace-screenshots ; then
#
# See http://people.freedesktop.org/~hughsient/appdata/#screenshots for more details.
#
-appstream-util replace-screenshots %{buildroot}%{_datadir}/appdata/audacity.appdata.xml \
+appstream-util replace-screenshots %{buildroot}%{_metainfodir}/audacity.appdata.xml \
https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screens...
fi
%endif
@@ -187,6 +180,7 @@ mkdir %{buildroot}%{_datadir}/doc/%{realname}/nyquist
cp -pr lib-src/libnyquist/nyquist/license.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist
cp -pr lib-src/libnyquist/nyquist/Readme.txt %{buildroot}%{_datadir}/doc/%{realname}/nyquist
rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
+rm -f %{buildroot}%{_prefix}/%{realname}
%files -f %{realname}.lang
@@ -194,12 +188,11 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
%{_libdir}/%{realname}/
%dir %{_datadir}/%{realname}
%{_datadir}/%{realname}/EQDefaultCurves.xml
-%{_datadir}/%{realname}/modules/
%{_datadir}/%{realname}/nyquist/
%{_datadir}/%{realname}/plug-ins/
%{_mandir}/man*/*
%{_datadir}/applications/*
-%{_datadir}/appdata/%{realname}.appdata.xml
+%{_metainfodir}/%{realname}.appdata.xml
%{_datadir}/pixmaps/*
%{_datadir}/icons/hicolor/*/%{realname}.png
%{_datadir}/icons/hicolor/scalable/apps/%{realname}.svg
@@ -208,6 +201,9 @@ rm %{buildroot}%{_datadir}/doc/%{realname}/LICENSE.txt
%license LICENSE.txt
%changelog
+* Thu Oct 14 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3.0.5-1
+- 3.0.5
+
* Sat Oct 02 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3.0.2-3
- Add Fedora patches
diff --git a/sources b/sources
index 50c8ab6..fbc160b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-SHA512 (audacity-minsrc-3.0.2.tar.xz) = 9fb57b218ff9fdedc21a18feae7a7cac68db4ddcf92b4292ff11e516528f58e9a3c52cccb55b6e40af1e03f1eba0315ea97f77312709cce8d17eb43771a896aa
-SHA512 (audacity-wxWidgets-2.4.2.tar.gz) = 037ff9909be9ce8b5c930443172dd021c84246c7f18b25a13b5d9c9e7d7b2be360114f4138fcc6704cc6fc8153f207876c9f7b547d9a22a4d0e19a0e6206e29e
+SHA512 (Audacity-3.0.5.tar.gz) = d7585bf1b1715e54a79ab2c940dca91ec3041a97f02c5483eff9321bb7375401f868b7c394e06cf5e956017974ce21a0f0203c84d3a9b71745deb9a698b79131
3 years, 1 month
[wireguard-kmod/el8] Fix patch application
by Nicolas Chauvet
commit c1fa7e7ea03d9fd186d54be69e79a17d2ac092a7
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 14 10:23:09 2021 +0200
Fix patch application
wireguard-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 67ddd90..0868ef4 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -39,9 +39,12 @@ This package contains the kmod module for WireGuard.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0 -p 1
+%setup -q -c -T -a 0
for kernel_version in %{?kernel_versions} ; do
+ %patch0 -p1
+ %patch1 -p1
+ %patch2 -p1
cp -a wireguard-linux-compat-%{version} _kmod_build_${kernel_version%%___*}
done
3 years, 1 month
[wireguard-kmod/el8] Fix patch level
by Nicolas Chauvet
commit 4d1435ac3e8307e7969beafafcd6e59beae713ab
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 14 10:19:46 2021 +0200
Fix patch level
wireguard-kmod.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 09ed572..67ddd90 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -39,7 +39,7 @@ This package contains the kmod module for WireGuard.
# print kmodtool output for debugging purposes:
kmodtool --target %{_target_cpu} --repo rpmfusion --kmodname %{name} %{?buildforkernels:--%{buildforkernels}} %{?kernels:--for-kernels "%{?kernels}"} 2>/dev/null
-%autosetup -c -T -a 0 -p 0
+%autosetup -c -T -a 0 -p 1
for kernel_version in %{?kernel_versions} ; do
cp -a wireguard-linux-compat-%{version} _kmod_build_${kernel_version%%___*}
3 years, 1 month
[wireguard-kmod/el8] Update changelog
by Nicolas Chauvet
commit a81388a81a8880362dff9bd850cb63bfe35d2270
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 14 10:09:18 2021 +0200
Update changelog
wireguard-kmod.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 28c1d48..09ed572 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -6,7 +6,7 @@
Name: wireguard-kmod
Summary: Kernel module (kmod) for Wireguard
Version: 1.0.20210606
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
@@ -74,6 +74,9 @@ done
%changelog
+* Thu Oct 14 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.20210606-2
+- Backport patches
+
* Tue Jun 08 2021 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0.20210606-1
- Update to 1.0.20210606
3 years, 1 month
[wireguard-kmod/el8] Apply patches
by Nicolas Chauvet
commit 24aeea18039cc25ad3c7ac39ebf604828e527bbe
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 14 10:08:59 2021 +0200
Apply patches
wireguard-kmod.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 5855de0..28c1d48 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -11,6 +11,9 @@ License: GPLv2
URL: https://www.wireguard.com/
Source0: https://git.zx2c4.com/wireguard-linux-compat/snapshot/wireguard-linux-com...
+Patch0: 0001-compat-account-for-latest-c8s-backports.patch
+Patch1: 0002-compat-account-for-grsecurity-backports-and-changes.patch
+Patch2: 0003-crypto-curve25519-x86_64-solve-register-constraints-.patch
BuildRequires: kmodtool
%{!?kernels:BuildRequires: gcc, elfutils-libelf-devel, buildsys-build-rpmfusion-kerneldevpkgs-%{?buildforkernels:%{buildforkernels}}%{!?buildforkernels:current}-%{_target_cpu} }
3 years, 1 month
[wireguard-kmod/el8] Backport patches
by Nicolas Chauvet
commit 305f4cbad2688044110fee2bcb4be90d063fd964
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Oct 14 10:08:38 2021 +0200
Backport patches
0001-compat-account-for-latest-c8s-backports.patch | 44 ++++++++++++
...ount-for-grsecurity-backports-and-changes.patch | 84 ++++++++++++++++++++++
...e25519-x86_64-solve-register-constraints-.patch | 47 ++++++++++++
3 files changed, 175 insertions(+)
---
diff --git a/0001-compat-account-for-latest-c8s-backports.patch b/0001-compat-account-for-latest-c8s-backports.patch
new file mode 100644
index 0000000..c8136b1
--- /dev/null
+++ b/0001-compat-account-for-latest-c8s-backports.patch
@@ -0,0 +1,44 @@
+From 50dda8ce5ee691b97ae640aba4cbe55aa9b62085 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason(a)zx2c4.com>
+Date: Tue, 15 Jun 2021 01:13:41 +0200
+Subject: [PATCH 1/3] compat: account for latest c8s backports
+
+Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com>
+---
+ src/compat/compat.h | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/compat/compat.h b/src/compat/compat.h
+index 91d4388824ea..b2041327d85c 100644
+--- a/src/compat/compat.h
++++ b/src/compat/compat.h
+@@ -16,7 +16,7 @@
+ #define ISRHEL7
+ #elif RHEL_MAJOR == 8
+ #define ISRHEL8
+-#if RHEL_MINOR >= 4
++#if RHEL_MINOR >= 5
+ #define ISCENTOS8S
+ #endif
+ #endif
+@@ -757,7 +757,7 @@ static inline void crypto_xor_cpy(u8 *dst, const u8 *src1, const u8 *src2,
+ #define hlist_add_behind(a, b) hlist_add_after(b, a)
+ #endif
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(ISCENTOS8S)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 0, 0) && !defined(ISRHEL8)
+ #define totalram_pages() totalram_pages
+ #endif
+
+@@ -849,7 +849,7 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
+ #endif
+ #endif
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 5, 0) && !defined(ISCENTOS8S)
+ #define genl_dumpit_info(cb) ({ \
+ struct { struct nlattr **attrs; } *a = (void *)((u8 *)cb->args + offsetofend(struct dump_ctx, next_allowedip)); \
+ BUILD_BUG_ON(sizeof(cb->args) < offsetofend(struct dump_ctx, next_allowedip) + sizeof(*a)); \
+--
+2.31.1
+
diff --git a/0002-compat-account-for-grsecurity-backports-and-changes.patch b/0002-compat-account-for-grsecurity-backports-and-changes.patch
new file mode 100644
index 0000000..e2582d3
--- /dev/null
+++ b/0002-compat-account-for-grsecurity-backports-and-changes.patch
@@ -0,0 +1,84 @@
+From 29747255f9672035ccf9cc310b7ff66b1f35f1d2 Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli(a)grsecurity.net>
+Date: Tue, 6 Jul 2021 15:27:13 +0200
+Subject: [PATCH 2/3] compat: account for grsecurity backports and changes
+
+grsecurity kernels tend to carry additional backports and changes, like
+commit b60b87fc2996 ("netlink: add ethernet address policy types") or
+the SYM_FUNC_* changes. RAP nowadays hooks the latter, therefore no
+diversion to RAP_ENTRY is needed any more.
+
+Instead of relying on the kernel version test, also test for the macros
+we're about to define to not already be defined to account for these
+additional changes in the grsecurity patch without breaking
+compatibility to the older public ones.
+
+Also test for CONFIG_PAX instead of RAP_PLUGIN for the timer API related
+changes as these don't depend on the RAP plugin to be enabled but just a
+PaX/grsecurity patch to be applied. While there is no preprocessor knob
+for the latter, use CONFIG_PAX as this will likely be enabled in every
+kernel that uses the patch.
+
+Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
+[zx2c4: small changes to include a header nearby a macro def test]
+Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com>
+---
+ src/compat/compat-asm.h | 4 ++--
+ src/compat/compat.h | 8 +++++++-
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/src/compat/compat-asm.h b/src/compat/compat-asm.h
+index fde21dabba4f..5bfdb9410933 100644
+--- a/src/compat/compat-asm.h
++++ b/src/compat/compat-asm.h
+@@ -22,7 +22,7 @@
+ #endif
+
+ /* PaX compatibility */
+-#if defined(RAP_PLUGIN)
++#if defined(RAP_PLUGIN) && defined(RAP_ENTRY)
+ #undef ENTRY
+ #define ENTRY RAP_ENTRY
+ #endif
+@@ -51,7 +51,7 @@
+ #undef pull
+ #endif
+
+-#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) && !defined(ISCENTOS8S)
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 4, 76) && !defined(ISCENTOS8S) && !defined(SYM_FUNC_START)
+ #define SYM_FUNC_START ENTRY
+ #define SYM_FUNC_END ENDPROC
+ #endif
+diff --git a/src/compat/compat.h b/src/compat/compat.h
+index b2041327d85c..ee45a3cc7457 100644
+--- a/src/compat/compat.h
++++ b/src/compat/compat.h
+@@ -831,10 +831,16 @@ static inline void skb_mark_not_on_list(struct sk_buff *skb)
+ #endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(4, 20, 0) && !defined(ISRHEL8)
++#include <net/netlink.h>
++#ifndef NLA_POLICY_EXACT_LEN
+ #define NLA_POLICY_EXACT_LEN(_len) { .type = NLA_UNSPEC, .len = _len }
+ #endif
++#endif
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5, 2, 0) && !defined(ISRHEL8)
++#include <net/netlink.h>
++#ifndef NLA_POLICY_MIN_LEN
+ #define NLA_POLICY_MIN_LEN(_len) { .type = NLA_UNSPEC, .len = _len }
++#endif
+ #define COMPAT_CANNOT_INDIVIDUAL_NETLINK_OPS_POLICY
+ #endif
+
+@@ -1127,7 +1133,7 @@ static const struct header_ops ip_tunnel_header_ops = { .parse_protocol = ip_tun
+ #undef __read_mostly
+ #define __read_mostly
+ #endif
+-#if (defined(RAP_PLUGIN) || defined(CONFIG_CFI_CLANG)) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
++#if (defined(CONFIG_PAX) || defined(CONFIG_CFI_CLANG)) && LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0)
+ #include <linux/timer.h>
+ #define wg_expired_retransmit_handshake(a) wg_expired_retransmit_handshake(unsigned long timer)
+ #define wg_expired_send_keepalive(a) wg_expired_send_keepalive(unsigned long timer)
+--
+2.31.1
+
diff --git a/0003-crypto-curve25519-x86_64-solve-register-constraints-.patch b/0003-crypto-curve25519-x86_64-solve-register-constraints-.patch
new file mode 100644
index 0000000..773d3e2
--- /dev/null
+++ b/0003-crypto-curve25519-x86_64-solve-register-constraints-.patch
@@ -0,0 +1,47 @@
+From 8118c247a75ae95169f0a9a539dfc661ffda8bc5 Mon Sep 17 00:00:00 2001
+From: Mathias Krause <minipli(a)grsecurity.net>
+Date: Tue, 6 Jul 2021 15:27:14 +0200
+Subject: [PATCH 3/3] crypto: curve25519-x86_64: solve register constraints
+ with reserved registers
+
+The register constraints for the inline assembly in fsqr() and fsqr2()
+are pretty tight on what the compiler may assign to the remaining three
+register variables. The clobber list only allows the following to be
+used: RDI, RSI, RBP and R12. With RAP reserving R12 and a kernel having
+CONFIG_FRAME_POINTER=y, claiming RBP, there are only two registers left
+so the compiler rightfully complains about impossible constraints.
+
+Provide alternatives that'll allow a memory reference for 'out' to solve
+the allocation constraint dilemma for this configuration.
+
+Signed-off-by: Mathias Krause <minipli(a)grsecurity.net>
+Signed-off-by: Jason A. Donenfeld <Jason(a)zx2c4.com>
+---
+ src/crypto/zinc/curve25519/curve25519-x86_64.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/crypto/zinc/curve25519/curve25519-x86_64.c b/src/crypto/zinc/curve25519/curve25519-x86_64.c
+index 79716c425b0c..67f55affcf88 100644
+--- a/src/crypto/zinc/curve25519/curve25519-x86_64.c
++++ b/src/crypto/zinc/curve25519/curve25519-x86_64.c
+@@ -581,7 +581,7 @@ static inline void fsqr(u64 *out, const u64 *f, u64 *tmp)
+ " cmovc %%rdx, %%rax;"
+ " add %%rax, %%r8;"
+ " movq %%r8, 0(%0);"
+- : "+&r" (tmp), "+&r" (f), "+&r" (out)
++ : "+&r,&r" (tmp), "+&r,&r" (f), "+&r,m" (out)
+ :
+ : "%rax", "%rcx", "%rdx", "%r8", "%r9", "%r10", "%r11", "%rbx", "%r13", "%r14", "%r15", "memory", "cc"
+ );
+@@ -743,7 +743,7 @@ static inline void fsqr2(u64 *out, const u64 *f, u64 *tmp)
+ " cmovc %%rdx, %%rax;"
+ " add %%rax, %%r8;"
+ " movq %%r8, 32(%0);"
+- : "+&r" (tmp), "+&r" (f), "+&r" (out)
++ : "+&r,&r" (tmp), "+&r,&r" (f), "+&r,m" (out)
+ :
+ : "%rax", "%rcx", "%rdx", "%r8", "%r9", "%r10", "%r11", "%rbx", "%r13", "%r14", "%r15", "memory", "cc"
+ );
+--
+2.31.1
+
3 years, 1 month
[ppsspp] Release 1.12.2
by sagitter
commit 66711b1acd29e63ac9afffade95b69ec3472f531
Author: Antonio Trande <sagitter(a)fedoraproject.org>
Date: Wed Oct 13 19:21:37 2021 +0200
Release 1.12.2
.gitignore | 1 +
ppsspp.spec | 7 +++++--
sources | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 75398e1..dde832f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@
/ppsspp-ffmpeg-1.11.3.tar.gz
/ppsspp-1.12.tar.gz
/ppsspp-1.12.1.tar.gz
+/ppsspp-1.12.2.tar.gz
diff --git a/ppsspp.spec b/ppsspp.spec
index 0463cff..a78ffd8 100644
--- a/ppsspp.spec
+++ b/ppsspp.spec
@@ -73,7 +73,7 @@ ExcludeArch: %{power64}
Name: ppsspp
-Version: 1.12.1
+Version: 1.12.2
Release: 1%{?dist}
Summary: A PSP emulator
License: BSD and GPLv2+
@@ -83,7 +83,7 @@ URL: https://www.ppsspp.org/
## We need to checkout it, then download relative submodules
## which are not included in the source code:
##
-# git clone -b v1.11.3 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git
+# git clone -b v1.12.2 --depth 1 --single-branch --progress --recursive https://github.com/hrydgard/ppsspp.git
# cd ppsspp/ffmpeg && git checkout ??
# rm -rf ios Windows* windows* macosx blackberry* gas-preprocessor symbian* wiiu
# cd ..
@@ -424,6 +424,9 @@ fi
%{_datadir}/icons/%{name}/
%changelog
+* Wed Oct 13 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.12.2-1
+- Release 1.12.2
+
* Sat Oct 09 2021 Antonio Trande <sagitter(a)fedoraproject.org> - 1.12.1-1
- Release 1.12.1
diff --git a/sources b/sources
index 39bb8cf..b2ec6eb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ppsspp-1.12.1.tar.gz) = 2b7716e279254aac79b9a9008144f6dfd78678ab3001c59396d982ed4e98c99cd62b09e4c3472deee21e90fe7caf1f99c15105f4b367e3de296c3d7a6c8e3b4a
+SHA512 (ppsspp-1.12.2.tar.gz) = a2e9e27d86a8097d94e6b05f210826b8ba336d9c3748ee198594744e6d8565aa830f5a9ca491419dc9254f781641eb4b21d424d7997e8ef3c4d0e45938bb47f4
3 years, 1 month
[ffmpeg/el7] Release 3.4.9
by Leigh Scott
commit 90471c39acfa1a61c4cc905e5567b8a469e78bec
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Oct 13 08:34:20 2021 +0100
Release 3.4.9
ffmpeg.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index ece365c..6ccc833 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -66,7 +66,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
-Version: 3.4.8
+Version: 3.4.9
Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
License: %{ffmpeg_license}
URL: http://ffmpeg.org/
@@ -401,6 +401,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir}
%changelog
+* Wed Oct 13 2021 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.9-1
+- Release 3.4.9
+
* Sun Jul 05 2020 Leigh Scott <leigh123linux(a)gmail.com> - 3.4.8-1
- Release 3.4.8
diff --git a/sources b/sources
index 65851e4..b9d34a9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (ffmpeg-3.4.8.tar.xz) = cafa9affadfd373ef7a089888196b6853b305bed18acbcc735f3f546fa52c8555c3e6bd41055f0bf68925d9285030f6f85048d3365af588093710491a74fe78c
+SHA512 (ffmpeg-3.4.9.tar.xz) = f42a8082fb2163962b2120b047eba563f1329d23156fbc9b37a9e7bb5340704de4b87b801c4be979b5508da71a7a59bba8f28ec0c6ef91bc5fcdb7f6b786f3d2
3 years, 1 month
