[mixxx] Try to fix build of googletest on f36/rawhide
by Uwe Klotz
commit d427e78e9d44c8365ae9c36bd051b02a327d8b66
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Mon Jan 31 11:04:41 2022 +0100
Try to fix build of googletest on f36/rawhide
mixxx-googletest.patch | 26 ++++++++++++++++++++++++++
mixxx.spec | 1 +
2 files changed, 27 insertions(+)
---
diff --git a/mixxx-googletest.patch b/mixxx-googletest.patch
new file mode 100644
index 0000000..66aa228
--- /dev/null
+++ b/mixxx-googletest.patch
@@ -0,0 +1,26 @@
+From 6c48c4a0c1ef54b4929ae1b6da53439467984834 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz(a)mixxx.org>
+Date: Mon, 31 Jan 2022 10:55:24 +0100
+Subject: [PATCH] googletest: Disable GTEST_CAN_STREAM_RESULTS_
+
+To fix a build error on GCC 12
+---
+ lib/googletest/googletest/include/gtest/internal/gtest-port.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lib/googletest/googletest/include/gtest/internal/gtest-port.h b/lib/googletest/googletest/include/gtest/internal/gtest-port.h
+index 0953a781c0..acad2f6ed5 100644
+--- a/lib/googletest/googletest/include/gtest/internal/gtest-port.h
++++ b/lib/googletest/googletest/include/gtest/internal/gtest-port.h
+@@ -628,7 +628,7 @@ typedef struct _RTL_CRITICAL_SECTION GTEST_CRITICAL_SECTION;
+ // Determines whether test results can be streamed to a socket.
+ #if GTEST_OS_LINUX || GTEST_OS_GNU_KFREEBSD || GTEST_OS_DRAGONFLY || \
+ GTEST_OS_FREEBSD || GTEST_OS_NETBSD || GTEST_OS_OPENBSD
+-# define GTEST_CAN_STREAM_RESULTS_ 1
++# define GTEST_CAN_STREAM_RESULTS_ 0
+ #endif
+
+ // Defines some utility macros.
+--
+2.34.1
+
diff --git a/mixxx.spec b/mixxx.spec
index 920603d..7729750 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -33,6 +33,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{
# Append the actual downloaded file name with a preceding slash '/'
# as a fragment identifier to the URL to populate SOURCE1 correctly
Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
+Patch0: mixxx-googletest.patch
# Build Tools
BuildRequires: desktop-file-utils
2 years, 10 months
[mixxx/f34] New upstream release 2.3.2
by Uwe Klotz
commit 121b2c74a43eeafe262d666ca1078151c0f01acc
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sat Jan 22 23:54:46 2022 +0100
New upstream release 2.3.2
mixxx.spec | 21 +++++++++++----------
sources | 4 ++--
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 98e9d19..dcbabf6 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -12,7 +12,7 @@
#global gitcommitdate 20210615
# Additional sources
-%global libkeyfinder_archive v2.2.4.zip
+%global libkeyfinder_version 2.2.6
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -24,14 +24,15 @@
%endif
Name: mixxx
-Version: 2.3.1
+Version: 2.3.2
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{sources}....
-# Temporarily rename the libkeyfinder archive for disambiguation while downloading sources
-Source1: https://github.com/mixxxdj/libkeyfinder/archive/%{libkeyfinder_archive}#/...
+# Append the actual downloaded file name with a preceding slash '/'
+# as a fragment identifier to the URL to populate SOURCE1 correctly
+Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
# Build Tools
BuildRequires: desktop-file-utils
@@ -108,12 +109,9 @@ echo "#pragma once" > src/build.h
%endif
# Copy the libkeyfinder archive from the sources folder into the
-# dedicated download folder of the build directory. Thereby rename
-# the archive back into the original name as expected by the CMake
-# build.
-mkdir -p %{__cmake_builddir}/download/libkeyfinder
-cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
-
+# dedicated downloads folder of the build directory.
+mkdir -p %{__cmake_builddir}/downloads
+cp %{SOURCE1} %{__cmake_builddir}/downloads
%build
%cmake \
@@ -209,6 +207,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Mon Jan 31 2022 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.2-1
+- New upstream release 2.3.2
+
* Wed Sep 29 2021 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.1-1
- New upstream release 2.3.1
diff --git a/sources b/sources
index 65763b9..d9815e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libkeyfinder_v2.2.4.zip) = fcdd2a645d2770b62d30d2ee552fcfdd688692754779a1e13a9fd36e705a987a46ff388a094ec6dc4fdb5e58f4fc40efff0492e5ee820ec4962ed96fbb4b5c67
-SHA512 (mixxx-2.3.1.tar.gz) = 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
+SHA512 (libkeyfinder-2.2.6.zip) = 23ffcc4da59019349824b60dd1b125d559f39d7731fe7f00cdc8f4a97a342fa59ef5183c4e272ff4c5fd06eaa89c581e07fdb26bcfd3c98cc42d2dcc29e13e1e
+SHA512 (mixxx-2.3.2.tar.gz) = 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
2 years, 10 months
[mixxx/f34] Drop obsolete cmake version suffix
by Uwe Klotz
commit 629ad6e56fc4f224640b56ba968bf94c5636ebb1
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Oct 14 15:43:28 2021 +0200
Drop obsolete cmake version suffix
mixxx.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 172f9ae..98e9d19 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -37,7 +37,7 @@ Source1: https://github.com/mixxxdj/libkeyfinder/archive/%{libkeyfinder_a
BuildRequires: desktop-file-utils
BuildRequires: appstream
BuildRequires: protobuf-compiler
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: ccache
BuildRequires: gcc-c++
BuildRequires: ninja-build
@@ -116,7 +116,7 @@ cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
%build
-%cmake3 \
+%cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPTIMIZE=portable \
@@ -138,13 +138,13 @@ cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
-DVINYLCONTROL=ON \
-DWAVPACK=ON
-%cmake3_build
+%cmake_build
%install
# Install build artifacts
-%cmake3_install
+%cmake_install
# Install desktop launcher
desktop-file-install \
2 years, 10 months
[mixxx] New upstream release 2.3.2
by Uwe Klotz
commit 6c1437d16106e04cb5e3d38089be02accc47b0b9
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Sat Jan 22 23:54:46 2022 +0100
New upstream release 2.3.2
mixxx.spec | 21 +++++++++++----------
sources | 4 ++--
2 files changed, 13 insertions(+), 12 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 6a0fcd3..920603d 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -12,7 +12,7 @@
#global gitcommitdate 20210615
# Additional sources
-%global libkeyfinder_archive v2.2.4.zip
+%global libkeyfinder_version 2.2.6
%if "%{?gitcommit}" == ""
# (Pre-)Releases
@@ -24,14 +24,15 @@
%endif
Name: mixxx
-Version: 2.3.1
+Version: 2.3.2
Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{sources}....
-# Temporarily rename the libkeyfinder archive for disambiguation while downloading sources
-Source1: https://github.com/mixxxdj/libkeyfinder/archive/%{libkeyfinder_archive}#/...
+# Append the actual downloaded file name with a preceding slash '/'
+# as a fragment identifier to the URL to populate SOURCE1 correctly
+Source1: https://github.com/mixxxdj/libkeyfinder/archive/refs/tags/v%{libkeyfinder...
# Build Tools
BuildRequires: desktop-file-utils
@@ -108,12 +109,9 @@ echo "#pragma once" > src/build.h
%endif
# Copy the libkeyfinder archive from the sources folder into the
-# dedicated download folder of the build directory. Thereby rename
-# the archive back into the original name as expected by the CMake
-# build.
-mkdir -p %{__cmake_builddir}/download/libkeyfinder
-cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
-
+# dedicated downloads folder of the build directory.
+mkdir -p %{__cmake_builddir}/downloads
+cp %{SOURCE1} %{__cmake_builddir}/downloads
%build
%cmake \
@@ -209,6 +207,9 @@ appstreamcli \
%{_udevrulesdir}/69-%{name}-usb-uaccess.rules
%changelog
+* Mon Jan 31 2022 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.2-1
+- New upstream release 2.3.2
+
* Wed Sep 29 2021 Uwe Klotz <uklotz(a)mixxx.org> - 2.3.1-1
- New upstream release 2.3.1
diff --git a/sources b/sources
index 65763b9..d9815e2 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (libkeyfinder_v2.2.4.zip) = fcdd2a645d2770b62d30d2ee552fcfdd688692754779a1e13a9fd36e705a987a46ff388a094ec6dc4fdb5e58f4fc40efff0492e5ee820ec4962ed96fbb4b5c67
-SHA512 (mixxx-2.3.1.tar.gz) = 17cf8dee2aaca2ed85067474d40b0955abd22268767a9c68dbc8126554e6b216ddab9a42b6c888606aca61fdcccccda3062f5b4f1f550722c5033c516e046816
+SHA512 (libkeyfinder-2.2.6.zip) = 23ffcc4da59019349824b60dd1b125d559f39d7731fe7f00cdc8f4a97a342fa59ef5183c4e272ff4c5fd06eaa89c581e07fdb26bcfd3c98cc42d2dcc29e13e1e
+SHA512 (mixxx-2.3.2.tar.gz) = 81282d6c587914157b9ef4a7ca2f0e886cb97a847e215e2b0496671938d392e3fc8f941071577bc69db517e677dcd96b72e4b53d6fd42d2224c8a4e62d2acbcd
2 years, 10 months
[mixxx] Drop obsolete cmake version suffix
by Uwe Klotz
commit 88417e5ec8a6dfda05b22c8e0c5fb0b6e3b74fad
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Oct 14 15:43:28 2021 +0200
Drop obsolete cmake version suffix
mixxx.spec | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index b1ac969..6a0fcd3 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -37,7 +37,7 @@ Source1: https://github.com/mixxxdj/libkeyfinder/archive/%{libkeyfinder_a
BuildRequires: desktop-file-utils
BuildRequires: appstream
BuildRequires: protobuf-compiler
-BuildRequires: cmake3
+BuildRequires: cmake
BuildRequires: ccache
BuildRequires: gcc-c++
BuildRequires: ninja-build
@@ -116,7 +116,7 @@ cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
%build
-%cmake3 \
+%cmake \
-GNinja \
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DOPTIMIZE=portable \
@@ -138,13 +138,13 @@ cp %{SOURCE1} %{__cmake_builddir}/download/libkeyfinder/%{libkeyfinder_archive}
-DVINYLCONTROL=ON \
-DWAVPACK=ON
-%cmake3_build
+%cmake_build
%install
# Install build artifacts
-%cmake3_install
+%cmake_install
# Install desktop launcher
desktop-file-install \
2 years, 10 months
