Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2020-05-23 17:19:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "projectM"
Sat May 23 17:19:53 2020 rev:17 rq:807372 version:3.1.3
Changes:
--------
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes 2020-04-29
20:43:57.887890190 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new.2738/projectM.changes
2020-05-23 17:20:06.422456050 +0200
@@ -1,0 +2,14 @@
+Tue May 19 15:23:08 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Re-enable pulseaudio_qt on aarch64 and %arm
+
+-------------------------------------------------------------------
+Tue May 19 13:57:17 UTC 2020 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Fix build on aarch64 and %arm:
+ * Enable GLES flavor
+ * Disable Qt
+ * Enable SDL
+- Other architectures are unchanged
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ projectM.spec ++++++
--- /var/tmp/diff_new_pack.IwLVLO/_old 2020-05-23 17:20:07.174457677 +0200
+++ /var/tmp/diff_new_pack.IwLVLO/_new 2020-05-23 17:20:07.174457677 +0200
@@ -17,6 +17,14 @@
%define _libver 3
+%ifarch %arm aarch64
+%bcond_without sdl
+%bcond_without gles_flavor
+%else
+%bcond_with sdl
+%bcond_with gles_flavor
+%endif
+%bcond_without pulseaudio_qt
Name: projectM
Version: 3.1.3
Release: 0
@@ -33,20 +41,32 @@
BuildRequires: fdupes
BuildRequires: glm-devel
BuildRequires: hicolor-icon-theme
-BuildRequires: libqt5-linguist-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
+BuildRequires: pkgconfig(pthread-stubs)
+Recommends: %{name}-data = %{version}
+%if %{with pulseaudio_qt}
+BuildRequires: libqt5-linguist-devel
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(ftgl)
BuildRequires: pkgconfig(libpulse)
-BuildRequires: pkgconfig(pthread-stubs)
-Recommends: %{name}-data = %{version}
+%endif
+%if %{with sdl}
+BuildRequires: libSDL2-devel
+%endif
+%if %{with gles_flavor}
+# Workaround: Qt5OpenGL is required for configure when testing libglm
+BuildRequires: pkgconfig(Qt5OpenGL)
+BuildRequires: pkgconfig(glesv1_cm)
+%endif
+%if %{with pulseaudio_qt}
Obsoletes: %{name}-qt5 < %{version}
Provides: %{name}-qt5 = %{version}
+%endif
%description
projectM is a music visualizer.
@@ -92,15 +112,43 @@
%patch0 -p1
%patch1 -p1
+%if %{with gles_flavor}
+# https://github.com/projectM-visualizer/projectm/issues/356
+echo "#include <GL/gl.h>" | cat - src/projectM-qt/qprojectmwidget.hpp >
/tmp/out && mv /tmp/out src/projectM-qt/qprojectmwidget.hpp
+%endif
+
%build
autoreconf -fiv
perl -pi -e 's#2>/dev/null##g' configure
-%configure --disable-static --disable-rpath --enable-qt
+%if %{with gles_flavor}
+export CFLAGS="$CFLAGS -DSOIL_GLES2"
+%endif
+%if %{with sdl}
+export LDFLAGS="$LDFLAGS -lEGL"
+%endif
+%configure \
+%if %{with gles_flavor}
+ --enable-gles \
+%endif
+%if %{with sdl}
+ --enable-sdl \
+%else
+ --disable-sdl \
+%endif
+%if %{with pulseaudio_qt}
+ --enable-qt \
+%else
+ --disable-qt \
+%endif
+ --disable-static --disable-rpath
%make_build
%install
%make_install
+%if %{with sdl}
+rm -rf %{buildroot}%{_bindir}/projectM-unittest
+%endif
find %{buildroot} -type f -name "*.la" -delete -print
%suse_update_desktop_file -r projectM-pulseaudio AudioVideo Audio Mixer
%fdupes -s %{buildroot}
@@ -111,10 +159,15 @@
%files
%license LICENSE.txt
%doc README.md
+%if %{with pulseaudio_qt}
%{_bindir}/%{name}-pulseaudio
%{_datadir}/applications/%{name}-pulseaudio.desktop
%{_datadir}/icons/hicolor/scalable/apps/projectM.svg
%{_mandir}/man1/%{name}-pulseaudio.1%{?ext_man}
+%endif
+%if %{with sdl}
+%{_bindir}/%{name}SDL
+%endif
%files -n lib%{name}%{_libver}
%{_libdir}/lib%{name}.so.%{_libver}*
