sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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

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 (e0bdf89d574cab2535acf36f8b6f35ef5318c88e)
Date: Wed, 30 Sep 2020 20:39:07 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-creation/ardour5/DEPENDS | 12
audio-creation/ardour5/HISTORY | 5
audio-creation/audacity/BUILD | 16
audio-creation/audacity/CONFIGURE | 14
audio-creation/audacity/DEPENDS | 165
++++------
audio-creation/audacity/DETAILS | 10
audio-creation/audacity/HISTORY | 3
audio-creation/musescore/DEPENDS | 9
audio-creation/musescore/DETAILS | 10
audio-creation/musescore/HISTORY | 4
audio-creation/musescore/PRE_BUILD | 6
audio-plugins/calf-plugins/DEPENDS | 2
audio-plugins/calf-plugins/DETAILS | 4
audio-plugins/calf-plugins/HISTORY | 4
crypto/cryptsetup-luks/DETAILS | 6
crypto/cryptsetup-luks/HISTORY | 3
dev/null |binary
graphics-libs/freeglut/HISTORY | 4
graphics-libs/freeglut/PRE_BUILD | 3
graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch | 53 +++
graphics-libs/poppler/DEPENDS | 12
graphics-libs/poppler/HISTORY | 3
http/firefox-esr/BUILD | 7
http/firefox-esr/HISTORY | 4
java/openjdk13/BUILD | 1
java/openjdk13/HISTORY | 3
qt5-cmake/qtwebkit/DETAILS | 8
qt5-cmake/qtwebkit/HISTORY | 4
qt5/qtbase/BUILD | 8
qt5/qtbase/HISTORY | 4
qt5/qtwebengine/BUILD | 8
qt5/qtwebengine/HISTORY | 4
video/mjpegtools/DETAILS | 5
video/mjpegtools/HISTORY | 4
video/mjpegtools/PRE_BUILD | 4
video/v4l-utils/BUILD | 2
video/v4l-utils/CONFIGURE | 2
video/v4l-utils/HISTORY | 4
38 files changed, 268 insertions(+), 152 deletions(-)

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

musescore: version 3.5.0

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

ardour5: dependency fixes

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

audacity: version 2.4.2

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

calf-plugins: version 0.90.3, fix depends

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

qtwebkit: back to a modern snapshot of 5.212 (somehow undead)

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

qtwebengine: -optimize-size

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

qtbase: enable -optimize-size when -Os in CXXFLAGS

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

firefox-esr: remove outdated compiler flag mangling

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

v4l-utils: option to disable BPF

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

mjpegtools: version 2.1.0

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

cryptsetup-luks: version 2.3.4, builds again

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

openjdl13: unset JAVA_HOME for build

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

freeglut: gcc 10 build fix

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

poppler: actually disable some optional deps

diff --git a/audio-creation/ardour5/DEPENDS b/audio-creation/ardour5/DEPENDS
index d7ebd23..eb6556a 100755
--- a/audio-creation/ardour5/DEPENDS
+++ b/audio-creation/ardour5/DEPENDS
@@ -13,7 +13,7 @@ depends liblo &&
depends taglib &&
depends vamp-plugin-sdk &&
depends rubberband &&
-depends fftw &&
+depends -sub "SINGLE THREADS" fftw &&
depends aubio &&
depends libxml2 &&
depends libsigc++3 &&
@@ -65,10 +65,12 @@ optional_depends doxygen \
"" \
"to build documentation" &&

-optional_depends GETTEXT \
- "--nls" \
- "--no-nls" \
- "for native language support" &&
+depends GETTEXT &&
+# Ardour 5.12 has a build bug with --no-nls
+#optional_depends GETTEXT \
+# "--nls" \
+# "--no-nls" \
+# "for native language support" &&

optional_depends valgrind \
"--grind" \
diff --git a/audio-creation/ardour5/HISTORY b/audio-creation/ardour5/HISTORY
index 0a4d90a..39e6fc7 100644
--- a/audio-creation/ardour5/HISTORY
+++ b/audio-creation/ardour5/HISTORY
@@ -1,3 +1,8 @@
+2020-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: sub-dep on fftw2f_threads, hard-depend on GETTEXT
+ due to build failure (the latter to be changed again on
+ update to fixed version)
+
2019-05-18 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Update dependency; s/gettext/GETTEXT/

