summaryrefslogtreecommitdiffstats
path: root/source/ap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-07-17 21:57:16 +0000
committer Eric Hameleers <alien@slackware.com>2019-07-18 08:59:47 +0200
commita36b32349bdec2880ce9ddab547c0fbd56c5fa89 (patch)
tree96432ba7cb1791d71442b28aa9defa818629fd8c /source/ap
parenta528a0b94eee4e03c8decfdb3e9dc0e0b9cae6bd (diff)
downloadcurrent-a36b32349bdec2880ce9ddab547c0fbd56c5fa89.tar.gz
current-a36b32349bdec2880ce9ddab547c0fbd56c5fa89.tar.xz
Wed Jul 17 21:57:16 UTC 201920190717215716
ap/moc-2.5.2-x86_64-5.txz: Rebuilt. Patched and recompiled against ffmpeg-4.1.4. Thanks to Heinz Wiesinger. ap/vim-8.1.1710-x86_64-1.txz: Upgraded. d/cmake-3.15.0-x86_64-1.txz: Upgraded. e/emacs-26.2-x86_64-2.txz: Rebuilt. Patched package.el to obey buffer-file-coding-system (bug #35739), fixing bad signature from GNU ELPA for archive-contents. Thanks to Stefan Monnier and Eric Lindblad. kde/k3b-2.0.3-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. kde/kfilemetadata-4.14.3-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. kde/nepomuk-core-4.14.3-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. l/alsa-plugins-1.1.9-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. l/ffmpeg-4.1.4-x86_64-1.txz: Upgraded. Shared library .so-version bump. l/gegl-0.4.16-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. l/gst-plugins-libav-1.16.0-x86_64-2.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. l/gvfs-1.40.2-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_54-x86_64-1.txz: Upgraded. l/libvisual-plugins-0.4.0-x86_64-4.txz: Rebuilt. Patched to fix a segmentation fault while loading plugin file. Thanks to alienBOB. l/libvpx-1.8.1-x86_64-1.txz: Upgraded. n/curl-7.65.2-x86_64-1.txz: Upgraded. xap/MPlayer-20190717-x86_64-1.txz: Upgraded. Compiled against ffmpeg-4.1.4. xap/audacious-plugins-3.10.1-x86_64-3.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. xap/vim-gvim-8.1.1710-x86_64-1.txz: Upgraded. xap/xine-lib-1.2.9-x86_64-5.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. extra/pure-alsa-system/MPlayer-20190717-x86_64-1_alsa.txz: Upgraded. Compiled against ffmpeg-4.1.4. extra/pure-alsa-system/alsa-plugins-1.1.9-x86_64-2_alsa.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. extra/pure-alsa-system/audacious-plugins-3.10.1-x86_64-3_alsa.txz: Rebuilt. Recompiled against ffmpeg-4.1.4. extra/pure-alsa-system/ffmpeg-4.1.4-x86_64-1_alsa.txz: Upgraded. Shared library .so-version bump. extra/pure-alsa-system/xine-lib-1.2.9-x86_64-5_alsa.txz: Rebuilt. Recompiled against ffmpeg-4.1.4.
Diffstat (limited to 'source/ap')
-rwxr-xr-xsource/ap/ksh93/ksh93.SlackBuild4
-rw-r--r--source/ap/moc/moc-ffmpeg4.patch33
-rwxr-xr-xsource/ap/moc/moc.SlackBuild6
3 files changed, 39 insertions, 4 deletions
diff --git a/source/ap/ksh93/ksh93.SlackBuild b/source/ap/ksh93/ksh93.SlackBuild
index 36a319a53..5650bad7c 100755
--- a/source/ap/ksh93/ksh93.SlackBuild
+++ b/source/ap/ksh93/ksh93.SlackBuild
@@ -109,8 +109,8 @@ meson setup \
--localstatedir=/var \
--buildtype=release \
.. || exit 1
- ninja $NUMJOBS || exit 1
- DESTDIR=$PKG ninja install || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
cd ..
# Stuff we don't ship:
diff --git a/source/ap/moc/moc-ffmpeg4.patch b/source/ap/moc/moc-ffmpeg4.patch
new file mode 100644
index 000000000..c1e43a7c2
--- /dev/null
+++ b/source/ap/moc/moc-ffmpeg4.patch
@@ -0,0 +1,33 @@
+Index: decoder_plugins/ffmpeg/ffmpeg.c
+===================================================================
+--- decoder_plugins/ffmpeg/ffmpeg.c (revisiĆ³n: 2963)
++++ decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo)
+@@ -697,7 +697,7 @@
+ * FFmpeg/LibAV in use. For some versions this will be caught in
+ * *_find_stream_info() above and misreported as an unfound codec
+ * parameters error. */
+- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
++ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
+ decoder_error (&data->error, ERROR_FATAL, 0,
+ "The codec is experimental and may damage MOC: %s",
+ data->codec->name);
+@@ -705,8 +705,8 @@
+ }
+
+ set_downmixing (data);
+- if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
+- data->enc->flags |= CODEC_FLAG_TRUNCATED;
++ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
++ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
+
+ if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
+ {
+@@ -725,7 +725,7 @@
+
+ data->sample_width = sfmt_Bps (data->fmt);
+
+- if (data->codec->capabilities & CODEC_CAP_DELAY)
++ if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
+ data->delay = true;
+ data->seek_broken = is_seek_broken (data);
+ data->timing_broken = is_timing_broken (data->ic);
diff --git a/source/ap/moc/moc.SlackBuild b/source/ap/moc/moc.SlackBuild
index 2fbf4320f..35293ca63 100755
--- a/source/ap/moc/moc.SlackBuild
+++ b/source/ap/moc/moc.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2011, 2013, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2013, 2018, 2019 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=moc
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | rev | cut -f 2- -d -)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -78,6 +78,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+zcat $CWD/moc-ffmpeg4.patch.gz | patch -p0 --verbose || exit 1
+
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \