Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 11 additions & 16 deletions common/shlibs
Original file line number Diff line number Diff line change
Expand Up @@ -1795,8 +1795,8 @@ libksba.so.8 libksba-1.3.1_1
libgltf-0.0.so.0 libgltf-0.0.2_1
libgltf-0.1.so.1 libgltf-0.1.0_1
libabw-0.1.so.1 libabw-0.1.0_1
libcmis-0.6.so.6 libcmis-0.6.3_1
libcmis-c-0.6.so.6 libcmis-0.6.3_1
libcmis-0.6.so.6 libcmis-0.6.2_1
libcmis-c-0.6.so.6 libcmis-0.6.2_1
libQt5Bluetooth.so.5 qt5-connectivity-5.15.2_3
libQt53DAnimation.so.5 qt5-3d-5.15.2_3
libQt53DCore.so.5 qt5-3d-5.15.2_3
Expand Down Expand Up @@ -1989,7 +1989,7 @@ libKF6Syndication.so.6 kf6-syndication-6.19.0_1
libKF6SyntaxHighlighting.so.6 kf6-syntax-highlighting-6.19.0_1
libKF6ThreadWeaver.so.6 kf6-threadweaver-6.19.0_1
# KDE Plasma
KDE_Plasma.6.7.5 kde-plasma-base-6.7.5_1
KDE_Plasma.6.7.4 kde-plasma-base-6.7.4_1
libKQuickImageEditor.so.1 kquickimageeditor-0.6.0_1
libKNightTime.so.0 knighttime-6.5.1_1
libklookandfeel.so.6 plasma-workspace-6.5.1_1
Expand Down Expand Up @@ -2732,7 +2732,7 @@ libges-1.0.so.0 gst1-editing-services-1.6.2_1
libykneomgr.so.0 libykneomgr-0.1.8_1
libopenshot-audio.so.10 libopenshot-audio-0.4.0_1
libopenshot.so.27 libopenshot-0.4.0_1
libpqxx-8.0.so libpqxx-8.0.2_1
libpqxx-6.3.so libpqxx-6.3.3_1
libndpi.so.5 ndpi-5.0_1
libKF5WidgetsAddons.so.5 kwidgetsaddons-5.26.0_1
libsearpc.so.1 libsearpc-3.0.7_1
Expand All @@ -2759,15 +2759,10 @@ libSwiften.so.0 swiften-4.0.3_2
libfreehand-0.1.so.1 libfreehand-0.1.1_1
libe-book-0.1.so.1 libe-book-0.1.2_1
libCoinMP.so.1 CoinMP-1.8.3_1
libOsiCbc.so.3 coin-or-cbc-2.10.13_1
libCgl.so.1 coin-or-cgl-0.60.10_1
libCbc.so.3 coin-or-cbc-2.10.13_1
libCbcSolver.so.3 coin-or-cbc-2.10.13_1
libCoinUtils.so.3 coin-or-utils-2.11.13_1
libOsi.so.1 coin-or-osi-0.108.12_1
libClp.so.1 libClp-1.7.11_1
libClpSolver.so.1 libClp-1.7.11_1
libOsiClp.so.1 libClp-1.7.11_1
libOsiCbc.so.3 CoinMP-1.8.3_1
libCgl.so.1 CoinMP-1.8.3_1
libCbc.so.3 CoinMP-1.8.3_1
libCbcSolver.so.3 CoinMP-1.8.3_1
libmwaw-0.3.so.3 libmwaw-0.3.7_1
libixion-0.20.so.0 libixion-0.20.0_1
liborcus-parser-0.21.so.0 liborcus-0.21.0_1
Expand Down Expand Up @@ -2922,8 +2917,8 @@ libMonoPosixHelper.so mono-4.0.1.44_2
libMonoSupportW.so mono-4.0.1.44_2
libmono-btls-shared.so mono-5.2.0.215_1
libxcb-xrm.so.0 xcb-util-xrm-1.0_1
libinchi.so.1 openbabel-3.2.1_1
libopenbabel.so.8 openbabel-3.2.1_1
libinchi.so.0 openbabel-3.1.1_1
libopenbabel.so.7 openbabel-3.1.1_1
libcourier-unicode.so.12 courier-unicode-2.6.0_1
libzstd.so.1 libzstd-1.0.0_1
libudis86.so.0 udis86-1.7.2_4
Expand Down Expand Up @@ -3560,7 +3555,7 @@ libhtmlcxx.so.3 htmlcxx-0.86_1
libcss_parser_pp.so.0 htmlcxx-0.86_1
libcss_parser.so.0 htmlcxx-0.86_1
libaom.so.3 libaom-3.4.0_1
libre.so.45 re-4.11.0_1
libre.so.44 re-4.10.0_1
libtpms.so.0 libtpms-0.9.0_1
libswtpm_libtpms.so.0 libswtpm-0.6.1_1
libspandsp.so.2 spandsp-0.0.6_1
Expand Down
11 changes: 6 additions & 5 deletions srcpkgs/2bwm/template
Original file line number Diff line number Diff line change
@@ -1,20 +1,21 @@
# Template file for '2bwm'
pkgname=2bwm
version=0.4
version=0.3
revision=1
build_style=gnu-makefile
make_use_env=yes
makedepends="libxcb-devel xcb-util-keysyms-devel xcb-util-wm-devel xcb-util-xrm-devel"
short_desc="Fast floating window manager"
maintainer="Orphaned <orphan@voidlinux.org>"
license="ISC"
homepage="https://github.com/venam/2bwm"
distfiles="https://github.com/venam/2bwm/archive/v${version}.tar.gz"
checksum=74f30e049dc43ed1bcd2667b75dcc9c9b6544a7851f29537d1fb58d04300da8e
distfiles="https://github.com/venam/${pkgname}/archive/v${version}.tar.gz"
checksum=a4889ea4b01b1a3d4a508daa034b9d86676913cbbca1f977858df692a6e2af95

