[arch-commits] Commit in gnuradio-iqbal/repos (8 files)

Kyle Keen kkeen at nymeria.archlinux.org
Mon Jul 14 09:30:04 UTC 2014


    Date: Monday, July 14, 2014 @ 11:30:04
  Author: kkeen
Revision: 115693

archrelease: copy trunk to community-i686, community-x86_64

Added:
  gnuradio-iqbal/repos/community-i686/PKGBUILD
    (from rev 115692, gnuradio-iqbal/trunk/PKGBUILD)
  gnuradio-iqbal/repos/community-i686/float-complex.patch
    (from rev 115692, gnuradio-iqbal/trunk/float-complex.patch)
  gnuradio-iqbal/repos/community-x86_64/PKGBUILD
    (from rev 115692, gnuradio-iqbal/trunk/PKGBUILD)
  gnuradio-iqbal/repos/community-x86_64/float-complex.patch
    (from rev 115692, gnuradio-iqbal/trunk/float-complex.patch)
Deleted:
  gnuradio-iqbal/repos/community-i686/PKGBUILD
  gnuradio-iqbal/repos/community-i686/float-complex.patch
  gnuradio-iqbal/repos/community-x86_64/PKGBUILD
  gnuradio-iqbal/repos/community-x86_64/float-complex.patch

--------------------------------------+
 /PKGBUILD                            |   86 +++++++++++++++++++++++++++++++++
 /float-complex.patch                 |   44 ++++++++++++++++
 community-i686/PKGBUILD              |   41 ---------------
 community-i686/float-complex.patch   |   22 --------
 community-x86_64/PKGBUILD            |   41 ---------------
 community-x86_64/float-complex.patch |   22 --------
 6 files changed, 130 insertions(+), 126 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2014-07-14 09:29:44 UTC (rev 115692)
