commit dc060d7232473077d789434c7e18ad45026e95df Author: Uwe Klotz <uklotz(a)mixxx.org&gt; Date: Fri Mar 20 14:32:43 2020 +0100 Update bundled google/benchmark library .gitignore | 2 +- mixxx.spec | 21 +++------- sources | 2 +- usb_hidapi_udev_rules0.patch | 95 -------------------------------------------- usb_hidapi_udev_rules1.patch | 79 ------------------------------------ 5 files changed, 7 insertions(+), 192 deletions(-) --- diff --git a/.gitignore b/.gitignore index 91c9a9c..b62b3c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/mixxx-9c15f9eb257f4a65419d1e582f7907897bd28ed4.tar.gz +/mixxx-79809419ea8b4c1c9a846cde1aec60a1b527b0f2.tar.gz diff --git a/mixxx.spec b/mixxx.spec index 323b37d..de6d4d7 100644 --- a/mixxx.spec +++ b/mixxx.spec @@ -2,9 +2,9 @@ %global extraver alpha # Optional: Only used for untagged snapshot versions -%global gitcommit 9c15f9eb257f4a65419d1e582f7907897bd28ed4 +%global gitcommit 79809419ea8b4c1c9a846cde1aec60a1b527b0f2 # Format: <yyyymmdd> -%global gitcommitdate 20200318 +%global gitcommitdate 20200320 %if "%{?gitcommit}" == "" # (Pre-)Releases @@ -23,8 +23,6 @@ Group: Applications/Multimedia License: GPLv2+ URL: http://www.mixxx.org Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s... -Patch0: usb_hidapi_udev_rules0.patch -Patch1: usb_hidapi_udev_rules1.patch # Build Tools BuildRequires: desktop-file-utils @@ -100,8 +98,6 @@ cd cmake_build %cmake \ -DCMAKE_BUILD_TYPE=Release \ -DOPTIMIZE=portable \ - -DINSTALL_GTEST=OFF \ - -DWITH_STATIC_PIC=ON \ -DBATTERY=ON \ -DBROADCAST=ON \ -DBULK=ON \ @@ -118,15 +114,7 @@ cd cmake_build -DWAVPACK=ON \ .. -# Exclude tests from build -# The bundled legacy gbenchmark lib cannot be built successfully -# for all architectures. This is the reason why we can't use the -# make_build macro here und must instead use plain cmake with an -# explicit build target. -cmake \ - --build . \ - --target mixxx \ - %{?_smp_mflags} +%make_build %install @@ -191,8 +179,9 @@ appstream-util \ %changelog -* Wed Mar 18 2020 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.3.0-0.2.alpha.20200318gitdf88442 +* Wed Mar 20 2020 Uwe Klotz <uklotz(a)mixxx.org&gt; - 2.3.0-0.2.alpha.20200320git7980941 - New upstream snapshot 2.3.0-pre-alpha +- Fix udev rules for USB HID devices - Build debuginfo packages - Use cmake macros for the build diff --git a/sources b/sources index 817d8ec..5a4e54e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (mixxx-9c15f9eb257f4a65419d1e582f7907897bd28ed4.tar.gz) = f949f94d09dc5fb51b4aff03a9fa4d61e264c7cb97bb3716bc5b6ed33d0c55ca0a902b3d34f2c105b8e241a827c1f803b417b5df8a59de8578720f0faf761649 +SHA512 (mixxx-79809419ea8b4c1c9a846cde1aec60a1b527b0f2.tar.gz) = a04e3b98ed54ac2e20e0caaa902079816da475dec3336b230ab30846e57a76e636fd1ade824ba3a2a1f8902ec3fac4126a12d35f5a8d8e0e60c2c9a9aa1ccc6b