pre_build() {
[ -e ${FILESDIR}/config.h ] && cp ${FILESDIR}/config.h config.h
sed -i 's|-Os ||g' Makefile
sed -i 's|^CFLAGS+=|override CFLAGS +=|g' Makefile
sed -i 's|^LDFLAGS+=|override LDFLAGS +=|g' Makefile
sed -i '/#include <stdlib.h>/i#define _GNU_SOURCE' 2bwm.c
sed -n 1,17p 2bwm.c >LICENSE
}
do_install() {
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/Aegisub/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'Aegisub'
pkgname=Aegisub
version=3.4.2
revision=6
revision=5
build_style=meson
configure_args="-Dsystem_luajit=true"
hostmakedepends="pkg-config gettext meson ninja LuaJIT"
Expand Down
37 changes: 36 additions & 1 deletion srcpkgs/Clp/patches/disable-avx.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
This disables AVX2 usage on x86_64 (by defining NO_AVX_HARDWARE) as well as
removes now-unused includes for AVX2/AVX512 instrinsics (the NEON header
was never used in the first place and the way it's included is completely
wrong anyway).

We need it disabled on x86_64 because we're generic (and AVX is sandybridge
and newer, but the enabled code was for haswell and newer), and on other
arches it's disabled for obvious reasons.

