automatic version update by autodist [release 1.3.1-1mamba;Sun Jul 10 2016]
This commit is contained in:
parent
a1846bf612
commit
1503b45a9f
59
clementine-1.3.1-libprojectm-gcc-6.1.0.patch
Normal file
59
clementine-1.3.1-libprojectm-gcc-6.1.0.patch
Normal file
@ -0,0 +1,59 @@
|
||||
diff -x '*orig' -rup a/MilkdropPresetFactory/Parser.cpp b/MilkdropPresetFactory/Parser.cpp
|
||||
--- a/MilkdropPresetFactory/Parser.cpp 2012-05-20 04:43:26.000000000 +0100
|
||||
+++ b/MilkdropPresetFactory/Parser.cpp 2016-03-17 05:00:14.177905556 +0000
|
||||
@@ -1406,7 +1406,7 @@ PerFrameEqn * Parser::parse_implicit_per
|
||||
PerFrameEqn * per_frame_eqn;
|
||||
GenExpr * gen_expr;
|
||||
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return NULL;
|
||||
if (param_string == NULL)
|
||||
return NULL;
|
||||
@@ -1561,7 +1561,7 @@ InitCond * Parser::parse_per_frame_init_
|
||||
|
||||
if (preset == NULL)
|
||||
return NULL;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return NULL;
|
||||
|
||||
if ((token = parseToken(fs, name)) != tEq)
|
||||
@@ -1875,7 +1875,7 @@ int Parser::parse_shapecode(char * token
|
||||
/* Null argument checks */
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (token == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
@@ -2166,7 +2166,7 @@ int Parser::parse_wave(char * token, std
|
||||
|
||||
if (token == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
@@ -2348,7 +2348,7 @@ int Parser::parse_shape(char * token, st
|
||||
if (token == NULL)
|
||||
|
||||
return PROJECTM_FAILURE;
|
||||
- if (fs == NULL)
|
||||
+ if (!fs)
|
||||
return PROJECTM_FAILURE;
|
||||
if (preset == NULL)
|
||||
return PROJECTM_FAILURE;
|
||||
--- libprojectm/Common.hpp.orig 2016-07-10 00:26:11.375640433 +0200
|
||||
+++ libprojectm/Common.hpp 2016-07-10 00:28:52.537623402 +0200
|
||||
@@ -64,7 +64,7 @@
|
||||
#ifdef LINUX
|
||||
#include <cstdlib>
|
||||
#include <cmath>
|
||||
-#define projectM_isnan isnan
|
||||
+#define projectM_isnan std::isnan
|
||||
|
||||
#endif
|
||||
|
@ -1,6 +1,6 @@
|
||||
Name: clementine
|
||||
Version: 1.2.3
|
||||
Release: 4mamba
|
||||
Version: 1.3.1
|
||||
Release: 1mamba
|
||||
Summary: A modern music player and library organiser
|
||||
Group: Graphical Desktop/Applications/Multimedia
|
||||
Vendor: openmamba
|
||||
@ -14,6 +14,7 @@ Patch1: %{name}-0.7.1-glibc-2.31.patch
|
||||
Patch2: %{name}-1.0.1-libimobiledevice-1.1.2.patch
|
||||
Patch3: clementine-1.2.2-glibc-2.19.patch
|
||||
Patch4: clementine-1.2.3-udisks-1.0.5.patch
|
||||
Patch5: clementine-1.3.1-libprojectm-gcc-6.1.0.patch
|
||||
License: GPL
|
||||
## AUTOBUILDREQ-BEGIN
|
||||
BuildRequires: glibc-devel
|
||||
@ -56,6 +57,8 @@ BuildRequires: liblastfm-devel >= 0.3.3
|
||||
BuildRequires: libboost-devel
|
||||
BuildRequires: protobuf-devel >= 2.4.1
|
||||
BuildRequires: libavformat-devel
|
||||
BuildRequires: libsparsehash-devel
|
||||
BuildRequires: libechonest-devel
|
||||
Requires: udisks
|
||||
Requires: upower
|
||||
Requires: gst-plugins-good010
|
||||
@ -73,7 +76,9 @@ Clementine is a modern music player and library organiser. Clementine is a port
|
||||
#%patch1 -p1
|
||||
#%patch2 -p1
|
||||
#%patch3 -p1
|
||||
%patch4 -p1
|
||||
#%patch4 -p1
|
||||
cd 3rdparty/libprojectm
|
||||
%patch5 -p1
|
||||
|
||||
%build
|
||||
%cmake -d build \
|
||||
@ -108,15 +113,19 @@ fi
|
||||
%{_bindir}/clementine-tagreader
|
||||
%{_bindir}/clementine
|
||||
%{_datadir}/applications/clementine.desktop
|
||||
%{_datadir}/appdata/clementine.appdata.xml
|
||||
%{_datadir}/kde4/services/clementine-*.protocol
|
||||
%{_datadir}/icons/hicolor/*/apps/application-x-clementine.png
|
||||
%{_datadir}/icons/hicolor/scalable/apps/application-x-clementine.svg
|
||||
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||
%{_datadir}/icons/hicolor/*/apps/*.svg
|
||||
%dir %{_datadir}/clementine
|
||||
%dir %{_datadir}/clementine/projectm-presets
|
||||
%{_datadir}/clementine/projectm-presets/*
|
||||
%doc COPYING
|
||||
|
||||
%changelog
|
||||
* Sun Jul 10 2016 Automatic Build System <autodist@mambasoft.it> 1.3.1-1mamba
|
||||
- automatic version update by autodist
|
||||
|
||||
* Tue Mar 29 2016 Silvan Calarco <silvan.calarco@mambasoft.it> 1.2.3-4mamba
|
||||
- rebuilt by autoport with build requirements: libchromaprint-devel>=1.3.1-1mamba
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user