Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Florian Franzmann (15be733b5c31fab8c488be8b834a621fa129ef06)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Florian Franzmann (15be733b5c31fab8c488be8b834a621fa129ef06)
  • Date: Sat, 14 Jul 2018 21:56:49 +0000

GIT changes to master grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4
FUNCTIONS | 6 -
devel/doxygen/DETAILS | 4
devel/doxygen/HISTORY | 3
python-pypi/pyzmq/DETAILS | 4
python-pypi/pyzmq/HISTORY | 3
science/comedilib/DETAILS | 4
science/comedilib/HISTORY | 3
science/gnuradio-osmosdr/BUILD | 2
science/gnuradio-osmosdr/DEPENDS | 1
science/gnuradio-osmosdr/DETAILS | 1
science/gnuradio-osmosdr/HISTORY | 3
science/gnuradio/0001-do-not-build-gr-trellis-documentation.patch | 42
----------
science/gnuradio/BUILD | 8 -
science/gnuradio/DEPENDS | 17 ++--
science/gnuradio/DETAILS | 4
science/gnuradio/HISTORY | 5 +
science/gnuradio/PRE_BUILD | 3
science/gqrx/BUILD | 2
science/gqrx/DEPENDS | 8 +
science/gqrx/DETAILS | 6 -
science/gqrx/HISTORY | 4
science/hackrf/DETAILS | 6 -
science/hackrf/HISTORY | 3
science/uhd/DETAILS | 8 -
science/uhd/HISTORY | 3
x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch | 25
+++++
x11-toolkits/qwt5/BUILD | 2
x11-toolkits/qwt5/DEPENDS | 2
x11-toolkits/qwt5/DETAILS | 4
x11-toolkits/qwt5/HISTORY | 6 +
x11-toolkits/qwt5/PRE_BUILD | 4
32 files changed, 115 insertions(+), 85 deletions(-)

New commits:
commit 15be733b5c31fab8c488be8b834a621fa129ef06
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/gqrx: version 2.11.5

commit 83e3851828f90b089463b4d3dd899f11add75822
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/gnuradio: version 3.7.13.3

commit b680be909fe8174aea8ce1c787797d0a756b6e63
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

FUNCTIONS: set cmake search path in qt5_cmake_build and qt4_cmake_build

commit 06d2fc37920de20b1278c1dae8c46b185ea7e470
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/gnuradio-osmosdr: use qt5

commit 37ff6a3595571a345c50c915a06fde8c22e20533
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

devel/doxygen: version 1.8.14

commit 139c1b1b67d0d9b590e85e738fc058d6ac13157d
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

x11-toolkits/qwt5: version 6.1.3

commit 517b0d5633aa538e8d742dfc7425a9f66ae1bad7
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/comedilib: version 0.11.0

commit 17c82f1774ca1ee970dbafc6d0ff466af3bb7f1a
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

python-pypi/pyzmq: version 17.1.0

commit 708546d7ca149ebb064d4b898c91a796bb78075f
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/uhd: version 3.12.0.0

commit f7fbff48bef0a7325f1dc84abf55078446baefd5
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

science/hackrf: version 2018.01.1

diff --git a/ChangeLog b/ChangeLog
index c9fb604..89f4080 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * FUNCTIONS: set cmake module search path in qt5_cmake_build and
+ qt4_cmake_build
+
2018-07-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* haskell/haskell-invariant: new spell, Haskell98 invariant functors

diff --git a/FUNCTIONS b/FUNCTIONS
index 71bb7ca..7b286e1 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -15,8 +15,9 @@ qt5_build() {
}

function qt5_cmake_build() {
- PATH="$QT5DIR/bin/:$PATH"
- export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig"
+ PATH="$QT5DIR/bin/:$PATH" &&
+ export PKG_CONFIG_PATH="$QT5DIR/lib/pkgconfig" &&
+ export CMAKE_PREFIX_PATH="$QT5DIR/lib/cmake" &&
cmake_build ${1-$QT5DIR}
}