diff --git a/audio-creation/audacity/BUILD b/audio-creation/audacity/BUILD
index fd3dd8f..5e1772b 100755
--- a/audio-creation/audacity/BUILD
+++ b/audio-creation/audacity/BUILD
@@ -1,11 +1,5 @@
-if [ "$AUDACITY_UNI" == "y" ]; then
- OPTS="$OPTS --enable-unicode"
-fi &&
-
-OPTS="$AUDACITY_LADSPA $OPTS" &&
-OPTS="$AUDACITY_PORTMIXER $OPTS" &&
-OPTS="$AUDACITY_NYQUIST $OPTS" &&
-# Things are too fragile for that.
-#OPTS="--with-lib-preferences=system $OPTS" &&
-
-default_build
+# Rationale: prevent untracked dependencies.
+# Generally, external libs are not that well tested.
+OPTS+=" -Daudacity_lib_preference=local" &&
+OPTS+=" $AUDACITY_NYQUIST $AUDACITY_VST2" &&
+cmake_build
diff --git a/audio-creation/audacity/CONFIGURE
b/audio-creation/audacity/CONFIGURE
index f4212bdf9..1fea642 100755
--- a/audio-creation/audacity/CONFIGURE
+++ b/audio-creation/audacity/CONFIGURE
@@ -1,9 +1,7 @@
-config_query_option AUDACITY_NYQUIST "Compile with Nyquist plug-in
support?" y \
- "--enable-nyquist" "--disable-nyquist" &&
+config_query_option AUDACITY_NYQUIST \
+ "Compile with Nyquist plug-in support?" y \
+ -Daudacity_use_nyquist={local,off} &&

