summaryrefslogtreecommitdiff
path: root/source
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2021-01-13 19:51:45 +0000
committerEric Hameleers <alien@slackware.com>2021-01-14 08:59:48 +0100
commita1b82f3ef322065db8e1e4f21b3a80e35a1bb514 (patch)
tree5df2b40cf1fd592606a84b68cb3f31079764288e /source
parent4e75b0d129720e16c3e34ab1edce6a9597e34b10 (diff)
downloadcurrent-a1b82f3ef322065db8e1e4f21b3a80e35a1bb514.tar.gz
Wed Jan 13 19:51:45 UTC 202120210113195145
ap/diffstat-1.64-x86_64-1.txz: Upgraded. d/cmake-3.19.3-x86_64-1.txz: Upgraded. l/gcr-3.38.1-x86_64-1.txz: Upgraded. l/mlt-6.24.0-x86_64-2.txz: Rebuilt. Patched for opencv >= 4.5.1. Thanks to nobodino. l/pulseaudio-14.1-x86_64-1.txz: Upgraded. n/netkit-bootparamd-0.17-x86_64-4.txz: Rebuilt. Patched for libtirpc. Thanks to nobodino. n/netkit-rusers-0.17-x86_64-3.txz: Rebuilt. Patched for libtirpc. Thanks to nobodino. n/netkit-rwall-0.17-x86_64-3.txz: Rebuilt. Patched for libtirpc. Thanks to nobodino. xfce/Greybird-3.22.14-noarch-1.txz: Upgraded. extra/source/flashplayer-plugin/: Removed.
Diffstat (limited to 'source')
-rw-r--r--source/ap/diffstat/diffstat.url2
-rw-r--r--source/l/mlt/mlt-opencv.patch55
-rwxr-xr-xsource/l/mlt/mlt.SlackBuild5
-rwxr-xr-xsource/l/pulseaudio/pulseaudio.SlackBuild2
-rwxr-xr-xsource/n/netkit-bootparamd/netkit-bootparamd.SlackBuild11
-rwxr-xr-xsource/n/netkit-rusers/netkit-rusers.SlackBuild9
-rwxr-xr-xsource/n/netkit-rwall/netkit-rwall.SlackBuild9
-rw-r--r--source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch115
-rw-r--r--source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch61
-rwxr-xr-xsource/xfce/Greybird/Greybird.SlackBuild5
10 files changed, 85 insertions, 189 deletions
diff --git a/source/ap/diffstat/diffstat.url b/source/ap/diffstat/diffstat.url
index a755313e..93042284 100644
--- a/source/ap/diffstat/diffstat.url
+++ b/source/ap/diffstat/diffstat.url
@@ -1 +1 @@
-ftp://invisible-island.net/diffstat/
+ftp://ftp.invisible-island.net/diffstat/
diff --git a/source/l/mlt/mlt-opencv.patch b/source/l/mlt/mlt-opencv.patch
new file mode 100644
index 00000000..bd486a73
--- /dev/null
+++ b/source/l/mlt/mlt-opencv.patch
@@ -0,0 +1,55 @@
+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 59182265..fffc3a93 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:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -88,6 +88,9 @@ 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
diff --git a/source/l/pulseaudio/pulseaudio.SlackBuild b/source/l/pulseaudio/pulseaudio.SlackBuild
index dab661bf..f39144c6 100755
--- a/source/l/pulseaudio/pulseaudio.SlackBuild
+++ b/source/l/pulseaudio/pulseaudio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pulseaudio
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild b/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
index a5ac3f8b..bc031d66 100755
--- a/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
+++ b/source/n/netkit-bootparamd/netkit-bootparamd.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2021 Patrick J. Volkerding, Sebeka, MN, 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=netkit-bootparamd
VERSION=0.17
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -55,7 +55,14 @@ rm -rf netkit-bootparamd-$VERSION
tar xzvf $CWD/netkit-bootparamd-$VERSION.tar.gz || exit 1
cd netkit-bootparamd-$VERSION
chown -R root:root .
+
./configure --prefix=/usr
+
+# Fixes for libtirpc:
+sed -i -e 's/Winline/Winline -I\/usr\/include\/tirpc/' MCONFIG
+sed -i -e 's/LDFLAGS=/LDFLAGS=-ltirpc/' MCONFIG
+sed -i -e 's/void get_myaddress/extern int get_myaddress/' rpc.bootparamd/main.c
+
make || exit 1
cd rpc.bootparamd
strip bootparamd callbootd
diff --git a/source/n/netkit-rusers/netkit-rusers.SlackBuild b/source/n/netkit-rusers/netkit-rusers.SlackBuild
index 9a8eb7c3..fd0908ea 100755
--- a/source/n/netkit-rusers/netkit-rusers.SlackBuild
+++ b/source/n/netkit-rusers/netkit-rusers.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2021 Patrick J. Volkerding, Sebeka, MN, 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=netkit-rusers
VERSION=0.17
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -56,6 +56,11 @@ cd netkit-rusers-$VERSION
chown -R root:root .
zcat $CWD/netkit-rusers-0.17.diff.gz | patch -p1 || exit 1
./configure --prefix=/usr
+
+# Fixes for libtirpc:
+sed -i -e 's/Winline/Winline -I\/usr\/include\/tirpc/' MCONFIG
+sed -i -e 's/LDFLAGS=/LDFLAGS=-ltirpc/' MCONFIG
+
make || exit
cd rpc.rusersd
strip rusersd
diff --git a/source/n/netkit-rwall/netkit-rwall.SlackBuild b/source/n/netkit-rwall/netkit-rwall.SlackBuild
index 7a210569..6a2fae61 100755
--- a/source/n/netkit-rwall/netkit-rwall.SlackBuild
+++ b/source/n/netkit-rwall/netkit-rwall.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007-2021 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=netkit-rwall
VERSION=0.17
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -56,6 +56,11 @@ tar xzvf $CWD/netkit-rwall-$VERSION.tar.gz || exit 1
cd netkit-rwall-$VERSION
chown -R root:root .
./configure --prefix=/usr
+
+# Fixes for libtirpc:
+sed -i -e 's/Winline/Winline -I\/usr\/include\/tirpc/' MCONFIG
+sed -i -e 's/LDFLAGS=/LDFLAGS=-ltirpc/' MCONFIG
+
make || exit 1
cd rpc.rwalld
strip rwalld
diff --git a/source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch b/source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch
deleted file mode 100644
index ec5b54d2..00000000
--- a/source/xfce/Greybird/0001-Make-CSD-titlebars-slimmer.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From d6a43f7c080487bdde8157c767023a1f8d76a240 Mon Sep 17 00:00:00 2001
-From: Maurizio Galli <maurizio.galli@gmail.com>
-Date: Thu, 17 Dec 2020 03:28:42 +0800
-Subject: [PATCH 1/2] Make CSD titlebars slimmer
-
----
- light/gtk-3.0/_common.scss | 56 ++++++++++++++++++++++++++++----------
- 1 file changed, 41 insertions(+), 15 deletions(-)
-
-diff --git a/light/gtk-3.0/_common.scss b/light/gtk-3.0/_common.scss
-index ad5f199..fdf1aa0 100644
---- a/light/gtk-3.0/_common.scss
-+++ b/light/gtk-3.0/_common.scss
-@@ -1419,7 +1419,7 @@ searchbar,
- %titlebar,
- headerbar {
- padding: 0 5px;
-- min-height: 38px;
-+ min-height: 32px;
- border-width: 0 0 1px;
- border-style: solid;
- border-color: $borders_color;
-@@ -1586,13 +1586,13 @@ headerbar {
- }
-
- &.default-decoration {
-- min-height: 28px;
-+ min-height: 24px;
- padding: 4px;
-
- button.titlebutton,
- menubutton.titlebutton {
-- min-height: 26px;
-- min-width: 26px;
-+ min-height: 22px;
-+ min-width: 22px;
- margin: 0;
- padding: 0;
- }
-@@ -1621,35 +1621,61 @@ headerbar {
- headerbar {
- // add vertical margins to common widget on the headerbar to avoid them spanning the whole height
- entry,
-- spinbutton,
-- separator,
-- button {
-+ separator {
- margin-top: 3px;
- margin-bottom: 3px;
- }
-+ spinbutton,
-+ button {
-+ margin-top: 2px;
-+ margin-bottom: 2px;
-+ padding-top: 0;
-+ padding-bottom: 0;
-+ }
- button label {
- min-width: 28px;
-- min-height: 28px;
-+ min-height: 22px;
- }
- button.titlebutton image {
- min-width: 22px;
- min-height: 22px;
- }
- button:not(.image-button):not(.titlebutton) image {
-- min-width: 28px;
-- min-height: 28px;
-+ min-width: 22px;
-+ min-height: 22px;
- }
- button.image-button {
-- min-width: 28px;
-- min-height: 28px;
-+ min-width: 22px;
-+ min-height: 22px;
- padding-left: 2px;
- padding-right: 2px;
- }
-+ .stack-switcher button {
-+ min-width: 26px;
-+ min-height: 26px;
-+ &:not(.text-button) {
-+ min-height: 22px;
-+ min-width: 22px;
-+ padding-left: 0px;
-+ padding-right: 0px;
-+ }
-+ }
-+ buttonbox {
-+ padding: 0px;
-+ button {
-+ min-width: 26px;
-+ min-height: 26px;
-+ &:not(.text-button) {
-+ min-width: 22px;
-+ padding-left: 0px;
-+ padding-right: 0px;
-+ }
-+ }
-+ }
- switch {
-- margin-top: 9px;
-- margin-bottom: 9px;
-+ margin-top: 5px;
-+ margin-bottom: 5px;
- }
-- buttonbox { padding: 0px; }
- }
-
- .background:not(.tiled):not(.maximized):not(.solid-csd) .titlebar,
---
-2.29.2
-
diff --git a/source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch b/source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch
deleted file mode 100644
index 6f495cd4..00000000
--- a/source/xfce/Greybird/0002-Reduce-messagedialog-buttonbox-size.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From ede9f55e3f2ea64248f01801c394e70e85a8f824 Mon Sep 17 00:00:00 2001
-From: Simon Steinbeiss <simon.steinbeiss@elfenbeinturm.at>
-Date: Fri, 18 Dec 2020 00:33:05 +0100
-Subject: [PATCH 2/2] Reduce messagedialog buttonbox size
-
----
- light/gtk-3.0/_common.scss | 36 +++++++++++++++++-------------------
- 1 file changed, 17 insertions(+), 19 deletions(-)
-
-diff --git a/light/gtk-3.0/_common.scss b/light/gtk-3.0/_common.scss
-index fdf1aa0..a75c10b 100644
---- a/light/gtk-3.0/_common.scss
-+++ b/light/gtk-3.0/_common.scss
-@@ -3776,27 +3776,25 @@ messagedialog { // Message Dialog styling
- border-bottom-right-radius: 9px;
- }
-
-- buttonbox {
-+ .dialog-action-area {
- padding: 0px;
-- button { padding: 6px; }
-- }
--
-- .dialog-action-area button {
-- padding: 10px 14px; // labels are not vertically centered on message dialog, this is a workaround
-- border-radius: 0;
-- border-left-style: solid;
-- border-right-style: none;
-- border-bottom-style: none;
--
-- &:first-child{
-- border-left-style: none;
-- border-bottom-left-radius: 7px;
-- -gtk-outline-bottom-left-radius: 5px;
-- }
-+ button {
-+ padding: 3px;
-+ border-radius: 0px;
-+ border-left-style: solid;
-+ border-right-style: none;
-+ border-bottom-style: none;
-+
-+ &:first-child{
-+ border-left-style: none;
-+ border-bottom-left-radius: 7px;
-+ -gtk-outline-bottom-left-radius: 5px;
-+ }
-
-- &:last-child {
-- border-bottom-right-radius: 7px;
-- -gtk-outline-bottom-right-radius: 5px;
-+ &:last-child {
-+ border-bottom-right-radius: 7px;
-+ -gtk-outline-bottom-right-radius: 5px;
-+ }
- }
- }
- }
---
-2.29.2
-
diff --git a/source/xfce/Greybird/Greybird.SlackBuild b/source/xfce/Greybird/Greybird.SlackBuild
index e8e82aa0..939cbb20 100755
--- a/source/xfce/Greybird/Greybird.SlackBuild
+++ b/source/xfce/Greybird/Greybird.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=Greybird
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -76,9 +76,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-zcat $CWD/0001-Make-CSD-titlebars-slimmer.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0002-Reduce-messagedialog-buttonbox-size.patch.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"