@@ -625,6 +626,7 @@ function cmake_install() {
qt4_cmake_build() {
PATH="$QT4DIR/bin/:$PATH"
export PKG_CONFIG_PATH="$QT4DIR/lib/pkgconfig"
+ export CMAKE_PREFIX_PATH="$QT4DIR/lib/cmake" &&
cmake_build ${1-$QT4DIR}
}

diff --git a/devel/doxygen/DETAILS b/devel/doxygen/DETAILS
index 794f4c8..9cf45ed 100755
--- a/devel/doxygen/DETAILS
+++ b/devel/doxygen/DETAILS
@@ -1,6 +1,6 @@
SPELL=doxygen
- VERSION=1.8.13
-
SOURCE_HASH=sha512:85da5bd28ad9f33a8e50fa92796817d31e59c024127cb647cb967e4321dd51378feaacdf099d578b7e6020fd646a3c63e99c77420e49e3894fc18ca89ba3e0a2
+ VERSION=1.8.14
+
SOURCE_HASH=sha512:5fac7e457a51b1f8e39fb65de5e0c07633e573f74e876580e7bcad5693540d6970fde1b2cb799a4df6ab9dfca951ece15b76b3010134d7658db3500183bea85c
SOURCE=$SPELL-$VERSION.src.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=ftp://ftp.stack.nl/pub/users/dimitri/$SOURCE
diff --git a/devel/doxygen/HISTORY b/devel/doxygen/HISTORY
index d304915..eb9a77c 100644
--- a/devel/doxygen/HISTORY
+++ b/devel/doxygen/HISTORY
@@ -1,3 +1,6 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.8.14
+
2017-03-26 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.8.13

diff --git a/python-pypi/pyzmq/DETAILS b/python-pypi/pyzmq/DETAILS
index e188cf0..548e8d4 100755
--- a/python-pypi/pyzmq/DETAILS
+++ b/python-pypi/pyzmq/DETAILS
@@ -1,8 +1,8 @@
SPELL=pyzmq
- VERSION=17.0.0
+ VERSION=17.1.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=https://pypi.org/packages/source/p/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:e7e9bd402b12ea4ef94740cc60db8481b0a873e0038fbeb80bc03f985c2bd6eab73ebaea41fb8cee277a8f4e6859baac4c8530650d1659c415b1c0eb6042d9a1
+
SOURCE_HASH=sha512:7f1975c4d02e7d47577049da8df84753905d01672d5a244cef2e5b05e0b6fdb22e88cbb36f2e59831e95a8224819183d9a82baf1f9d7f599da61bcbfe2fc23d3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
DOC_DIRS=""
WEB_SITE=http://github.com/zeromq/pyzmq
diff --git a/python-pypi/pyzmq/HISTORY b/python-pypi/pyzmq/HISTORY
index 758cecc..66b4b74 100644
--- a/python-pypi/pyzmq/HISTORY
+++ b/python-pypi/pyzmq/HISTORY
@@ -1,3 +1,6 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 17.1.0
+
2018-02-10 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 17.0.0; don't gather doc sources

diff --git a/science/comedilib/DETAILS b/science/comedilib/DETAILS
index 6a8267d..ab0dc03 100755
--- a/science/comedilib/DETAILS
+++ b/science/comedilib/DETAILS
@@ -1,8 +1,8 @@
SPELL=comedilib
- VERSION=0.10.2
+ VERSION=0.11.0
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://www.comedi.org/download/${SOURCE}
-
SOURCE_HASH=sha512:8adf52001e997e38a685d87db60d5814d43b49be0c76c03ad8b5672ff84945cb8f0f2ff9d69c33d8a08d54c6a9adb50dee683b679e4036a5d6398d2d8f6878ec
+
SOURCE_HASH=sha512:bebf24161d145d077498db91e4fac92a962c33c6b7dce3e19b68b32814e44aafdf6b5f8f9c0dd5fdbf5cbbe3b150498bbe08c9307503e4c7be5e7699a68e1b34
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://www.comedi.org/";
LICENSE[0]=LGPL
diff --git a/science/comedilib/HISTORY b/science/comedilib/HISTORY
index df1ea70..d936fff 100644
--- a/science/comedilib/HISTORY
+++ b/science/comedilib/HISTORY
@@ -1,3 +1,6 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.11.0
+
2015-09-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS, DETAILS: spell created

diff --git a/science/gnuradio-osmosdr/BUILD b/science/gnuradio-osmosdr/BUILD
index 151188d..c3f201f 100755
--- a/science/gnuradio-osmosdr/BUILD
+++ b/science/gnuradio-osmosdr/BUILD
@@ -1 +1 @@
-PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/opt/qt4/lib/pkgconfig qt4_cmake_build
+PKG_CONFIG_LIBDIR=/usr/lib/pkgconfig:/opt/qt4/lib/pkgconfig qt5_cmake_build
diff --git a/science/gnuradio-osmosdr/DEPENDS
b/science/gnuradio-osmosdr/DEPENDS
index 8b53256..cca4612 100755
--- a/science/gnuradio-osmosdr/DEPENDS
+++ b/science/gnuradio-osmosdr/DEPENDS
@@ -2,4 +2,5 @@ depends gnuradio &&
depends boost &&
depends cmake &&
depends cheetah &&
+depends qtbase &&
optional_depends uhd "-DENABLE_UHD=ON" "-DENABLE_UHD=OFF" "for UHD device
support"
diff --git a/science/gnuradio-osmosdr/DETAILS
b/science/gnuradio-osmosdr/DETAILS
index 2ff297b..cd3d96e 100755
--- a/science/gnuradio-osmosdr/DETAILS
+++ b/science/gnuradio-osmosdr/DETAILS
@@ -1,5 +1,6 @@
SPELL=gnuradio-osmosdr
VERSION=0.1.4
+ PATCHLEVEL=1
SOURCE="gr-osmosdr-${VERSION}.tar.xz"
SOURCE_URL[0]=http://cgit.osmocom.org/gr-osmosdr/snapshot/${SOURCE}

SOURCE_HASH=sha512:930a7f6065fba709fb770fd373f0fe7eba13abf09e49f6e839718d547ce69176d93d89d1b037ee3f0cdffda7060ac6c9ff4023dc835ec50ef456d51d383046ab
diff --git a/science/gnuradio-osmosdr/HISTORY
b/science/gnuradio-osmosdr/HISTORY
index 3eff550..ae4b12a 100644
--- a/science/gnuradio-osmosdr/HISTORY
+++ b/science/gnuradio-osmosdr/HISTORY
@@ -1,3 +1,6 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: use qt5
+
2016-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* TRIGGERS: on_cast gnuradio cast_self

diff --git
a/science/gnuradio/0001-do-not-build-gr-trellis-documentation.patch
b/science/gnuradio/0001-do-not-build-gr-trellis-documentation.patch
deleted file mode 100644
index f67f5cc..0000000
--- a/science/gnuradio/0001-do-not-build-gr-trellis-documentation.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From ba735cd0edc79a0880c43313e5b954d6e08a677f Mon Sep 17 00:00:00 2001
-From: Florian Franzmann <siflfran AT hawo.net>
-Date: Sun, 28 Feb 2016 16:17:31 +0100
-Subject: [PATCH] do not build gr-trellis documentation
-
----
- gr-trellis/CMakeLists.txt | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/gr-trellis/CMakeLists.txt b/gr-trellis/CMakeLists.txt
-index a3f0ad4..cb6ab71 100644
---- a/gr-trellis/CMakeLists.txt
-+++ b/gr-trellis/CMakeLists.txt
-@@ -56,11 +56,11 @@ if(ENABLE_GR_TRELLIS)
- include(GrPackage)
- CPACK_SET(CPACK_COMPONENT_GROUP_TRELLIS_DESCRIPTION "GNU Radio Trellis
Blocks")
-
--CPACK_COMPONENT("trellis_docs"
-- GROUP "Trellis"
-- DISPLAY_NAME "Documentation"
-- DESCRIPTION "Doxygen HTML and XML"
--)
-+#CPACK_COMPONENT("trellis_docs"
-+# GROUP "Trellis"
-+# DISPLAY_NAME "Documentation"
-+# DESCRIPTION "Doxygen HTML and XML"
-+#)
-
- CPACK_COMPONENT("trellis_runtime"
- GROUP "Trellis"
-@@ -102,7 +102,7 @@ CPACK_COMPONENT("trellis_swig"
- ########################################################################
- add_subdirectory(include/gnuradio/trellis)
- add_subdirectory(lib)
--add_subdirectory(doc)
-+#add_subdirectory(doc)
- if(ENABLE_PYTHON)
- add_subdirectory(swig)
- add_subdirectory(python/trellis)
---
-2.7.0
-
diff --git a/science/gnuradio/BUILD b/science/gnuradio/BUILD
index c4eba77..c56ccbd 100755
--- a/science/gnuradio/BUILD
+++ b/science/gnuradio/BUILD
@@ -1,4 +1,4 @@
-OPTS+="-DENABLE_GR_AUDIO=on" &&
-make_single &&
-qt4_cmake_build &&
-make_normal
+OPTS+="-DENABLE_GR_AUDIO=on" &&
+CFLAGS="$CFLAGS -pthread" &&
+CXXFLAGS="$CXXFLAGS -pthread" &&
+qt5_cmake_build
diff --git a/science/gnuradio/DEPENDS b/science/gnuradio/DEPENDS
index 496250a..deb102b 100755
--- a/science/gnuradio/DEPENDS
+++ b/science/gnuradio/DEPENDS
@@ -11,15 +11,13 @@ sub_depends boost THREAD &&
depends alsa-lib &&
depends cmake &&
depends fftw &&
-depends qt4 &&
-depends pyqt4 &&
+depends qtbase &&
+depends pyqt5 &&
depends qwt5 &&
depends swig &&
depends cheetah &&
depends lxml &&
-depends pygtk2 &&
depends numpy &&
-depends sdl &&
depends gsl &&
depends pyzmq &&
depends hackrf &&
@@ -39,10 +37,15 @@ optional_depends log4cpp \
"" \
"for logging tools" &&
optional_depends comedilib \
- "" \
- "" \
+ "-DENABLE_GR_COMEDI=on" \
+ "-DENABLE_GR_COMEDI=off" \
"device support through comedilib" &&
optional_depends JACK-DRIVER \
"" \
"" \
- "sound support through jackd"
+ "sound support through jackd" &&
+optional_depends doxygen \
+ "-DENABLE_DOXYGEN=on" \
+ "-DENABLE_DOXYGEN=off" \
+ "build documentation"
+
diff --git a/science/gnuradio/DETAILS b/science/gnuradio/DETAILS
index 88d833e..a4d87b4 100755
--- a/science/gnuradio/DETAILS
+++ b/science/gnuradio/DETAILS
@@ -1,8 +1,8 @@
SPELL=gnuradio
- VERSION=3.7.9.1
+ VERSION=3.7.13.3
SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://${SPELL}.org/releases/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:ee575616bede307e18c3f6c4d039cdf27388796ad17adaf65bd39a74a7754bc5f822b4d18da0dd31587d453d625dfa58d75809c4a37fa0809c4009ac8fe5451d
+
SOURCE_HASH=sha512:e4bf63899678fd792bc08baa2db673b192dc823d6e586124538cbdf12e60a882847e72cfca7f52ef906d52038a9cb48a8b5891593c9db1cb172c4077a54d4056
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://gnuradio.org";
LICENSE[0]=GPL
diff --git a/science/gnuradio/HISTORY b/science/gnuradio/HISTORY
index 935f2c9..6bfa73f 100644
--- a/science/gnuradio/HISTORY
+++ b/science/gnuradio/HISTORY
@@ -1,3 +1,8 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, DEPENDS: version 3.7.13.3
+ * DEPENDS, BUILD: use qt5
+ * 0001-do-not-build-gr-trellis-documentation.patch, PRE_BUILD: removed
+
2016-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.7.9.1
* BUILD: use make_single
diff --git a/science/gnuradio/PRE_BUILD b/science/gnuradio/PRE_BUILD
deleted file mode 100755
index 69ba7fe..0000000
--- a/science/gnuradio/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-patch -p1 < $SPELL_DIRECTORY/0001-do-not-build-gr-trellis-documentation.patch
diff --git a/science/gqrx/BUILD b/science/gqrx/BUILD
index 94e4bd2..182a954 100755
--- a/science/gqrx/BUILD
+++ b/science/gqrx/BUILD
@@ -1 +1 @@
-PKG_CONFIG_LIBDIR=${INSTALL_ROOT}/usr/lib/pkgconfig:${INSTALL_ROOT}/opt/qt4/lib/pkgconfig
qt4_build
+qt5_cmake_build
diff --git a/science/gqrx/DEPENDS b/science/gqrx/DEPENDS
index 09da26e..c1e0376 100755
--- a/science/gqrx/DEPENDS
+++ b/science/gqrx/DEPENDS
@@ -1,3 +1,7 @@
-depends gnuradio &&
+depends gnuradio &&
depends gnuradio-osmosdr &&
-depends qt4
+depends qtbase &&
+optional_depends PORTAUDIO \
+ "-DLINUX_AUDIO_BACKEND=Portaudio" \
+ "-DLINUX_AUDIO_BACKEND=Gr-audio" \
+ "for audio support"
diff --git a/science/gqrx/DETAILS b/science/gqrx/DETAILS
index e6bab7f..48d652c 100755
--- a/science/gqrx/DETAILS
+++ b/science/gqrx/DETAILS
@@ -1,8 +1,8 @@
SPELL=gqrx
- VERSION=2.5.3
+ VERSION=2.11.5
SOURCE="${SPELL}-${VERSION}.tar.xz"
-
SOURCE_URL[0]=https://github.com/csete/gqrx/releases/download/v${VERSION}/gqrx-sdr-src-${VERSION}.tar.xz
-
SOURCE_HASH=sha512:9e0dcd58501daa3d9b94f4eb16eb9b4578d354f77d83fa785ffa0128742d1f4cb4ddd4a666d10ce2939194b223b7754679ee114632ce5df68834b97536c15110
+
SOURCE_URL[0]=https://github.com/csete/gqrx/releases/download/v${VERSION}/gqrx-sdr-${VERSION}-src.tar.xz
+
SOURCE_HASH=sha512:f1006c37567a6c177ec0f5d15dcef9803b5dc1b124226b552b408e4ce0b3279a845a5875bfb1d7ccd6563b41f67c07a434f325e4ee8d28db2ee19b249159d3a3
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-sdr-${VERSION}"
WEB_SITE="http://gqrx.dk/";
LICENSE[0]=GPL
diff --git a/science/gqrx/HISTORY b/science/gqrx/HISTORY
index baccafd..6e13c2b 100644
--- a/science/gqrx/HISTORY
+++ b/science/gqrx/HISTORY
@@ -1,3 +1,7 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.11.5
+ * DEPENDS, BUILD: use qt5
+
2016-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.5.3

diff --git a/science/hackrf/DETAILS b/science/hackrf/DETAILS
index 63cfebd..f2a0ff8 100755
--- a/science/hackrf/DETAILS
+++ b/science/hackrf/DETAILS
@@ -1,9 +1,9 @@
SPELL=hackrf
- VERSION=2015.07.2
+ VERSION=2018.01.1
SOURCE="${SPELL}-v${VERSION}.tar.gz"

SOURCE_URL[0]=https://github.com/mossmann/${SPELL}/archive/v${VERSION}.tar.gz
-
SOURCE_HASH=sha512:6adf61e362afcf583024bb233743517e339bf31c92db3abc6e02e9eb9fbb5a82469635a45d1fea80815e25914bd38bea31e0757061ddcfad84d1ae1ac5492b64
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-2015.07.2"
+
SOURCE_HASH=sha512:227fe2b6c60e7af4b906371a89ace77d0284d3a1382ad8cd6c43bb0748e7208621afb15932c1c47647488a952270da3c111be987b6c0812edac79e11c1d1f2c7
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/mossmann/hackrf";
LICENSE[0]=GPL
ENTERED=20150821
diff --git a/science/hackrf/HISTORY b/science/hackrf/HISTORY
index bf6daec..18b30ee 100644
--- a/science/hackrf/HISTORY
+++ b/science/hackrf/HISTORY
@@ -1,3 +1,6 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2018.01.1
+
2015-08-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: spell created

diff --git a/science/uhd/DETAILS b/science/uhd/DETAILS
index 16e8995..f05237f 100755
--- a/science/uhd/DETAILS
+++ b/science/uhd/DETAILS
@@ -1,9 +1,9 @@
SPELL=uhd
- VERSION=003_009_002
+ VERSION=3.12.0.0
SOURCE="$SPELL-${VERSION}.tar.gz"
-
SOURCE_URL[0]=https://github.com/EttusResearch/${SPELL}/archive/release_${VERSION}.tar.gz
-
SOURCE_HASH=sha512:394e0e636ad5717ab16ef920ef23625a6ee537af50c84cf8e5ed67f179b41b9cd030b95878e777ae93fea496b124708c2e598d0e7e23c0a5205b340181c5dc09
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-release_${VERSION}"
+
SOURCE_URL[0]=https://github.com/EttusResearch/${SPELL}/archive/v${VERSION}.tar.gz
+
SOURCE_HASH=sha512:33efcb913a40fcceaf21460eeb7b8fe7fdd9066cefc1f6ae7d4f436532965b3fe55557d551a8e95c3823418ffec4c0e2804e200c9222b5bf5735622cc2cb1389
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="https://github.com/EttusResearch/uhd";
LICENSE[0]=GPL
ENTERED=20150906
diff --git a/science/uhd/HISTORY b/science/uhd/HISTORY
index 3013e7e..1b3ebe8 100644
--- a/science/uhd/HISTORY
+++ b/science/uhd/HISTORY
@@ -1,3 +1,6 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 3.12.0.0
+
2016-02-28 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 003.009.002
* DEPENDS: depend on gcc with CXX
diff --git a/x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch
b/x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch
new file mode 100644
index 0000000..d0b249d
--- /dev/null
+++ b/x11-toolkits/qwt5/0001-do-not-build-designer-plugin.patch
@@ -0,0 +1,25 @@
+From 83de529d6d22b2e8a890b3d88d7abcad74d7f301 Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <bwlf AT bandrate.org>
+Date: Sat, 14 Jul 2018 20:50:08 +0200
+Subject: [PATCH] do not build designer plugin
+
+---
+ qwtconfig.pri | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/qwtconfig.pri b/qwtconfig.pri
+index 2dc3715..4aae30f 100644
+--- a/qwtconfig.pri
++++ b/qwtconfig.pri
+@@ -118,7 +118,7 @@ QWT_CONFIG += QwtOpenGL
+ # Otherwise you have to build it from the designer directory.
+ ######################################################################
+
+-QWT_CONFIG += QwtDesigner
++#QWT_CONFIG += QwtDesigner
+
+ ######################################################################
+ # Compile all Qwt classes into the designer plugin instead
+--
+2.18.0
+
diff --git a/x11-toolkits/qwt5/BUILD b/x11-toolkits/qwt5/BUILD
index eec3de4..0694f56 100755
--- a/x11-toolkits/qwt5/BUILD
+++ b/x11-toolkits/qwt5/BUILD
@@ -1 +1 @@
-qt4_build
+qt5_build
diff --git a/x11-toolkits/qwt5/DEPENDS b/x11-toolkits/qwt5/DEPENDS
index 06a9804..bec1ddc 100755
--- a/x11-toolkits/qwt5/DEPENDS
+++ b/x11-toolkits/qwt5/DEPENDS
@@ -1,2 +1,2 @@
depends -sub CXX gcc &&
-depends qt4
+depends qtbase
diff --git a/x11-toolkits/qwt5/DETAILS b/x11-toolkits/qwt5/DETAILS
index 4cb3aab..937f189 100755
--- a/x11-toolkits/qwt5/DETAILS
+++ b/x11-toolkits/qwt5/DETAILS
@@ -1,6 +1,6 @@
SPELL=qwt5
- VERSION=6.1.0
-
SOURCE_HASH=sha512:5c5c8309debad1829cb59cf1c941b66306153a25b2027d674a2cfa5a150bfdd3823a1b6ed9df3b326bacc1dc7d1b6c301b1fd5bcebf7ff51cfa74b76a55f30bc
+ VERSION=6.1.3
+
SOURCE_HASH=sha512:d4a73e9e7ddcb7c16c508920a298784935be2eddc8f7585993d9fffe1bb01e1787a0d5d7ea4f220398b94ea2b211a19009dccaeadce56a84410357124bcb051a
SOURCE=qwt-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/qwt-$VERSION

SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/qwt/qwt/${VERSION}/${SOURCE}
diff --git a/x11-toolkits/qwt5/HISTORY b/x11-toolkits/qwt5/HISTORY
index 8f85fe6..e5d1a77 100644
--- a/x11-toolkits/qwt5/HISTORY
+++ b/x11-toolkits/qwt5/HISTORY
@@ -1,3 +1,9 @@
+2018-07-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 6.1.3
+ * DEPENDS, BUILD: use qt5
+ * PRE_BUILD, 0001-do-not-build-designer-plugin.patch: do not build
designer
+ plugin
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/x11-toolkits/qwt5/PRE_BUILD b/x11-toolkits/qwt5/PRE_BUILD
index 31656b1..1a6b953 100755
--- a/x11-toolkits/qwt5/PRE_BUILD
+++ b/x11-toolkits/qwt5/PRE_BUILD
@@ -5,5 +5,7 @@ default_pre_build &&
cd $SOURCE_DIRECTORY &&
sed -i -e "/local/D;/QWT_INSTALL_PREFIX *=/s|=.*$|= $INSTALL_ROOT/usr|" \
-e "s|/doc|/share/doc|;/features/s|/|/share/qt4/mkspecs/|" \
- qwtconfig.pri
+ qwtconfig.pri &&
+
+patch -p1 < "$SPELL_DIRECTORY/0001-do-not-build-designer-plugin.patch"




  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (15be733b5c31fab8c488be8b834a621fa129ef06), Florian Franzmann, 07/14/2018

Archive powered by MHonArc 2.6.24.

Top of Page