-config_query_option AUDACITY_LADSPA "Compile with LADSPA plug-in support?"
y \
- "--enable-ladspa" "--disable-ladspa"
-
-# Breaks horribly without.
-#config_query_option AUDACITY_PORTMIXER "Compile with PortMixer?" y \
-# "--with-portmixer" "--without-portmixer"
+config_query_option AUDACITY_VST2 \
+ "Compiler with VST2 plug-in support?" y \
+ -Daudacity_use_vst={ON,OFF}
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index 0dc56fd..3a2be19 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -1,87 +1,78 @@
-depends zip &&
-depends WXWIDGET &&
-optional_depends lame "--with-lame" \
- "--without-lame" \
- "for mp3 import/export support" &&
-
-optional_depends libsndfile \
- "--with-libsndfile=system" \
- "--with-libsndfile=local" \
- "to use system libsndfile" &&
-if [[ "$AUDACITY_BRANCH" == "scm" ]]; then
- depends CVS
-fi &&
-
-optional_depends flac "--with-flac" "--without-flac" "For flac support" &&
-
-optional_depends twolame "--with-libtwolame" \
- "--without-libtwolame" \
- "For twolame MP2 export support" &&
-
-optional_depends libvorbis "--with-vorbis" \
- "--without-vorbis" \
- "for ogg/vorbis support" &&
-
-optional_depends libmad "--with-libmad=system" "--without-libmad" \
- "for MP3 importing support" &&
-
-optional_depends libid3tag \
- "--with-id3tag" \
- "--without-id3tag" \
- "for MP3 ID3 tag support" &&
-
-optional_depends expat \
- "--with-expat=system" \
- "--with-expat=local" \
- "to use system expat" &&
-
-optional_depends JACK-DRIVER \
- "" \
- "" \
- "to build with jack support" &&
-
-message "${PROBLEM_COLOR}Do not use libsamplerate in conjunction with VST
plug-in support!${DEFAULT_COLOR}" &&
-
-optional_depends libsamplerate \
- "--with-libsamplerate=system" \
- "--with-libsamplerate=local" \
- "to use external libsamplerate" &&
-
-optional_depends soundtouch \
- "--with-soundtouch=system" \
- "--with-soundtouch=no" \
- "to use external soundtouch for editing" &&
-
-optional_depends vamp-plugin-sdk "--with-libvamp=system"
"--with-libvamp=local" \
- "Compile with external vamp plug-in support?"
-
-optional_depends LIBAVCODEC \
- "--with-ffmpeg" \
- "--without-ffmpeg" \
- "for ffmpeg import and export support" &&
-
-## no spell yet
-#optional_depends libresample \
-# "--with-libresample" \
-# "--without-libresample" \
-# "for sample rate conversion" &&
-
-optional_depends redland \
- "--with-redland" \
- "--without-redland" \
- "for reading RDF data" &&
-
-optional_depends slv2 \
- "--with-lv2=system" \
- "--without-lv2" \
- "for system LV2 loader" &&
-
-optional_depends liblrdf \
- "--with-liblrdf" \
- "--without-liblrdf" \
- "for categorisation of LADSPA plugins" &&
-
-optional_depends portaudio19 \
- "--with-portaudio=system" \
- "--with-portaudio=local" \
- "to use external portaudio"
+depends cmake &&
+depends python3 &&
+depends WXWIDGET -Daudacity_use_wxwidgets=system &&
+# Dunno what for, but is checked explicitly.
+depends gtk+3 &&
+depends glib2 &&
+depends expat -Daudacity_use_expat=system &&
+
+optional_depends ffmpeg \
+ -Daudacity_use_ffmpeg={loaded,off} \
+ "for conversions" &&
+
+optional_depends flac \
+ -Daudacity_use_flac={system,off} \
+ "for FLAC support" &&
+
+optional_depends libmad \
+ -Daudacity_use_mad={system,off} \
+ "as mp3 decoder" &&
+
+optional_depends libid3tag \
+ -Daudacity_use_id3tag={system,off} \
+ "for ID3 tagging" &&
+
+depends libsndfile -Daudacity_use_sndfile=system &&
+
+optional_depends libvorbis \
+ -Daudacity_use_vorbis={system,off} &&
+
+# Not strictly necessary, as the API is a shipped
+# header, but it helps to have the basic set of
+# example plugins present, and it's cheap.
+
+depends ladspa -Daudacity_use_ladspa=ON &&
+
+# insists on using shipped copy of lame, strange
+# so no depends here
+
+optional_depends lv2 \
+ -Daudacity_use_lv2={system,off} \
+ "for LV2 plugins (triggers some more related deps)" &&
+
+if is_depends_enabled "$SPELL" lv2; then
+ depends serd &&
+ depends sord &&
+ depends sratom-0 &&
+ depends lilv-0 &&
+ depends suil-0
+fi &&
+
+# dunno about smbms, keep it local
+
+optional_depends soundtouch \
+ -Daudacity_use_soundtouch={system,off} \
+ "for effects" &&
+
+depends soxr \
+ -Daudacity_use_soxr=system &&
+
+optional_depends vamp-plugin-sdk \
+ -Daudacity_use_vamp={system,off} &&
+
+optional_depends twolame \
+ -Daudacity_use_twolame={system,off} \
+ "for MP2 creation" &&
+
+# Not trying to force portaudio stuff,
+# that can be sensitive and is core to audacity.
+
+optional_depends alsa-lib \
+ -Daudacity_use_pa_alsa={YES,NO} \
+ "for audio I/O" &&
+
+optional_depends JACK-DRIVER \
+ -Daudacity_use_pa_jack={loaded,off} \
+ "for audio I/O" &&
+
+true
diff --git a/audio-creation/audacity/DETAILS b/audio-creation/audacity/DETAILS
index 61647d1..00c0b0b 100755
--- a/audio-creation/audacity/DETAILS
+++ b/audio-creation/audacity/DETAILS
@@ -1,9 +1,9 @@
SPELL=audacity
- VERSION=2.3.1
- SOURCE=Audacity-${VERSION}.tar.gz
-
SOURCE_URL[0]=https://github.com/audacity/audacity/archive/Audacity-2.3.1.tar.gz
-
SOURCE_HASH=sha512:066f57bd90d2baea6969f0cbfb63e41a42ed6dac955d87dc7b601c7a270888363e414c57e36393618801ea31b1068b7b22003f52897bf9a44fbc355aaf23cbaa
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-Audacity-$VERSION
+ VERSION=2.4.2
+ SOURCE=audacity-minsrc-$VERSION.tar.xz
+ SOURCE_URL[0]=http://sobukus.de/$SPELL/$SOURCE
+
SOURCE_HASH=sha512:0fcbb2d9e131b3d683b3f0b0d16f565f034d46e57dab1749c52fc8e72f2bc8c64606fd749ed13d925aecef31f38258ad8b79f8e1baa23c99c7b805686e5445b4
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/${SOURCE%.tar.xz}
WEB_SITE=http://audacityteam.org/
ENTERED=20011217
LICENSE[0]=GPL
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 18abd8f..673a7d8 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2020-09-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.4.2
+
2019-06-09 Kenneth Raplee <kenneth AT raplee.email>
* DETAILS: version 2.3.1, update SOURCE and SOURCE_URL
* DEPENDS: change slv2 disable parameter from "--with-lv2=local" to
diff --git a/audio-creation/musescore/DEPENDS
b/audio-creation/musescore/DEPENDS
index 2ea5ef7..40e471f 100755
--- a/audio-creation/musescore/DEPENDS
+++ b/audio-creation/musescore/DEPENDS
@@ -8,6 +8,10 @@ optional_depends portaudio19 \
"-DBUILD_PORTAUDIO=on" \
"-DBUILD_PORTAUDIO=off" \
"support for the portaudio backend" &&
+if is_depends_enabled $SPELL portaudio19; then
+ optional_depends portmidi -DBUILD_PORTMIDI={on,off} \
+ "MIDI features"
+fi &&
optional_depends pulseaudio \
"-DBUILD_PULSEAUDIO=on" \
"-DBUILD_PULSEAUDIO=off" \
@@ -34,9 +38,10 @@ fi &&
depends qtbase &&
depends qttools &&
depends qtdeclarative &&
-depends qtquickcontrols &&
+depends qtquickcontrols2 &&
depends qtscript &&
depends qtxmlpatterns &&
depends qtsvg &&
depends SSL &&
-depends qtwebkit
+optional_depends qtwebengine -DBUILD_WEBENGINE={on,off} \
+ "built-in browsery"
diff --git a/audio-creation/musescore/DETAILS
b/audio-creation/musescore/DETAILS
index ec70a22..c3dfccd 100755
--- a/audio-creation/musescore/DETAILS
+++ b/audio-creation/musescore/DETAILS
@@ -1,9 +1,9 @@
SPELL=musescore
- VERSION=3.4.2
- SOURCE="${SPELL}-${VERSION}.tar.gz"
-
SOURCE_URL[0]="https://github.com/musescore/MuseScore/archive/v${VERSION}.tar.gz";
-
SOURCE_HASH=sha512:d53024a04793dd418bce910e47b1d6f785b6e5ffbd97117a910f144ee37d20c20ce555a45fcf30532019aa8d7e429fc2dfedfef33a6078ab73889fe7995fe9f4
-SOURCE_DIRECTORY="${BUILD_DIRECTORY}/MuseScore-${VERSION}"
+ VERSION=3.5.0
+ SOURCE="MuseScore-${VERSION}.zip"
+
SOURCE_URL[0]="https://github.com/musescore/MuseScore/releases/download/v$(echo
$VERSION|cut -f 1,2 -d .)/$SOURCE"
+
SOURCE_HASH=sha512:692f2678cee7f693404bd229426844c8adbd35d1b9fdc87c01f7f7a291d1d05ee894bb3100c35d0e7247d3716ecc287e2aa10858f0d05931c498a67cefb9ed0a
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SOURCE%.zip}"
TMPFS=off
WEB_SITE="https://musescore.org";
LICENSE[0]=GPLv2
diff --git a/audio-creation/musescore/HISTORY
b/audio-creation/musescore/HISTORY
index e00b8d2..5765a53 100644
--- a/audio-creation/musescore/HISTORY
+++ b/audio-creation/musescore/HISTORY
@@ -1,3 +1,7 @@
+2020-09-28 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, PRE_BUILD: version 3.5.0
+ * DEPENDS: some Qt updates, qtwebengine, qtquickcontrols2
+
2020-02-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.4.2

