[chromaprint-tools] Update to 1.5.0
by Leigh Scott
commit 06d588de8667ae18a46df63423781598e4b0a2fa
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Apr 23 11:28:38 2020 +0100
Update to 1.5.0
.gitignore | 1 +
chromaprint-tools.spec | 22 ++++++++++++++++------
sources | 2 +-
3 files changed, 18 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 98d3648..ab66dd8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ chromaprint-1.1.tar.gz
chromaprint-1.2.tar.gz
/chromaprint-1.4.2.tar.gz
/chromaprint-1.4.3.tar.gz
+/chromaprint-1.5.0.tar.gz
diff --git a/chromaprint-tools.spec b/chromaprint-tools.spec
index 0d3fc40..69adb96 100644
--- a/chromaprint-tools.spec
+++ b/chromaprint-tools.spec
@@ -1,6 +1,6 @@
Name: chromaprint-tools
-Version: 1.4.3
-Release: 5%{?dist}
+Version: 1.5.0
+Release: 1%{?dist}
Summary: Chromaprint audio fingerprinting tools
License: GPLv2+
URL: http://www.acoustid.org/chromaprint
@@ -9,6 +9,7 @@ Source: https://github.com/acoustid/chromaprint/releases/download/v%{ver
BuildRequires: cmake3
BuildRequires: gcc-c++
BuildRequires: fftw-devel >= 3
+BuildRequires: ninja-build
# examples requires ffmpeg
BuildRequires: ffmpeg-devel
@@ -27,15 +28,21 @@ featuring fpcalc an standalone AcoustID tool used by Picard.
License for binaries is GPLv2+ but source code is MIT + LGPLv2+
%prep
-%setup -q -n chromaprint-v%{version}
+%autosetup -n chromaprint-v%{version}
%build
-%cmake3 -DBUILD_EXAMPLES=ON -DBUILD_TESTS=OFF -DCMAKE_BUILD_TYPE=Release -DBUILD_TOOLS=ON
-%make_build
+mkdir -p build
+pushd build
+%cmake3 -GNinja \
+ -DBUILD_TESTS=OFF \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DBUILD_TOOLS=ON ..
+%ninja_build
+popd
%install
-%make_install
+%ninja_install -C build
# cleaning files managed in the chromaprint main package
rm -f %{buildroot}%{_includedir}/chromaprint.h
@@ -49,6 +56,9 @@ rm -f %{buildroot}%{_libdir}/lib*.so*
%{_bindir}/fpcalc
%changelog
+* Thu Apr 23 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1.5.0-1
+- Update to 1.5.0
+
* Sat Feb 22 2020 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 1.4.3-5
- Rebuild for ffmpeg-4.3 git
diff --git a/sources b/sources
index 3c90b20..8d7143e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-20014ca19974de9657d91d331d11f936 chromaprint-1.4.3.tar.gz
+SHA512 (chromaprint-1.5.0.tar.gz) = 25ab3f7834581a8204ac09614fef6036c801f5f8b7b72a864701ca0de8082b2458a2bd7c075d53451581d770898576411cdcfb23ce609bc82f9d9b395cc1a129
4 years
[wireguard-kmod/f30: 2/2] Merge branch 'f31' into f30
by Nicolas Chauvet
commit 72165e4fdae9153b632acf3bfedf5475b45194dd
Merge: 8a60306 2c0a54b
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Apr 23 11:46:02 2020 +0200
Merge branch 'f31' into f30
wireguard-kmod.spec | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
---
4 years
[wireguard-kmod/f31] Don't build wireguard on kernel >= 5.6
by Nicolas Chauvet
commit 2c0a54bad7eed78c459a5f41ff1f4d71070e626c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Tue Apr 14 13:28:35 2020 +0200
Don't build wireguard on kernel >= 5.6
wireguard-kmod.spec | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
---
diff --git a/wireguard-kmod.spec b/wireguard-kmod.spec
index 340cb7d..4389ae5 100644
--- a/wireguard-kmod.spec
+++ b/wireguard-kmod.spec
@@ -6,7 +6,7 @@
Name: wireguard-kmod
Summary: Kernel module (kmod) for Wireguard
Version: 0.0.20191219
-Release: 2%{?dist}
+Release: 3%{?dist}
License: GPLv2
URL: https://www.wireguard.com/
@@ -46,6 +46,12 @@ done
%build
for kernel_version in %{?kernel_versions} ; do
+# We don't override kernel wireguard module (unless forced) until the packages are obsoleted by f32
+%if 0%{!?_with_kmod_wireguard_override:1}
+ if [[ ${kernel_version%%___*} -ge 5.6 ]] ; then
+ continue
+ fi
+%endif
make V=1 %{?_smp_mflags} -C ${kernel_version##*___} M=${PWD}/_kmod_build_${kernel_version%%___*}/src modules
done
@@ -53,6 +59,12 @@ done
%install
for kernel_version in %{?kernel_versions}; do
mkdir -p %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/
+# We don't override kernel wireguard module (unless forced) until the packages are obsoleted by f32
+%if 0%{!?_with_kmod_wireguard_override:1}
+ if [[ ${kernel_version%%___*} -ge 5.6 ]] ; then
+ continue
+ fi
+%endif
install -D -m 755 -t %{buildroot}%{kmodinstdir_prefix}/${kernel_version%%___*}/%{kmodinstdir_postfix}/ $(find _kmod_build_${kernel_version%%___*}/ -name '*.ko')
chmod u+x %{buildroot}%{_prefix}/lib/modules/*/extra/*/*
done
@@ -60,6 +72,9 @@ done
%changelog
+* Tue Apr 14 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.20191219-3
+- Disable wireguard until obsoleted
+
* Thu Apr 09 2020 Leigh Scott <leigh123linux(a)gmail.com> - 0.0.20191219-2
- Patch for kernel-5.5.15
4 years
[simplescreenrecorder/el7: 8/8] Merge branch 'master' into el7
by Vasiliy Glazov
commit f268e0925356771062ccdf46c08476f067fe1bd6
Merge: 022a446 4197efc
Author: vascom <vascom2(a)gmail.com>
Date: Thu Apr 23 12:26:02 2020 +0300
Merge branch 'master' into el7
.gitignore | 2 ++
simplescreenrecorder.spec | 53 ++++++++++++++++++++++++++---------------------
sources | 2 +-
3 files changed, 32 insertions(+), 25 deletions(-)
---
4 years
