[mixxx/f29] Use XCB instead of the default Qt Wayland platform adapter
by Uwe Klotz
commit 326283ad5b80084ff2bad62a757dd49e54ccabd9
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Oct 31 23:15:54 2019 +0100
Use XCB instead of the default Qt Wayland platform adapter
https://bugs.launchpad.net/mixxx/+bug/1850729
https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
launcher-platform-xcb.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++
mixxx.spec | 7 +++++-
2 files changed, 59 insertions(+), 1 deletion(-)
---
diff --git a/launcher-platform-xcb.patch b/launcher-platform-xcb.patch
new file mode 100644
index 0000000..d9311bf
--- /dev/null
+++ b/launcher-platform-xcb.patch
@@ -0,0 +1,53 @@
+From c4197fa4cf7e4bfa7f24850fd619a77e9e4f2f32 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz(a)mixxx.org>
+Date: Thu, 31 Oct 2019 21:16:51 +0100
+Subject: [PATCH 1/2] Disable QtWayland in desktop launcher
+
+https://bugs.launchpad.net/mixxx/+bug/1850729
+---
+ build/debian/mixxx.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
+index fc89fa6da1..3bad29a170 100644
+--- a/build/debian/mixxx.desktop
++++ b/build/debian/mixxx.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=Mixxx
+ GenericName=Digital DJ interface
+ Comment=A digital DJ interface
+-Exec=pasuspender -- mixxx
++Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
+ Terminal=false
+ Icon=mixxx_icon
+ Type=Application
+--
+2.23.0
+
+
+From 55d700f4894164b7b8f463eea319cdb9896d3b3d Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz(a)mixxx.org>
+Date: Thu, 31 Oct 2019 22:55:20 +0100
+Subject: [PATCH 2/2] Use command-line argument to select the platform
+ abstraction
+
+---
+ build/debian/mixxx.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
+index 3bad29a170..c7c96e7720 100644
+--- a/build/debian/mixxx.desktop
++++ b/build/debian/mixxx.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=Mixxx
+ GenericName=Digital DJ interface
+ Comment=A digital DJ interface
+-Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
++Exec=pasuspender -- mixxx -platform xcb
+ Terminal=false
+ Icon=mixxx_icon
+ Type=Application
+--
+2.23.0
+
diff --git a/mixxx.spec b/mixxx.spec
index aa3cfc1..25ce296 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,12 +17,13 @@
Name: mixxx
Version: 2.2.2
-Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
+Patch0: launcher-platform-xcb.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -162,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Thu Oct 31 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-2
+- Use XCB instead of the default Qt Wayland platform adapter
+- Use system libebur128
+
* Wed Aug 14 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-1
- New upstream release 2.2.2
4 years, 6 months
[mixxx/f29] Use system libebur128
by Uwe Klotz
commit 4733959e8061203cbe3b426f194823c8e29564fc
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Oct 31 23:04:28 2019 +0100
Use system libebur128
mixxx.spec | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 69ab35e..aa3cfc1 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -38,6 +38,7 @@ BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
+BuildRequires: libebur128-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libchromaprint-devel
@@ -69,12 +70,6 @@ BuildRequires: taglib-devel
BuildRequires: upower-devel
BuildRequires: wavpack-devel
-# Bundled Requirements
-# The following essential libraries for audio processing are
-# currently bundled and statically linked to avoid unexpected
-# behavior due to version differences.
-#BuildRequires: libebur128-devel
-
%description
Mixxx is open source software for DJ'ing. You can use
4 years, 6 months
[mixxx/f29] Remove obsolete dependency (already commented out)
by Uwe Klotz
commit 37d68a92a50582c4a210c31a902cb25af49c4c17
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Aug 9 21:11:29 2019 +0200
Remove obsolete dependency (already commented out)
mixxx.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index fb24aad..69ab35e 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -74,7 +74,6 @@ BuildRequires: wavpack-devel
# currently bundled and statically linked to avoid unexpected
# behavior due to version differences.
#BuildRequires: libebur128-devel
-#BuildRequires: vamp-plugin-sdk-devel
%description
4 years, 6 months
[mixxx/f29] Add TODO notes for upgrading to a newer SCons version with Mixxx 2.3.0
by Uwe Klotz
commit 0bd56c7292fd3539bbe2824444a7a0f858046f6f
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Aug 9 21:10:48 2019 +0200
Add TODO notes for upgrading to a newer SCons version with Mixxx 2.3.0
mixxx.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/mixxx.spec b/mixxx.spec
index bb03686..fb24aad 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -28,6 +28,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: protobuf-compiler
+# TODO: Update to python3-scons for 2.3.0
BuildRequires: python2-scons
# Build Requirements
@@ -101,6 +102,7 @@ MIDI and HID devices.
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
+# TODO: Switch from scons-2 to scons(-3) for 2.3.0
scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
@@ -121,6 +123,7 @@ scons-2 %{?_smp_mflags} \
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
+# TODO: Switch from scons-2 to scons(-3) for 2.3.0
scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
4 years, 6 months
[mixxx/f29] fix scons command
by Uwe Klotz
commit 600b07d6f4b8453eae6f519103e28136b1026df9
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 7 15:34:40 2019 +0100
fix scons command
mixxx.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 3b5698d..bb03686 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -101,7 +101,7 @@ MIDI and HID devices.
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-scons %{?_smp_mflags} \
+scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
build=release \
@@ -121,7 +121,7 @@ scons %{?_smp_mflags} \
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-scons %{?_smp_mflags} \
+scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
install_root=$RPM_BUILD_ROOT%{_prefix} \
4 years, 6 months
[mixxx/f30] Use XCB instead of the default Qt Wayland platform adapter
by Uwe Klotz
commit ea0a66423a5e50d3d743ca2437eba46267a2dae8
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Oct 31 23:15:54 2019 +0100
Use XCB instead of the default Qt Wayland platform adapter
https://bugs.launchpad.net/mixxx/+bug/1850729
https://fedoraproject.org/wiki/Changes/Qt_Wayland_By_Default_On_Gnome
launcher-platform-xcb.patch | 53 +++++++++++++++++++++++++++++++++++++++++++++
mixxx.spec | 7 +++++-
2 files changed, 59 insertions(+), 1 deletion(-)
---
diff --git a/launcher-platform-xcb.patch b/launcher-platform-xcb.patch
new file mode 100644
index 0000000..d9311bf
--- /dev/null
+++ b/launcher-platform-xcb.patch
@@ -0,0 +1,53 @@
+From c4197fa4cf7e4bfa7f24850fd619a77e9e4f2f32 Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz(a)mixxx.org>
+Date: Thu, 31 Oct 2019 21:16:51 +0100
+Subject: [PATCH 1/2] Disable QtWayland in desktop launcher
+
+https://bugs.launchpad.net/mixxx/+bug/1850729
+---
+ build/debian/mixxx.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
+index fc89fa6da1..3bad29a170 100644
+--- a/build/debian/mixxx.desktop
++++ b/build/debian/mixxx.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=Mixxx
+ GenericName=Digital DJ interface
+ Comment=A digital DJ interface
+-Exec=pasuspender -- mixxx
++Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
+ Terminal=false
+ Icon=mixxx_icon
+ Type=Application
+--
+2.23.0
+
+
+From 55d700f4894164b7b8f463eea319cdb9896d3b3d Mon Sep 17 00:00:00 2001
+From: Uwe Klotz <uklotz(a)mixxx.org>
+Date: Thu, 31 Oct 2019 22:55:20 +0100
+Subject: [PATCH 2/2] Use command-line argument to select the platform
+ abstraction
+
+---
+ build/debian/mixxx.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build/debian/mixxx.desktop b/build/debian/mixxx.desktop
+index 3bad29a170..c7c96e7720 100644
+--- a/build/debian/mixxx.desktop
++++ b/build/debian/mixxx.desktop
+@@ -3,7 +3,7 @@ Version=1.0
+ Name=Mixxx
+ GenericName=Digital DJ interface
+ Comment=A digital DJ interface
+-Exec=QT_QPA_PLATFORM=xcb pasuspender -- mixxx
++Exec=pasuspender -- mixxx -platform xcb
+ Terminal=false
+ Icon=mixxx_icon
+ Type=Application
+--
+2.23.0
+
diff --git a/mixxx.spec b/mixxx.spec
index e51487d..7475bd8 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -17,12 +17,13 @@
Name: mixxx
Version: 2.2.2
-Release: 1%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
+Release: 2%{?extraver:.%{extraver}}%{?snapinfo:.%{snapinfo}}%{?dist}
Summary: Mixxx is open source software for DJ'ing
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{name}-%{s...
+Patch0: launcher-platform-xcb.patch
# Build Tools
BuildRequires: desktop-file-utils
@@ -162,6 +163,10 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}
%changelog
+* Thu Oct 31 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-2
+- Use XCB instead of the default Qt Wayland platform adapter
+- Use system libebur128
+
* Wed Aug 14 2019 Uwe Klotz <uklotz(a)mixxx.org> - 2.2.2-1
- New upstream release 2.2.2
4 years, 6 months
[mixxx/f30] Use system libebur128
by Uwe Klotz
commit 13ddbec69e18f35e9796b4004452bf65c0976bc4
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Thu Oct 31 23:04:28 2019 +0100
Use system libebur128
mixxx.spec | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 1dd977f..e51487d 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -38,6 +38,7 @@ BuildRequires: ffmpeg-devel
BuildRequires: fftw-devel
BuildRequires: flac-devel
BuildRequires: hidapi-devel
+BuildRequires: libebur128-devel
BuildRequires: libGL-devel
BuildRequires: libGLU-devel
BuildRequires: libchromaprint-devel
@@ -69,12 +70,6 @@ BuildRequires: taglib-devel
BuildRequires: upower-devel
BuildRequires: wavpack-devel
-# Bundled Requirements
-# The following essential libraries for audio processing are
-# currently bundled and statically linked to avoid unexpected
-# behavior due to version differences.
-#BuildRequires: libebur128-devel
-
%description
Mixxx is open source software for DJ'ing. You can use
4 years, 6 months
[mixxx/f30] Remove obsolete dependency (already commented out)
by Uwe Klotz
commit 4725d1f5927782002adad311cf5c264452f8b33a
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Aug 9 21:11:29 2019 +0200
Remove obsolete dependency (already commented out)
mixxx.spec | 1 -
1 file changed, 1 deletion(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index e83e699..1dd977f 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -74,7 +74,6 @@ BuildRequires: wavpack-devel
# currently bundled and statically linked to avoid unexpected
# behavior due to version differences.
#BuildRequires: libebur128-devel
-#BuildRequires: vamp-plugin-sdk-devel
%description
4 years, 6 months
[mixxx/f30] Add TODO notes for upgrading to a newer SCons version with Mixxx 2.3.0
by Uwe Klotz
commit 7f1beb13fadb59a0905f6a4ed434cc7b97619d84
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Aug 9 21:10:48 2019 +0200
Add TODO notes for upgrading to a newer SCons version with Mixxx 2.3.0
mixxx.spec | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/mixxx.spec b/mixxx.spec
index bfcc349..e83e699 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -28,6 +28,7 @@ Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}.tar.gz#/%{
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: protobuf-compiler
+# TODO: Update to python3-scons for 2.3.0
BuildRequires: python2-scons
# Build Requirements
@@ -101,6 +102,7 @@ MIDI and HID devices.
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
+# TODO: Switch from scons-2 to scons(-3) for 2.3.0
scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
@@ -121,6 +123,7 @@ scons-2 %{?_smp_mflags} \
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
+# TODO: Switch from scons-2 to scons(-3) for 2.3.0
scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
4 years, 6 months
[mixxx/f30] fix scons command
by Uwe Klotz
commit fd780f9de295e325377fdc84def04c180679cfa7
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Wed Aug 7 15:34:40 2019 +0100
fix scons command
mixxx.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/mixxx.spec b/mixxx.spec
index 4ead293..bfcc349 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -101,7 +101,7 @@ MIDI and HID devices.
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-scons %{?_smp_mflags} \
+scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
build=release \
@@ -121,7 +121,7 @@ scons %{?_smp_mflags} \
export CFLAGS=$RPM_OPT_FLAGS
export LDFLAGS=$RPM_LD_FLAGS
export LIBDIR=%{_libdir}
-scons %{?_smp_mflags} \
+scons-2 %{?_smp_mflags} \
prefix=%{_prefix} \
qtdir=%{_qt5_prefix} \
install_root=$RPM_BUILD_ROOT%{_prefix} \
4 years, 6 months