diff --git a/audio-creation/musescore/PRE_BUILD
b/audio-creation/musescore/PRE_BUILD
new file mode 100755
index 0000000..3395778
--- /dev/null
+++ b/audio-creation/musescore/PRE_BUILD
@@ -0,0 +1,6 @@
+# No directory name in official source archive.
+# We use it anyway instea of a git snapshot, as the
+# website publishes a hash for it.
+mk_source_dir &&
+cd "$SOURCE_DIRECTORY" &&
+unpack_file
diff --git a/audio-plugins/calf-plugins/DEPENDS
b/audio-plugins/calf-plugins/DEPENDS
index 950c5ae..edcb6fd 100755
--- a/audio-plugins/calf-plugins/DEPENDS
+++ b/audio-plugins/calf-plugins/DEPENDS
@@ -25,6 +25,6 @@ elif is_depends_enabled $SPELL lv2; then
fi &&

if is_depends_enabled $SPELL gtk+2; then
- depends glade2 &&
+ depends libglade2 &&
depends gtk-engines2
fi
diff --git a/audio-plugins/calf-plugins/DETAILS
b/audio-plugins/calf-plugins/DETAILS
index 3f3f38f..9f4b1cc 100755
--- a/audio-plugins/calf-plugins/DETAILS
+++ b/audio-plugins/calf-plugins/DETAILS
@@ -1,8 +1,8 @@
SPELL=calf-plugins
- VERSION=0.0.60
+ VERSION=0.90.3
SOURCE="${SPELL%-*}-${VERSION}.tar.gz"
SOURCE_URL[0]=http://calf-studio-gear.org/files/${SOURCE}
-
SOURCE_HASH=sha512:f7b556254d2ff812fc9e64d2eebdd25f2713d460772785d555cfcbf65ddae046f1fd0090447ab1c056a9eb15e8b1ed706c06176246035d6d75357bbac6cf208e
+
SOURCE_HASH=sha512:a17be4f2e753c5426ff6995ebf4e88f1d4916629f624fcb576e09e5cafd56474fc8944d9defba31561a3476c55d78dd69189cedb11197a09cc3af6e59aa2a867
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL%-*}-${VERSION}"
WEB_SITE="http://cald-studio-gear.org";
LICENSE[0]=LGPL
diff --git a/audio-plugins/calf-plugins/HISTORY
b/audio-plugins/calf-plugins/HISTORY
index ce26170..a37872d 100644
--- a/audio-plugins/calf-plugins/HISTORY
+++ b/audio-plugins/calf-plugins/HISTORY
@@ -1,3 +1,7 @@
+2020-09-24 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: update to 0.90.3
+ * DEPENDS: libglade2, not glade2
+
2015-06-21 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: update to 0.0.60, update website

