summaryrefslogtreecommitdiffstats
path: root/source/l/mlt
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2021-04-12 20:07:12 +0000
committer Eric Hameleers <alien@slackware.com>2021-04-13 08:59:54 +0200
commit749d9833893fd9563593f4da69895ee19a13eb62 (patch)
tree0b82865950aacdd98a7df744b6c9507026c11310 /source/l/mlt
parent0b6c0a0531b1ebd83557f88a8280c2c398ecb247 (diff)
downloadcurrent-749d9833893fd9563593f4da69895ee19a13eb62.tar.gz
current-749d9833893fd9563593f4da69895ee19a13eb62.tar.xz
Mon Apr 12 20:07:12 UTC 202120210412200712
I'm going to go ahead and call this a beta even though there's still no fix for the illegal instruction issue with 32-bit mariadb. But there should be soon (thanks ponce!) No build regressions noted with the official gcc-10.3 release. Please report any new (or old) issues on the LQ Slackware forum. Enjoy! :-) a/kernel-generic-5.10.29-x86_64-1.txz: Upgraded. a/kernel-huge-5.10.29-x86_64-1.txz: Upgraded. a/kernel-modules-5.10.29-x86_64-1.txz: Upgraded. d/gcc-10.3.0-x86_64-1.txz: Upgraded. d/gcc-brig-10.3.0-x86_64-1.txz: Upgraded. d/gcc-g++-10.3.0-x86_64-1.txz: Upgraded. d/gcc-gdc-10.3.0-x86_64-1.txz: Upgraded. d/gcc-gfortran-10.3.0-x86_64-1.txz: Upgraded. d/gcc-gnat-10.3.0-x86_64-1.txz: Upgraded. d/gcc-go-10.3.0-x86_64-1.txz: Upgraded. d/gcc-objc-10.3.0-x86_64-1.txz: Upgraded. d/kernel-headers-5.10.29-x86-1.txz: Upgraded. d/libtool-2.4.6-x86_64-17.txz: Rebuilt. Recompiled to update embedded GCC version number. d/meson-0.57.2-x86_64-1.txz: Upgraded. d/vala-0.52.2-x86_64-1.txz: Upgraded. k/kernel-source-5.10.29-noarch-1.txz: Upgraded. CC_VERSION_TEXT "gcc (GCC) 10.2.0" -> "gcc (GCC) 10.3.0" GCC_VERSION 100200 -> 100300 INTEL_IDXD m -> n kde/attica-5.81.0-x86_64-1.txz: Upgraded. kde/baloo-5.81.0-x86_64-1.txz: Upgraded. kde/bluez-qt-5.81.0-x86_64-1.txz: Upgraded. kde/breeze-icons-5.81.0-noarch-1.txz: Upgraded. kde/extra-cmake-modules-5.81.0-x86_64-1.txz: Upgraded. kde/frameworkintegration-5.81.0-x86_64-1.txz: Upgraded. kde/kactivities-5.81.0-x86_64-1.txz: Upgraded. kde/kactivities-stats-5.81.0-x86_64-1.txz: Upgraded. kde/kapidox-5.81.0-x86_64-1.txz: Upgraded. kde/karchive-5.81.0-x86_64-1.txz: Upgraded. kde/kauth-5.81.0-x86_64-1.txz: Upgraded. kde/kbookmarks-5.81.0-x86_64-1.txz: Upgraded. kde/kcalendarcore-5.81.0-x86_64-1.txz: Upgraded. kde/kcmutils-5.81.0-x86_64-1.txz: Upgraded. kde/kcodecs-5.81.0-x86_64-1.txz: Upgraded. kde/kcompletion-5.81.0-x86_64-1.txz: Upgraded. kde/kconfig-5.81.0-x86_64-1.txz: Upgraded. kde/kconfigwidgets-5.81.0-x86_64-1.txz: Upgraded. kde/kcontacts-5.81.0-x86_64-1.txz: Upgraded. kde/kcoreaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kcrash-5.81.0-x86_64-1.txz: Upgraded. kde/kdav-5.81.0-x86_64-1.txz: Upgraded. kde/kdbusaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kdeclarative-5.81.0-x86_64-1.txz: Upgraded. kde/kded-5.81.0-x86_64-1.txz: Upgraded. kde/kdelibs4support-5.81.0-x86_64-1.txz: Upgraded. kde/kdesignerplugin-5.81.0-x86_64-1.txz: Upgraded. kde/kdesu-5.81.0-x86_64-1.txz: Upgraded. kde/kdewebkit-5.81.0-x86_64-1.txz: Upgraded. kde/kdnssd-5.81.0-x86_64-1.txz: Upgraded. kde/kdoctools-5.81.0-x86_64-1.txz: Upgraded. kde/kemoticons-5.81.0-x86_64-1.txz: Upgraded. kde/kfilemetadata-5.81.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.81.0-x86_64-1.txz: Upgraded. kde/kguiaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kholidays-5.81.0-x86_64-1.txz: Upgraded. kde/khtml-5.81.0-x86_64-1.txz: Upgraded. kde/ki18n-5.81.0-x86_64-1.txz: Upgraded. kde/kiconthemes-5.81.0-x86_64-1.txz: Upgraded. kde/kidletime-5.81.0-x86_64-1.txz: Upgraded. kde/kimageformats-5.81.0-x86_64-1.txz: Upgraded. kde/kinit-5.81.0-x86_64-1.txz: Upgraded. kde/kio-5.81.0-x86_64-1.txz: Upgraded. kde/kirigami2-5.81.0-x86_64-1.txz: Upgraded. kde/kitemmodels-5.81.0-x86_64-1.txz: Upgraded. kde/kitemviews-5.81.0-x86_64-1.txz: Upgraded. kde/kjobwidgets-5.81.0-x86_64-1.txz: Upgraded. kde/kjs-5.81.0-x86_64-1.txz: Upgraded. kde/kjsembed-5.81.0-x86_64-1.txz: Upgraded. kde/kmediaplayer-5.81.0-x86_64-1.txz: Upgraded. kde/knewstuff-5.81.0-x86_64-1.txz: Upgraded. kde/knotifications-5.81.0-x86_64-1.txz: Upgraded. kde/knotifyconfig-5.81.0-x86_64-1.txz: Upgraded. kde/kpackage-5.81.0-x86_64-1.txz: Upgraded. kde/kparts-5.81.0-x86_64-1.txz: Upgraded. kde/kpeople-5.81.0-x86_64-1.txz: Upgraded. kde/kplotting-5.81.0-x86_64-1.txz: Upgraded. kde/kpty-5.81.0-x86_64-1.txz: Upgraded. kde/kquickcharts-5.81.0-x86_64-1.txz: Upgraded. kde/kross-5.81.0-x86_64-1.txz: Upgraded. kde/krunner-5.81.0-x86_64-1.txz: Upgraded. kde/kservice-5.81.0-x86_64-1.txz: Upgraded. kde/ktexteditor-5.81.0-x86_64-1.txz: Upgraded. kde/ktextwidgets-5.81.0-x86_64-1.txz: Upgraded. kde/kunitconversion-5.81.0-x86_64-1.txz: Upgraded. kde/kwallet-5.81.0-x86_64-1.txz: Upgraded. kde/kwayland-5.81.0-x86_64-1.txz: Upgraded. kde/kwidgetsaddons-5.81.0-x86_64-1.txz: Upgraded. kde/kwindowsystem-5.81.0-x86_64-1.txz: Upgraded. kde/kxmlgui-5.81.0-x86_64-1.txz: Upgraded. kde/kxmlrpcclient-5.81.0-x86_64-1.txz: Upgraded. kde/modemmanager-qt-5.81.0-x86_64-1.txz: Upgraded. kde/networkmanager-qt-5.81.0-x86_64-1.txz: Upgraded. kde/oxygen-icons5-5.81.0-noarch-1.txz: Upgraded. kde/plasma-framework-5.81.0-x86_64-1.txz: Upgraded. kde/plasma-wayland-protocols-1.2.1-x86_64-1.txz: Upgraded. kde/prison-5.81.0-x86_64-1.txz: Upgraded. kde/purpose-5.81.0-x86_64-1.txz: Upgraded. kde/qqc2-desktop-style-5.81.0-x86_64-1.txz: Upgraded. kde/solid-5.81.0-x86_64-1.txz: Upgraded. kde/sonnet-5.81.0-x86_64-1.txz: Upgraded. kde/syndication-5.81.0-x86_64-1.txz: Upgraded. kde/syntax-highlighting-5.81.0-x86_64-1.txz: Upgraded. kde/threadweaver-5.81.0-x86_64-1.txz: Upgraded. l/ffmpeg-4.4-x86_64-1.txz: Upgraded. Thanks to Heinz Wiesinger. l/fuse3-3.10.3-x86_64-1.txz: Upgraded. l/mlt-6.26.0-x86_64-1.txz: Upgraded. n/dnsmasq-2.85-x86_64-1.txz: Upgraded. Use random source ports where possible if source addresses/interfaces in use. For more information, see: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2021-3448 (* Security fix *) n/irssi-1.2.3-x86_64-1.txz: Upgraded. This update fixes bugs and security issues. See the NEWS file for details. (* Security fix *) n/postfix-3.5.10-x86_64-1.txz: Upgraded. xap/xsnow-3.3.0-x86_64-1.txz: Upgraded. Just in time for tonight's snowstorm here in Minnesota. ;-) xfce/exo-4.16.2-x86_64-1.txz: Upgraded. xfce/xfce4-settings-4.16.1-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/linux-5.11.x/kernel-generic-5.11.13-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-headers-5.11.13-x86-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-huge-5.11.13-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-modules-5.11.13-x86_64-1.txz: Upgraded. testing/packages/linux-5.11.x/kernel-source-5.11.13-noarch-1.txz: Upgraded. -INTEL_IDXD_SVM y CC_VERSION_TEXT "gcc (GCC) 10.2.0" -> "gcc (GCC) 10.3.0" GCC_VERSION 100200 -> 100300 INTEL_IDXD m -> n usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l/mlt')
-rw-r--r--source/l/mlt/mlt-opencv.patch55
-rwxr-xr-xsource/l/mlt/mlt.SlackBuild5
2 files changed, 1 insertions, 59 deletions
diff --git a/source/l/mlt/mlt-opencv.patch b/source/l/mlt/mlt-opencv.patch
deleted file mode 100644
index bd486a73b..000000000
--- a/source/l/mlt/mlt-opencv.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-diff -aurN mlt-6.24.1/src/modules/opencv/filter_opencv_tracker.cpp mlt-6.24.1.mod/src/modules/opencv/filter_opencv_tracker.cpp
---- mlt-6.24.1/src/modules/opencv/filter_opencv_tracker.cpp 2021-01-05 19:15:52.000000000 +0100
-+++ mlt-6.24.1.mod/src/modules/opencv/filter_opencv_tracker.cpp 2021-01-13 10:29:26.314403046 +0100
-@@ -25,7 +25,11 @@
- typedef struct
- {
- cv::Ptr<cv::Tracker> tracker;
-- cv::Rect2d boundingBox;
-+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
-+ cv::Rect2d boundingBox;
-+#else
-+ cv::Rect boundingBox;
-+#endif
- char * algo;
- mlt_rect startRect;
- bool initialized;
-@@ -138,7 +142,7 @@
- {
- data->tracker = cv::TrackerKCF::create();
- }
--#if CV_VERSION_MAJOR > 3 || (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 4 && CV_VERSION_REVISION >= 2)
-+#if (CV_VERSION_MAJOR > 3 && CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5) || (CV_VERSION_MAJOR == 3 && CV_VERSION_MINOR >= 4 && CV_VERSION_REVISION >= 2)
- else if ( !strcmp(data->algo, "CSRT" ) )
- {
- data->tracker = cv::TrackerCSRT::create();
-@@ -152,6 +156,7 @@
- {
- data->tracker = cv::TrackerMIL::create();
- }
-+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
- else if ( !strcmp(data->algo, "TLD" ) )
- {
- data->tracker = cv::TrackerTLD::create();
-@@ -160,6 +165,7 @@
- {
- data->tracker = cv::TrackerBoosting::create();
- }
-+#endif // CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
- #else
- if ( data->algo == NULL || !strcmp(data->algo, "" ) )
- {
-@@ -224,7 +230,12 @@
- if ( data->boundingBox.height <1 ) {
- data->boundingBox.height = 50;
- }
-- if ( data->tracker->init( cvFrame, data->boundingBox ) ) {
-+#if CV_VERSION_MAJOR < 4 && CV_VERSION_MINOR < 5
-+ if ( data->tracker->init( cvFrame, data->boundingBox ) ) {
-+#else
-+ {
-+ data->tracker->init( cvFrame, data->boundingBox );
-+#endif
- data->initialized = true;
- data->analyze = true;
- data->last_position = position - 1;
diff --git a/source/l/mlt/mlt.SlackBuild b/source/l/mlt/mlt.SlackBuild
index dfb422c73..59182265f 100755
--- a/source/l/mlt/mlt.SlackBuild
+++ b/source/l/mlt/mlt.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mlt
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -88,9 +88,6 @@ find . \
PYTHONSITEPKG=$(python3 -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")
-# Fix compatibility with newer opencv:
-zcat $CWD/mlt-opencv.patch.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
if [ ! -r configure ]; then
if [ -x ./autogen.sh ]; then