diff options
| author | B. Watson <urchlay@slackware.uk> | 2022-12-24 20:55:40 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2022-12-31 09:14:47 +0700 |
| commit | 9d1352bcedba7e3c43c3b968587734c2876aed9d (patch) | |
| tree | 583c97b5ae9b5d54aa616dda782087a6fdf96232 /multimedia/vlc | |
| parent | 55e546e45195b23a8a8f1915d186cc561790ba2d (diff) | |
multimedia/vlc: Allow building with libebml (it works now).
Signed-off-by: B. Watson <urchlay@slackware.uk>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'multimedia/vlc')
| -rw-r--r-- | multimedia/vlc/vlc.SlackBuild | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/multimedia/vlc/vlc.SlackBuild b/multimedia/vlc/vlc.SlackBuild index 0198eb68cd80..5eabff2773e1 100644 --- a/multimedia/vlc/vlc.SlackBuild +++ b/multimedia/vlc/vlc.SlackBuild @@ -30,6 +30,10 @@ # POSSIBILITY OF SUCH DAMAGE. # ----------------------------------------------------------------------------- +# 20221224 bkw: Modified by SlackBuilds.org, BUILD=4: +# - libebml builds are OK now, get rid of "stop the build" code. +# - don't install useless INSTALL and ABOUT-NLS in doc dir. + # 20220215 bkw: Modified by SlackBuilds.org: # - stop the build if libebml is installed, since it will fail. @@ -37,7 +41,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=vlc VERSION=${VERSION:-3.0.17.3} -BUILD=${BUILD:-3} +BUILD=${BUILD:-4} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -73,25 +77,7 @@ else fi SLKLDFLAGS="-lrt" -DOCS="ABOUT-NLS AUTHORS COPYING INSTALL NEWS README THANKS" - -# 20220215 bkw: this compiles for a long time, then fails, if libebml is -# installed. Better to fail immediately and let the user know how to fix it. -if [ "${FORCE:-no}" != "yes" ] && pkg-config --exists libebml; then - cat <<EOF -********************************************************** -* Conflicting package found: libebml * -********************************************************** -* This build is known to fail when libebml is installed. * -* Run "removepkg libebml", then re-run this script. * -* You can reinstall libebml after vlc finishes building. * -********************************************************** - -If you want to try building vlc anyway, export FORCE=yes -in the environment. -EOF - exit 1 -fi +DOCS="AUTHORS COPYING NEWS README THANKS" set -e |