diff --git a/audio-plugins/calf-plugins/SCRIBBLED
b/audio-plugins/calf-plugins/SCRIBBLED
new file mode 100644
index 0000000..e69de29
diff --git a/crypto/cryptsetup-luks/DETAILS b/crypto/cryptsetup-luks/DETAILS
index ae8e43b..e0c12f9 100755
--- a/crypto/cryptsetup-luks/DETAILS
+++ b/crypto/cryptsetup-luks/DETAILS
@@ -1,9 +1,9 @@
- SPELL=cryptsetup-luks
- VERSION=2.0.6
+ SPELL=cryptsetup-luks
+ VERSION=2.3.4
BRANCH=v$(echo $VERSION | cut -f 1 -d .).$(echo $VERSION | cut -f
2 -d .)
SOURCE_DIRECTORY=$BUILD_DIRECTORY/cryptsetup-$VERSION
SOURCE=cryptsetup-$VERSION.tar.xz
-
SOURCE_HASH=sha512:1fdb9068fe2b5825cef65323a9b788b5e043c1000e614e47e2b21ab3969e416653580aba639755ba936718ad612b986768029df5e07f3fa191db2bf29d2501ef
+
SOURCE_HASH=sha512:db0bfd795343e575acb7a80ea2b9d32acf08ac970037e5b158a1e4381976552dc292107ce79e55913f49fcf643d4ea7104ed73de7c1e8d424b83d471d20ab60d

SOURCE_URL[0]=https://www.kernel.org/pub/linux/utils/cryptsetup/$BRANCH/$SOURCE
WEB_SITE=https://gitlab.com/cryptsetup/cryptsetup
ENTERED=20060117
diff --git a/crypto/cryptsetup-luks/HISTORY b/crypto/cryptsetup-luks/HISTORY
index 128c50b..7c2158e 100644
--- a/crypto/cryptsetup-luks/HISTORY
+++ b/crypto/cryptsetup-luks/HISTORY
@@ -1,3 +1,6 @@
+2020-09-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.3.4, builds again with json-c
+
2019-09-05 Ismael Luceno <ismael AT sourcemage.org>
* BUILD: Disabled static build; fails due to unsatisfied dependencies

diff --git a/graphics-libs/freeglut/HISTORY b/graphics-libs/freeglut/HISTORY
index 5f38c0c..cb2d2da 100644
--- a/graphics-libs/freeglut/HISTORY
+++ b/graphics-libs/freeglut/HISTORY
@@ -1,3 +1,7 @@
+2020-09-26 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, patches/freeglut-3.2.1-gcc10_fix-1.patch:
+ add patch for gcc 10 via LFS
+
2020-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 3.2.1

