Hello community, here is the log from the commit of package projectM for openSUSE:Leap:15.2 checked in at 2020-05-14 06:51:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.2/projectM (Old) and /work/SRC/openSUSE:Leap:15.2/.projectM.new.2738 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "projectM" Thu May 14 06:51:25 2020 rev:11 rq:805235 version:3.1.3 Changes: -------- --- /work/SRC/openSUSE:Leap:15.2/projectM/projectM.changes 2020-01-15 15:45:31.279326096 +0100 +++ /work/SRC/openSUSE:Leap:15.2/.projectM.new.2738/projectM.changes 2020-05-14 06:51:36.259718799 +0200 @@ -1,0 +2,60 @@ +Tue Apr 28 07:24:01 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Add patch to reduce build dependencies: + * 0001-Reduce-dependencies.patch + +------------------------------------------------------------------- +Sat Mar 28 21:42:31 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 3.1.3. Lots of fixes since 3.1.0. Only list changes + in the latest version: + * Input device capture toggle support + Check https://github.com/projectM-visualizer/projectm/releases + for older changes. +- Drop projectM-increase_soversion.patch. Merged upstream. +- Rebase projectM-disable_native_plugins.patch + +------------------------------------------------------------------- +Sat Mar 16 18:29:28 UTC 2019 - Jan Engelhardt <[email protected]> + +- Ensure neutrality of description. + +------------------------------------------------------------------- +Mon Mar 4 09:24:45 UTC 2019 - Luigi Baldoni <[email protected]> + +- Update to version 3.1.0 + * Thanks to the tireless efforts of @deltaoscarmike there are + now modern GLSL shaders being run for the core renderer and all + presets with shader code in them (transpiled on the fly from + HLSL to GLSL). + * Improved support for GLES and embedded platforms (compile + with --enable-gles). + * Thread-safety errors fixed. + * The macOS iTunes plugin is fully working once again. + * Work continues on making it run in a web browser (#92), + windows (#98), working with downstream package maintainers, + projects using it as a plugin. + version 3.0.0 + * This includes fantastic work from @deltaoscarmike on + modernizing OpenGL for GLES3 support which should enable the + building of projectM on modern and embedded devices - #70 . + * Also includes work from @mbellew adding intel SSE support to + optimize expression parsing - #59 . + * Coming soon: fixing shader support - #26 + version 2.2.1 + * New! Qt5 support thanks to @deltaoscarmike + * Building improvements. + version 2.2.0 + * Now building using GNU autotools + +- Dropped qt4 package + +- Dropped projectM-2.1.0-fix-isnan-gcc6.patch, + projectM-2.1.0-no-return-in-nonvoid.patch, + projectM-2.1.0-SUSE_misc.patch and + projectM-2.1.0-Qt5.patch + +- Added projectM-disable_native_plugins.patch and + projectM-increase_soversion.patch + +------------------------------------------------------------------- Old: ---- pre_checkin.sh projectM-2.1.0-Qt5.patch projectM-2.1.0-SUSE_misc.patch projectM-2.1.0-fix-isnan-gcc6.patch projectM-2.1.0-no-return-in-nonvoid.patch projectM-complete-2.1.0-Source.tar.gz projectM-qt5.changes projectM-qt5.spec New: ---- 0001-Reduce-dependencies.patch projectM-disable_native_plugins.patch projectm-3.1.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ projectM.spec ++++++ --- /var/tmp/diff_new_pack.RheElL/_old 2020-05-14 06:51:37.819722161 +0200 +++ /var/tmp/diff_new_pack.RheElL/_new 2020-05-14 06:51:37.823722169 +0200 @@ -1,7 +1,7 @@ # # spec file for package projectM # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,156 +12,119 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%undefine _isqt5 -%define _oname projectM +%define _libver 3 Name: projectM -Version: 2.1.0 +Version: 3.1.3 Release: 0 -Summary: An Awesome Music Visualizer -License: LGPL-2.1+ +Summary: A Music Visualizer +License: LGPL-2.1-or-later Group: Productivity/Multimedia/Sound/Visualization -Url: http://projectm.sourceforge.net -Source0: https://sourceforge.net/projects/projectm/files/%{version}/%{_oname}-complete-%{version}-Source.tar.gz -# PATCH-FIX-UPSTREAM projectM-2.1.0-fix-isnan-gcc6.patch -- fix build with GCC6 (patch from upstream development branch) -Patch0: projectM-2.1.0-fix-isnan-gcc6.patch -# PATCH-FIX-OPENSUSE projectM-2.1.0-no-return-in-nonvoid.patch -- fix rpmlint warning -Patch1: projectM-2.1.0-no-return-in-nonvoid.patch -# PATCH-FIX-OPENSUSE projectM-2.1.0-SUSE_misc.patch -- address a few SUSE-specific issues -Patch2: projectM-2.1.0-SUSE_misc.patch -%if 0%{?_isqt5} -# PATCH-FIX-OPENSUSE projectM-2.1.0-Qt5.patch -- build against Qt5 libraries -Patch3: projectM-2.1.0-Qt5.patch -%endif -BuildRequires: cmake +URL: http://projectm.sourceforge.net +Source0: https://github.com/projectM-visualizer/projectm/archive/v%{version}.tar.gz#/projectm-%{version}.tar.gz +# PATCH-FIX-OPENSUSE projectM-disable_native_plugins.patch +Patch0: projectM-disable_native_plugins.patch +# PATCH-FIX-UPSTREAM 0001-Reduce-dependencies.patch +Patch1: 0001-Reduce-dependencies.patch +BuildRequires: automake BuildRequires: fdupes -BuildRequires: ftgl-devel -BuildRequires: glew-devel -BuildRequires: libSDL-devel -BuildRequires: libpulse-devel -BuildRequires: libsndfile-devel -BuildRequires: libvisual-devel +BuildRequires: glm-devel +BuildRequires: hicolor-icon-theme +BuildRequires: libqt5-linguist-devel +BuildRequires: libtool BuildRequires: pkgconfig -%if 0%{?_isqt5} +BuildRequires: update-desktop-files BuildRequires: pkgconfig(Qt5Core) +BuildRequires: pkgconfig(Qt5Gui) BuildRequires: pkgconfig(Qt5OpenGL) BuildRequires: pkgconfig(Qt5Widgets) -BuildRequires: pkgconfig(Qt5Xml) -%else -BuildRequires: libqt4-devel -%endif +BuildRequires: pkgconfig(ftgl) +BuildRequires: pkgconfig(libpulse) +BuildRequires: pkgconfig(pthread-stubs) Recommends: %{name}-data = %{version} +Obsoletes: %{name}-qt5 < %{version} +Provides: %{name}-qt5 = %{version} %description -projectM%{?_isqt5:-qt5} is an awesome music visualizer. +projectM is a music visualizer. -%package -n lib%{_oname}%{?_isqt5:-qt5-}2 -Summary: Run-time Libraries for ProjectM%{?_isqt5:-qt5} +%package -n lib%{name}%{_libver} +Summary: Run-time library for projectM Group: System/Libraries +Obsoletes: lib%{name}-qt5-%{_libver} < %{version} +Provides: lib%{name}-qt5-%{_libver} = %{version} -%description -n lib%{_oname}%{?_isqt5:-qt5-}2 -projectM%{?_isqt5:-qt5} is an awesome music visualizer. -This package contains its runtime libraries. - -%package -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -Summary: Qt Run-time Libraries for ProjectM%{?_isqt5:-qt5} -Group: System/Libraries - -%description -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -projectM%{?_isqt5:-qt5} is an awesome music visualizer. -This package contains its qt runtime libraries. - -%package -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -Summary: Libvisual Collaboration for ProjectM%{?_isqt5:-qt5} -Group: System/Libraries - -%description -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -projectM%{?_isqt5:-qt5} is an awesome music visualizer. -This package contains its libvisual collaboration libraries. +%description -n lib%{name}%{_libver} +projectM is a music visualizer. +This package contains its runtime library. %package data -Summary: Data files for ProjectM%{?_isqt5:-qt5} +Summary: Data files for projectM Group: Productivity/Multimedia/Sound/Visualization Requires: %{name} = %{version} Requires: dejavu +Obsoletes: %{name}-qt5-data < %{version} +Provides: %{name}-qt5-data = %{version} %description data -projectM%{?_isqt5:-qt5} is an awesome music visualizer. +projectM is a music visualizer. This package contains its data: config, presets, shaders. %package devel -Summary: Development Files for ProjectM%{?_isqt5:-qt5} +Summary: Development Files for projectM Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: %{name}-data = %{version} -Requires: lib%{_oname}%{?_isqt5:-qt5-}2 = %{version} -Requires: lib%{_oname}-qt%{?_isqt5:-qt5-}1 = %{version} +Requires: lib%{name}%{_libver} = %{version} +Obsoletes: %{name}-qt5-devel < %{version} +Provides: %{name}-qt5-devel = %{version} %description devel -projectM%{?_isqt5:-qt5} is an awesome music visualizer. +projectM is a music visualizer. This package contains its development files. %prep -%setup -q -n %{_oname}-complete-%{version}-Source +%setup -q -n projectm-%{version} +chmod -x LICENSE.txt %patch0 -p1 %patch1 -p1 -%patch2 -p1 -%if 0%{?_isqt5} -%patch3 -p1 -%endif - -rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree %build -#projectM-test has runtime problems, I don't know how to fix it, so I disable it -%cmake -DINCLUDE-PROJECTM-TEST=OFF -make %{?_smp_mflags} +autoreconf -fiv + +perl -pi -e 's#2>/dev/null##g' configure +%configure --disable-static --disable-rpath --enable-qt +%make_build %install -%cmake_install -find %{buildroot} -name *.la -delete -%fdupes %{buildroot} - -%post -n lib%{_oname}%{?_isqt5:-qt5-}2 -p /sbin/ldconfig -%post -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -p /sbin/ldconfig -%post -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -p /sbin/ldconfig -%postun -n lib%{_oname}%{?_isqt5:-qt5-}2 -p /sbin/ldconfig -%postun -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -p /sbin/ldconfig -%postun -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -p /sbin/ldconfig +%make_install +find %{buildroot} -type f -name "*.la" -delete -print +%suse_update_desktop_file -r projectM-pulseaudio AudioVideo Audio Mixer +%fdupes -s %{buildroot} + +%post -n lib%{name}%{_libver} -p /sbin/ldconfig +%postun -n lib%{name}%{_libver} -p /sbin/ldconfig %files -%defattr(-,root,root) -%{_bindir}/%{_oname}-pulseaudio%{?_isqt5:-qt5} -%{_datadir}/applications/%{_oname}-pulseaudio%{?_isqt5:-qt5}.desktop -%{_datadir}/pixmaps/* - -%files -n lib%{_oname}%{?_isqt5:-qt5-}2 -%defattr(-,root,root) -%{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so.%{version} - -%files -n lib%{_oname}-qt%{?_isqt5:-qt5-}1 -%defattr(-,root,root) -%{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so.1.10 - -%files -n lib%{_oname}-libvisual%{?_isqt5:-qt5} -%defattr(-,root,root) -%{_libdir}/libvisual-0.4%{?_isqt5:-qt5}/ +%license LICENSE.txt +%doc README.md +%{_bindir}/%{name}-pulseaudio +%{_datadir}/applications/%{name}-pulseaudio.desktop +%{_datadir}/icons/hicolor/scalable/apps/projectM.svg +%{_mandir}/man1/%{name}-pulseaudio.1%{?ext_man} + +%files -n lib%{name}%{_libver} +%{_libdir}/lib%{name}.so.%{_libver}* %files data -%defattr(-,root,root) -%{_datadir}/%{name}/ +%{_datadir}/%{name} %files devel -%defattr(-,root,root) -%{_includedir}/lib%{_oname}%{?_isqt5:-qt5} -%{_includedir}/lib%{_oname}-qt%{?_isqt5:-qt5} -%{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so -%{_libdir}/lib%{_oname}%{?_isqt5:-qt5}.so.2 -%{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so -%{_libdir}/lib%{_oname}-qt%{?_isqt5:-qt5}.so.1 -%{_libdir}/pkgconfig/* +%{_includedir}/lib%{name} +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/lib%{name}.pc %changelog ++++++ 0001-Reduce-dependencies.patch ++++++ >From 3d113737c9aafeb723e9cc81ee54534c2a22f7f6 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <[email protected]> Date: Tue, 28 Apr 2020 09:18:00 +0200 Subject: [PATCH] Reduce dependencies. projectM doesn't need all Qt modules, so just look for the ones really required. --- m4/autoconf-archive/ax_have_qt.m4 | 26 -------------------------- 1 file changed, 26 deletions(-) diff --git a/m4/autoconf-archive/ax_have_qt.m4 b/m4/autoconf-archive/ax_have_qt.m4 index ab92ff4..d1dcedd 100644 --- a/m4/autoconf-archive/ax_have_qt.m4 +++ b/m4/autoconf-archive/ax_have_qt.m4 @@ -73,36 +73,10 @@ AC_DEFUN([AX_HAVE_QT], am_have_qt_makefile=`mktemp` # http://qt-project.org/doc/qt-5/qmake-variable-reference.html#qt cat > $am_have_qt_pro << EOF -qtHaveModule(axcontainer): QT += axcontainer -qtHaveModule(axserver): QT += axserver -qtHaveModule(concurrent): QT += concurrent qtHaveModule(core): QT += core -qtHaveModule(dbus): QT += dbus -qtHaveModule(declarative): QT += declarative -qtHaveModule(designer): QT += designer qtHaveModule(gui): QT += gui -qtHaveModule(help): QT += help -qtHaveModule(multimedia): QT += multimedia -qtHaveModule(multimediawidgets): QT += multimediawidgets -qtHaveModule(network): QT += network qtHaveModule(opengl): QT += opengl qtHaveModule(widgets): QT += widgets -qtHaveModule(printsupport): QT += printsupport -qtHaveModule(qml): QT += qml -qtHaveModule(qmltest): QT += qmltest -qtHaveModule(x11extras): QT += x11extras -qtHaveModule(script): QT += script -qtHaveModule(scripttools): QT += scripttools -qtHaveModule(sensors): QT += sensors -qtHaveModule(serialport): QT += serialport -qtHaveModule(sql): QT += sql -qtHaveModule(svg): QT += svg -qtHaveModule(testlib): QT += testlib -qtHaveModule(uitools): QT += uitools -qtHaveModule(webkit): QT += webkit -qtHaveModule(webkitwidgets): QT += webkitwidgets -qtHaveModule(xml): QT += xml -qtHaveModule(xmlpatterns): QT += xmlpatterns percent.target = % percent.commands = @echo -n "\$(\$(@))\ " QMAKE_EXTRA_TARGETS += percent -- 2.26.1 ++++++ projectM-disable_native_plugins.patch ++++++ From: Luigi Baldoni <[email protected]> Date: 2018-12-01 15:40:43 +0200 Subject: Do not build native plugins Native plugins are problematic to package on account of being binaries being looked for into datadir. Will have to create a better patch that looks for them inside libdir, but for now I'm simply disabling them. Furthermore, according to upstream, they aren't particularly useful. --- diff --git a/src/Makefile.am b/src/Makefile.am index 6d5e6e7..1ecbe81 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -22,4 +22,4 @@ endif # for compatibility reasons here as nobase_include nobase_include_HEADERS = libprojectM/projectM.hpp libprojectM/Common.hpp libprojectM/dlldefs.h libprojectM/event.h libprojectM/fatal.h libprojectM/PCM.hpp -SUBDIRS = libprojectM NativePresets ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR} ${PROJECTM_EMSCRIPTEN_SUBDIR} ${PROJECTM_JACK_SUBDIR} ${PROJECTM_PULSEAUDIO_SUBDIR} +SUBDIRS = libprojectM ${PROJECTM_SDL_SUBDIR} ${PROJECTM_QT_SUBDIR} ${PROJECTM_EMSCRIPTEN_SUBDIR} ${PROJECTM_JACK_SUBDIR} ${PROJECTM_PULSEAUDIO_SUBDIR}
