[projectM-libvisual] Added a patch for gcc 4.6 compatibility
Jameson Pugh
imntreal at fedoraproject.org
Mon Jan 16 16:55:16 UTC 2012
commit 1014e685249ac4944774dc7c992f5c5b69fc64d6
Author: Jameson Pugh <imntreal at gmail.com>
Date: Mon Jan 16 11:55:05 2012 -0500
Added a patch for gcc 4.6 compatibility
.gitignore | 1 +
projectM-libvisual-gcc46.patch | 12 ++++++++++++
projectM-libvisual.spec | 11 ++++++++---
sources | 2 +-
4 files changed, 22 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4d77bbf..08cdb4f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
projectM-libvisual-2.0.1.tar.bz2
+/projectM_libvisual-2.0.1-Source.tar.gz
diff --git a/projectM-libvisual-gcc46.patch b/projectM-libvisual-gcc46.patch
new file mode 100644
index 0000000..45c14be
--- /dev/null
+++ b/projectM-libvisual-gcc46.patch
@@ -0,0 +1,12 @@
+diff -Naur projectM_libvisual-2.0.1-Source-orig/actor_projectM.cpp projectM_libvisual-2.0.1-Source/actor_projectM.cpp
+--- projectM_libvisual-2.0.1-Source-orig/actor_projectM.cpp 2009-12-05 20:20:38.000000000 -0500
++++ projectM_libvisual-2.0.1-Source/actor_projectM.cpp 2012-01-16 11:14:28.445373474 -0500
+@@ -209,7 +209,7 @@
+ * we aren't with projectm, so just ignore :) */
+ extern "C" VisPalette *lv_projectm_palette (VisPluginData *plugin)
+ {
+- return NULL;
++ return (VisPalette *) NULL;
+ }
+
+ /* This is where the real rendering happens! This function is what we call, many times
diff --git a/projectM-libvisual.spec b/projectM-libvisual.spec
index 26c0b1f..c168f8e 100644
--- a/projectM-libvisual.spec
+++ b/projectM-libvisual.spec
@@ -1,11 +1,12 @@
Name: projectM-libvisual
Version: 2.0.1
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: The projectM visualization plugin for libvisual
Group: Applications/Multimedia
License: GPLv2+ and LGPLv2+ and MIT
URL: http://projectm.sourceforge.net/
-Source0: http://downloads.sourceforge.net/projectm/%{name}-%{version}.tar.bz2
+Source0: http://downloads.sourceforge.net/projectm/projectM_libvisual-%{version}-Source.tar.gz
+Patch0: projectM-libvisual-gcc46.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: cmake, libprojectM-devel => %{version}, libvisual-devel = 0.4.0, SDL-devel
@@ -14,7 +15,8 @@ This package allows the use of the projectM visualization plugin through any
libvisual compatible applications.
%prep
-%setup -q
+%setup -q -n projectM_libvisual-%{version}-Source
+%patch0 -p1
%build
@@ -41,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libvisual-0.4/
%changelog
+* Mon Jan 16 2012 Jameson Pugh <imntreal at gmail.com> - 2.0.1-5
+- Added a patch for gcc 4.6 compatibility
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
diff --git a/sources b/sources
index eff7176..5193520 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8f86de90fdfc84b0c38b344b15ab8315 projectM-libvisual-2.0.1.tar.bz2
+35e09b09210d48b437e3574bd00b15a8 projectM_libvisual-2.0.1-Source.tar.gz
More information about the scm-commits
mailing list