| 1 |
zerochaos 14/08/25 15:47:57 |
| 2 |
|
| 3 |
Modified: gnuradio-9999.ebuild ChangeLog |
| 4 |
Added: gnuradio-3.7.4-r1.ebuild |
| 5 |
Removed: gnuradio-3.7.4.ebuild |
| 6 |
Log: |
| 7 |
fix bug in qtgui where we included qwt5 but linked to qwt6, fix missing include for string.h |
| 8 |
|
| 9 |
(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key DD11F94A) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.22 net-wireless/gnuradio/gnuradio-9999.ebuild |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild?rev=1.22&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild?rev=1.22&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild?r1=1.21&r2=1.22 |
| 17 |
|
| 18 |
Index: gnuradio-9999.ebuild |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v |
| 21 |
retrieving revision 1.21 |
| 22 |
retrieving revision 1.22 |
| 23 |
diff -u -r1.21 -r1.22 |
| 24 |
--- gnuradio-9999.ebuild 24 Aug 2014 21:49:25 -0000 1.21 |
| 25 |
+++ gnuradio-9999.ebuild 25 Aug 2014 15:47:57 -0000 1.22 |
| 26 |
@@ -1,6 +1,6 @@ |
| 27 |
# Copyright 1999-2014 Gentoo Foundation |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.21 2014/08/24 21:49:25 zerochaos Exp $ |
| 30 |
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-9999.ebuild,v 1.22 2014/08/25 15:47:57 zerochaos Exp $ |
| 31 |
|
| 32 |
EAPI=5 |
| 33 |
PYTHON_COMPAT=( python2_7 ) |
| 34 |
@@ -153,7 +153,6 @@ |
| 35 |
-DSYSCONFDIR="${EPREFIX}"/etc \ |
| 36 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
| 37 |
) |
| 38 |
- use qt4 && mycmakeargs+=( -DQWT_INCLUDE_DIRS="${EPREFIX}"/usr/include/qwt5 ) |
| 39 |
cmake-utils_src_configure |
| 40 |
} |
| 41 |
|
| 42 |
|
| 43 |
|
| 44 |
|
| 45 |
1.52 net-wireless/gnuradio/ChangeLog |
| 46 |
|
| 47 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/ChangeLog?rev=1.52&view=markup |
| 48 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/ChangeLog?rev=1.52&content-type=text/plain |
| 49 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/ChangeLog?r1=1.51&r2=1.52 |
| 50 |
|
| 51 |
Index: ChangeLog |
| 52 |
=================================================================== |
| 53 |
RCS file: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v |
| 54 |
retrieving revision 1.51 |
| 55 |
retrieving revision 1.52 |
| 56 |
diff -u -r1.51 -r1.52 |
| 57 |
--- ChangeLog 24 Aug 2014 21:49:25 -0000 1.51 |
| 58 |
+++ ChangeLog 25 Aug 2014 15:47:57 -0000 1.52 |
| 59 |
@@ -1,6 +1,14 @@ |
| 60 |
# ChangeLog for net-wireless/gnuradio |
| 61 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 62 |
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.51 2014/08/24 21:49:25 zerochaos Exp $ |
| 63 |
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/ChangeLog,v 1.52 2014/08/25 15:47:57 zerochaos Exp $ |
| 64 |
+ |
| 65 |
+*gnuradio-3.7.4-r1 (25 Aug 2014) |
| 66 |
+ |
| 67 |
+ 25 Aug 2014; Rick Farina <zerochaos@g.o> |
| 68 |
+ +files/gnuradio-3.7.4-include_stringh.patch, +gnuradio-3.7.4-r1.ebuild, |
| 69 |
+ -files/include_stringh.patch, -gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild: |
| 70 |
+ fix bug in qtgui where we included qwt5 but linked to qwt6, fix missing |
| 71 |
+ include for string.h |
| 72 |
|
| 73 |
24 Aug 2014; Rick Farina <zerochaos@g.o> +files/include_stringh.patch, |
| 74 |
gnuradio-3.7.4.ebuild, gnuradio-9999.ebuild, metadata.xml: |
| 75 |
|
| 76 |
|
| 77 |
|
| 78 |
1.1 net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild |
| 79 |
|
| 80 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild?rev=1.1&view=markup |
| 81 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild?rev=1.1&content-type=text/plain |
| 82 |
|
| 83 |
Index: gnuradio-3.7.4-r1.ebuild |
| 84 |
=================================================================== |
| 85 |
# Copyright 1999-2014 Gentoo Foundation |
| 86 |
# Distributed under the terms of the GNU General Public License v2 |
| 87 |
# $Header: /var/cvsroot/gentoo-x86/net-wireless/gnuradio/gnuradio-3.7.4-r1.ebuild,v 1.1 2014/08/25 15:47:57 zerochaos Exp $ |
| 88 |
|
| 89 |
EAPI=5 |
| 90 |
PYTHON_COMPAT=( python2_7 ) |
| 91 |
|
| 92 |
inherit cmake-utils fdo-mime python-single-r1 |
| 93 |
|
| 94 |
DESCRIPTION="Toolkit that provides signal processing blocks to implement software radios" |
| 95 |
HOMEPAGE="http://gnuradio.org/" |
| 96 |
LICENSE="GPL-3" |
| 97 |
SLOT="0/${PV}" |
| 98 |
|
| 99 |
if [[ ${PV} == "9999" ]] ; then |
| 100 |
EGIT_REPO_URI="http://gnuradio.org/git/gnuradio.git" |
| 101 |
inherit git-2 |
| 102 |
KEYWORDS="" |
| 103 |
else |
| 104 |
SRC_URI="http://gnuradio.org/releases/${PN}/${P}.tar.gz" |
| 105 |
KEYWORDS="~amd64 ~arm ~x86" |
| 106 |
fi |
| 107 |
|
| 108 |
IUSE="alsa +analog +digital channels +ctrlport doc examples fcd +filter grc jack log oss pager performance-counters portaudio +qt4 sdl uhd +utils wavelet wxwidgets" |
| 109 |
|
| 110 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 111 |
analog? ( filter ) |
| 112 |
digital? ( filter analog ) |
| 113 |
pager? ( filter analog ) |
| 114 |
qt4? ( filter ) |
| 115 |
uhd? ( filter analog ) |
| 116 |
fcd? ( || ( alsa oss ) ) |
| 117 |
wavelet? ( analog ) |
| 118 |
wxwidgets? ( filter analog )" |
| 119 |
|
| 120 |
# bug #348206 |
| 121 |
# comedi? ( >=sci-electronics/comedilib-0.8 ) |
| 122 |
# boost-1.52.0 is blacklisted, bug #461578, upstream #513, boost #7669 |
| 123 |
RDEPEND="${PYTHON_DEPS} |
| 124 |
>=dev-lang/orc-0.4.12 |
| 125 |
dev-libs/boost:0=[${PYTHON_USEDEP}] |
| 126 |
!<=dev-libs/boost-1.52.0-r6:0/1.52 |
| 127 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 128 |
>=dev-util/cppunit-1.9.14 |
| 129 |
sci-libs/fftw:3.0= |
| 130 |
alsa? ( |
| 131 |
media-libs/alsa-lib[${PYTHON_USEDEP}] |
| 132 |
) |
| 133 |
ctrlport? ( dev-libs/Ice[python,${PYTHON_USEDEP}] ) |
| 134 |
fcd? ( virtual/libusb:1 ) |
| 135 |
filter? ( sci-libs/scipy ) |
| 136 |
grc? ( |
| 137 |
dev-python/cheetah[${PYTHON_USEDEP}] |
| 138 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 139 |
>=dev-python/pygtk-2.10:2[${PYTHON_USEDEP}] |
| 140 |
) |
| 141 |
jack? ( |
| 142 |
media-sound/jack-audio-connection-kit |
| 143 |
) |
| 144 |
log? ( dev-libs/log4cpp ) |
| 145 |
portaudio? ( |
| 146 |
>=media-libs/portaudio-19_pre |
| 147 |
) |
| 148 |
qt4? ( |
| 149 |
>=dev-python/PyQt4-4.4[X,opengl,${PYTHON_USEDEP}] |
| 150 |
>=dev-python/pyqwt-5.2:5 |
| 151 |
>=dev-qt/qtcore-4.4 |
| 152 |
>=dev-qt/qtgui-4.4:4 |
| 153 |
>=x11-libs/qwt-5.2 |
| 154 |
) |
| 155 |
sdl? ( >=media-libs/libsdl-1.2.0 ) |
| 156 |
uhd? ( >=net-wireless/uhd-3.4.3-r1:=[${PYTHON_USEDEP}] ) |
| 157 |
wavelet? ( |
| 158 |
>=sci-libs/gsl-1.10 |
| 159 |
) |
| 160 |
wxwidgets? ( |
| 161 |
dev-python/lxml[${PYTHON_USEDEP}] |
| 162 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 163 |
dev-python/wxpython:2.8[${PYTHON_USEDEP}] |
| 164 |
) |
| 165 |
" |
| 166 |
DEPEND="${RDEPEND} |
| 167 |
dev-lang/swig |
| 168 |
dev-python/cheetah[${PYTHON_USEDEP}] |
| 169 |
virtual/pkgconfig |
| 170 |
doc? ( |
| 171 |
>=app-doc/doxygen-1.5.7.1 |
| 172 |
dev-python/sphinx[${PYTHON_USEDEP}] |
| 173 |
) |
| 174 |
grc? ( |
| 175 |
x11-misc/xdg-utils |
| 176 |
) |
| 177 |
oss? ( |
| 178 |
virtual/os-headers |
| 179 |
) |
| 180 |
" |
| 181 |
|
| 182 |
src_prepare() { |
| 183 |
# Useless UI element would require qt3support, bug #365019 |
| 184 |
sed -i '/qPixmapFromMimeSource/d' "${S}"/gr-qtgui/lib/spectrumdisplayform.ui || die |
| 185 |
epatch "${FILESDIR}"/${PN}-3.6.1-automagic-audio.patch |
| 186 |
epatch "${FILESDIR}"/${P}-include_stringh.patch |
| 187 |
} |
| 188 |
|
| 189 |
src_configure() { |
| 190 |
# TODO: docs are installed to /usr/share/doc/${PN} not /usr/share/doc/${PF} |
| 191 |
# SYSCONFDIR/GR_PREFSDIR default to install below CMAKE_INSTALL_PREFIX |
| 192 |
#this flag breaks everything, but more likely it's a sign we need to work on this |
| 193 |
#-DENABLE_DEFAULT=OFF |
| 194 |
mycmakeargs=( |
| 195 |
$(cmake-utils_use_enable alsa GR_AUDIO_ALSA) \ |
| 196 |
$(cmake-utils_use_enable analog GR_ANALOG) \ |
| 197 |
$(cmake-utils_use_enable channels GR_CHANNELS) \ |
| 198 |
$(cmake-utils_use_enable ctrlport GR_CTRLPORT) \ |
| 199 |
$(cmake-utils_use_enable digital GR_DIGITAL) \ |
| 200 |
$(cmake-utils_use_enable doc DOXYGEN) \ |
| 201 |
$(cmake-utils_use_enable doc SPHINX) \ |
| 202 |
$(cmake-utils_use_enable fcd GR_FCD) \ |
| 203 |
$(cmake-utils_use_enable filter GR_FILTER) \ |
| 204 |
$(cmake-utils_use_enable grc GRC) \ |
| 205 |
$(cmake-utils_use_enable jack GR_AUDIO_JACK) \ |
| 206 |
$(cmake-utils_use_enable log GR_LOG) \ |
| 207 |
$(cmake-utils_use_enable oss GR_AUDIO_OSS) \ |
| 208 |
$(cmake-utils_use_enable pager GR_PAGER) \ |
| 209 |
$(cmake-utils_use_enable performance-counters ENABLE_PERFORMANCE_COUNTERS) \ |
| 210 |
$(cmake-utils_use_enable portaudio GR_AUDIO_PORTAUDIO) \ |
| 211 |
$(cmake-utils_use_enable uhd GR_UHD) \ |
| 212 |
$(cmake-utils_use_enable utils GR_UTILS) \ |
| 213 |
$(cmake-utils_use_enable wavelet GR_WAVELET) \ |
| 214 |
$(cmake-utils_use_enable wxwidgets GR_WXGUI) \ |
| 215 |
$(cmake-utils_use_enable qt4 GR_QTGUI) \ |
| 216 |
$(cmake-utils_use_enable sdl GR_VIDEO_SDL) \ |
| 217 |
-DENABLE_GR_CORE=ON \ |
| 218 |
-DSYSCONFDIR="${EPREFIX}"/etc \ |
| 219 |
-DPYTHON_EXECUTABLE="${PYTHON}" |
| 220 |
) |
| 221 |
cmake-utils_src_configure |
| 222 |
} |
| 223 |
|
| 224 |
src_install() { |
| 225 |
cmake-utils_src_install |
| 226 |
|
| 227 |
if use examples ; then |
| 228 |
dodir /usr/share/doc/${PF}/ |
| 229 |
mv "${ED}"/usr/share/${PN}/examples "${ED}"/usr/share/doc/${PF}/ || die |
| 230 |
else |
| 231 |
# It seems that the examples are always installed |
| 232 |
rm -rf "${ED}"/usr/share/${PN}/examples || die |
| 233 |
fi |
| 234 |
|
| 235 |
# We install the mimetypes to the correct locations from the ebuild |
| 236 |
rm -rf "${ED}"/usr/share/${PN}/grc/freedesktop || die |
| 237 |
rm -f "${ED}"/usr/libexec/${PN}/grc_setup_freedesktop || die |
| 238 |
|
| 239 |
# Install icons, menu items and mime-types for GRC |
| 240 |
if use grc ; then |
| 241 |
local fd_path="${S}/grc/freedesktop" |
| 242 |
insinto /usr/share/mime/packages |
| 243 |
doins "${fd_path}/${PN}-grc.xml" |
| 244 |
|
| 245 |
domenu "${fd_path}/"*.desktop |
| 246 |
doicon "${fd_path}/"*.png |
| 247 |
fi |
| 248 |
|
| 249 |
python_fix_shebang "${ED}" |
| 250 |
} |
| 251 |
|
| 252 |
src_test() |
| 253 |
{ |
| 254 |
ctest -E qtgui |
| 255 |
} |
| 256 |
|
| 257 |
pkg_postinst() |
| 258 |
{ |
| 259 |
local GRC_ICON_SIZES="32 48 64 128 256" |
| 260 |
|
| 261 |
if use grc ; then |
| 262 |
fdo-mime_desktop_database_update |
| 263 |
fdo-mime_mime_database_update |
| 264 |
for size in ${GRC_ICON_SIZES} ; do |
| 265 |
xdg-icon-resource install --noupdate --context mimetypes --size ${size} \ |
| 266 |
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" application-gnuradio-grc \ |
| 267 |
|| die "icon resource installation failed" |
| 268 |
xdg-icon-resource install --noupdate --context apps --size ${size} \ |
| 269 |
"${EROOT}/usr/share/pixmaps/grc-icon-${size}.png" gnuradio-grc \ |
| 270 |
|| die "icon resource installation failed" |
| 271 |
done |
| 272 |
xdg-icon-resource forceupdate |
| 273 |
fi |
| 274 |
} |
| 275 |
|
| 276 |
pkg_postrm() |
| 277 |
{ |
| 278 |
local GRC_ICON_SIZES="32 48 64 128 256" |
| 279 |
|
| 280 |
if use grc ; then |
| 281 |
fdo-mime_desktop_database_update |
| 282 |
fdo-mime_mime_database_update |
| 283 |
for size in ${GRC_ICON_SIZES} ; do |
| 284 |
xdg-icon-resource uninstall --noupdate --context mimetypes --size ${size} \ |
| 285 |
application-gnuradio-grc || ewarn "icon uninstall failed" |
| 286 |
xdg-icon-resource uninstall --noupdate --context apps --size ${size} \ |
| 287 |
gnuradio-grc || ewarn "icon uninstall failed" |
| 288 |
|
| 289 |
done |
| 290 |
xdg-icon-resource forceupdate |
| 291 |
fi |
| 292 |
} |
Archives