CoinMP split

common/shlibs

@@ -2759,10 +2759,15 @@ 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 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
+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
 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

srcpkgs/Clp/patches/disable-avx.patch

@@ -1,27 +1,6 @@
-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
-@@ -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
+@@ -6777,7 +6777,7 @@ ClpPackedMatrix3::ClpPackedMatrix3(ClpSi
  {
    //#undef COIN_AVX2
    //#define COIN_AVX2 8
@@ -30,17 +9,3 @@ arches it's disabled for obvious reasons.
  #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,

srcpkgs/Clp/template

@@ -1,15 +1,29 @@
 # Template file for 'Clp'
 pkgname=Clp
-version=1.17.3
-revision=2
+version=1.17.11
+revision=1
 build_style=gnu-configure
+hostmakedepends="gcc-fortran pkg-config"
+makedepends="coin-or-osi-devel coin-or-utils-devel"
 depends="libClp>=${version}_${revision}"
-short_desc="COIN LP Solver"
-maintainer="Orphaned <orphan@voidlinux.org>"
-license="EPL-1.0"
+short_desc="COIN-OR linear programming solver"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="EPL-2.0"
 homepage="https://github.com/coin-or/Clp"
-distfiles="https://www.coin-or.org/Tarballs/Clp/Clp-${version}.tgz"
-checksum=a13bf54291ad503cf76f5f93f2643d2add4faa5d0e60ff2db902ef715c094573
+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
+}
 
 libClp-devel_package() {
 	short_desc+=" - development files"

srcpkgs/CoinMP/patches/implicit-function.patch

@@ -0,0 +1,10 @@
+--- a/CoinMP/src/CoinProblem.c
++++ b/CoinMP/src/CoinProblem.c
+@@ -2,6 +2,7 @@
+ /*  CoinProblem.c  */
+
+
++#include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <float.h>   /* DBL_MAX */

srcpkgs/CoinMP/template

@@ -1,21 +1,40 @@
 # Template file for 'CoinMP'
 pkgname=CoinMP
 version=1.8.4
-revision=1
+revision=2
 build_style=gnu-configure
-hostmakedepends="doxygen graphviz pkg-config"
+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"
 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
+}
+
 post_configure() {
 	# remove erroneous cross base prefix from include paths
 	find -name Makefile -exec sed -i "{}" -e "s;-I${XBPS_CROSS_BASE};-I;g" \;
 }
 
+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_install() {
 	# move wrong ${DESTDIR}/${DESTDIR}/usr/share/coin/doc/CoinMP
 	vmkdir usr/share/coin/doc/CoinMP
@@ -26,7 +45,7 @@ post_install() {
 
 CoinMP-devel_package() {
 	short_desc+=" - development files"
-	depends="${sourcepkg}>=${version}_${revision}"
+	depends="${sourcepkg}>=${version}_${revision} ${makedepends}"
 	pkg_install() {
 		vmove usr/include
 		vmove usr/lib/pkgconfig

srcpkgs/coin-or-cbc-devel

@@ -0,0 +1 @@
+coin-or-cbc

srcpkgs/coin-or-cbc/template

@@ -0,0 +1,37 @@
+# Template file for 'coin-or-cbc'
+pkgname=coin-or-cbc
+version=2.10.13
+revision=1
+build_style=gnu-configure
+hostmakedepends="gcc-fortran pkg-config"
+makedepends="coin-or-utils-devel coin-or-osi-devel coin-or-cgl-devel
+ libClp-devel"
+short_desc="COIN-OR Branch-and-Cut solver"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="EPL-2.0"
+homepage="https://github.com/coin-or/Cbc"
+distfiles="https://github.com/coin-or/Cbc/archive/refs/tags/releases/${version}.tar.gz"
+checksum=62fde44dcf6f3d05c5cd291d7435cdd1b7e8acd3c78ec481dd39fe49cbc40399
+
+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
+}
+
+coin-or-cbc-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/coin/doc
+	}
+}

srcpkgs/coin-or-cgl-devel

@@ -0,0 +1 @@
+coin-or-cgl

srcpkgs/coin-or-cgl/template

@@ -0,0 +1,36 @@
+# Template file for 'coin-or-cgl'
+pkgname=coin-or-cgl
+version=0.60.10
+revision=1
+build_style=gnu-configure
+hostmakedepends="gcc-fortran pkg-config"
+makedepends="coin-or-utils-devel coin-or-osi-devel libClp-devel"
+short_desc="Coin OR Cut Generator Library"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="GPL-3.0-or-later"
+homepage="https://github.com/coin-or/Cgl"
+distfiles="https://github.com/coin-or/Cgl/archive/refs/tags/releases/${version}.tar.gz"
+checksum=41b7ac9402db883d9c487eb7101e59eb513cefd726e6e7a669dc94664d9385e6
+
+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
+}
+
+coin-or-cgl-devel_package() {
+	short_desc+=" - development files"
+	depends="${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/coin/doc
+	}
+}

