[packages/libxtract] - new URLs, updated to 0.6.6 - updated link patch, added includes,swig patch

Sat Jul 20 08:22:19 CEST 2013

commit ab1a1b6082b045f4024934e208d396b3f55ba551
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jul 20 08:22:26 2013 +0200

    - new URLs, updated to 0.6.6
    - updated link patch, added includes,swig patch

 libxtract-include.patch | 10 ++++++++++
 libxtract-link.patch    | 16 ++++++++--------
 libxtract-swig.patch    | 11 +++++++++++
 libxtract.spec          | 19 ++++++++++++++-----
 4 files changed, 43 insertions(+), 13 deletions(-)
---

diff --git a/libxtract.spec b/libxtract.spec
index 464db8d..8d950fb 100644
--- a/libxtract.spec
+++ b/libxtract.spec
@@ -1,14 +1,17 @@
 Summary:	LibXtract - a library of audio feature extraction functions
 Summary(pl.UTF-8):	LibXtract - biblioteka funkcji do wydobywania cech dźwięku
 Name:		libxtract
-Version:	0.6.3
+Version:	0.6.6
 Release:	1
 License:	GPL v2+
 Group:		Libraries
-Source0:	http://downloads.sourceforge.net/libxtract/%{name}-%{version}.tar.gz
-# Source0-md5:	43cd8403b9227690dd7e8c09acaefc36
+#Source0Download: https://github.com/jamiebullock/LibXtract/downloads
+Source0:	https://github.com/downloads/jamiebullock/LibXtract/%{name}-%{version}.tar.gz
+# Source0-md5:	098dde7030e03ffdfc246423cbcf6ed4
 Patch0:		%{name}-link.patch
-URL:		http://libxtract.sourceforge.net/
+Patch1:		%{name}-include.patch
+Patch2:		%{name}-swig.patch
+URL:		https://github.com/jamiebullock/LibXtract/
 BuildRequires:	autoconf >= 2.13
 BuildRequires:	automake >= 1.6
 BuildRequires:	fftw3-single-devel >= 2.0
@@ -123,6 +126,8 @@ Wiązania Pythona do biblioteki libxtract.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -137,6 +142,9 @@ Wiązania Pythona do biblioteki libxtract.
 	--with-java \
 	--with-python
 
+%{__make} -C swig/java clean-local
+%{__make} -C swig/python clean-local
+
 %{__make}
 
 %install
@@ -157,7 +165,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog NEWS README TODO
+%doc AUTHORS ChangeLog NEWS README.md TODO
 %attr(755,root,root) %{_libdir}/libxtract.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/libxtract.so.0
 
@@ -181,4 +189,5 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{py_sitedir}/libxtract
 %attr(755,root,root) %{py_sitedir}/libxtract/_xtract.so
 %dir %{py_sitescriptdir}/libxtract
+%{py_sitescriptdir}/libxtract/__init__.py[co]
 %{py_sitescriptdir}/libxtract/xtract.py[co]
diff --git a/libxtract-include.patch b/libxtract-include.patch
new file mode 100644
index 0000000..6a197eb
--- /dev/null
+++ b/libxtract-include.patch
@@ -0,0 +1,10 @@
+--- libxtract-0.6.6/swig/xtract.i.orig	2012-06-17 17:25:53.000000000 +0200
++++ libxtract-0.6.6/swig/xtract.i	2013-07-20 07:06:34.492632748 +0200
+@@ -5,6 +5,7 @@
+ */
+ 
+ %{
++#include <stdint.h>
+ #include "xtract/xtract_scalar.h"
+ #include "xtract/xtract_vector.h"
+ #include "xtract/xtract_helper.h"
diff --git a/libxtract-link.patch b/libxtract-link.patch
index fc9f630..671c58b 100644
--- a/libxtract-link.patch
+++ b/libxtract-link.patch
@@ -1,22 +1,22 @@
---- libxtract-0.6.3/swig/java/Makefile.am.orig	2008-10-27 14:53:59.000000000 +0100
-+++ libxtract-0.6.3/swig/java/Makefile.am	2011-05-11 15:58:38.550164197 +0200
-@@ -86,7 +86,7 @@
+--- libxtract-0.6.6/swig/java/Makefile.am.orig	2013-07-20 06:57:09.052656477 +0200
++++ libxtract-0.6.6/swig/java/Makefile.am	2013-07-20 07:03:11.565974598 +0200
+@@ -69,7 +69,7 @@
  lib_LTLIBRARIES = libjxtract.la
  libjxtract_la_SOURCES = $(srcdir)/xtract_wrap.c $(SWIG_SOURCES)
  libjxtract_la_CFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
--libjxtract_la_LDFLAGS = -module -lxtract
+-libjxtract_la_LDFLAGS = -lxtract
 +libjxtract_la_LDFLAGS = -module -avoid-version
  libjxtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
  
  SWIG_JAVA_OPT = -java -package xtract.core
---- libxtract-0.6.3/swig/python/Makefile.am.orig	2008-10-27 14:54:00.000000000 +0100
-+++ libxtract-0.6.3/swig/python/Makefile.am	2011-05-11 16:02:13.166838051 +0200
+--- libxtract-0.6.6/swig/python/Makefile.am.orig	2013-07-20 06:57:09.052656477 +0200
++++ libxtract-0.6.6/swig/python/Makefile.am	2013-07-20 07:03:49.485973008 +0200
 @@ -7,7 +7,7 @@
  pkgpyexec_LTLIBRARIES = _xtract.la
  _xtract_la_SOURCES = $(srcdir)/xtract_wrap.c $(SWIG_SOURCES)
- _xtract_la_CFLAGS = $(SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
+ _xtract_la_CFLAGS = $(AX_SWIG_PYTHON_CPPFLAGS) -I$(top_srcdir)/src
 -_xtract_la_LDFLAGS = -module -lxtract
 +_xtract_la_LDFLAGS = -module -avoid-version
  _xtract_la_LIBADD = $(top_srcdir)/src/libxtract.la
  
- xtract_wrap.c : $(SWIG_SOURCES)
+ $(srcdir)/xtract_wrap.c : $(SWIG_SOURCES)
diff --git a/libxtract-swig.patch b/libxtract-swig.patch
new file mode 100644
index 0000000..c96f270
--- /dev/null
+++ b/libxtract-swig.patch
@@ -0,0 +1,11 @@
+--- libxtract-0.6.6/xtract/xtract_scalar.h.orig	2012-06-10 12:51:41.000000000 +0200
++++ libxtract-0.6.6/xtract/xtract_scalar.h	2013-07-20 07:28:51.545909975 +0200
+@@ -128,7 +128,7 @@
+  * \param *result: the  average deviation of the spectrum pointed to by *data
+  */
+ /*
+-int xtract_spectral_average_deviation(const float *data, const int N, const void *argv, float *result);
++//int xtract_spectral_average_deviation(const float *data, const int N, const void *argv, float *result);
+ */
+ 
+ /** \brief Extract the skewness of an input spectrum
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libxtract.git/commitdiff/ab1a1b6082b045f4024934e208d396b3f55ba551

