sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Thomas Orgis (0231826ad20a008629cd59784075e9f4b53484ce)
- 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 (0231826ad20a008629cd59784075e9f4b53484ce)
- Date: Mon, 8 Jan 2018 00:43:49 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
audio-drivers/jack2/BUILD | 2 -
audio-drivers/jack2/DETAILS | 11 ++----
audio-drivers/jack2/HISTORY | 4 ++
audio-drivers/jack2/PRE_BUILD | 3 -
audio-drivers/jack2/jack2-1.9.10-buildfix.patch | 31 -----------------
graphics-libs/libva-intel-driver/DETAILS | 13 +++----
graphics-libs/libva-intel-driver/HISTORY | 3 +
libs/libva/BUILD | 3 +
libs/libva/HISTORY | 4 ++
shell-term-fm/shared-mime-info/BUILD | 4 ++
shell-term-fm/shared-mime-info/HISTORY | 5 ++
shell-term-fm/shared-mime-info/PRE_BUILD | 4 ++
xorg-extras/libpthread-stubs/HISTORY | 4 ++
xorg-extras/libpthread-stubs/UP_TRIGGERS | 13 ++++++-
xorg-extras/libpthread-stubs/libpthread-stubs.la | 41
-----------------------
15 files changed, 55 insertions(+), 90 deletions(-)
New commits:
commit 0231826ad20a008629cd59784075e9f4b53484ce
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
jack2: version 1.9.12
commit b1a4f6dbeaeb24997eb3c1fec96b1da208ac524e
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
shared-mime-info: remove debugging settings from DETAILS
commit 02ddd1954fea537a2ecebd50256c8dc4dea32506
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libva: disable parallel build
commit 02d35c59f2781882e6260d140027dc0def08ee52
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libva-intel-driver: version 2.0.0
commit affc39e98dc56c65e70a3cfbb17b70e8e07830c4
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
shared-mime-info: harden build againts certain odds
This prevents parallel make, which is troublesome (see LFS book for
another opinion besides mine) and hacks against mysterious build
failures I saw with an older version of grep (2.24) installed,
which printed 'Binary file … matches' with LC_ALL=C and broke
a Makefile test that way.
Once grep 3.x is in stable, we might drop that hack.
commit 484fef160666ea301071edebc448e63c25796c64
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
libpthread-stubs: fix and extend UP_TRIGGERS for version 0.4
This now triggers at all for the version 0.4 update and employs
some additional work to find stuff that has libpthread-stubs only
in the installed .la files.
diff --git a/audio-drivers/jack2/BUILD b/audio-drivers/jack2/BUILD
index 4f94490..3ebb641 100755
--- a/audio-drivers/jack2/BUILD
+++ b/audio-drivers/jack2/BUILD
@@ -1,3 +1,3 @@
OPTS="--enable-pkg-config-dbus-service-dir $OPTS" &&
-./waf configure --nocache --prefix=${INSTALL_ROOT}/usr $OPTS &&
+./waf configure --prefix=${INSTALL_ROOT}/usr $OPTS &&
./waf build
diff --git a/audio-drivers/jack2/DETAILS b/audio-drivers/jack2/DETAILS
index 2de72bd..66bea46 100755
--- a/audio-drivers/jack2/DETAILS
+++ b/audio-drivers/jack2/DETAILS
@@ -10,12 +10,11 @@ if [[ $JACK2_BRANCH == scm ]]; then
FORCE_DOWNLOAD=1
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-git"
else
- VERSION=1.9.10
- SOURCE=$SPELLX-$VERSION.tar.bz2
- SOURCE_URL[0]=https://dl.dropboxusercontent.com/u/28869550/$SOURCE
- SOURCE_URL[1]=http://jackaudio.org/downloads/$SOURCE
-
SOURCE_HASH=sha512:d64d233c2d626a4ae635f009a7209c2c8740c7959988d282e733b5fc663c168301a2aa2b517dff80f44cb25417aeb5ccca87da5c24616dadf38d69a6cb307e7c
-SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELLX-$VERSION"
+ VERSION=1.9.12
+ SOURCE=$SPELL-$VERSION.tar.gz
+
SOURCE_URL[0]=https://github.com/jackaudio/jack2/releases/download/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:f0271dfc8f8e2f2489ca52f431ad4fa420665816d6c67a01a76da1d4b5ae91f6dad8c4e3309ec5e0c159c9d312ed56021ab323d74bce828ace26f1b8d477ddfa
+SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
fi
WEB_SITE=http://jackaudio.org/
ENTERED=20080707
diff --git a/audio-drivers/jack2/HISTORY b/audio-drivers/jack2/HISTORY
index afb6dd4..428229b 100644
--- a/audio-drivers/jack2/HISTORY
+++ b/audio-drivers/jack2/HISTORY
@@ -1,3 +1,7 @@
+2018-01-08 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated to 1.19.12, now from github
+ * PRE_BUILD, jack2-buildfix.patch: gone
+
2017-09-27 Thomas Orgis <sobukus AT sourcemage.org>
* PRE_BUILD, jack2-buildfix.patch: fix build
diff --git a/audio-drivers/jack2/PRE_BUILD b/audio-drivers/jack2/PRE_BUILD
deleted file mode 100755
index c967084..0000000
--- a/audio-drivers/jack2/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-patch -p0 < "$SCRIPT_DIRECTORY/jack2-1.9.10-buildfix.patch"
diff --git a/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
b/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
deleted file mode 100644
index 19dc5a1..0000000
--- a/audio-drivers/jack2/jack2-1.9.10-buildfix.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- tests/test.cpp.orig 2017-09-27 09:33:27.704970834 +0200
-+++ tests/test.cpp 2017-09-27 09:35:50.973979582 +0200
-@@ -480,7 +480,7 @@
- jack_nframes_t delta_time = cur_time - last_time;
-
- Log("calling process4 callback : jack_frame_time = %ld delta_time =
%ld\n", cur_time, delta_time);
-- if (delta_time > 0 && (jack_nframes_t)abs(delta_time -
cur_buffer_size) > tolerance) {
-+ if (delta_time > 0 && (jack_nframes_t)abs((long long)(delta_time -
cur_buffer_size)) > tolerance) {
- printf("!!! ERROR !!! jack_frame_time seems to return
incorrect values cur_buffer_size = %d, delta_time = %d tolerance %d\n",
cur_buffer_size, delta_time, tolerance);
- }
-
---- tests/iodelay.cpp.orig 2017-09-27 09:41:22.342999815 +0200
-+++ tests/iodelay.cpp 2017-09-27 09:43:49.582008805 +0200
-@@ -167,8 +167,8 @@
- static jack_port_t *jack_capt;
- static jack_port_t *jack_play;
-
--jack_latency_range_t capture_latency = {-1, -1};
--jack_latency_range_t playback_latency = {-1, -1};
-+jack_latency_range_t capture_latency = {(jack_nframes_t)-1,
(jack_nframes_t)-1};
-+jack_latency_range_t playback_latency = {(jack_nframes_t)-1,
(jack_nframes_t)-1};
-
- void
- latency_cb (jack_latency_callback_mode_t mode, void *arg)
-@@ -266,4 +266,4 @@
- return 0;
- }
-
--//
--------------------------------------------------------------------------------
-\ No newline at end of file
-+//
--------------------------------------------------------------------------------
diff --git a/graphics-libs/libva-intel-driver/DETAILS
b/graphics-libs/libva-intel-driver/DETAILS
index 6747085..90b263d 100755
--- a/graphics-libs/libva-intel-driver/DETAILS
+++ b/graphics-libs/libva-intel-driver/DETAILS
@@ -1,10 +1,11 @@
SPELL=libva-intel-driver
- VERSION=1.7.3
- SOURCE="${SPELL}-${VERSION}.tar.bz2"
-
SOURCE_URL[0]=http://www.freedesktop.org/software/vaapi/releases/${SPELL}/${SOURCE}
-
SOURCE_HASH=sha512:90567b94e3373287b1b5fe776e291dfd33577bbe5e4ec1bee359c88544c9c17bbae2aac511ff3d704d7b99b19fbc908c9a38ebbd3162e3625c86c416142390e6
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
- WEB_SITE="http://cgit.freedesktop.org/vaapi/intel-driver";
+ SPELLX=intel-vaapi-driver
+ VERSION=2.0.0
+ SOURCE="${SPELLX}-${VERSION}.tar.bz2"
+
SOURCE_URL[0]=https://github.com/01org/${SPELLX}/releases/download/${VERSION}/${SOURCE}
+
SOURCE_HASH=sha512:a1ca679e1e928a56d369140f3a129a5ed66668d37e25b6115712d406d58fdc9cdce16df22361b91356ea267a558eaf30789d9eba0d415bf2e5ca559d983d0c27
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELLX}-${VERSION}"
+ WEB_SITE="https://github.com/01org/intel-vaapi-driver";
LICENSE[0]=MIT
ENTERED=20131007
SHORT="HW video decode support for Intel integrated graphics"
diff --git a/graphics-libs/libva-intel-driver/HISTORY
b/graphics-libs/libva-intel-driver/HISTORY
index 3569495..6caef87 100644
--- a/graphics-libs/libva-intel-driver/HISTORY
+++ b/graphics-libs/libva-intel-driver/HISTORY
@@ -1,3 +1,6 @@
+2018-01-01 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.0.0, moved to github
+
2017-01-09 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.7.3
* DEPENDS: add dependency on libdrm with INTEL
diff --git a/libs/libva/BUILD b/libs/libva/BUILD
new file mode 100755
index 0000000..d22e99f
--- /dev/null
+++ b/libs/libva/BUILD
@@ -0,0 +1,3 @@
+make_single &&
+default_build &&
+make_normal
diff --git a/libs/libva/HISTORY b/libs/libva/HISTORY
index 44b1c51..3b495c8 100644
--- a/libs/libva/HISTORY
+++ b/libs/libva/HISTORY
@@ -1,3 +1,7 @@
+2018-01-01 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: added to enable non-parallel build, which seems to
+ fix corner cases
+
2017-10-30 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 2.0.0
* UP_TRIGGERS: fix abi breakage
diff --git a/shell-term-fm/shared-mime-info/BUILD
b/shell-term-fm/shared-mime-info/BUILD
index 567222a..0238f46 100755
--- a/shell-term-fm/shared-mime-info/BUILD
+++ b/shell-term-fm/shared-mime-info/BUILD
@@ -1,3 +1,7 @@
+# There is some trouble with parallel build. LFS book contains this hint:
+# If your processor is not a very recent Intel, you may need to use
+# make -j1 for this package.
+# This hit was for version 1.9 in 2018.
make_single &&
OPTS="$OPTS --disable-update-mimedb" &&
default_build &&
diff --git a/shell-term-fm/shared-mime-info/HISTORY
b/shell-term-fm/shared-mime-info/HISTORY
index a617eb2..1aaf55b 100644
--- a/shell-term-fm/shared-mime-info/HISTORY
+++ b/shell-term-fm/shared-mime-info/HISTORY
@@ -1,3 +1,8 @@
+2018-01-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD: Hack around failure involving (older?) grep with LC_ALL=C
+ breaking a Makefile check.
+ * BUILD: avoid parallel build which is flaky
+
2017-09-25 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 1.9
diff --git a/shell-term-fm/shared-mime-info/PRE_BUILD
b/shell-term-fm/shared-mime-info/PRE_BUILD
new file mode 100755
index 0000000..46c4da6
--- /dev/null
+++ b/shell-term-fm/shared-mime-info/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+# There is a test chaining grep that fails when grep thinks an
+# UTF-8 file is binary. This happens with LC_ALL=C and grep 2.24 at least.
+sed -i 's:grep comment:grep -a comment:' "$SOURCE_DIRECTORY/Makefile.in"
diff --git a/xorg-extras/libpthread-stubs/HISTORY
b/xorg-extras/libpthread-stubs/HISTORY
index 12424c8..5afa4dd 100644
--- a/xorg-extras/libpthread-stubs/HISTORY
+++ b/xorg-extras/libpthread-stubs/HISTORY
@@ -1,3 +1,7 @@
+2018-01-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * UP_TRIGGERS: updated to for version 0.4 and also to catch libtool
+ junk dependencies
+
2017-03-15 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.4
diff --git a/xorg-extras/libpthread-stubs/UP_TRIGGERS
b/xorg-extras/libpthread-stubs/UP_TRIGGERS
index 74d4163..687a4b2 100755
--- a/xorg-extras/libpthread-stubs/UP_TRIGGERS
+++ b/xorg-extras/libpthread-stubs/UP_TRIGGERS
@@ -1,12 +1,20 @@
+. "$GRIMOIRE"/FUNCTIONS
+# Not using the normal depender check as there is indirect use
+# of the fake lib that enters libtool files.
if spell_ok $SPELL; then
local OLD_SPELL_VERSION="$(installed_version $SPELL)"
- if [[ "${VERSION}" != "${OLD_SPELL_VERSION}" ]] &&
- [[ "${OLD_SPELL_VERSION}" < 0.3 ]]; then
+ if is_version_less $OLD_SPELL_VERSION 0.4; then
message "This is an ABI incompatible update of libpthread-stubs..."
message "Determining which spells need to be recast, this may take a
while."
+ # There are spells wich do not link to the .so, but still have the .la
+ # in dependencies in their .la file (giflib), inherited. So first check
for
+ # that and also for actual linkage.
for other_spell in $(gaze installed | cut -d: -f1); do
if gaze install $other_spell \
+ | grep '\.la$' \
+ | xargs grep -q 'libpthread-stubs' ||
+ gaze install $other_spell \
| xargs file -e apptype -e ascii -e compress -e tar \
| grep '\<ELF\>.*\<dynamically linked\>' \
| cut -d: -f1 \
@@ -17,3 +25,4 @@ if spell_ok $SPELL; then
done
fi
fi
+
diff --git a/xorg-extras/libpthread-stubs/libpthread-stubs.la
b/xorg-extras/libpthread-stubs/libpthread-stubs.la
deleted file mode 100755
index 7d5d063..0000000
--- a/xorg-extras/libpthread-stubs/libpthread-stubs.la
+++ /dev/null
@@ -1,41 +0,0 @@
-# libpthread-stubs.la - a libtool library file
-# Generated by ltmain.sh (GNU libtool) 2.2.6 Debian-2.2.6a-4
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname=''
-
-# Names of this library.
-library_names='libc.so'
-
-# The name of the static archive.
-old_library=''
-
-# Linker flags that can not go in dependency_libs.
-inherited_linker_flags=''
-
-# Libraries that this one depends upon.
-dependency_libs=''
-
-# Names of additional weak libraries provided by this library
-weak_library_names=''
-
-# Version information for libpthread-stubs.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
- [SM-Commit] GIT changes to master grimoire by Thomas Orgis (0231826ad20a008629cd59784075e9f4b53484ce), Thomas Orgis, 01/07/2018
Archive powered by MHonArc 2.6.24.