Page MenuHomeFreeBSD
Files F153557838

D30700.id101509.diff
No OneTemporary
Actions

D30700.id101509.diff
View Options

Index: devel/volk/Makefile
===================================================================
--- devel/volk/Makefile
+++ devel/volk/Makefile
@@ -2,10 +2,10 @@
DISTVERSION= 2.5.0
PORTREVISION= 1
CATEGORIES= devel comms hamradio
-MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/releases/download/v${DISTVERSION}/
+MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
-PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
+PATCH_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/commit/
PATCHFILES= dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch:-p1 \
dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch:-p1
@@ -15,34 +15,27 @@
LICENSE= GPLv3
LICENSE_FILE= ${WRKSRC}/COPYING
-BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/mako/__init__.py:textproc/py-mako@${PY_FLAVOR}
-LIB_DEPENDS= liborc-0.4.so:devel/orc
+BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}mako>=0.4.2:textproc/py-mako@${PY_FLAVOR}
+LIB_DEPENDS= liborc-0.4.so:devel/orc \
+ libboost_filesystem.so:devel/boost-libs
-USES= cmake:testing compiler:c++17-lang python:3.7+
-USE_LDCONFIG= yes
+USES= cmake:testing compiler:c++17-lang python:3.7+ tar:xz
-USE_GITHUB= nodefault
+USE_GITHUB= nodefault
GH_ACCOUNT= gnuradio
+GH_TUPLE= google:cpu_features:69d3993:cpu_features
-# The tarball does not contain sources for cpu_features
-# and CMakeLists.txt does not handle external cpu_features
-CMAKE_OFF= VOLK_CPU_FEATURES # see https://github.com/gnuradio/volk/issues/556
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == armv7
-USE_GCC= yes
-.endif
+USE_LDCONFIG= yes
-# Otherwise the shebang doubles in installed version.
-# Found by running Q/A tests (stage-qa) with 'DEVELOPER=yes' in /etc/make.conf
-post-patch:
- @${REINPLACE_CMD} -e '1d' \
- ${WRKSRC}/python/volk_modtool/volk_modtool
+post-extract:
+ @${RM} -r ${WRKSRC}/cpu_features
+ @${MV} ${WRKSRC_cpu_features} ${WRKSRC}/cpu_features
-# Replace by full version
-pre-install:
- @${REINPLACE_CMD} -e 's|#!/usr/local/bin/python3|#!/usr/local/bin/python${PYTHON_VER}|' \
- ${WRKDIR}/.build/python/volk_modtool/volk_modtool.exe
+post-install:
+# remove bundled cpu_features to avoid port conflicts
+ @${RM} ${STAGEDIR}${PREFIX}/bin/list_cpu_features
+ @${RM} -r ${STAGEDIR}${PREFIX}/include/cpu_features
+ @${RM} -r ${STAGEDIR}${PREFIX}/lib/cmake/CpuFeatures
+ @${RM} ${STAGEDIR}${PREFIX}/lib/libcpu_features.a
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
Index: devel/volk/distinfo
===================================================================
--- devel/volk/distinfo
+++ devel/volk/distinfo
@@ -1,6 +1,8 @@
-TIMESTAMP = 1642352109
-SHA256 (volk-2.5.0.tar.gz) = d9183b9f86a32cdbb8698cbbeb15de574962c05200ccf445c1058629073521f8
-SIZE (volk-2.5.0.tar.gz) = 413789
+TIMESTAMP = 1641238012
+SHA256 (volk-2.5.0.tar.xz) = ddc84d2396e9d3899ff0411a0659f64ba19d75b2210cce83bc2eaa7767429252
+SIZE (volk-2.5.0.tar.xz) = 322280
+SHA256 (google-cpu_features-69d3993_GH0.tar.gz) = 65dccf65727e62c111db6ec32ab4bf149bf3d03d2d0f8d133d6809f505a5c655
+SIZE (google-cpu_features-69d3993_GH0.tar.gz) = 83241
SHA256 (dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch) = 6a92d660a56b2964c1eeb0ab1a3848291ed3064fa0c17cbd63438346bfe582ce
SIZE (dbe88eb8fe3046745fac7afa17a92e8f47285a70.patch) = 846
SHA256 (dd6d9bf51d98f699c54c783995fcf3cca60c38d8.patch) = db7d75afcaeae1c0b6f06665ed903c6c925c6b5e88757215db82b3183201ffe9
Index: devel/volk/pkg-plist
===================================================================
--- devel/volk/pkg-plist
+++ devel/volk/pkg-plist
@@ -37,8 +37,8 @@
include/volk/volk_32f_binary_slicer_8i.h
include/volk/volk_32f_convert_64f.h
include/volk/volk_32f_cos_32f.h
-include/volk/volk_32f_exp_32f.h
include/volk/volk_32f_expfast_32f.h
+include/volk/volk_32f_exp_32f.h
include/volk/volk_32f_index_max_16u.h
include/volk/volk_32f_index_max_32u.h
include/volk/volk_32f_invsqrt_32f.h

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 22, 9:39 PM (18 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
31919628
Default Alt Text
D30700.id101509.diff (3 KB)

Event Timeline