Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c9f7ef13d5fb20a148c0ff6ddfa3b7665187cc65)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master grimoire by Thomas Orgis (c9f7ef13d5fb20a148c0ff6ddfa3b7665187cc65)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c9f7ef13d5fb20a148c0ff6ddfa3b7665187cc65)
  • Date: Wed, 30 Sep 2020 12:23:54 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

disk/libaal/HISTORY | 3 +++
disk/libaal/PRE_BUILD | 32 ++++++++++++++++++++++++++++++++
libs/fftw/BUILD | 13 ++++++++++++-
libs/fftw/CONFIGURE | 24 ++++++++++++++++++------
libs/fftw/HISTORY | 5 +++++
libs/fftw/PRE_SUB_DEPENDS | 6 ++++++
libs/fftw/REPAIR^all^PRE_SUB_DEPENDS | 11 +++++++++++
libs/fftw/SUB_DEPENDS | 12 ++++++++++++
libs/serd/DETAILS | 2 +-
libs/serd/HISTORY | 3 +++
libs/sord/DETAILS | 6 +++---
libs/sord/HISTORY | 3 +++
net/nfs-utils/BUILD | 1 -
net/nfs-utils/DEPENDS | 1 +
net/nfs-utils/DETAILS | 2 +-
net/nfs-utils/HISTORY | 4 ++++
16 files changed, 115 insertions(+), 13 deletions(-)

New commits:
commit c9f7ef13d5fb20a148c0ff6ddfa3b7665187cc65
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

nfs-utils: use rpcgen from rpcsvc-proto

commit 85c3f772c441e0f96ddbe40b0c3320e8d0654f2e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

libaal: fix build by avoiding stdint conflict

commit ad1b8305f33b34d21482f9d60000af1dbd5b620d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

sord: version 0.16.4

commit 36ec623892aeb154227849f3eb08af9eb09bd60c
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

serd: version 0.30.4

commit 3426bc4529347cc8b0e76a9f39cc7521a21ad388
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

ffmpeg: add sub-dependenies for multithreading

diff --git a/disk/libaal/HISTORY b/disk/libaal/HISTORY
index f3930e8..e30813a 100644
--- a/disk/libaal/HISTORY
+++ b/disk/libaal/HISTORY
@@ -1,3 +1,6 @@
+2020-09-20 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: avoid conflicting stdint, fixing build
+
2016-01-13 David C. Haley <khoralin AT gmail.com>
* DETAILS: version bumped 1.0.6
SOURCE_URL and WEB_SITE updated
diff --git a/disk/libaal/PRE_BUILD b/disk/libaal/PRE_BUILD
new file mode 100755
index 0000000..35abbb1
--- /dev/null
+++ b/disk/libaal/PRE_BUILD
@@ -0,0 +1,32 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p0 <<'EOT'
+--- include/aal/types.h.orig 2020-09-20 09:08:30.744265363 +0200
++++ include/aal/types.h 2020-09-20 09:18:18.229252254 +0200
+@@ -26,24 +26,8 @@
+ #undef ESTRUCT
+ #define ESTRUCT 50
+
+-#ifndef __int8_t_defined
+-#define __int8_t_defined
+-typedef signed char int8_t;
+-typedef short int int16_t;
+-typedef int int32_t;
+-__extension__
+-typedef long long int int64_t;
+-#endif
++#include <stdint.h>
+
+-typedef unsigned char uint8_t;
+-typedef unsigned short int uint16_t;
+-#ifndef __uint32_t_defined
+-#define __uint32_t_defined
+-typedef unsigned int uint32_t;
+-__extension__
+-typedef unsigned long long int uint64_t;
+-#endif
+-
+ #define MAX_UINT8 ((uint8_t)~0)
+ #define MAX_UINT16 ((uint16_t)~0)
+ #define MAX_UINT32 ((uint32_t)~0)
+EOT
diff --git a/libs/fftw/BUILD b/libs/fftw/BUILD
index aaabb1e..281604a 100755
--- a/libs/fftw/BUILD
+++ b/libs/fftw/BUILD
@@ -3,7 +3,18 @@ if [[ $FORTRAN == "n" ]]; then
fi &&

# Ensure we got shared libs. It is expected nowadays.
-COMMON_OPTS="$FFTW_OPTS_NEW $OPTS --enable-shared" &&
+COMMON_OPTS="$OPTS --enable-shared" &&
+
+if [[ "$FFTW_THREADS" == y ]]; then
+ COMMON_OPTS+=" --enable-threads"
+else
+ COMMON_OPTS+=" --disable-threads"
+fi &&
+if [[ "$FFTW_OPENMP" == y ]]; then
+ COMMON_OPTS+=" --enable-openmp"
+else
+ COMMON_OPTS+=" --disable-openmp"
+fi &&

