Mon Oct 10 18:45:33 UTC 202220221010184533

ap/diffstat-1.65-x86_64-1.txz:  Upgraded.
ap/moc-2.6_alpha3-x86_64-1.txz:  Upgraded.
  Compiled against ffmpeg-5.1.2.
kde/attica-5.99.0-x86_64-1.txz:  Upgraded.
kde/baloo-5.99.0-x86_64-1.txz:  Upgraded.
kde/bluez-qt-5.99.0-x86_64-1.txz:  Upgraded.
kde/breeze-icons-5.99.0-noarch-1.txz:  Upgraded.
kde/digikam-7.8.0-x86_64-3.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
kde/extra-cmake-modules-5.99.0-x86_64-1.txz:  Upgraded.
kde/ffmpegthumbs-22.08.1-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
kde/frameworkintegration-5.99.0-x86_64-1.txz:  Upgraded.
kde/kactivities-5.99.0-x86_64-1.txz:  Upgraded.
kde/kactivities-stats-5.99.0-x86_64-1.txz:  Upgraded.
kde/kapidox-5.99.0-x86_64-1.txz:  Upgraded.
kde/karchive-5.99.0-x86_64-1.txz:  Upgraded.
kde/kauth-5.99.0-x86_64-1.txz:  Upgraded.
kde/kbookmarks-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcalendarcore-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcmutils-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcodecs-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcompletion-5.99.0-x86_64-1.txz:  Upgraded.
kde/kconfig-5.99.0-x86_64-1.txz:  Upgraded.
kde/kconfigwidgets-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcontacts-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcoreaddons-5.99.0-x86_64-1.txz:  Upgraded.
kde/kcrash-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdav-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdbusaddons-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdeclarative-5.99.0-x86_64-1.txz:  Upgraded.
kde/kded-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdelibs4support-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdesignerplugin-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdesu-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdewebkit-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdnssd-5.99.0-x86_64-1.txz:  Upgraded.
kde/kdoctools-5.99.0-x86_64-1.txz:  Upgraded.
kde/kemoticons-5.99.0-x86_64-1.txz:  Upgraded.
kde/kfilemetadata-5.99.0-x86_64-1.txz:  Upgraded.
  Compiled against ffmpeg-5.1.2.
