From df7886e6a79fb39aa3d4e045b99a8b9f72d970ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Feb 2021 22:23:17 +0700 Subject: [PATCH 1/3] wxWidgets: remove cross reference --- srcpkgs/wxWidgets/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wxWidgets/template b/srcpkgs/wxWidgets/template index d02563fa6bd..789cf961f46 100644 --- a/srcpkgs/wxWidgets/template +++ b/srcpkgs/wxWidgets/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets' pkgname=wxWidgets version=3.0.5.1 -revision=4 +revision=5 configure_args="--enable-unicode --with-opengl --with-sdl --with-libmspack --with-libnotify --enable-mediactrl --with-gtk=2 --disable-webview" build_style=gnu-configure @@ -44,11 +44,13 @@ post_install() { ${DESTDIR}/usr/lib/wx/config/${_config} fi - vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \ - -e '/^bindir="\/usr/s,/usr,${exec_prefix},' \ + vsed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \ -e 's/is_cross() { .* }/is_cross() { false; }/g' \ -e '/--\*=\*)/i --host=\*) continue;;' \ - -e "s/lib${XBPS_WORDSIZE}/lib/g" \ + -e "s,/usr/lib${XBPS_TARGET_WORDSIZE},\${exec_prefix}/lib,g" \ + -e "s/-$XBPS_CROSS_TRIPLET//g" \ + -e "s/$XBPS_CROSS_TRIPLET-//g" \ + -e "s,$XBPS_CROSS_BASE,,g" \ ${DESTDIR}/usr/lib/wx/config/${_config} ln -sf ../lib/wx/config/${_config} ${PKGDESTDIR}/usr/bin/wx-config-3.0 ln -sf wx-config-3.0 ${DESTDIR}/usr/bin/wx-config From 99f9fb0e94c8f73139945ddb25402ab897336983 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Feb 2021 22:31:53 +0700 Subject: [PATCH 2/3] wxWidgets-gtk3: remove cross reference --- srcpkgs/wxWidgets-gtk3/template | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/srcpkgs/wxWidgets-gtk3/template b/srcpkgs/wxWidgets-gtk3/template index 7847442b405..d74d755d1d5 100644 --- a/srcpkgs/wxWidgets-gtk3/template +++ b/srcpkgs/wxWidgets-gtk3/template @@ -1,7 +1,7 @@ # Template file for 'wxWidgets-gtk3' pkgname=wxWidgets-gtk3 version=3.0.5.1 -revision=4 +revision=5 wrksrc="wxWidgets-${version}" build_style=gnu-configure configure_args="--with-gtk=3 --enable-unicode --with-opengl --with-sdl @@ -34,11 +34,13 @@ post_install() { ln -sf ../lib/wx/config/${_config} ${DESTDIR}/usr/bin/wx-config-gtk3 # - ignore --host option; breaks configure scripts when # cross compiling (isn’t necessary in our case anyway) - vsed -i -e '/^libdir="\/usr/s,/usr,${exec_prefix},' \ - -e '/^bindir="\/usr/s,/usr,${exec_prefix},' \ + vsed -i -e 's,^bindir=.*,bindir=${exec_prefix}/bin,' \ -e 's/is_cross().*/is_cross() { false; }/g' \ -e '/--\*=\*)/i --host=\*) continue;;' \ - -e "s/lib${XBPS_WORDSIZE}/lib/g" \ + -e "s,/usr/lib${XBPS_TARGET_WORDSIZE},\${exec_prefix}/lib,g" \ + -e "s/-$XBPS_CROSS_TRIPLET//g" \ + -e "s/$XBPS_CROSS_TRIPLET-//g" \ + -e "s,$XBPS_CROSS_BASE,,g" \ $DESTDIR/usr/lib/wx/config/${_config} } From fe34daaeea47a9324395992df70320ab5322ea94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Fri, 5 Feb 2021 22:56:27 +0700 Subject: [PATCH 3/3] CubicSDR: build with gtk3 --- srcpkgs/CubicSDR/template | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/srcpkgs/CubicSDR/template b/srcpkgs/CubicSDR/template index 2f8c589d9ae..87c2e037a0f 100644 --- a/srcpkgs/CubicSDR/template +++ b/srcpkgs/CubicSDR/template @@ -1,11 +1,11 @@ # Template file for 'CubicSDR' pkgname=CubicSDR version=0.2.5 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA) $(vopt_bool pulseaudio USE_AUDIO_PULSE) $(vopt_bool jack USE_AUDIO_JACK)" -makedepends="SoapySDR-devel wxWidgets-devel glu-devel liquid-dsp-devel hamlib-devel +makedepends="SoapySDR-devel wxWidgets-gtk3-devel glu-devel liquid-dsp-devel hamlib-devel $(vopt_if alsa alsa-lib-devel) $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)" short_desc="Cross-Platform Software-Defined Radio (SDR) Application" @@ -18,6 +18,10 @@ checksum=5cb44c110fcbbb70a468b7fa402cf35f84d8901b3dd42d471a90ac3f5db00f4d build_options="alsa pulseaudio jack" build_options_default="alsa pulseaudio" +if [ "$CROSS_BUILD" ]; then + export WX_CONFIG=$XBPS_WRAPPERDIR/wx-config-gtk3 +fi + if [ "$XBPS_TARGET_NO_ATOMIC8" ]; then makedepends+=" libatomic-devel" configure_args+=" -DOTHER_LIBRARIES=atomic"