+++ community-i686/PKGBUILD	2014-07-14 09:30:04 UTC (rev 115693)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Dominik Heidler <dheidler at gmail.com>
-pkgname=gnuradio-iqbal
-_pkgname=gr-iqbal
-pkgver=0.37.1
-pkgrel=2
-pkgdesc="gnuradio I/Q balancing"
-arch=('i686' 'x86_64')
-url="http://cgit.osmocom.org/gr-iqbal/"
-license=('GPL')
-depends=('gnuradio')
-replaces=('gr-iqbal')
-makedepends=('git' 'cmake' 'boost' 'swig')
-source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
-        float-complex.patch)
-md5sums=('SKIP'
-         '6417f4c064b44e8875fbb783c3a2c308')
-
-build() {
-  cd "$srcdir/$_pkgname"
-  git submodule init
-  git submodule update
-  # patch is already in git, only applies to 0.37.1
-  patch -p1 -i "$srcdir/float-complex.patch"
-  mkdir build
-  cd build
-  cmake \
-    -Wno-dev \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DPYTHON_EXECUTABLE=$(which python2) \
-    -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
-    -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-    -DCMAKE_INSTALL_PREFIX=/usr ../
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname/build/"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnuradio-iqbal/repos/community-i686/PKGBUILD (from rev 115692, gnuradio-iqbal/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2014-07-14 09:30:04 UTC (rev 115693)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Dominik Heidler <dheidler at gmail.com>
+pkgname=gnuradio-iqbal
+_pkgname=gr-iqbal
+pkgver=0.37.1
+pkgrel=3
+pkgdesc="Gnuradio I/Q balancing"
+arch=('i686' 'x86_64')
+url="http://cgit.osmocom.org/gr-iqbal/"
+license=('GPL')
+depends=('gnuradio' 'fftw')
+replaces=('gr-iqbal')
+makedepends=('git' 'cmake' 'boost' 'swig')
+source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
+        float-complex.patch)
+md5sums=('SKIP'
+         '6417f4c064b44e8875fbb783c3a2c308')
+
+build() {
+  cd "$srcdir/$_pkgname"
+  git submodule init
+  git submodule update
+  # patches are already in git, only applies to 0.37.1
+  patch -p1 -i "$srcdir/float-complex.patch"
+  sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES}/' CMakeLists.txt 
+  mkdir build
+  cd build
+  cmake \
+    -Wno-dev \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DPYTHON_EXECUTABLE=$(which python2) \
+    -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
+    -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
+    -DCMAKE_LIBRARY_PATH=/usr/lib \
+    -DCMAKE_INSTALL_PREFIX=/usr ../
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname/build/"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-i686/float-complex.patch
===================================================================
--- community-i686/float-complex.patch	2014-07-14 09:29:44 UTC (rev 115692)
+++ community-i686/float-complex.patch	2014-07-14 09:30:04 UTC (rev 115693)
@@ -1,22 +0,0 @@
-diff --git a/lib/optimize_c.cc b/lib/optimize_c.cc
-index 318a996..2cad998 100644
---- a/lib/optimize_c.cc
-+++ b/lib/optimize_c.cc
-@@ -25,6 +25,17 @@
- #include <gnuradio/io_signature.h>
- #include <gnuradio/iqbalance/optimize_c.h>
- 
-+#define GCC_VERSION (		\
-+	__GNUC__ * 10000 +  \
-+	__GNUC_MINOR__ * 100 +	\
-+	__GNUC_PATCHLEVEL__ \
-+   )
-+
-+#if GCC_VERSION >= 40800
-+# define complex _Complex
-+# undef _GLIBCXX_HAVE_COMPLEX_H
-+#endif
-+
- extern "C" {
- #include <osmocom/dsp/cxvec.h>
- #include <osmocom/dsp/iqbal.h>

Copied: gnuradio-iqbal/repos/community-i686/float-complex.patch (from rev 115692, gnuradio-iqbal/trunk/float-complex.patch)
===================================================================
--- community-i686/float-complex.patch	                        (rev 0)
+++ community-i686/float-complex.patch	2014-07-14 09:30:04 UTC (rev 115693)
@@ -0,0 +1,22 @@
+diff --git a/lib/optimize_c.cc b/lib/optimize_c.cc
+index 318a996..2cad998 100644
+--- a/lib/optimize_c.cc
++++ b/lib/optimize_c.cc
+@@ -25,6 +25,17 @@
+ #include <gnuradio/io_signature.h>
+ #include <gnuradio/iqbalance/optimize_c.h>
+ 
++#define GCC_VERSION (		\
++	__GNUC__ * 10000 +  \
++	__GNUC_MINOR__ * 100 +	\
++	__GNUC_PATCHLEVEL__ \
++   )
++
++#if GCC_VERSION >= 40800
++# define complex _Complex
++# undef _GLIBCXX_HAVE_COMPLEX_H
++#endif
++
+ extern "C" {
+ #include <osmocom/dsp/cxvec.h>
+ #include <osmocom/dsp/iqbal.h>

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2014-07-14 09:29:44 UTC (rev 115692)
+++ community-x86_64/PKGBUILD	2014-07-14 09:30:04 UTC (rev 115693)
@@ -1,41 +0,0 @@
-# $Id$
-# Maintainer: Kyle Keen <keenerd at gmail.com>
-# Contributor: Dominik Heidler <dheidler at gmail.com>
-pkgname=gnuradio-iqbal
-_pkgname=gr-iqbal
-pkgver=0.37.1
-pkgrel=2
-pkgdesc="gnuradio I/Q balancing"
-arch=('i686' 'x86_64')
-url="http://cgit.osmocom.org/gr-iqbal/"
-license=('GPL')
-depends=('gnuradio')
-replaces=('gr-iqbal')
-makedepends=('git' 'cmake' 'boost' 'swig')
-source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
-        float-complex.patch)
-md5sums=('SKIP'
-         '6417f4c064b44e8875fbb783c3a2c308')
-
-build() {
-  cd "$srcdir/$_pkgname"
-  git submodule init
-  git submodule update
-  # patch is already in git, only applies to 0.37.1
-  patch -p1 -i "$srcdir/float-complex.patch"
-  mkdir build
-  cd build
-  cmake \
-    -Wno-dev \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DPYTHON_EXECUTABLE=$(which python2) \
-    -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
-    -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
-    -DCMAKE_INSTALL_PREFIX=/usr ../
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname/build/"
-  make DESTDIR="${pkgdir}" install
-}