kde/kglobalaccel-5.99.0-x86_64-1.txz:  Upgraded.
kde/kguiaddons-5.99.0-x86_64-1.txz:  Upgraded.
kde/kholidays-5.99.0-x86_64-1.txz:  Upgraded.
kde/khtml-5.99.0-x86_64-1.txz:  Upgraded.
kde/ki18n-5.99.0-x86_64-1.txz:  Upgraded.
kde/kiconthemes-5.99.0-x86_64-1.txz:  Upgraded.
kde/kidletime-5.99.0-x86_64-1.txz:  Upgraded.
kde/kimageformats-5.99.0-x86_64-1.txz:  Upgraded.
kde/kinit-5.99.0-x86_64-1.txz:  Upgraded.
kde/kio-5.99.0-x86_64-1.txz:  Upgraded.
kde/kirigami2-5.99.0-x86_64-1.txz:  Upgraded.
kde/kitemmodels-5.99.0-x86_64-1.txz:  Upgraded.
kde/kitemviews-5.99.0-x86_64-1.txz:  Upgraded.
kde/kjobwidgets-5.99.0-x86_64-1.txz:  Upgraded.
kde/kjs-5.99.0-x86_64-1.txz:  Upgraded.
kde/kjsembed-5.99.0-x86_64-1.txz:  Upgraded.
kde/kmediaplayer-5.99.0-x86_64-1.txz:  Upgraded.
kde/knewstuff-5.99.0-x86_64-1.txz:  Upgraded.
kde/knotifications-5.99.0-x86_64-1.txz:  Upgraded.
kde/knotifyconfig-5.99.0-x86_64-1.txz:  Upgraded.
kde/kpackage-5.99.0-x86_64-1.txz:  Upgraded.
kde/kparts-5.99.0-x86_64-1.txz:  Upgraded.
kde/kpeople-5.99.0-x86_64-1.txz:  Upgraded.
kde/kplotting-5.99.0-x86_64-1.txz:  Upgraded.
kde/kpty-5.99.0-x86_64-1.txz:  Upgraded.
kde/kquickcharts-5.99.0-x86_64-1.txz:  Upgraded.
kde/kross-5.99.0-x86_64-1.txz:  Upgraded.
kde/krunner-5.99.0-x86_64-1.txz:  Upgraded.
kde/kservice-5.99.0-x86_64-1.txz:  Upgraded.
kde/ktexteditor-5.99.0-x86_64-1.txz:  Upgraded.
kde/ktextwidgets-5.99.0-x86_64-1.txz:  Upgraded.
kde/kunitconversion-5.99.0-x86_64-1.txz:  Upgraded.
kde/kwallet-5.99.0-x86_64-1.txz:  Upgraded.
kde/kwayland-5.99.0-x86_64-1.txz:  Upgraded.
kde/kwidgetsaddons-5.99.0-x86_64-1.txz:  Upgraded.
kde/kwindowsystem-5.99.0-x86_64-1.txz:  Upgraded.
kde/kxmlgui-5.99.0-x86_64-1.txz:  Upgraded.
kde/kxmlrpcclient-5.99.0-x86_64-1.txz:  Upgraded.
kde/modemmanager-qt-5.99.0-x86_64-1.txz:  Upgraded.
kde/networkmanager-qt-5.99.0-x86_64-1.txz:  Upgraded.
kde/oxygen-icons5-5.99.0-noarch-1.txz:  Upgraded.
kde/plasma-framework-5.99.0-x86_64-1.txz:  Upgraded.
kde/prison-5.99.0-x86_64-1.txz:  Upgraded.
kde/purpose-5.99.0-x86_64-1.txz:  Upgraded.
kde/qqc2-desktop-style-5.99.0-x86_64-1.txz:  Upgraded.
kde/solid-5.99.0-x86_64-1.txz:  Upgraded.
kde/sonnet-5.99.0-x86_64-1.txz:  Upgraded.
kde/syndication-5.99.0-x86_64-1.txz:  Upgraded.
kde/syntax-highlighting-5.99.0-x86_64-1.txz:  Upgraded.
kde/threadweaver-5.99.0-x86_64-1.txz:  Upgraded.
l/QtAV-20220226_fdc613dc-x86_64-1.txz:  Upgraded.
  Compiled against ffmpeg-5.1.2.
l/alsa-plugins-1.2.7.1-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
l/ffmpeg-5.1.2-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
  Enabled glslang and vulkan. Thanks to Heinz Wiesinger.
l/gegl-0.4.38-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
l/gst-plugins-libav-1.20.3-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
l/harfbuzz-5.3.0-x86_64-1.txz:  Upgraded.
l/imagemagick-7.1.0_50-x86_64-1.txz:  Upgraded.
l/libvncserver-0.9.13-x86_64-4.txz:  Rebuilt.
  Disabled ffmpeg support (not compatible with ffmpeg5).
l/mlt-7.8.0-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
l/opencv-4.6.0-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
l/pcre2-10.40-x86_64-2.txz:  Rebuilt.
  Moved shared libraries into /lib${LIBDIRSUFFIX}. Thanks to TommyC7.
l/pipewire-0.3.59-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
l/qt5-5.15.6_20220928_06b700dd-x86_64-1.txz:  Upgraded.
  Compiled against ffmpeg-5.1.2.
n/libgpg-error-1.46-x86_64-2.txz:  Rebuilt.
  Rebuilt with --enable-install-gpg-error-config to fix regression building
  gpgme. Thanks to nobodino and ponce.
x/libva-utils-2.16.0-x86_64-1.txz:  Upgraded.
x/wayland-protocols-1.27-noarch-1.txz:  Upgraded.
xap/MPlayer-20221009-x86_64-1.txz:  Upgraded.
  Compiled against ffmpeg-5.1.2.