diff --git a/graphics-libs/freeglut/PRE_BUILD
b/graphics-libs/freeglut/PRE_BUILD
new file mode 100755
index 0000000..e996298
--- /dev/null
+++ b/graphics-libs/freeglut/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir
diff --git a/graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch
b/graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch
new file mode 100644
index 0000000..85fe4d7
--- /dev/null
+++ b/graphics-libs/freeglut/patches/freeglut-3.2.1-gcc10_fix-1.patch
@@ -0,0 +1,53 @@
+Submitted By: Pierre Labastie <pierre dot labastie at neuf dot fr>
+Date: 2020-05-19
+Initial Package Version: 3.2.1
+Upstream Status: Committed
+Origin: Upstream
https://sourceforge.net/p/freeglut/code/1863/
+Description: Fixes "multiple defition" issues
+
+--- a/src/fg_gl2.c
++++ b/src/fg_gl2.c
+@@ -26,6 +26,20 @@
+ #include <GL/freeglut.h>
+ #include "fg_internal.h"
+ #include "fg_gl2.h"
++
++#ifndef GL_ES_VERSION_2_0
++/* GLES2 has the corresponding entry points built-in, and these fgh-prefixed
++ * names are defined in fg_gl2.h header to reference them, for any other
case,
++ * define them as function pointers here.
++ */
++FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++FGH_PFNGLBUFFERDATAPROC fghBufferData;
++FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++#endif
+
+ void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
+ if (fgStructure.CurrentWindow != NULL)
+--- a/src/fg_gl2.h
++++ b/src/fg_gl2.h
+@@ -67,13 +67,13 @@
+ typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
+ typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index,
GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid
*pointer);
+
+-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
+-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
+-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
+-FGH_PFNGLBUFFERDATAPROC fghBufferData;
+-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
+-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
+-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
++extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
++extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
++extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
++extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
++extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
++extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
++extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
+
+ # endif
+
diff --git a/graphics-libs/poppler/DEPENDS b/graphics-libs/poppler/DEPENDS
index 0728f0b..5be853a 100755
--- a/graphics-libs/poppler/DEPENDS
+++ b/graphics-libs/poppler/DEPENDS
@@ -3,17 +3,19 @@ depends libxml2 &&
depends freetype2 &&
depends fontconfig &&
depends poppler-data &&
-optional_depends curl ' -DENABLE_LIBCURL=1' '' 'HTTP support' &&
+optional_depends curl -DENABLE_LIBCURL={ON,OFF} 'HTTP support' &&
optional_depends glib2 '' '' 'GLib support' &&
optional_depends gobject-introspection '' '' 'introspection support' &&
optional_depends libpng '' '' 'for pdftohtml' &&
optional_depends lcms2 '' '' 'for color management' &&
optional_depends nss '' '' 'crypto support' &&
-optional_depends JPEG '' '' "for jpeg support" &&
-optional_depends openjpeg '' '' "for OpenJpeg support" &&
+optional_depends JPEG \
+ -DENABLE_DCTDECODER={libjpeg,none} "for DCT (JPEG) support" &&
+optional_depends openjpeg \
+ -DENABLE_LIBOPENJPEG={openjpeg2,none} "for JPX (JPEG 2000) streams" &&
optional_depends tiff '' '' 'for TIFF support' &&
optional_depends zlib '' '' "for compressed file support" &&
-optional_depends gtk+3 '' '-DBUILD_GTK_TESTS=0' "GTK tests" &&
-optional_depends qtbase '' '-DBUILD_QT5_TESTS=0' 'qt5 support' &&
+optional_depends gtk+3 -DBUILD_GTK_TESTS={ON,OFF} "GTK tests" &&
+optional_depends qtbase -DENABLE_QT5={ON,OFF} "Qt5 support" &&
optional_depends cairo '' '' 'for cairo output' &&
optional_depends gtk-doc '' '' 'build GTK documentation'
diff --git a/graphics-libs/poppler/HISTORY b/graphics-libs/poppler/HISTORY
index 20ee17d..0473869 100644
--- a/graphics-libs/poppler/HISTORY
+++ b/graphics-libs/poppler/HISTORY
@@ -1,3 +1,6 @@
+2020-09-28 Thomas Orgis
+ * DEPENDS: some fixup to actually disable some optional deps
+
2020-09-05 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 20.09.0
* UP_TRIGGERS: adapt to new versioning
diff --git a/http/firefox-esr/BUILD b/http/firefox-esr/BUILD
index 93b5f7b..6a2e829 100755
--- a/http/firefox-esr/BUILD
+++ b/http/firefox-esr/BUILD
@@ -14,13 +14,6 @@ export LIBGL_ALWAYS_INDIRECT=1 &&
# System rustc has no debuginfo
export RUSTFLAGS="-C debuginfo=0" &&

-#
-# No fast optimization for Mozilla, bit us so many times...
-# This used to default to -O2, but that produces crashing firefox for
-# sobukus with gcc-5.2.0; -Os seems more safe.
-CFLAGS="${CFLAGS//-O[3s]/-O2}" &&
-CXXFLAGS="${CXXFLAGS//-O[3s]/-O2}" &&
-
# harden
LDFLAGS="$LDFLAGS -Wl,-z,now" &&