srcpkgs/coin-or-osi-devel

@@ -0,0 +1 @@
+coin-or-osi

srcpkgs/coin-or-osi/template

@@ -0,0 +1,38 @@
+# Template file for 'coin-or-osi'
+pkgname=coin-or-osi
+version=0.108.12
+revision=1
+build_style=gnu-configure
+hostmakedepends="gcc-fortran pkg-config"
+makedepends="coin-or-utils-devel"
+short_desc="COIN-OR Open Solver Interface"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="EPL-2.0"
+homepage="https://github.com/coin-or/Osi"
+distfiles="https://github.com/coin-or/Osi/archive/refs/tags/releases/${version}.tar.gz"
+checksum=1d80d0b4275f2e1ceefc6dda66b8616e3a8c8b07a926ef4456db4a0d55249333
+
+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
+}
+
+coin-or-osi-devel_package() {
+	depends="${sourcepkg}>=${version}_${revision}"
+	short_desc+=" - development files"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/libOsiCommonTests*"
+		vmove "usr/lib/*.la"
+		vmove "usr/lib/*.so"
+		vmove usr/share/coin/doc
+	}
+}

srcpkgs/coin-or-sample/template

@@ -0,0 +1,11 @@
+# Template file for 'coin-or-sample'
+pkgname=coin-or-sample
+version=1.2.13
+revision=1
+build_style=gnu-configure
+short_desc="COIN-OR Sample Data"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="EPL-2.0"
+homepage="https://github.com/coin-or-tools/Data-Sample/"
+distfiles="https://github.com/coin-or-tools/Data-Sample/archive/refs/tags/releases/${version}.tar.gz"
+checksum=cb4c3713b2a2510d0b6387c24a68c88ba5eff27e2c392429653b1bdef50f06c9

srcpkgs/coin-or-utils-devel

@@ -0,0 +1 @@
+coin-or-utils

srcpkgs/coin-or-utils/template

@@ -0,0 +1,37 @@
+# Template file for 'coin-or-utils'
+pkgname=coin-or-utils
+version=2.11.13
+revision=1
+build_style=gnu-configure
+hostmakedepends="gcc-fortran pkg-config"
+makedepends="blas-devel lapack-devel zlib-devel bzip2-devel"
+short_desc="COIN-OR collection of utility classes"
+maintainer="Đoàn Trần Công Danh <congdanhqx@gmail.com>"
+license="EPL-2.0"
+homepage="COIN-OR Utilities"
+distfiles="https://github.com/coin-or/CoinUtils/archive/refs/tags/releases/${version}.tar.gz"
+checksum=ddfea48e10209215748bc9f90a8c04abbb912b662c1aefaf280018d0a181ef79
+
+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
+}
+
+coin-or-utils-devel_package() {
+	short_desc+=" - development files"
+	depends="${makedepends}
+	 ${sourcepkg}>=${version}_${revision}"
+	pkg_install() {
+		vmove usr/include
+		vmove usr/lib/pkgconfig
+		vmove "usr/lib/*.so"
+		vmove usr/share/coin/doc
+	}
+}

srcpkgs/libogdf/patches/install-coin.patch

@@ -0,0 +1,11 @@
+--- a/cmake/coin.cmake
++++ b/cmake/coin.cmake
+@@ -23,7 +23,7 @@ add_library(COIN ${COIN_LIBRARY_TYPE} ${
+ group_files(COIN_SOURCES "coin")
+ target_include_directories(COIN SYSTEM PUBLIC
+   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include/coin>
+-  $<INSTALL_INTERFACE:include/coin>)
++  $<INSTALL_INTERFACE:include/ogdf/coin>)
+ target_compile_definitions(COIN PRIVATE
+     -DCLP_BUILD -DCOINUTILS_BUILD -DOSI_BUILD -D__OSI_CLP__
+     -DCOMPILE_IN_CG -DCOMPILE_IN_CP -DCOMPILE_IN_LP -DCOMPILE_IN_TM