commit projectM for openSUSE:Factory
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.changes2020-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
+
+- Re-enable pulseaudio_qt on aarch64 and %arm
+
+---
+Tue May 19 13:57:17 UTC 2020 - Guillaume GARDET
+
+- 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 " | 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}*
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2020-04-29 20:43:55
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new.2738 (New)
Package is "projectM"
Wed Apr 29 20:43:55 2020 rev:16 rq:798592 version:3.1.3
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2019-03-27
16:11:09.079671393 +0100
+++ /work/SRC/openSUSE:Factory/.projectM.new.2738/projectM.changes
2020-04-29 20:43:57.887890190 +0200
@@ -1,0 +2,17 @@
+Tue Apr 28 07:24:01 UTC 2020 - Christophe Giboudeaux
+
+- Add patch to reduce build dependencies:
+ * 0001-Reduce-dependencies.patch
+
+---
+Sat Mar 28 21:42:31 UTC 2020 - Christophe Giboudeaux
+
+- 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
+
+---
Old:
projectM-increase_soversion.patch
projectm-3.1.0.tar.gz
New:
0001-Reduce-dependencies.patch
projectm-3.1.3.tar.gz
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.aKGSIu/_old 2020-04-29 20:44:01.039898408 +0200
+++ /var/tmp/diff_new_pack.aKGSIu/_new 2020-04-29 20:44:01.039898408 +0200
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2019 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
@@ -18,24 +18,27 @@
%define _libver 3
Name: projectM
-Version:3.1.0
+Version:3.1.3
Release:0
Summary:A Music Visualizer
License:LGPL-2.1-or-later
Group: Productivity/Multimedia/Sound/Visualization
-Url:http://projectm.sourceforge.net
+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
-Patch4: projectM-disable_native_plugins.patch
-# PATCH-FIX-UPSTREAM projectM-increase_soversion.patch
-Patch5: projectM-increase_soversion.patch
+Patch0: projectM-disable_native_plugins.patch
+# PATCH-FIX-UPSTREAM 0001-Reduce-dependencies.patch
+Patch1: 0001-Reduce-dependencies.patch
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: glm-devel
+BuildRequires: hicolor-icon-theme
+BuildRequires: libqt5-linguist-devel
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: update-desktop-files
BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5OpenGL)
BuildRequires: pkgconfig(Qt5Widgets)
BuildRequires: pkgconfig(ftgl)
@@ -86,17 +89,19 @@
%prep
%setup -q -n projectm-%{version}
chmod -x LICENSE.txt
-%patch4 -p1
-%patch5 -p1
+%patch0 -p1
+%patch1 -p1
%build
autoreconf -fiv
+
+perl -pi -e 's#2>/dev/null##g' configure
%configure --disable-static --disable-rpath --enable-qt
-make %{?_smp_mflags}
+%make_build
%install
%make_install
-find %{buildroot} -name *.la -delete
+find %{buildroot} -type f -name "*.la" -delete -print
%suse_update_desktop_file -r projectM-pulseaudio AudioVideo Audio Mixer
%fdupes -s %{buildroot}
@@ -108,8 +113,8 @@
%doc README.md
%{_bindir}/%{name}-pulseaudio
%{_datadir}/applications/%{name}-pulseaudio.desktop
-%{_datadir}/pixmaps/prjm16-transparent.svg
-%{_mandir}/man1/%{name}-pulseaudio.1%{ext_man}
+%{_datadir}/icons/hicolor/scalable/apps/projectM.svg
+%{_mandir}/man1/%{name}-pulseaudio.1%{?ext_man}
%files -n lib%{name}%{_libver}
%{_libdir}/lib%{name}.so.%{_libver}*
++ 0001-Reduce-dependencies.patch ++
>From 3d113737c9aafeb723e9cc81ee54534c2a22f7f6 Mon Sep 17 00:00:00 2001
From: Christophe Giboudeaux
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`
#
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2019-03-27 16:11:06
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new.25356 (New)
Package is "projectM"
Wed Mar 27 16:11:06 2019 rev:15 rq:685825 version:3.1.0
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2019-03-08
13:28:20.290994451 +0100
+++ /work/SRC/openSUSE:Factory/.projectM.new.25356/projectM.changes
2019-03-27 16:11:09.079671393 +0100
@@ -1,0 +2,5 @@
+Sat Mar 16 18:29:28 UTC 2019 - Jan Engelhardt
+
+- Ensure neutrality of description.
+
+---
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.s27taq/_old 2019-03-27 16:11:11.591670753 +0100
+++ /var/tmp/diff_new_pack.s27taq/_new 2019-03-27 16:11:11.623670745 +0100
@@ -20,7 +20,7 @@
Name: projectM
Version:3.1.0
Release:0
-Summary:An Awesome Music Visualizer
+Summary:A Music Visualizer
License:LGPL-2.1-or-later
Group: Productivity/Multimedia/Sound/Visualization
Url:http://projectm.sourceforge.net
@@ -46,7 +46,7 @@
Provides: %{name}-qt5 = %{version}
%description
-projectM is an awesome music visualizer.
+projectM is a music visualizer.
%package -n lib%{name}%{_libver}
Summary:Run-time library for projectM
@@ -55,7 +55,7 @@
Provides: lib%{name}-qt5-%{_libver} = %{version}
%description -n lib%{name}%{_libver}
-projectM is an awesome music visualizer.
+projectM is a music visualizer.
This package contains its runtime library.
%packagedata
@@ -67,7 +67,7 @@
Provides: %{name}-qt5-data = %{version}
%descriptiondata
-projectM is an awesome music visualizer.
+projectM is a music visualizer.
This package contains its data: config, presets, shaders.
%packagedevel
@@ -80,7 +80,7 @@
Provides: %{name}-qt5-devel = %{version}
%descriptiondevel
-projectM is an awesome music visualizer.
+projectM is a music visualizer.
This package contains its development files.
%prep
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2019-03-08 13:28:18
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new.28833 (New)
Package is "projectM"
Fri Mar 8 13:28:18 2019 rev:14 rq:681497 version:3.1.0
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2017-07-30
11:22:22.387785433 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new.28833/projectM.changes
2019-03-08 13:28:20.290994451 +0100
@@ -1,0 +2,38 @@
+Mon Mar 4 09:24:45 UTC 2019 - Luigi Baldoni
+
+- 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:
projectM-disable_native_plugins.patch
projectM-increase_soversion.patch
projectm-3.1.0.tar.gz
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.h1QNk3/_old 2019-03-08 13:28:24.614993696 +0100
+++ /var/tmp/diff_new_pack.h1QNk3/_new 2019-03-08 13:28:24.618993696 +0100
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -12,156 +12,114 @@
# 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.0
Release:0
Summary:An Awesome Music Visualizer
-License:LGPL-2.1+
+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
+Source0:
https://github.com/projectM-visualizer/projectm/archive/v%{version}.tar.gz#/projectm-%{version}.tar.gz
+# PATCH-FIX-OPENSUSE projectM-disable_native_plugins.patch
+Patch4: projectM-disable_native_plugins.patch
+# PATCH-FIX-UPSTREAM projectM-increase_soversion.patch
+Patch5: projectM-increase_soversion.patch
+BuildRequires: automake
BuildRequires: fdupes
commit projectM for openSUSE:Factory
Hello community, here is the log from the commit of package projectM for openSUSE:Factory checked in at 2017-07-30 11:22:15 Comparing /work/SRC/openSUSE:Factory/projectM (Old) and /work/SRC/openSUSE:Factory/.projectM.new (New) Package is "projectM" Sun Jul 30 11:22:15 2017 rev:13 rq:512665 version:2.1.0 Changes: New Changes file: --- /dev/null 2017-07-20 07:30:00.335470106 +0200 +++ /work/SRC/openSUSE:Factory/.projectM.new/projectM-qt5.changes 2017-07-30 11:22:20.568042215 +0200 @@ -0,0 +1,72 @@ +--- +Wed Jul 26 12:11:29 UTC 2017 - aloi...@gmx.com + +- Spec cleanup (use %cmake macros) +- Added projectM-2.1.0-no-return-in-nonvoid.patch and + projectM-2.1.0-SUSE_misc.patch +- Obtain official tarball from sourceforge +- Dropped FindGLEW.cmake (no current target needs it) +- Added separate -qt5 version of the package and + projectM-2.1.0-Qt5.patch and pre_checkin.sh to support the + latter + +--- +Mon May 23 19:30:03 UTC 2016 - antoine.belv...@laposte.net + +- Fix build with GCC6: + * Add projectM-2.1.0-fix-isnan-gcc6.patch + +--- +Thu Dec 11 07:19:08 UTC 2014 - o...@aepfle.de + +- Correct usage of fdupes macro + +--- +Tue Jun 25 01:30:24 UTC 2013 - i...@marguerite.su + +- fix bnc#825162: Error in standard configuration File causes projectM not to start + +--- +Sun Mar 24 16:50:14 UTC 2013 - sch...@suse.de + +- Properly determine list of lib64 platforms + +--- +Thu May 24 22:31:29 UTC 2012 - i...@marguerite.su + +- update version 2.1.0 + * Fixed several memory leaks (when projectM gets destroyed, or when a preset gets destroyed) + * Resolved some parser errors and an embarrasing evaluation bug (in particular, 2^x does not equal x^2) + * +/- keys support to edit the ratings + * libvisual / gstreamer compatible + * Various cmake build fixes and improvements +- drop two patches. upstream fixed. + +--- +Sat May 12 15:33:06 UTC 2012 - reddw...@opensuse.org + +- fix the version in the pkg-config file + +--- +Tue Mar 27 19:18:42 UTC 2012 - dval...@suse.com + +- fix ppc64 build + +--- +Tue Jan 3 14:57:12 UTC 2012 - sasc...@suse.de + +- Remove licenses from subpackages (inherited anyways) +- Remove src/WinLibs tree (bnc#738417) + +--- +Sat Dec 31 01:11:29 UTC 2011 - prus...@opensuse.org + +- spec cleanup +- fix font locations in config.inp + +--- +Sat Dec 10 06:40:58 UTC 2011 - i...@marguerite.su + +- initial package 2.0.1+ from git +- split libraries and data + --- /work/SRC/openSUSE:Factory/projectM/projectM.changes2016-05-31 12:09:14.0 +0200 +++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2017-07-30 11:22:22.387785433 +0200 @@ -1,0 +2,12 @@ +Wed Jul 26 12:11:29 UTC 2017 - aloi...@gmx.com + +- Spec cleanup (use %cmake macros) +- Added projectM-2.1.0-no-return-in-nonvoid.patch and + projectM-2.1.0-SUSE_misc.patch +- Obtain official tarball from sourceforge +- Dropped FindGLEW.cmake (no current target needs it) +- Added separate -qt5 version of the package and + projectM-2.1.0-Qt5.patch and pre_checkin.sh to support the + latter + +--- Old: FindGLEW.cmake projectM-2.1.0.tar.bz2 New: pre_checkin.sh projectM-2.1.0-Qt5.patch projectM-2.1.0-SUSE_misc.patch projectM-2.1.0-no-return-in-nonvoid.patch projectM-complete-2.1.0-Source.tar.gz projectM-qt5.changes projectM-qt5.spec Other differences: -- ++ projectM-qt5.spec ++ # # spec file for package projectM-qt5 # # Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) #
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2016-05-31 12:09:13
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is "projectM"
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2014-12-16
14:50:47.0 +0100
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2016-05-31
12:09:14.0 +0200
@@ -1,0 +2,6 @@
+Mon May 23 19:30:03 UTC 2016 - antoine.belv...@laposte.net
+
+- Fix build with GCC6:
+ * Add projectM-2.1.0-fix-isnan-gcc6.patch
+
+---
New:
projectM-2.1.0-fix-isnan-gcc6.patch
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.BxhRi0/_old 2016-05-31 12:09:15.0 +0200
+++ /var/tmp/diff_new_pack.BxhRi0/_new 2016-05-31 12:09:15.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,6 +25,8 @@
Url:http://projectm.sourceforge.net
Source0:%{name}-%{version}.tar.bz2
Source1:FindGLEW.cmake
+# 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
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: ftgl-devel
@@ -89,6 +91,7 @@
%prep
%setup -q
+%patch0 -p1
rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree
++ projectM-2.1.0-fix-isnan-gcc6.patch ++
>From 92226e25192a69839b9ae3b66ea7173732c639b3 Mon Sep 17 00:00:00 2001
From: Hodorgasm
Date: Thu, 12 May 2016 19:25:46 -0400
Subject: [PATCH] GCC-6 only makes 'isnan' available in 'std' namespace, and
iostream classes are no longer implicitly convertible to void* so use the
equivalent '(fs.fail())' instead of '(fs == NULL)'
---
src/libprojectM/Common.hpp | 2 +-
src/libprojectM/MilkdropPresetFactory/Parser.cpp | 10 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/libprojectM/Common.hpp b/src/libprojectM/Common.hpp
index 25ecafa..366802a 100755
--- a/src/libprojectM/Common.hpp
+++ b/src/libprojectM/Common.hpp
@@ -63,7 +63,7 @@ extern FILE *fmemopen(void *buf, size_t
#ifdef LINUX
#include
-#define projectM_isnan isnan
+#define projectM_isnan std::isnan
#endif
diff --git a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
index fb14e6f..8dde420 100755
--- a/src/libprojectM/MilkdropPresetFactory/Parser.cpp
+++ b/src/libprojectM/MilkdropPresetFactory/Parser.cpp
@@ -1406,7 +1406,7 @@ PerFrameEqn *
Parser::parse_implicit_per_frame_eqn(std::istream & fs, char * pa
PerFrameEqn * per_frame_eqn;
GenExpr * gen_expr;
- if (fs == NULL)
+ if (fs.fail())
return NULL;
if (param_string == NULL)
return NULL;
@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_eqn(std::istream
& fs, MilkdropPreset *
if (preset == NULL)
return NULL;
- if (fs == NULL)
+ if (fs.fail())
return NULL;
if ((token = parseToken(fs, name)) != tEq)
@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token, std::istream &
fs, MilkdropPreset * p
/* Null argument checks */
if (preset == NULL)
return PROJECTM_FAILURE;
- if (fs == NULL)
+ if (fs.fail())
return PROJECTM_FAILURE;
if (token == NULL)
return PROJECTM_FAILURE;
@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std::istream & fs,
MilkdropPreset * preset
if (token == NULL)
return PROJECTM_FAILURE;
- if (fs == NULL)
+ if (fs.fail())
return PROJECTM_FAILURE;
if (preset == NULL)
return PROJECTM_FAILURE;
@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, std::istream & fs,
MilkdropPreset * prese
if (token == NULL)
return PROJECTM_FAILURE;
- if (fs == NULL)
+ if (fs.fail())
return PROJECTM_FAILURE;
if (preset == NULL)
return PROJECTM_FAILURE;
--
2.8.2
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2014-12-16 14:50:50
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is projectM
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2013-06-25
14:44:36.0 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2014-12-16
14:50:47.0 +0100
@@ -1,0 +2,5 @@
+Thu Dec 11 07:19:08 UTC 2014 - o...@aepfle.de
+
+- Correct usage of fdupes macro
+
+---
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.QKcl74/_old 2014-12-16 14:50:49.0 +0100
+++ /var/tmp/diff_new_pack.QKcl74/_new 2014-12-16 14:50:49.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -112,7 +112,7 @@
pushd src/build
%make_install
popd
-%fdupes
+%fdupes %{buildroot}
%suse_update_desktop_file -n
%{buildroot}%{_datadir}/applications/%{name}-pulseaudio.desktop Mixer
%if %{_lib} == lib64
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2013-06-25 09:35:04
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is projectM
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2013-03-26
07:01:35.0 +0100
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2013-06-25
14:44:36.0 +0200
@@ -1,0 +2,5 @@
+Tue Jun 25 01:30:24 UTC 2013 - i...@marguerite.su
+
+- fix bnc#825162: Error in standard configuration File causes projectM not to
start
+
+---
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.ppya6o/_old 2013-06-25 14:44:37.0 +0200
+++ /var/tmp/diff_new_pack.ppya6o/_new 2013-06-25 14:44:37.0 +0200
@@ -120,7 +120,7 @@
%endif
sed -i 's:^Title Font.*$:Title Font =
/usr/share/fonts/truetype/DejaVuSans.ttf:'
%{buildroot}%{_datadir}/projectM/config.inp
-sed -i 's:^Menu Font.*$:Title Font =
/usr/share/fonts/truetype/DejaVuSansMono.ttf:'
%{buildroot}%{_datadir}/projectM/config.inp
+sed -i 's:^Menu Font.*$:Menu Font =
/usr/share/fonts/truetype/DejaVuSansMono.ttf:'
%{buildroot}%{_datadir}/projectM/config.inp
%clean
rm -rf %{buildroot}
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2013-03-26 07:01:33
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is projectM, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2012-05-31
17:09:17.0 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2013-03-26
07:01:35.0 +0100
@@ -1,0 +2,5 @@
+Sun Mar 24 16:50:14 UTC 2013 - sch...@suse.de
+
+- Properly determine list of lib64 platforms
+
+---
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.l6R1yS/_old 2013-03-26 07:01:39.0 +0100
+++ /var/tmp/diff_new_pack.l6R1yS/_new 2013-03-26 07:01:39.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -115,7 +115,7 @@
%fdupes
%suse_update_desktop_file -n
%{buildroot}%{_datadir}/applications/%{name}-pulseaudio.desktop Mixer
-%ifarch x86_64 ppc64
+%if %{_lib} == lib64
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2012-05-31 17:09:15
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is projectM, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2012-05-14
16:18:13.0 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2012-05-31
17:09:17.0 +0200
@@ -1,0 +2,11 @@
+Thu May 24 22:31:29 UTC 2012 - i...@marguerite.su
+
+- update version 2.1.0
+ * Fixed several memory leaks (when projectM gets destroyed, or when a preset
gets destroyed)
+ * Resolved some parser errors and an embarrasing evaluation bug (in
particular, 2^x does not equal x^2)
+ * +/- keys support to edit the ratings
+ * libvisual / gstreamer compatible
+ * Various cmake build fixes and improvements
+- drop two patches. upstream fixed.
+
+---
Old:
override_cmake_cmp0015_warning.patch
projectM-2.0.1-pc_version.patch
projectM-2.0.1.tar.bz2
New:
projectM-2.1.0.tar.bz2
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.evkJct/_old 2012-05-31 17:09:20.0 +0200
+++ /var/tmp/diff_new_pack.evkJct/_new 2012-05-31 17:09:20.0 +0200
@@ -17,16 +17,14 @@
Name: projectM
-Version:2.0.1
-Release:1.1
+Version:2.1.0
+Release:0
Summary:An Awesome Music Visualizer
License:LGPL-2.1+
Group: Productivity/Multimedia/Sound/Visualization
Url:http://projectm.sourceforge.net
Source0:%{name}-%{version}.tar.bz2
Source1:FindGLEW.cmake
-Patch0: override_cmake_cmp0015_warning.patch
-Patch1: projectM-2.0.1-pc_version.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: ftgl-devel
@@ -91,8 +89,7 @@
%prep
%setup -q
-%patch0 -p1
-%patch1 -p0
+
rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree
%build
@@ -104,7 +101,10 @@
EXTRA_FLAGS=$EXTRA_FLAGS -DLIB_SUFFIX=64
fi
-cmake -DCMAKE_INSTALL_PREFIX=/usr $EXTRA_FLAGS ..
+#projectM-test has link problems, I don't know how to fix, so disable it
+cmake -DCMAKE_INSTALL_PREFIX=/usr $EXTRA_FLAGS \
+ -DINCLUDE-PROJECTM-TEST=OFF \
+ ..
make %{?_smp_mflags}
@@ -135,14 +135,14 @@
%files
%defattr(-,root,root)
%{_bindir}/%{name}-pulseaudio
-%{_bindir}/%{name}-test
-%{_bindir}/%{name}-test-texture
+#%{_bindir}/%{name}-test
+#%{_bindir}/%{name}-test-texture
%{_datadir}/applications/%{name}-pulseaudio.desktop
%{_datadir}/pixmaps/*
%files -n lib%{name}2
%defattr(-,root,root)
-%{_libdir}/lib%{name}.so.2.00
+%{_libdir}/lib%{name}.so.%{version}
%files -n lib%{name}-qt1
%defattr(-,root,root)
++ projectM-2.0.1.tar.bz2 - projectM-2.1.0.tar.bz2 ++
/work/SRC/openSUSE:Factory/projectM/projectM-2.0.1.tar.bz2
/work/SRC/openSUSE:Factory/.projectM.new/projectM-2.1.0.tar.bz2 differ: char
11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2012-05-14 16:18:09
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is projectM, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2012-03-29
07:47:10.0 +0200
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2012-05-14
16:18:13.0 +0200
@@ -1,0 +2,5 @@
+Sat May 12 15:33:06 UTC 2012 - reddw...@opensuse.org
+
+- fix the version in the pkg-config file
+
+---
New:
projectM-2.0.1-pc_version.patch
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.NptJgh/_old 2012-05-14 16:18:15.0 +0200
+++ /var/tmp/diff_new_pack.NptJgh/_new 2012-05-14 16:18:15.0 +0200
@@ -26,6 +26,7 @@
Source0:%{name}-%{version}.tar.bz2
Source1:FindGLEW.cmake
Patch0: override_cmake_cmp0015_warning.patch
+Patch1: projectM-2.0.1-pc_version.patch
BuildRequires: cmake
BuildRequires: fdupes
BuildRequires: ftgl-devel
@@ -91,6 +92,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p0
rm -r src/WinLibs # legal issues, see bnc#738417, we don't need that whole tree
%build
++ projectM-2.0.1-pc_version.patch ++
Index: src/libprojectM/libprojectM.pc.in
===
--- src/libprojectM/libprojectM.pc.in.orig
+++ src/libprojectM/libprojectM.pc.in
@@ -6,7 +6,7 @@ pkgdatadir=@CMAKE_INSTALL_PREFIX@/@RESOU
sysconfdir=@CMAKE_INSTALL_PREFIX@/@RESOURCE_PREFIX@
Name: libprojectM
-Version: 2.0.0
+Version: 2.0.1
Description: projectM - OpenGL Milkdrop
Requires:
Libs: -L${libdir} -lprojectM
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit projectM for openSUSE:Factory
Hello community,
here is the log from the commit of package projectM for openSUSE:Factory
checked in at 2012-03-29 07:47:06
Comparing /work/SRC/openSUSE:Factory/projectM (Old)
and /work/SRC/openSUSE:Factory/.projectM.new (New)
Package is projectM, Maintainer is
Changes:
--- /work/SRC/openSUSE:Factory/projectM/projectM.changes2012-01-05
19:15:13.0 +0100
+++ /work/SRC/openSUSE:Factory/.projectM.new/projectM.changes 2012-03-29
07:47:10.0 +0200
@@ -1,0 +2,5 @@
+Tue Mar 27 19:18:42 UTC 2012 - dval...@suse.com
+
+- fix ppc64 build
+
+---
Other differences:
--
++ projectM.spec ++
--- /var/tmp/diff_new_pack.YKcjWH/_old 2012-03-29 07:47:12.0 +0200
+++ /var/tmp/diff_new_pack.YKcjWH/_new 2012-03-29 07:47:12.0 +0200
@@ -1,7 +1,7 @@
#
# spec file for package projectM
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,13 +15,14 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+
Name: projectM
Version:2.0.1
Release:1.1
-License:LGPL-2.1+
Summary:An Awesome Music Visualizer
-Url:http://projectm.sourceforge.net
+License:LGPL-2.1+
Group: Productivity/Multimedia/Sound/Visualization
+Url:http://projectm.sourceforge.net
Source0:%{name}-%{version}.tar.bz2
Source1:FindGLEW.cmake
Patch0: override_cmake_cmp0015_warning.patch
@@ -112,7 +113,7 @@
%fdupes
%suse_update_desktop_file -n
%{buildroot}%{_datadir}/applications/%{name}-pulseaudio.desktop Mixer
-%ifarch x86_64
+%ifarch x86_64 ppc64
mv %{buildroot}%{_prefix}/lib/* %{buildroot}%{_libdir}
%endif
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