diff --git a/http/firefox-esr/HISTORY b/http/firefox-esr/HISTORY
index 2bbcf95..9c2780d 100644
--- a/http/firefox-esr/HISTORY
+++ b/http/firefox-esr/HISTORY
@@ -1,3 +1,7 @@
+2020-09-25 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: disable CFLAGS optimization mangling, time for
+ a fresh start
+
2020-09-08 Thomas Orgis <sobukus AT sourcemage.org>
* DEPENDS: try the current nss 3.56

diff --git a/http/firefox-esr/SCRIBBLED b/http/firefox-esr/SCRIBBLED
new file mode 100644
index 0000000..e69de29
diff --git a/java/openjdk13/BUILD b/java/openjdk13/BUILD
index b27c6c3..977379b 100755
--- a/java/openjdk13/BUILD
+++ b/java/openjdk13/BUILD
@@ -1,3 +1,4 @@
+unset JAVA_HOME &&
cd "$SOURCE_DIRECTORY" &&

NOWARN="-Wno-error=stringop-truncation" &&
diff --git a/java/openjdk13/HISTORY b/java/openjdk13/HISTORY
index 47f3cfe..2054f52 100644
--- a/java/openjdk13/HISTORY
+++ b/java/openjdk13/HISTORY
@@ -1,3 +1,6 @@
+2020-09-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: unset JAVA_HOME as that breaks the build
+
2020-09-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* CONFLICTS, DEPENDS, FINAL, INSTALL, PRE_BUILD, PROVIDES: add
missing files
diff --git a/qt5-cmake/qtwebkit/DETAILS b/qt5-cmake/qtwebkit/DETAILS
index eaff570..9304997 100755
--- a/qt5-cmake/qtwebkit/DETAILS
+++ b/qt5-cmake/qtwebkit/DETAILS
@@ -1,10 +1,10 @@
URI=http://download.qt.io/snapshots/ci/qtwebkit
SPELL=qtwebkit
- SPELLX=qtwebkit-everywhere-src
- VERSION=5.13.1
+ SPELLX=qtwebkit-opensource-src
+ VERSION=5.212
VX=5.212
- PATCH_LEVEL=1570542016
-
SOURCE_HASH=sha512:25a116e6ed6a1bdfab266741ceddbf8afff9e132a3e1815242e16d09c7dcdd349149564203fd4c807cd9ca53d80423adbe49a7716261cd3d7bcb0562ebd51030
+ PATCH_LEVEL=1600955993
+
SOURCE_HASH=sha512:e2983ac291654ac75a8cdaaa1ca16810ae047e8d78c8910c415ab76e6efa532b75b119be8f053f00214ee5526099a75930becfbd23e8f7a4c08be32e5f41a1d7
SOURCE=$SPELLX-$VERSION-$PATCH_LEVEL.tar.xz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELLX-$VERSION
WEB_SITE=https://qt-project.org
diff --git a/qt5-cmake/qtwebkit/HISTORY b/qt5-cmake/qtwebkit/HISTORY
index e960c17..ceb13b2 100644
--- a/qt5-cmake/qtwebkit/HISTORY
+++ b/qt5-cmake/qtwebkit/HISTORY
@@ -1,3 +1,7 @@
+2002-09-27 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: snapshot 1600955993, base version 5.212 again,
+ matching upstream
+
2019-10-12 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: snapshot 1570542016

