[packages/libofa] - fix building with current c++ std - rel 4

baggins baggins at pld-linux.org
Sat Dec 7 17:14:42 CET 2013


commit 7bd29a4601620e0e4d59a032d98b13ac0eaf827f
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 7 17:14:17 2013 +0100

    - fix building with current c++ std
    - rel 4

 libofa-c++.patch | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 libofa.spec      |  3 ++-
 2 files changed, 61 insertions(+), 1 deletion(-)
---
diff --git a/libofa.spec b/libofa.spec
index 350caf5..d5b3856 100644
--- a/libofa.spec
+++ b/libofa.spec
@@ -2,7 +2,7 @@ Summary:	Open Fingerprint Architecture - identyfying a piece of music with just
 Summary(pl.UTF-8):	Open Fingerprint Architecture - identyfikowanie muzyki po samym dźwięku
 Name:		libofa
 Version:	0.9.3
-Release:	3
+Release:	4
 License:	GPL v2 or Adaptive Public License
 Group:		Libraries
 Source0:	http://musicip-libofa.googlecode.com/files/libofa-%{version}.tar.gz
@@ -77,6 +77,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING README
 %attr(755,root,root) %{_libdir}/libofa.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libofa.so.0
 
 %files devel
 %defattr(644,root,root,755)
diff --git a/libofa-c++.patch b/libofa-c++.patch
index c308405..23832d7 100644
--- a/libofa-c++.patch
+++ b/libofa-c++.patch
@@ -9,3 +9,62 @@
  	else
  	{
  		Real c = b/a;
+--- libofa-0.9.3/lib/signal_op.cpp~	2006-05-10 20:01:12.000000000 +0200
++++ libofa-0.9.3/lib/signal_op.cpp	2013-12-07 17:08:10.642704315 +0100
+@@ -13,6 +13,7 @@
+ 
+ 
+ #include <math.h>
++#include <cstdlib>
+ #include "signal_op.h"
+ #include "AFLIB/aflibConverter.h"
+ #include "error_op.h"
+diff -ur libofa-0.9.3/examples/example.cpp libofa-0.9.3-c++/examples/example.cpp
+--- libofa-0.9.3/examples/example.cpp	2006-05-10 20:05:37.000000000 +0200
++++ libofa-0.9.3-c++/examples/example.cpp	2013-12-07 17:11:08.776036358 +0100
+@@ -7,6 +7,9 @@
+ 
+ -------------------------------------------------------------------*/
+ 
++#include <stdio.h>
++#include <cstdlib>
++#include <cstring>
+ #include "protocol.h"
+ 
+ AudioData* loadWaveFile(char *file);
+diff -ur libofa-0.9.3/examples/protocol.cpp libofa-0.9.3-c++/examples/protocol.cpp
+--- libofa-0.9.3/examples/protocol.cpp	2006-05-10 20:05:42.000000000 +0200
++++ libofa-0.9.3-c++/examples/protocol.cpp	2013-12-07 17:10:11.666036772 +0100
+@@ -7,8 +7,8 @@
+ 
+ -------------------------------------------------------------------*/
+ #include <stdio.h>
+-#include <stdlib.h>
+-#include <string>
++#include <cstdlib>
++#include <cstring>
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+diff -ur libofa-0.9.3/examples/uselame.cpp libofa-0.9.3-c++/examples/uselame.cpp
+--- libofa-0.9.3/examples/uselame.cpp	2006-05-10 20:05:51.000000000 +0200
++++ libofa-0.9.3-c++/examples/uselame.cpp	2013-12-07 17:11:25.909369568 +0100
+@@ -10,6 +10,7 @@
+ #ifdef WIN32
+ #include "windows.h"
+ #else
++#include <unistd.h>
+ #include <sys/wait.h>
+ #endif
+ 
+diff -ur libofa-0.9.3/examples/wavefile.cpp libofa-0.9.3-c++/examples/wavefile.cpp
+--- libofa-0.9.3/examples/wavefile.cpp	2006-05-10 20:05:56.000000000 +0200
++++ libofa-0.9.3-c++/examples/wavefile.cpp	2013-12-07 17:12:09.426035919 +0100
+@@ -10,6 +10,7 @@
+ #ifdef WIN32
+ #include "io.h"
+ #endif
++#include <unistd.h>
+ #include <fcntl.h>
+ 
+ static bool readBytes(int fd, unsigned char *buf, int size) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libofa.git/commitdiff/7bd29a4601620e0e4d59a032d98b13ac0eaf827f



More information about the pld-cvs-commit mailing list