xap/audacious-plugins-4.2-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
xap/ffmpegthumbnailer-2.2.2-x86_64-4.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
xap/freerdp-2.8.0-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.
xap/ssr-0.4.4-x86_64-1.txz:  Upgraded.
  Compiled against ffmpeg-5.1.2.
xap/xine-lib-1.2.12-x86_64-2.txz:  Rebuilt.
  Recompiled against ffmpeg-5.1.2.

6 files changed, 134 insertions, 36 deletions

diff --git a/source/ap/moc/0005-avcodec-include.patch b/source/ap/moc/0005-avcodec-include.patch
new file mode 100644
index 000000000..5606df445
--- /dev/null
+++ b/source/ap/moc/0005-avcodec-include.patch
@@ -0,0 +1,25 @@
+From d75ef5832592c796b45018e81c939c375c1326b4 Mon Sep 17 00:00:00 2001
+From: John Fitzgerald <mocmaint@daper.net>
+Date: Sat, 25 Jun 2022 13:15:37 +0300
+Subject: [PATCH 1/3] avcodec include
+
+Signed-off-by: Elimar Riesebieter <riesebie@lxtec.de>
+---
+ decoder_plugins/ffmpeg/ffmpeg.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c
+index c043b5a..f5ea484 100644
+--- a/decoder_plugins/ffmpeg/ffmpeg.c
++++ b/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -32,6 +32,7 @@
+ #include <stdint.h>
+ #include <errno.h>
+ 
++#include <libavcodec/avcodec.h>
+ #include <libavformat/avformat.h>
+ #include <libavutil/mathematics.h>
+ #if HAVE_LIBAVUTIL_CHANNEL_LAYOUT_H
+-- 
+2.36.1
+
diff --git a/source/ap/moc/0006-uncast-warnings.patch b/source/ap/moc/0006-uncast-warnings.patch
new file mode 100644
index 000000000..204742058
--- /dev/null
+++ b/source/ap/moc/0006-uncast-warnings.patch
@@ -0,0 +1,44 @@
+From 27fa391c6b3361ef781dbf0a045445ceabfaa07f Mon Sep 17 00:00:00 2001
+From: John Fitzgerald <mocmaint@daper.net>
+Date: Sat, 25 Jun 2022 13:18:08 +0300
+Subject: [PATCH 2/3] uncast warnings
+
+Signed-off-by: Elimar Riesebieter <riesebie@lxtec.de>
+---
+ decoder_plugins/ffmpeg/ffmpeg.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c
+index f5ea484..fd4582f 100644
+--- a/decoder_plugins/ffmpeg/ffmpeg.c
++++ b/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -79,7 +79,7 @@ struct ffmpeg_data
+ 	AVIOContext *pb;
+ 	AVStream *stream;
+ 	AVCodecContext *enc;
+-	AVCodec *codec;
++	const AVCodec *codec;
+ 
+ 	char *remain_buf;
+ 	int remain_buf_len;
+@@ -848,7 +848,7 @@ static int ffmpeg_can_decode (struct io_stream *stream)
+ {
+ 	int res;
+ 	AVProbeData probe_data;
+-	AVInputFormat *fmt;
++	const AVInputFormat *fmt;
+ 	char buf[8096 + AVPROBE_PADDING_SIZE] = {0};
+ 
+ 	res = io_peek (stream, buf, sizeof (buf));
+@@ -1411,7 +1411,7 @@ static int ffmpeg_our_format_ext (const char *ext)
+ 
+ static int ffmpeg_our_format_mime (const char *mime_type)
+ {
+-	AVOutputFormat *fmt;
++	const AVOutputFormat *fmt;
+ 
+ 	fmt = av_guess_format (NULL, NULL, mime_type);
+ 	return fmt ? 1 : 0;
+-- 
+2.36.1
+
diff --git a/source/ap/moc/0007-cur-dts.patch b/source/ap/moc/0007-cur-dts.patch
new file mode 100644
index 000000000..cf65c5084
--- /dev/null
+++ b/source/ap/moc/0007-cur-dts.patch
@@ -0,0 +1,39 @@
+From dba3b4262b6187f688152126b4ca743f88e93c82 Mon Sep 17 00:00:00 2001
+From: John Fitzgerald <mocmaint@daper.net>
+Date: Sat, 25 Jun 2022 13:20:46 +0300
+Subject: [PATCH 3/3] cur dts
+
+Signed-off-by: Elimar Riesebieter <riesebie@lxtec.de>
+---
+ decoder_plugins/ffmpeg/ffmpeg.c | 8 +++-----
+ 1 file changed, 3 insertions(+), 5 deletions(-)
+
+diff --git a/decoder_plugins/ffmpeg/ffmpeg.c b/decoder_plugins/ffmpeg/ffmpeg.c
+index fd4582f..64afe04 100644
+--- a/decoder_plugins/ffmpeg/ffmpeg.c
++++ b/decoder_plugins/ffmpeg/ffmpeg.c
+@@ -1172,7 +1172,7 @@ static bool seek_in_stream (struct ffmpeg_data *data)
+ static bool seek_in_stream (struct ffmpeg_data *data, int sec)
+ #endif
+ {
+-	int rc, flags = AVSEEK_FLAG_ANY;
++	int rc;
+ 	int64_t seek_ts;
+ 
+ #if SEEK_IN_DECODER
+@@ -1198,10 +1198,8 @@ static bool seek_in_stream (struct ffmpeg_data *data, int sec)
+ 		seek_ts += data->stream->start_time;
+ 	}
+ 
+-	if (data->stream->cur_dts > seek_ts)
+-		flags |= AVSEEK_FLAG_BACKWARD;
+-
+-	rc = av_seek_frame (data->ic, data->stream->index, seek_ts, flags);
++	rc = av_seek_frame (data->ic, data->stream->index, seek_ts,
++	                    AVSEEK_FLAG_BACKWARD);
+ 	if (rc < 0) {
+ 		log_errno ("Seek error", rc);
+ 		return false;
+-- 
+2.36.1
+
diff --git a/source/ap/moc/moc-ffmpeg4.patch b/source/ap/moc/moc-ffmpeg4.patch
deleted file mode 100644
index c1e43a7c2..000000000
--- a/source/ap/moc/moc-ffmpeg4.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-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 547687838..af49333e7 100755
--- a/source/ap/moc/moc.SlackBuild
+++ b/source/ap/moc/moc.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2011, 2013, 2018, 2019  Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2011, 2013, 2018, 2019, 2022  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:-8}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -78,9 +78,18 @@ 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
+zcat $CWD/0005-avcodec-include.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/0006-uncast-warnings.patch.gz | patch -p1 --verbose || exit 1
+zcat $CWD/0007-cur-dts.patch.gz | patch -p1 --verbose || exit 1
 
 # Configure:
+if [ ! -r configure ]; then
+  if [ -x ./autogen.sh ]; then
+    NOCONFIGURE=1 ./autogen.sh
+  else
+    autoreconf -vif
+  fi
+fi
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
diff --git a/source/ap/moc/svn-checkout.sh b/source/ap/moc/svn-checkout.sh
new file mode 100755
index 000000000..a2f9a8084
--- /dev/null
+++ b/source/ap/moc/svn-checkout.sh
@@ -0,0 +1,14 @@
+# Clear the download area:
+rm -rf moc
+
+svn checkout svn://svn.daper.net/moc/trunk moc
+
+( cd moc && find -name "\.svn" -type d -print0 | xargs -0 rm -rf )
+
+# Tar it up:
+VERSION="$(grep PROJECT_NUMBER moc/Doxyfile | cut -f 2 -d = | tr -d ' ' | tr - _)"
+mv moc moc-${VERSION}
+tar cf moc-${VERSION}.tar moc-${VERSION}
+rm -f moc-${VERSION}.tar.lz
+plzip -9 moc-${VERSION}.tar
+rm -r moc-${VERSION}