# There are others available via custom configure.
# We just enable a runtime-chosen set of optimizations that should
diff --git a/libs/fftw/CONFIGURE b/libs/fftw/CONFIGURE
index 30d18a9..6870c29 100755
--- a/libs/fftw/CONFIGURE
+++ b/libs/fftw/CONFIGURE
@@ -5,14 +5,26 @@ config_query_multi FFTW_PRECISION "Choose precisions to
build:" \
config_query_list FFTW_VECTOR \
"Enforce vector instruction level (compiler flags have to support this):" \
none sse sse2 avx avx2 &&
-config_query_option FFTW_OPTS_NEW "Parallel fftw using pthreads?" n \
- "--enable-threads" \
- "--disable-threads" &&
-config_query_option FFTW_OPTS_NEW "Parallel fftw using OpenMP?" n \
- "--enable-openmp" \
- "--disable-openmp" &&
+# Transition from FFTW_OPTS_NEW for sub depends.
+threads=n &&
+openmp=n &&
+for o in $FFTW_OPTS_NEW
+do
+ case "$o" in
+ --enable-threads)
+ threads=y
+ ;;
+ --enable-openmp)
+ openmp=y
+ ;;
+ esac
+done &&
+config_query FFTW_THREADS "Parallel fftw using pthreads?" $threads &&
+config_query FFTW_OPENMP "Parallel fftw using OpenMP?" $openmp &&
# It was a long time ago that we had to be careful with enabling SSE or FMA.
# Remove the options for that.
+# Also outdated new opts.
+persistent_remove FFTW_OPTS_NEW &&
persistent_remove FFTW_DOUBLEOPTS &&
persistent_remove FFTW_FLOATOPTS &&
persistent_remove FFTW_OPTS
diff --git a/libs/fftw/HISTORY b/libs/fftw/HISTORY
index 04c01a3..f13bfe5 100644
--- a/libs/fftw/HISTORY
+++ b/libs/fftw/HISTORY
@@ -1,3 +1,8 @@
+2020-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE, BUILD, SUB_DEPENDS, PRE_SUB_DEPENDS: add sub-deps
+ for multithreading
+ * REPAIR^all^PRE_SUB_DEPENDS: update sub depend stuff in tablet
+
2018-12-04 Thomas Orgis <sobukus AT sourcemage.org>
* SUB_DEPENDS, PRE_SUB_DEPENDS: added for spells requesting
certain precision
diff --git a/libs/fftw/PRE_SUB_DEPENDS b/libs/fftw/PRE_SUB_DEPENDS
index 9a1171d..8080e90 100755
--- a/libs/fftw/PRE_SUB_DEPENDS
+++ b/libs/fftw/PRE_SUB_DEPENDS
@@ -2,4 +2,10 @@ case $THIS_SUB_DEPENDS in
SINGLE) list_find "$FFTW_PRECISION" single ;;
DOUBLE) list_find "$FFTW_PRECISION" double ;;
LONGDOUBLE) list_find "$FFTW_PRECISION" longdouble ;;
+ THREADS) [[ "$FFTW_THREADS" = y ]] ;;
+ OPENMP) [[ "$FFTW_OPENMP" = y ]] ;;
+ *)
+ message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1
+ ;;
esac
diff --git a/libs/fftw/REPAIR^all^PRE_SUB_DEPENDS
b/libs/fftw/REPAIR^all^PRE_SUB_DEPENDS
new file mode 100755
index 0000000..8080e90
--- /dev/null
+++ b/libs/fftw/REPAIR^all^PRE_SUB_DEPENDS
@@ -0,0 +1,11 @@
+case $THIS_SUB_DEPENDS in
+ SINGLE) list_find "$FFTW_PRECISION" single ;;
+ DOUBLE) list_find "$FFTW_PRECISION" double ;;
+ LONGDOUBLE) list_find "$FFTW_PRECISION" longdouble ;;
+ THREADS) [[ "$FFTW_THREADS" = y ]] ;;
+ OPENMP) [[ "$FFTW_OPENMP" = y ]] ;;
+ *)
+ message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1
+ ;;
+esac
diff --git a/libs/fftw/SUB_DEPENDS b/libs/fftw/SUB_DEPENDS
index 6f442ad..b6b938b 100755
--- a/libs/fftw/SUB_DEPENDS
+++ b/libs/fftw/SUB_DEPENDS
@@ -11,4 +11,16 @@ case $THIS_SUB_DEPENDS in
message "${MESSAGE_COLOR}Long double precision requested, enforcing
it.$DEFAULT_COLOR" &&
list_add FFTW_PRECISION longdouble
;;
+ THREADS)
+ message "${MESSAGE_COLOR}Multithreading requested, enforcing
it.$DEFAULT_COLOR" &&
+ FFTW_THREADS=y
+ ;;
+ OPENMP)
+ message "${MESSAGE_COLOR}OpenMP requested, enforcing it.$DEFAULT_COLOR"
&&
+ FFTW_OPENMP=y
+ ;;
+ *)
+ message "${PROBLEM_COLOR}bogus sub_depends: $SPELL
$THIS_SUB_DEPENDS${DEFAULT_COLOR}" ;
+ return 1
+ ;;
esac
diff --git a/libs/serd/DETAILS b/libs/serd/DETAILS
index 04a7071..af24674 100755
--- a/libs/serd/DETAILS
+++ b/libs/serd/DETAILS
@@ -1,5 +1,5 @@
SPELL=serd
- VERSION=0.28.0
+ VERSION=0.30.4
SOURCE="${SPELL}-${VERSION}.tar.bz2"
SOURCE2="$SOURCE.sig"
SOURCE_URL=http://download.drobilla.net/${SOURCE}
diff --git a/libs/serd/HISTORY b/libs/serd/HISTORY
index 1ed6655..3fd06b6 100644
--- a/libs/serd/HISTORY
+++ b/libs/serd/HISTORY
@@ -1,3 +1,6 @@
+2020-09-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: bump to 0.30.4
+
2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: bump to 0.28.0