diff --git a/qt5/qtbase/BUILD b/qt5/qtbase/BUILD
index 49cf0df..f08277c 100755
--- a/qt5/qtbase/BUILD
+++ b/qt5/qtbase/BUILD
@@ -6,8 +6,12 @@ OPTS+=" $QT_DEBUG \
$QT_ACCESS \
--linker=$QT_LINKER" &&
cd $SOURCE_DIRECTORY &&
+sizeopt= &&
+if list_find "$CXXFLAGS" -Os; then
+ sizeopt=-optimize-size
+fi &&
./configure -opensource -confirm-license \
-prefix $QT5DIR -platform linux-g++ \
- -reduce-relocations -reduce-exports $OPTS -v &&
+ -reduce-relocations -reduce-exports $sizeopt \
+ $OPTS -v &&
make
-
diff --git a/qt5/qtbase/HISTORY b/qt5/qtbase/HISTORY
index 40cb358..5dbf714 100644
--- a/qt5/qtbase/HISTORY
+++ b/qt5/qtbase/HISTORY
@@ -1,3 +1,7 @@
+2020-09-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: Qt uses own compiler flags, try to at least honour
+ -Os by translating to -optimize-size
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1
* 0001-replace-isystem-with-I-to-fix-compilation-error.patch: deleted
diff --git a/qt5/qtwebengine/BUILD b/qt5/qtwebengine/BUILD
index fcf33cf..e17c008 100755
--- a/qt5/qtwebengine/BUILD
+++ b/qt5/qtwebengine/BUILD
@@ -1,5 +1,9 @@
#CFLAGS="${CFLAGS/-ffast-math}" &&
-CFLAGS='' &&
-CXXFLAG='' &&
+#CFLAGS='' &&
+# This was mistyped, and why should we remove our flags?
+#CXXFLAGS='' &&
OPTS+=" -shared" &&
+if list_find "$CXXFLAGS" -Os; then
+ OPTS+=" -optimize-size"
+fi &&
default_build
diff --git a/qt5/qtwebengine/HISTORY b/qt5/qtwebengine/HISTORY
index dae1353..95c1397 100644
--- a/qt5/qtwebengine/HISTORY
+++ b/qt5/qtwebengine/HISTORY
@@ -1,3 +1,7 @@
+2020-09-30 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: Instead of trying to remove our flags, try to at least
+ pick up -Os for the build.
+
2020-09-09 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.15.1 SECURITY_PATCH++
Security fixes from Chrome up to version 85.0.4183.83
diff --git a/video/mjpegtools/DETAILS b/video/mjpegtools/DETAILS
index 2303ef6..2d6d96e 100755
--- a/video/mjpegtools/DETAILS
+++ b/video/mjpegtools/DETAILS
@@ -1,10 +1,9 @@
SPELL=mjpegtools
- VERSION=2.0.0
- PATCHLEVEL=1
+ VERSION=2.1.0
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://downloads.sourceforge.net/sourceforge/mjpeg/$SOURCE
- SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
+
SOURCE_HASH=sha512:10d3288f47d7cc4de87fa63f65e0fd4bd0a9af95db77155eecccecae7a7e60ebab83eaec44cf7a2c3d9e627f0cc086eda208abee1a7a74cbf3f85e87bb979ac5
WEB_SITE=http://mjpeg.sourceforge.net
ENTERED=20030113
DOCS="CHANGES COPYING NEWS README*"
diff --git a/video/mjpegtools/HISTORY b/video/mjpegtools/HISTORY
index a225353..2376ce2 100644
--- a/video/mjpegtools/HISTORY
+++ b/video/mjpegtools/HISTORY
@@ -1,3 +1,7 @@
+2020-09-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.1.0
+ * *.sig: gone
+
2015-05-25 Thomas Orgis <sobukus AT sourcemage.org>
* DETAILS: remove SOURCEFORGE_URL usage (automated)

diff --git a/video/mjpegtools/PRE_BUILD b/video/mjpegtools/PRE_BUILD
new file mode 100755
index 0000000..f60de6f
--- /dev/null
+++ b/video/mjpegtools/PRE_BUILD
@@ -0,0 +1,4 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+apply_patch_dir patches &&
+./autogen.sh
diff --git a/video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig
b/video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig
deleted file mode 100644
index 7d7730e..0000000
Binary files a/video/mjpegtools/mjpegtools-2.0.0.tar.gz.sig and /dev/null
differ
diff --git a/video/v4l-utils/BUILD b/video/v4l-utils/BUILD
index 3fbf8c2..c26d5c6 100755
--- a/video/v4l-utils/BUILD
+++ b/video/v4l-utils/BUILD
@@ -7,5 +7,7 @@ if is_depends_enabled $SPELL qtbase; then
PATH+=":$QT5DIR/bin"
fi &&

+OPTS+=" $V4L_BPF" &&
+
default_build

diff --git a/video/v4l-utils/CONFIGURE b/video/v4l-utils/CONFIGURE
new file mode 100755
index 0000000..1faa06a
--- /dev/null
+++ b/video/v4l-utils/CONFIGURE
@@ -0,0 +1,2 @@
+ config_query_option V4L_BPF "Enable IR bpf decoders?" y \
+ --enable-bpf --disable-bpf
diff --git a/video/v4l-utils/HISTORY b/video/v4l-utils/HISTORY
index 0b90a06..cdbb073 100644
--- a/video/v4l-utils/HISTORY
+++ b/video/v4l-utils/HISTORY
@@ -1,3 +1,7 @@
+2020-09-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE: add option to disable bpf code that has
+ build trouble here
+
2020-07-20 Ismael Luceno <ismael AT sourcemage.org>
* DEPENDS: Fixed disabling of QT tools
* DETAILS: PATCHLEVEL++

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