Copied: gnuradio-iqbal/repos/community-x86_64/PKGBUILD (from rev 115692, gnuradio-iqbal/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2014-07-14 09:30:04 UTC (rev 115693)
@@ -0,0 +1,43 @@
+# $Id$
+# Maintainer: Kyle Keen <keenerd at gmail.com>
+# Contributor: Dominik Heidler <dheidler at gmail.com>
+pkgname=gnuradio-iqbal
+_pkgname=gr-iqbal
+pkgver=0.37.1
+pkgrel=3
+pkgdesc="Gnuradio I/Q balancing"
+arch=('i686' 'x86_64')
+url="http://cgit.osmocom.org/gr-iqbal/"
+license=('GPL')
+depends=('gnuradio' 'fftw')
+replaces=('gr-iqbal')
+makedepends=('git' 'cmake' 'boost' 'swig')
+source=("git://git.osmocom.org/gr-iqbal/#tag=v$pkgver"
+        float-complex.patch)
+md5sums=('SKIP'
+         '6417f4c064b44e8875fbb783c3a2c308')
+
+build() {
+  cd "$srcdir/$_pkgname"
+  git submodule init
+  git submodule update
+  # patches are already in git, only applies to 0.37.1
+  patch -p1 -i "$srcdir/float-complex.patch"
+  sed -i 's/LIBOSMODSP_LIBRARIES ""/LIBOSMODSP_LIBRARIES ${FFTW3F_LIBRARIES}/' CMakeLists.txt 
+  mkdir build
+  cd build
+  cmake \
+    -Wno-dev \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DPYTHON_EXECUTABLE=$(which python2) \
+    -DPYTHON_INCLUDE_DIR=$(echo /usr/include/python2*) \
+    -DPYTHON_LIBRARY=$(echo /usr/lib/libpython2.*.so) \
+    -DCMAKE_LIBRARY_PATH=/usr/lib \
+    -DCMAKE_INSTALL_PREFIX=/usr ../
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname/build/"
+  make DESTDIR="${pkgdir}" install
+}

Deleted: community-x86_64/float-complex.patch
===================================================================
--- community-x86_64/float-complex.patch	2014-07-14 09:29:44 UTC (rev 115692)
+++ community-x86_64/float-complex.patch	2014-07-14 09:30:04 UTC (rev 115693)
@@ -1,22 +0,0 @@
-diff --git a/lib/optimize_c.cc b/lib/optimize_c.cc
-index 318a996..2cad998 100644
---- a/lib/optimize_c.cc
-+++ b/lib/optimize_c.cc
-@@ -25,6 +25,17 @@
- #include <gnuradio/io_signature.h>
- #include <gnuradio/iqbalance/optimize_c.h>
- 
-+#define GCC_VERSION (		\
-+	__GNUC__ * 10000 +  \
-+	__GNUC_MINOR__ * 100 +	\
-+	__GNUC_PATCHLEVEL__ \
-+   )
-+
-+#if GCC_VERSION >= 40800
-+# define complex _Complex
-+# undef _GLIBCXX_HAVE_COMPLEX_H
-+#endif
-+
- extern "C" {
- #include <osmocom/dsp/cxvec.h>
- #include <osmocom/dsp/iqbal.h>

Copied: gnuradio-iqbal/repos/community-x86_64/float-complex.patch (from rev 115692, gnuradio-iqbal/trunk/float-complex.patch)
===================================================================
--- community-x86_64/float-complex.patch	                        (rev 0)
+++ community-x86_64/float-complex.patch	2014-07-14 09:30:04 UTC (rev 115693)
@@ -0,0 +1,22 @@
+diff --git a/lib/optimize_c.cc b/lib/optimize_c.cc
+index 318a996..2cad998 100644
+--- a/lib/optimize_c.cc
++++ b/lib/optimize_c.cc
+@@ -25,6 +25,17 @@
+ #include <gnuradio/io_signature.h>
+ #include <gnuradio/iqbalance/optimize_c.h>
+ 
++#define GCC_VERSION (		\
++	__GNUC__ * 10000 +  \
++	__GNUC_MINOR__ * 100 +	\
++	__GNUC_PATCHLEVEL__ \
++   )
++
++#if GCC_VERSION >= 40800
++# define complex _Complex
++# undef _GLIBCXX_HAVE_COMPLEX_H
++#endif
++
+ extern "C" {
+ #include <osmocom/dsp/cxvec.h>
+ #include <osmocom/dsp/iqbal.h>




More information about the arch-commits mailing list