--- a/Clp/src/ClpPackedMatrix.cpp
+++ b/Clp/src/ClpPackedMatrix.cpp
@@ -6777,7 +6777,7 @@ ClpPackedMatrix3::ClpPackedMatrix3(ClpSi
@@ -6749,11 +6749,6 @@ ClpPackedMatrix3::ClpPackedMatrix3()
}
#ifdef _MSC_VER
#include <intrin.h>
-#elif defined(__arm__)
-#include <arm_neon.h>
-#else
-#include <immintrin.h>
-//#include <fmaintrin.h>
#endif
/* Constructor from copy. */
ClpPackedMatrix3::ClpPackedMatrix3(ClpSimplex *model, const CoinPackedMatrix *columnCopy)
@@ -6777,7 +6772,7 @@ ClpPackedMatrix3::ClpPackedMatrix3(ClpSimplex *model, const CoinPackedMatrix *co
{
//#undef COIN_AVX2
//#define COIN_AVX2 8
Expand All @@ -9,3 +30,17 @@
#ifndef COIN_AVX2
#define COIN_AVX2 4
#else
--- a/Clp/src/ClpSimplexDual.cpp
+++ b/Clp/src/ClpSimplexDual.cpp
@@ -3556,11 +3556,6 @@ void moveAndZero(clpTempInfo *info, int type, void *extra)
#endif
#ifdef _MSC_VER
#include <intrin.h>
-#elif defined(__arm__)
-#include <arm_neon.h>
-#else
-#include <immintrin.h>
-//#include <fmaintrin.h>
#endif
int ClpSimplexDual::dualColumn0(const CoinIndexedVector *rowArray,
const CoinIndexedVector *columnArray,
28 changes: 7 additions & 21 deletions srcpkgs/Clp/template
Original file line number Diff line number Diff line change
@@ -1,29 +1,15 @@
# Template file for 'Clp'
pkgname=Clp
version=1.17.11
version=1.17.3
revision=2
build_style=gnu-configure
hostmakedepends="gcc-fortran pkg-config"
makedepends="coin-or-osi-devel coin-or-utils-devel coin-or-sample"
depends="libClp>=${version}_${revision} coin-or-sample"
short_desc="COIN-OR linear programming solver"
maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
license="EPL-2.0"
depends="libClp>=${version}_${revision}"
short_desc="COIN LP Solver"
maintainer="Orphaned <orphan@voidlinux.org>"
license="EPL-1.0"
homepage="https://github.com/coin-or/Clp"
distfiles="https://github.com/coin-or/Clp/archive/refs/tags/releases/${version}.tar.gz"
checksum=2c078e174dc1a7a308e091b6256fb34b4017897fc140ea707ba207b2913ea46d

pre_build() {
if [ "$CROSS_BUILD" ]; then
vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX
else
cat <<-\EOF >$XBPS_WRAPPERDIR/g++
#!/bin/sh
exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@"
EOF
chmod +x $XBPS_WRAPPERDIR/g++
fi
}
distfiles="https://www.coin-or.org/Tarballs/Clp/Clp-${version}.tgz"
checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573

libClp-devel_package() {
short_desc+=" - development files"
Expand Down
10 changes: 0 additions & 10 deletions srcpkgs/CoinMP/patches/implicit-function.patch

This file was deleted.

15 changes: 15 additions & 0 deletions srcpkgs/CoinMP/patches/mips.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
Avoid `mips' as a parameter name. It is a reserved name for mips* targets.

--- a/Cbc/src/CbcModel.hpp 2015-07-07 22:44:40.000000000 +0200
+++ b/Cbc/src/CbcModel.hpp 2018-01-14 13:49:12.277278333 +0100
@@ -2394,8 +2394,8 @@
void redoWalkBack();
//@}

- void setMIPStart( const std::vector< std::pair< std::string, double > > &mips ) {
- this->mipStart_ = mips;
+ void setMIPStart( const std::vector< std::pair< std::string, double > > &start ) {
+ this->mipStart_ = start;
}

const std::vector< std::pair< std::string, double > > &getMIPStart() {
26 changes: 6 additions & 20 deletions srcpkgs/CoinMP/template
Original file line number Diff line number Diff line change
@@ -1,33 +1,19 @@
# Template file for 'CoinMP'
pkgname=CoinMP
version=1.8.4
revision=2
revision=1
build_style=gnu-configure
hostmakedepends="doxygen graphviz pkg-config gcc-fortran"
makedepends="coin-or-cbc-devel libClp-devel coin-or-cgl-devel
coin-or-osi-devel coin-or-utils-devel coin-or-sample"
depends="coin-or-sample"
hostmakedepends="doxygen graphviz pkg-config"
short_desc="Library that supports most of Coin CLP, CBC and CGL"
maintainer="Orphaned <orphan@voidlinux.org>"
license="CPL-1.0"
homepage="https://github.com/coin-or/CoinMP"
distfiles="https://www.coin-or.org/download/source/CoinMP/CoinMP-${version}.tgz"
checksum=3459fb0ccbdd39342744684338984ac4cc153fb0434f4cae8cf74bd67490a38d

post_extract() {
rm -rf Cbc Cgl Clp CoinUtils Osi Data/Sample
}

pre_build() {
if [ "$CROSS_BUILD" ]; then
vsed -i '$s/[+][+]/& $LDFLAGS/' $XBPS_WRAPPERDIR/$CXX
else
cat <<-\EOF >$XBPS_WRAPPERDIR/g++
#!/bin/sh
exec /usr/bin/ccache /usr/bin/g++ $LDFLAGS "$@"
EOF
chmod +x $XBPS_WRAPPERDIR/g++
fi
post_configure() {
# remove erroneous cross base prefix from include paths
find -name Makefile -exec sed -i "{}" -e "s;-I${XBPS_CROSS_BASE};-I;g" \;
}

post_install() {
Expand All @@ -40,7 +26,7 @@ post_install() {

CoinMP-devel_package() {
short_desc+=" - development files"
depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
depends="${sourcepkg}>=${version}_${revision}"
pkg_install() {
vmove usr/include
vmove usr/lib/pkgconfig
Expand Down
5 changes: 2 additions & 3 deletions srcpkgs/Converseen/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'Converseen'
pkgname=Converseen
version=0.15.2.7
version=0.15.2.0
revision=1
build_style=cmake
configure_args="-DUSE_QT6=yes -Wunused-result=yes"
Expand All @@ -10,6 +10,5 @@ short_desc="Free batch image processor"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://github.com/Faster3ck/Converseen"
changelog="https://github.com/Faster3ck/Converseen/blob/main/CHANGELOG"
distfiles="https://github.com/Faster3ck/Converseen/archive/refs/tags/v${version}.tar.gz"
checksum=1e2be90695f802e038c385346c19fd438185aac4eda83124af71fbc2854871f2
checksum=72613835b4a93985df3f2969d0bc383cbbd651ed4a6c97fdf7c7dfca147f5a2b
2 changes: 1 addition & 1 deletion srcpkgs/CubicSDR/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'CubicSDR'
pkgname=CubicSDR
version=0.2.7
revision=5
revision=4
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DUSE_HAMLIB=1 $(vopt_bool alsa USE_AUDIO_ALSA)
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/DarkRadiant/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'DarkRadiant'
pkgname=DarkRadiant
version=3.9.0
revision=4
revision=3
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config ruby-asciidoctor"
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/LimeSuite/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'LimeSuite'
pkgname=LimeSuite
version=23.11.0
revision=2
revision=1
build_style=cmake
build_helper="cmake-wxWidgets-gtk3"
configure_args="-DENABLE_SIMD_FLAGS=none -DENABLE_UTILITIES=True -DENABLE_LIME_UTIL=True
Expand Down
8 changes: 6 additions & 2 deletions srcpkgs/OpenCPN/template
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
# Template file for 'OpenCPN'
pkgname=OpenCPN
version=5.8.4
revision=2
revision=1
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
configure_args="-DOCPN_BUNDLE_GSHHS=NONE -DOCPN_BUNDLE_TCDATA=ON
-DOCPN_BUNDLE_DOCS=ON -DOCPN_FORCE_GTK3=ON
-DOCPN_USE_CRASHREPORT=$(vopt_if crashreport ON OFF)
-DOCPN_USE_BUNDLED_LIBS=OFF -DOCPN_BUILD_TEST=OFF"
-DOCPN_USE_BUNDLED_LIBS=OFF"
hostmakedepends="gettext pkg-config"
makedepends="gtk+3-devel libcurl-devel portaudio-devel tinyxml-devel
wxWidgets-gtk3-devel glu-devel glew-devel rapidjson gtest-devel
Expand All @@ -34,6 +34,10 @@ case $XBPS_TARGET_MACHINE in
*) build_options_default+=" crashreport";;
esac

if [ -n "$CROSS_BUILD" ]; then
configure_args+=" -DOCPN_BUILD_TEST=OFF"
fi

CXXFLAGS="-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64"

post_install() {
Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/SLADE/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'SLADE'
pkgname=SLADE
version=3.2.12
revision=2
revision=1
build_style=cmake
build_helper=cmake-wxWidgets-gtk3
hostmakedepends="pkg-config 7zip which"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/Signal-Desktop/template
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Template file for 'Signal-Desktop'
pkgname=Signal-Desktop
version=8.26.0
version=8.25.0
revision=1
# *-musl could potentially work based on the Alpine port:
# https://git.alpinelinux.org/aports/tree/testing/signal-desktop
Expand All @@ -13,7 +13,7 @@ maintainer="dkwo <npiazza@disroot.org>"
license="AGPL-3.0-only"
homepage="https://github.com/signalapp/Signal-Desktop"
distfiles="https://github.com/signalapp/Signal-Desktop/archive/v${version}.tar.gz"
checksum=e09ea57cca7e0a1b8455f17b5402e30e4e0240af75a0e05bf2f4f2f31ba36925
checksum=d119d2a90d0c7de2f26587c4c34968e3365bb42032309bbabcda7ef83626cf32
nostrip_files="signal-desktop"
nocross="gyp -> aarch64-linux-gnu-gcc: error: unrecognized command-line option '-m64'"

Expand Down
2 changes: 1 addition & 1 deletion srcpkgs/WoeUSB/template
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'WoeUSB'
pkgname=WoeUSB
version=3.3.1
revision=5
revision=4
build_style=gnu-configure
configure_args="--with-wx-config=wx-config-gtk3"
hostmakedepends="automake gettext libtool"
Expand Down
4 changes: 2 additions & 2 deletions srcpkgs/amber/template
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Template file for 'amber'
pkgname=amber
version=0.6.1
version=0.6.0
revision=1
build_style=cargo
short_desc="Code search/replace tool"
maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT"
homepage="https://github.com/dalance/amber"
distfiles="https://github.com/dalance/amber/archive/refs/tags/v${version}.tar.gz"
checksum=58ca7d172e68acde06c80039762073f6fb700a75d1013aece84f310a4535c277
checksum=41908502077197f55ec86b3a4dd4059a78deae9833e9ba33302b1146cc1ec3f5

post_install() {
vlicense LICENSE
Expand Down
Loading
Loading