diff --git a/libs/sord/DETAILS b/libs/sord/DETAILS
index 2578094..11205b5 100755
--- a/libs/sord/DETAILS
+++ b/libs/sord/DETAILS
@@ -1,9 +1,9 @@
SPELL=sord
- VERSION=0.16.0
+ VERSION=0.16.4
SOURCE="${SPELL}-${VERSION}.tar.bz2"
- SOURCE2="$SOURCE.asc"
+ SOURCE2="$SOURCE.sig"
SOURCE_URL=http://download.drobilla.net/${SOURCE}
- SOURCE2_URL="$SOURCE_URL.asc"
+ SOURCE2_URL="$SOURCE_URL.sig"
SOURCE2_IGNORE=signature
SOURCE_GPG=dave_robillard.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
diff --git a/libs/sord/HISTORY b/libs/sord/HISTORY
index 5b7a3fc..a0388a2 100644
--- a/libs/sord/HISTORY
+++ b/libs/sord/HISTORY
@@ -1,3 +1,6 @@
+2020-09-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 0.16.4
+
2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: updated spell to 0.16.0

diff --git a/net/nfs-utils/BUILD b/net/nfs-utils/BUILD
index 7b8dba2..a801299 100755
--- a/net/nfs-utils/BUILD
+++ b/net/nfs-utils/BUILD
@@ -1,6 +1,5 @@
OPTS="$OPTS \
--disable-gss \
- --with-rpcgen=internal \
$NFS_UTILS_NFSV4" &&

make_single &&
diff --git a/net/nfs-utils/DEPENDS b/net/nfs-utils/DEPENDS
index e027245..06ba7e0 100755
--- a/net/nfs-utils/DEPENDS
+++ b/net/nfs-utils/DEPENDS
@@ -1,4 +1,5 @@
depends libtirpc &&
+depends rpcsvc-proto &&
depends gcc &&
depends keyutils &&
depends rpcbind &&
diff --git a/net/nfs-utils/DETAILS b/net/nfs-utils/DETAILS
index 91b7aa3..3b33368 100755
--- a/net/nfs-utils/DETAILS
+++ b/net/nfs-utils/DETAILS
@@ -1,6 +1,6 @@
SPELL=nfs-utils
VERSION=2.5.1
- PATCHLEVEL=1
+ PATCHLEVEL=2
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
diff --git a/net/nfs-utils/HISTORY b/net/nfs-utils/HISTORY
index 754fa9d..0f48e15 100644
--- a/net/nfs-utils/HISTORY
+++ b/net/nfs-utils/HISTORY
@@ -1,3 +1,7 @@
+2020-09-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS, BUILD: use rpcsvc-proto instead of internal rpcgen
+ * DETAILS: ++PATCHLEVEL
+
2020-09-28 Eric Sandall <sandalle AT sourcemage.org>
* DETAILS: PATCHLEVEL=1 to install rpcgen after upgrade
* BUILD: nfs-utils needs to build with its internal rpcgen as it's
also


  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c9f7ef13d5fb20a148c0ff6ddfa3b7665187cc65), Thomas Orgis, 09/30/2020

Archive powered by MHonArc 2.6.24.

Top of Page