diff --git a/Apps/k3b/README b/Apps/k3b/README new file mode 100644 index 0000000..651c3a3 --- /dev/null +++ b/Apps/k3b/README @@ -0,0 +1,16 @@ +The checks for musepack and musicbrainz installed are done based on: + +Musepack +"""""""" +The musepack decoder was built with gcc11.2 and libmpcdec source +https://files.musepack.net/source/libmpcdec-1.2.6.tar.bz2 +with default prefix /usr/local +and ./configure --libdir=/usr/local/lib64 --disable-static + +Musicbrainz +""""""""""" +Libmusicbrainz 2.1.5 was built with the SBo libmusicbrainz script with gcc7.3 and Archlinux patch to fix gcc6 errors - https://bugs.archlinux.org/task/50754?getfile=14619 + + +Later versions cause FTBFS errors, either with gcc or k3b. + diff --git a/Apps/k3b/k3b.SlackBuild b/Apps/k3b/k3b.SlackBuild index 7212224..7cb0377 100755 --- a/Apps/k3b/k3b.SlackBuild +++ b/Apps/k3b/k3b.SlackBuild @@ -59,13 +59,13 @@ chown_fn cd_builddir_fn # Check for ffmpeg: -[[ -s /usr/include/libavcodec/avcodec.h ]] && FFMPEG="ON" -# Check for lame: -[[ -s /usr/include/lame/lame.h ]] && LAME="ON" -# Check for musepack: -[[ -s /usr/include/musepack/musepack.h ]] && MUSEPACK="ON" +pkg-config libavcodec && FFMPEG="ON" +# Check for lame [no .pc file]: +ldconfig -p|grep libmp3lame 1>/dev/null && LAME="ON" +# Check for musepack [no .pc file]: +ldconfig -p|grep libmpcdec 1>/dev/null && MUSEPACK="ON" # Check for musicbrainz: -[[ -s /usr/include/musicbrainz/mb_c.h ]] && MUSICBRAINZ="ON" +pkg-config libmusicbrainz && MUSICBRAINZ="ON" cmake ${G_NINJA:-} \ -DCMAKE_C_FLAGS="$SLKRCFLAGS" \ diff --git a/Misc/inkscape/README b/Misc/inkscape/README index 4ded2fd..7a37eff 100644 --- a/Misc/inkscape/README +++ b/Misc/inkscape/README @@ -1,6 +1,6 @@ -inkscape v1.0.2 requires non-Slackware packages gdl and double-conversion. +Inkscape v1* requires the non-Slackware package double-conversion. -The sources will need to be pre-downloaded and placed in the 'src' directory and will then be built, packaged, and installed during the inkscape build. +The source will need to be pre-downloaded and placed in the 'src' directory and will then be built, packaged, and installed during the inkscape build. -The URLs will be displayed when running the SlackBuild if the installations or sources aren't found. +The URL will be displayed when running the SlackBuild if the installation or source isn't found.