Removed speex from the build list

Revised removal of gcc visibility support
Added exclusion for kplayer 14.0.x update
master
Ray-V 2 years ago
parent 8daefd3cb2
commit 93c1c7faeb

@ -171,7 +171,7 @@ mkdir doc/misc
mv FAQ doc/misc/ mv FAQ doc/misc/
## build fails with gcc visibility support ## build fails with gcc visibility support
sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
[[ $TDEVERSION == 14.0.13 ]] && { [[ $TDEVERSION == 14.0.13 ]] && {
patch -p0 << EOF patch -p0 << EOF

@ -34,7 +34,7 @@ getsource_fn
untar_fn untar_fn
## build fails with gcc visibility support ## build fails with gcc visibility support
sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
# set support for additional language(s) as per I18N variable # set support for additional language(s) as per I18N variable
# but only for languages available with this package # but only for languages available with this package

@ -371,7 +371,6 @@ Non-TDE apps are in the Misc category and don't need the \Zb\Zr\Z4R\Znequired TD
"Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with avahi support if avahi & avahi-tqt are installed. \Zn" \ "Core/tdelibs" "\Zb\Zr\Z4R\Zn TDE libraries" off "\Zb\Z6 Will build with avahi support if avahi & avahi-tqt are installed. \Zn" \
"Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" off "\Zb\Z6 \Zn" \ "Core/tdebase" "\Zb\Zr\Z4R\Zn TDE base" off "\Zb\Z6 \Zn" \
"Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \ "Core/tde-i18n" "Additional language support for TDE" off "\Zb\Z6 Required when any \Zb\Z3Additional language support\Zb\Z6 has been selected \Zn" \
" Misc/speex" "Audio compression format designed for speech" off "\Zb\Z6 Buildtime option for akode [xiph], tdenetwork and amarok. Requires l/speexdsp \Zn" \
"Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk, and amarok engine \Zn" \ "Deps/akode" "A player and plugins for aRts music formats" off "\Zb\Z6 For tdemultimedia - aRts-plugin and Juk, and amarok engine \Zn" \
"Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 Optional build-time dependency -> akode \Zn" \ "Core/tdemultimedia" "Multimedia packages for TDE" off "\Zb\Z6 Optional build-time dependency -> akode \Zn" \
"Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \ "Core/tdeaccessibility" "Accessibility programs" off "\Zb\Z6 Optional build-time dependencies -> akode + tdemultimedia \Zn" \

@ -34,7 +34,7 @@ getsource_fn
untar_fn untar_fn
## build fails with gcc visibility support ## build fails with gcc visibility support
sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
listdocs_fn listdocs_fn

@ -44,13 +44,11 @@ sed -i "s|/opt/trinity/share/doc/lisa/README.gz|$INSTALL_TDE/share/apps/lisa/REA
## If changing any of these options, READ CMakeLists.txt for info on interdependencies .. ## If changing any of these options, READ CMakeLists.txt for info on interdependencies ..
## GADU & MEANWHILE require libgadu and meanwhile installed. ## GADU & MEANWHILE require libgadu and meanwhile installed.
# If speex is installed, include it in the build for jingle
pkg-config speex && SPX="ON"
cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \ cmake ${G_NINJA:-} -C $TMPVARS/CMAKE_CACHE ${CMAKE_OPTS:-} \
-DWITH_ARTS="ON" \ -DWITH_ARTS="ON" \
-DWITH_JINGLE="ON" \ -DWITH_JINGLE="ON" \
-DWITH_SPEEX=${SPX:-"OFF"} \ -DWITH_SPEEX="ON" \
-DWITH_GSM="OFF" \ -DWITH_GSM="OFF" \
-DWITH_LIBXSLT="OFF" \ -DWITH_LIBXSLT="OFF" \
-DWITH_XMMS="ON" \ -DWITH_XMMS="ON" \

@ -34,7 +34,7 @@ getsource_fn
untar_fn untar_fn
## build fails with gcc visibility support ## build fails with gcc visibility support
sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
listdocs_fn listdocs_fn

@ -34,7 +34,7 @@ getsource_fn
untar_fn untar_fn
## build fails with gcc visibility support ## build fails with gcc visibility support
sed -i '/check for gcc visibility support/,+4d' ConfigureChecks.cmake sed -i 's|tde_setup_gcc_visibility|#&|' ConfigureChecks.cmake
listdocs_fn listdocs_fn

@ -1 +0,0 @@
The speex build for version 1.2.0 has been retained for 14.0.12 builds, but speex v1.2.1 is available as a Slackware 15.0 package and should be used for tdenetwork and amarok builds.

@ -1,97 +0,0 @@
#!/bin/sh
# Generated by Alien's SlackBuild Toolkit: http://slackware.com/~alien/AST
# Copyright 2009, 2010, 2011, 2012, 2013, 2014, 2015 Eric Hameleers, Eindhoven, Netherlands
# Copyright 2015-2017 Thorn Inurcide
# Copyright 2015-2017 tde-slackbuilds project on GitHub
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
# any purpose with or without fee is hereby granted, provided that
# the above copyright notice and this permission notice appear in all
# copies.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
# IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
# USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
# Heavily influenced by the SBo build script
# Copyright (c) 2007 Alex Lysenka <me@alkos333.net>
# Copyright (c) 2012 Vliegendehuiskat
# Copyright (c) 2014-2015 Matteo Bernardini <ponce@slackbuilds.org>
# All rights reserved.
PRGNAM=speex
VERSION=1.2.0
BUILD=${BUILD:-1}
TAG=${TAG:-}
ARCHIVE_TYPE="tar.gz"
SRCURL="https://ftp.osuosl.org/pub/xiph/releases/speex/speex-$VERSION.$ARCHIVE_TYPE"
source ../../get-source.sh
getsource_fn
untar_fn
# Thanks to SBo:
sed -i 's/\r//' README.TI-DSP
listdocs_fn
chown_fn
cd_builddir_fn
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
CC=$COMPILER \
CXX=$COMPILER_CXX \
../configure \
--prefix=/usr \
--libdir=/usr/lib$LIBDIRSUFFIX \
--mandir=/usr/man \
--enable-static=no \
--enable-binaries
make_fn
installdocs_fn
INSTALL_TDE=/usr
mangzip_fn
strip_fn
mkdir_install_fn
echo "
# HOW TO EDIT THIS FILE:
# The 'handy ruler' below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
$PRGNAM: speex (patent-free audio compression format designed for speech)
$PRGNAM:
$PRGNAM: Speex is an Open Source/Free Software patent-free audio compression
$PRGNAM: format designed for speech. The Speex Project aims to lower
$PRGNAM: the barrier of entry for voice applications by providing a free
$PRGNAM: alternative to expensive proprietary speech codecs.
$PRGNAM:
$PRGNAM: Home: http://www.speex.org/
$PRGNAM:
$PRGNAM:
$PRGNAM:
" > $PKG/install/slack-desc
makepkg_fn

@ -7,7 +7,7 @@
See [*Cross compiling for RPi3*](#xcompiling) for building for arm_hf and aarch64. See [*Cross compiling for RPi3*](#xcompiling) for building for arm_hf and aarch64.
For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input, For a native build, run **./BUILD-TDE.sh** - a dialog based script with a series of screens for user input,
which will build the release version 14.0.13, or the development versions 14.0.x [\[see note \[6\]\]](#6), or 14.1.0. which will build the release version 14.0.13, or the development versions 14.0.x [\[see note \[5\]\]](#5), or 14.1.0.
[<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png "TDE version") [<img src="https://ray-v.github.io/TDE-version.png">](https://ray-v.github.io/TDE-version.png "TDE version")
... select TDE version ... select TDE version
@ -134,10 +134,8 @@ Includes:
[4] The README for a [native build for Raspberry Pi3](./README-Raspberry-Pi3.md) is out-of-date and cross compiling is a better option. [4] The README for a [native build for Raspberry Pi3](./README-Raspberry-Pi3.md) is out-of-date and cross compiling is a better option.
[5] The speex build for version 1.2.0 has been retained, but speex v1.2.1 is available as a Slackware 15.0 package and should be used for tdenetwork and amarok builds. <a id="5"></a>
[5] There are no plans for a 14.0.14 release and so the 14.0.x branch is effectively frozen at 14.0.13 - go to [new target...](https://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org/thread/JKKMYZUAFMG4HT2EMKFSZHVSNSUTED27/) for more information.
<a id="6"></a>
[6] There are no plans for a 14.0.14 release and so the 14.0.x branch is effectively frozen at 14.0.13 - go to [new target...](https://mail.trinitydesktop.org/mailman3/hyperkitty/list/users@trinitydesktop.org/thread/JKKMYZUAFMG4HT2EMKFSZHVSNSUTED27/) for more information.
--- ---

@ -157,7 +157,7 @@ cd $PRGNAM
rm -rf .git/worktrees/* rm -rf .git/worktrees/*
git checkout -- * git checkout -- *
git pull git pull
git fetch origin r14.0.x:r14.0.x) [[ $PRGNAM != kplayer ]] && git fetch origin r14.0.x:r14.0.x)
## if the local repository for PRGNAM doesn't exist, clone it .. ## if the local repository for PRGNAM doesn't exist, clone it ..
[[ ! -d $PRGNAM ]] && \ [[ ! -d $PRGNAM ]] && \
git clone https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM git clone https://mirror.git.trinitydesktop.org/gitea/TDE/$PRGNAM

Loading…
Cancel
Save