diff --git a/ChangeLog.rss b/ChangeLog.rss
index 057ed46d6..d78017ceb 100644
--- a/ChangeLog.rss
+++ b/ChangeLog.rss
@@ -11,9 +11,31 @@
Tracking Slackware development in git.
en-us
urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f
- Fri, 31 May 2024 18:49:48 GMT
- Fri, 31 May 2024 19:34:02 GMT
+ Fri, 31 May 2024 23:52:07 GMT
+ Sat, 1 Jun 2024 00:30:34 GMT
maintain_current_git.sh v 1.17
+ -
+ Fri, 31 May 2024 23:52:07 GMT
+ Fri, 31 May 2024 23:52:07 GMT
+ https://git.slackware.nl/current/tag/?h=20240531235207
+ 20240531235207
+
+
+d/luajit-2.0.1716656478-x86_64-1.txz: Added.
+ Thanks to Erik Falor.
+n/proftpd-1.3.8b-x86_64-4.txz: Rebuilt.
+ Build with mod_wrap2 and mod_wrap2_file instead of mod_wrap, which has
+ problems with ipv6. Thanks to jayjwa.
+xap/mpv-0.38.0-x86_64-2.txz: Rebuilt.
+ [PATCH 1/4] av_common: parent mp_get_lavf_demuxer contents to the list.
+ [PATCH 2/4] stream: implement get_protocols method for stream_lavf.
+ [PATCH 3/4] build: dynamically generate mpv.desktop file protocols.
+ [PATCH 4/4] stream_lavf: don't add ffmpeg bluray or dvd protocols.
+ Thanks to gmgf.
+ Build against luajit. Thanks to pm_a_cup_of_tea.
+ ]]>
+
+
-
Fri, 31 May 2024 18:49:48 GMT
Fri, 31 May 2024 18:49:48 GMT
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 4f0a5fce3..a00c20244 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,17 @@
+Fri May 31 23:52:07 UTC 2024
+d/luajit-2.0.1716656478-x86_64-1.txz: Added.
+ Thanks to Erik Falor.
+n/proftpd-1.3.8b-x86_64-4.txz: Rebuilt.
+ Build with mod_wrap2 and mod_wrap2_file instead of mod_wrap, which has
+ problems with ipv6. Thanks to jayjwa.
+xap/mpv-0.38.0-x86_64-2.txz: Rebuilt.
+ [PATCH 1/4] av_common: parent mp_get_lavf_demuxer contents to the list.
+ [PATCH 2/4] stream: implement get_protocols method for stream_lavf.
+ [PATCH 3/4] build: dynamically generate mpv.desktop file protocols.
+ [PATCH 4/4] stream_lavf: don't add ffmpeg bluray or dvd protocols.
+ Thanks to gmgf.
+ Build against luajit. Thanks to pm_a_cup_of_tea.
++--------------------------+
Fri May 31 18:49:48 UTC 2024
a/hwdata-0.383-noarch-1.txz: Upgraded.
a/pciutils-3.13.0-x86_64-1.txz: Upgraded.
diff --git a/FILELIST.TXT b/FILELIST.TXT
index 83d0aaebf..d6f2884da 100644
--- a/FILELIST.TXT
+++ b/FILELIST.TXT
@@ -1,20 +1,20 @@
-Fri May 31 18:53:21 UTC 2024
+Fri May 31 23:55:36 UTC 2024
Here is the file list for this directory. If you are using a
mirror site and find missing or extra files in the disk
subdirectories, please have the archive administrator refresh
the mirror.
-drwxr-xr-x 12 root root 4096 2024-05-31 18:49 .
+drwxr-xr-x 12 root root 4096 2024-05-31 23:52 .
-rw-r--r-- 1 root root 5767 2022-02-02 22:44 ./ANNOUNCE.15.0
-rw-r--r-- 1 root root 16617 2022-02-02 23:27 ./CHANGES_AND_HINTS.TXT
--rw-r--r-- 1 root root 1154091 2024-05-30 18:42 ./CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-05-30 18:42 ./CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 1155009 2024-05-31 18:53 ./CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-05-31 18:53 ./CHECKSUMS.md5.asc
-rw-r--r-- 1 root root 17976 1994-06-10 02:28 ./COPYING
-rw-r--r-- 1 root root 35147 2007-06-30 04:21 ./COPYING3
-rw-r--r-- 1 root root 19573 2016-06-23 20:08 ./COPYRIGHT.TXT
-rw-r--r-- 1 root root 616 2006-10-02 04:37 ./CRYPTO_NOTICE.TXT
--rw-r--r-- 1 root root 1086331 2024-05-31 18:49 ./ChangeLog.txt
+-rw-r--r-- 1 root root 1087004 2024-05-31 23:52 ./ChangeLog.txt
drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI
drwxr-xr-x 2 root root 4096 2024-05-30 18:37 ./EFI/BOOT
-rw-r--r-- 1 root root 1187840 2021-06-15 19:16 ./EFI/BOOT/bootx64.efi
@@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2024-05-30 18:37 ./EFI/BOOT
-rwxr-xr-x 1 root root 2504 2019-07-05 18:54 ./EFI/BOOT/make-grub.sh
-rw-r--r-- 1 root root 10722 2013-09-21 19:02 ./EFI/BOOT/osdetect.cfg
-rw-r--r-- 1 root root 1273 2013-08-12 21:08 ./EFI/BOOT/tools.cfg
--rw-r--r-- 1 root root 1510204 2024-05-30 18:42 ./FILELIST.TXT
+-rw-r--r-- 1 root root 1511393 2024-05-31 18:53 ./FILELIST.TXT
-rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY
--rw-r--r-- 1 root root 910887 2024-05-31 18:52 ./PACKAGES.TXT
+-rw-r--r-- 1 root root 911260 2024-05-31 23:55 ./PACKAGES.TXT
-rw-r--r-- 1 root root 8034 2022-02-02 03:36 ./README.TXT
-rw-r--r-- 1 root root 3623 2024-05-30 18:22 ./README.initrd
-rw-r--r-- 1 root root 34114 2023-12-11 20:35 ./README_CRYPT.TXT
@@ -662,11 +662,11 @@ drwxr-xr-x 2 root root 4096 2022-02-03 07:02 ./patches
-rw-r--r-- 1 root root 575 2022-02-03 07:02 ./patches/FILE_LIST
-rw-r--r-- 1 root root 14 2022-02-03 07:02 ./patches/MANIFEST.bz2
-rw-r--r-- 1 root root 224 2022-02-03 07:02 ./patches/PACKAGES.TXT
-drwxr-xr-x 17 root root 4096 2024-05-31 18:52 ./slackware64
--rw-r--r-- 1 root root 355233 2024-05-31 18:52 ./slackware64/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-05-31 18:52 ./slackware64/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 439939 2024-05-31 18:52 ./slackware64/FILE_LIST
--rw-r--r-- 1 root root 4649558 2024-05-31 18:52 ./slackware64/MANIFEST.bz2
+drwxr-xr-x 17 root root 4096 2024-05-31 23:55 ./slackware64
+-rw-r--r-- 1 root root 355456 2024-05-31 23:55 ./slackware64/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-05-31 23:55 ./slackware64/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 440205 2024-05-31 23:54 ./slackware64/FILE_LIST
+-rw-r--r-- 1 root root 4655607 2024-05-31 23:54 ./slackware64/MANIFEST.bz2
lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT
drwxr-xr-x 2 root root 32768 2024-05-31 18:51 ./slackware64/a
-rw-r--r-- 1 root root 327 2022-02-15 18:16 ./slackware64/a/aaa_base-15.1-x86_64-2.txt
@@ -1322,7 +1322,7 @@ drwxr-xr-x 2 root root 20480 2024-05-26 18:31 ./slackware64/ap
-rw-r--r-- 1 root root 506 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txt
-rw-r--r-- 1 root root 3156392 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-05-15 17:09 ./slackware64/ap/zsh-5.9-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 20480 2024-05-31 18:52 ./slackware64/d
+drwxr-xr-x 2 root root 20480 2024-05-31 23:54 ./slackware64/d
-rw-r--r-- 1 root root 360 2024-03-30 21:20 ./slackware64/d/Cython-3.0.10-x86_64-1.txt
-rw-r--r-- 1 root root 4305292 2024-03-30 21:20 ./slackware64/d/Cython-3.0.10-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-03-30 21:20 ./slackware64/d/Cython-3.0.10-x86_64-1.txz.asc
@@ -1454,14 +1454,17 @@ drwxr-xr-x 2 root root 20480 2024-05-31 18:52 ./slackware64/d
-rw-r--r-- 1 root root 511 2024-05-04 02:05 ./slackware64/d/lua-5.4.6-x86_64-6.txt
-rw-r--r-- 1 root root 299216 2024-05-04 02:05 ./slackware64/d/lua-5.4.6-x86_64-6.txz
-rw-r--r-- 1 root root 195 2024-05-04 02:05 ./slackware64/d/lua-5.4.6-x86_64-6.txz.asc
+-rw-r--r-- 1 root root 227 2024-05-31 23:35 ./slackware64/d/luajit-2.0.1716656478-x86_64-1.txt
+-rw-r--r-- 1 root root 284264 2024-05-31 23:35 ./slackware64/d/luajit-2.0.1716656478-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-05-31 23:35 ./slackware64/d/luajit-2.0.1716656478-x86_64-1.txz.asc
-rw-r--r-- 1 root root 473 2021-05-31 19:24 ./slackware64/d/m4-1.4.19-x86_64-1.txt
-rw-r--r-- 1 root root 298692 2021-05-31 19:24 ./slackware64/d/m4-1.4.19-x86_64-1.txz
-rw-r--r-- 1 root root 163 2021-05-31 19:24 ./slackware64/d/m4-1.4.19-x86_64-1.txz.asc
-rw-r--r-- 1 root root 466 2023-02-27 19:42 ./slackware64/d/make-4.4.1-x86_64-1.txt
-rw-r--r-- 1 root root 558408 2023-02-27 19:42 ./slackware64/d/make-4.4.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-02-27 19:42 ./slackware64/d/make-4.4.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 6151 2024-04-12 18:09 ./slackware64/d/maketag
--rw-r--r-- 1 root root 6151 2024-04-12 18:09 ./slackware64/d/maketag.ez
+-rw-r--r-- 1 root root 6209 2024-05-31 23:49 ./slackware64/d/maketag
+-rw-r--r-- 1 root root 6209 2024-05-31 23:49 ./slackware64/d/maketag.ez
-rw-r--r-- 1 root root 659 2024-05-07 18:43 ./slackware64/d/mercurial-6.7.3-x86_64-1.txt
-rw-r--r-- 1 root root 5690844 2024-05-07 18:43 ./slackware64/d/mercurial-6.7.3-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-05-07 18:43 ./slackware64/d/mercurial-6.7.3-x86_64-1.txz.asc
@@ -1555,7 +1558,7 @@ drwxr-xr-x 2 root root 20480 2024-05-31 18:52 ./slackware64/d
-rw-r--r-- 1 root root 559 2024-02-26 19:46 ./slackware64/d/swig-4.2.1-x86_64-1.txt
-rw-r--r-- 1 root root 2790884 2024-02-26 19:46 ./slackware64/d/swig-4.2.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2024-02-26 19:46 ./slackware64/d/swig-4.2.1-x86_64-1.txz.asc
--rw-r--r-- 1 root root 961 2024-04-12 18:09 ./slackware64/d/tagfile
+-rw-r--r-- 1 root root 972 2024-05-31 23:49 ./slackware64/d/tagfile
-rw-r--r-- 1 root root 424 2024-02-14 21:26 ./slackware64/d/tree-sitter-0.20.9-x86_64-1.txt
-rw-r--r-- 1 root root 3200272 2024-02-14 21:26 ./slackware64/d/tree-sitter-0.20.9-x86_64-1.txz
-rw-r--r-- 1 root root 163 2024-02-14 21:26 ./slackware64/d/tree-sitter-0.20.9-x86_64-1.txz.asc
@@ -2706,9 +2709,9 @@ drwxr-xr-x 2 root root 86016 2024-05-31 18:52 ./slackware64/kde
-rw-r--r-- 1 root root 195 2024-05-22 18:13 ./slackware64/kde/qqc2-desktop-style-5.116.1-x86_64-1.txz.asc
-rw-r--r-- 1 root root 460 2024-02-15 21:32 ./slackware64/kde/rocs-23.08.5-x86_64-1.txt
-rw-r--r-- 1 root root 1591648 2024-02-15 21:32 ./slackware64/kde/rocs-23.08.5-x86_64-1.txz
--rw-r--r-- 1 root root 163 2024-02-15 21:32 ./slackware64/kde/rocs-23.08.5-x86_64-1.txz.asc
--rw-r--r-- 1 root root 275 2024-03-06 20:49 ./slackware64/kde/sddm-kcm-5.27.11-x86_64-1.txt
--rw-r--r-- 1 root root 121684 2024-03-06 20:49 ./slackware64/kde/sddm-kcm-5.27.11-x86_64-1.txz
+-rw-r--r-- 1 root root 163 2024-02-15 21:32 ./slackware64/kde/rocs-23.08.5-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 275 2024-03-06 20:49 ./slackware64/kde/sddm-kcm-5.27.11-x86_64-1.txt
+-rw-r--r-- 1 root root 121684 2024-03-06 20:49 ./slackware64/kde/sddm-kcm-5.27.11-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-03-06 20:49 ./slackware64/kde/sddm-kcm-5.27.11-x86_64-1.txz.asc
-rw-r--r-- 1 root root 204 2024-02-15 21:41 ./slackware64/kde/skanlite-23.08.5-x86_64-1.txt
-rw-r--r-- 1 root root 2539336 2024-02-15 21:41 ./slackware64/kde/skanlite-23.08.5-x86_64-1.txz
@@ -4103,7 +4106,7 @@ drwxr-xr-x 2 root root 102400 2024-05-31 18:52 ./slackware64/l
-rw-r--r-- 1 root root 403 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txt
-rw-r--r-- 1 root root 773596 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-12-11 22:02 ./slackware64/l/zxing-cpp-2.2.1-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 36864 2024-05-31 18:52 ./slackware64/n
+drwxr-xr-x 2 root root 36864 2024-05-31 23:54 ./slackware64/n
-rw-r--r-- 1 root root 357 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txt
-rw-r--r-- 1 root root 1517848 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz
-rw-r--r-- 1 root root 163 2023-03-09 19:11 ./slackware64/n/ModemManager-1.20.6-x86_64-1.txz.asc
@@ -4480,9 +4483,9 @@ drwxr-xr-x 2 root root 36864 2024-05-31 18:52 ./slackware64/n
-rw-r--r-- 1 root root 687 2023-03-05 21:13 ./slackware64/n/procmail-3.24-x86_64-2.txt
-rw-r--r-- 1 root root 135308 2023-03-05 21:13 ./slackware64/n/procmail-3.24-x86_64-2.txz
-rw-r--r-- 1 root root 163 2023-03-05 21:13 ./slackware64/n/procmail-3.24-x86_64-2.txz.asc
--rw-r--r-- 1 root root 371 2024-03-15 17:19 ./slackware64/n/proftpd-1.3.8b-x86_64-3.txt
--rw-r--r-- 1 root root 1402272 2024-03-15 17:19 ./slackware64/n/proftpd-1.3.8b-x86_64-3.txz
--rw-r--r-- 1 root root 195 2024-03-15 17:19 ./slackware64/n/proftpd-1.3.8b-x86_64-3.txz.asc
+-rw-r--r-- 1 root root 371 2024-05-31 21:48 ./slackware64/n/proftpd-1.3.8b-x86_64-4.txt
+-rw-r--r-- 1 root root 1400168 2024-05-31 21:48 ./slackware64/n/proftpd-1.3.8b-x86_64-4.txz
+-rw-r--r-- 1 root root 195 2024-05-31 21:48 ./slackware64/n/proftpd-1.3.8b-x86_64-4.txz.asc
-rw-r--r-- 1 root root 584 2024-03-29 05:01 ./slackware64/n/pssh-2.3.5-x86_64-2.txt
-rw-r--r-- 1 root root 51712 2024-03-29 05:01 ./slackware64/n/pssh-2.3.5-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-03-29 05:01 ./slackware64/n/pssh-2.3.5-x86_64-2.txz.asc
@@ -5486,10 +5489,10 @@ drwxr-xr-x 2 root root 65536 2024-05-31 18:52 ./slackware64/x
-rw-r--r-- 1 root root 421 2022-12-04 19:50 ./slackware64/x/xstdcmap-1.0.5-x86_64-1.txt
-rw-r--r-- 1 root root 18720 2022-12-04 19:50 ./slackware64/x/xstdcmap-1.0.5-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-12-04 19:50 ./slackware64/x/xstdcmap-1.0.5-x86_64-1.txz.asc
--rw-r--r-- 1 root root 308 2024-05-23 17:32 ./slackware64/x/xterm-392-x86_64-1.txt
--rw-r--r-- 1 root root 440924 2024-05-23 17:32 ./slackware64/x/xterm-392-x86_64-1.txz
--rw-r--r-- 1 root root 195 2024-05-23 17:32 ./slackware64/x/xterm-392-x86_64-1.txz.asc
--rw-r--r-- 1 root root 391 2023-06-04 18:34 ./slackware64/x/xtrans-1.5.0-noarch-1.txt
+-rw-r--r-- 1 root root 308 2024-05-23 17:32 ./slackware64/x/xterm-392-x86_64-1.txt
+-rw-r--r-- 1 root root 440924 2024-05-23 17:32 ./slackware64/x/xterm-392-x86_64-1.txz
+-rw-r--r-- 1 root root 195 2024-05-23 17:32 ./slackware64/x/xterm-392-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 391 2023-06-04 18:34 ./slackware64/x/xtrans-1.5.0-noarch-1.txt
-rw-r--r-- 1 root root 65032 2023-06-04 18:34 ./slackware64/x/xtrans-1.5.0-noarch-1.txz
-rw-r--r-- 1 root root 163 2023-06-04 18:34 ./slackware64/x/xtrans-1.5.0-noarch-1.txz.asc
-rw-r--r-- 1 root root 235 2023-02-05 20:19 ./slackware64/x/xvidtune-1.0.4-x86_64-1.txt
@@ -5507,7 +5510,7 @@ drwxr-xr-x 2 root root 65536 2024-05-31 18:52 ./slackware64/x
-rw-r--r-- 1 root root 213 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txt
-rw-r--r-- 1 root root 25896 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz
-rw-r--r-- 1 root root 163 2022-07-11 18:36 ./slackware64/x/xwud-1.0.6-x86_64-1.txz.asc
-drwxr-xr-x 2 root root 16384 2024-05-31 18:52 ./slackware64/xap
+drwxr-xr-x 2 root root 16384 2024-05-31 23:54 ./slackware64/xap
-rw-r--r-- 1 root root 625 2024-05-04 01:48 ./slackware64/xap/MPlayer-20240403-x86_64-2.txt
-rw-r--r-- 1 root root 2705916 2024-05-04 01:48 ./slackware64/xap/MPlayer-20240403-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-05-04 01:48 ./slackware64/xap/MPlayer-20240403-x86_64-2.txz.asc
@@ -5590,9 +5593,9 @@ drwxr-xr-x 2 root root 16384 2024-05-31 18:52 ./slackware64/xap
-rw-r--r-- 1 root root 663 2024-04-26 19:08 ./slackware64/xap/mozilla-thunderbird-125.0-x86_64-1.txt
-rw-r--r-- 1 root root 63588452 2024-04-26 19:08 ./slackware64/xap/mozilla-thunderbird-125.0-x86_64-1.txz
-rw-r--r-- 1 root root 195 2024-04-26 19:08 ./slackware64/xap/mozilla-thunderbird-125.0-x86_64-1.txz.asc
--rw-r--r-- 1 root root 470 2024-05-30 21:50 ./slackware64/xap/mpv-0.38.0-x86_64-1.txt
--rw-r--r-- 1 root root 1285316 2024-05-30 21:50 ./slackware64/xap/mpv-0.38.0-x86_64-1.txz
--rw-r--r-- 1 root root 195 2024-05-30 21:50 ./slackware64/xap/mpv-0.38.0-x86_64-1.txz.asc
+-rw-r--r-- 1 root root 470 2024-05-31 23:38 ./slackware64/xap/mpv-0.38.0-x86_64-2.txt
+-rw-r--r-- 1 root root 1356940 2024-05-31 23:38 ./slackware64/xap/mpv-0.38.0-x86_64-2.txz
+-rw-r--r-- 1 root root 195 2024-05-31 23:38 ./slackware64/xap/mpv-0.38.0-x86_64-2.txz.asc
-rw-r--r-- 1 root root 359 2024-01-19 19:48 ./slackware64/xap/network-manager-applet-1.36.0-x86_64-1.txt
-rw-r--r-- 1 root root 879652 2024-01-19 19:48 ./slackware64/xap/network-manager-applet-1.36.0-x86_64-1.txz
-rw-r--r-- 1 root root 163 2024-01-19 19:48 ./slackware64/xap/network-manager-applet-1.36.0-x86_64-1.txz.asc
@@ -5777,11 +5780,11 @@ drwxr-xr-x 2 root root 4096 2024-05-05 18:37 ./slackware64/y
-rw-r--r-- 1 root root 1488844 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz
-rw-r--r-- 1 root root 195 2024-05-05 17:22 ./slackware64/y/nethack-3.6.7-x86_64-2.txz.asc
-rw-r--r-- 1 root root 26 2020-12-30 21:55 ./slackware64/y/tagfile
-drwxr-xr-x 18 root root 4096 2024-05-31 18:53 ./source
--rw-r--r-- 1 root root 622616 2024-05-31 18:53 ./source/CHECKSUMS.md5
--rw-r--r-- 1 root root 195 2024-05-31 18:53 ./source/CHECKSUMS.md5.asc
--rw-r--r-- 1 root root 867668 2024-05-31 18:53 ./source/FILE_LIST
--rw-r--r-- 1 root root 29338152 2024-05-31 18:53 ./source/MANIFEST.bz2
+drwxr-xr-x 18 root root 4096 2024-05-31 23:55 ./source
+-rw-r--r-- 1 root root 622964 2024-05-31 23:55 ./source/CHECKSUMS.md5
+-rw-r--r-- 1 root root 195 2024-05-31 23:55 ./source/CHECKSUMS.md5.asc
+-rw-r--r-- 1 root root 868160 2024-05-31 23:55 ./source/FILE_LIST
+-rw-r--r-- 1 root root 29346473 2024-05-31 23:55 ./source/MANIFEST.bz2
-rw-r--r-- 1 root root 828 2022-02-02 04:43 ./source/README.TXT
drwxr-xr-x 124 root root 4096 2024-05-23 18:35 ./source/a
-rw-r--r-- 1 root root 339 2023-09-28 19:06 ./source/a/FTBFSlog
@@ -7547,7 +7550,7 @@ drwxr-xr-x 2 root root 4096 2024-05-12 05:06 ./source/ap/zsh
-rwxr-xr-x 1 root root 4423 2024-05-12 05:06 ./source/ap/zsh/zsh.SlackBuild
-rw-r--r-- 1 root root 23 2018-09-14 17:50 ./source/ap/zsh/zsh.url
-rwxr-xr-x 1 root root 12001 2021-10-08 01:36 ./source/buildlist-from-changelog.sh
-drwxr-xr-x 72 root root 4096 2024-05-14 04:49 ./source/d
+drwxr-xr-x 73 root root 4096 2024-05-31 23:35 ./source/d
drwxr-xr-x 2 root root 4096 2024-03-30 21:16 ./source/d/Cython
-rw-r--r-- 1 root root 2125118 2024-03-30 20:12 ./source/d/Cython/Cython-3.0.10.tar.lz
-rwxr-xr-x 1 root root 3118 2024-02-28 18:04 ./source/d/Cython/Cython.SlackBuild
@@ -7800,6 +7803,11 @@ drwxr-xr-x 2 root root 4096 2024-05-04 00:01 ./source/d/lua
-rw-r--r-- 1 root root 23 2023-08-19 18:36 ./source/d/lua/lua.url
-rw-r--r-- 1 root root 966 2024-02-13 19:05 ./source/d/lua/lua.usr.local.patch
-rw-r--r-- 1 root root 994 2023-08-30 20:24 ./source/d/lua/slack-desc
+drwxr-xr-x 2 root root 4096 2024-05-31 23:35 ./source/d/luajit
+-rwxr-xr-x 1 root root 2497 2024-05-31 23:34 ./source/d/luajit/fetch-luajit.sh
+-rw-r--r-- 1 root root 602434 2024-05-25 16:38 ./source/d/luajit/luajit-2.0.1716656478.tar.lz
+-rwxr-xr-x 1 root root 4151 2024-05-31 23:12 ./source/d/luajit/luajit.SlackBuild
+-rw-r--r-- 1 root root 713 2024-05-31 22:32 ./source/d/luajit/slack-desc
drwxr-xr-x 2 root root 4096 2021-05-31 19:24 ./source/d/m4
-rw-r--r-- 1 root root 1654908 2021-05-28 21:55 ./source/d/m4/m4-1.4.19.tar.xz
-rw-r--r-- 1 root root 488 2021-05-28 21:55 ./source/d/m4/m4-1.4.19.tar.xz.sig
@@ -13336,7 +13344,7 @@ drwxr-xr-x 2 root root 4096 2024-03-11 17:42 ./source/n/openssh
-rw-r--r-- 1 root root 593 2020-02-07 03:05 ./source/n/openssh/doinst.sh.gz
-rw-r--r-- 1 root root 1848766 2024-03-11 10:19 ./source/n/openssh/openssh-9.7p1.tar.gz
-rw-r--r-- 1 root root 833 2024-03-11 10:19 ./source/n/openssh/openssh-9.7p1.tar.gz.asc
--rwxr-xr-x 1 root root 6293 2023-10-04 19:04 ./source/n/openssh/openssh.SlackBuild
+-rwxr-xr-x 1 root root 6268 2024-05-31 21:14 ./source/n/openssh/openssh.SlackBuild
-rw-r--r-- 1 root root 1658 2022-02-24 19:30 ./source/n/openssh/openssh.tcp_wrappers.diff.gz
-rw-r--r-- 1 root root 54 2020-02-14 19:40 ./source/n/openssh/openssh.url
-rw-r--r-- 1 root root 1814 2017-07-18 06:51 ./source/n/openssh/rc.sshd
@@ -13455,7 +13463,7 @@ drwxr-xr-x 2 root root 4096 2017-04-20 21:08 ./source/n/proftpd/etc
-rw-r--r-- 1 root root 581 2001-02-26 07:31 ./source/n/proftpd/etc/ftpusers
-rw-r--r-- 1 root root 1988 2024-03-13 19:08 ./source/n/proftpd/etc/proftpd.conf
-rw-r--r-- 1 root root 13966952 2023-12-20 04:42 ./source/n/proftpd/proftpd-1.3.8b.tar.xz
--rwxr-xr-x 1 root root 4780 2024-03-15 17:18 ./source/n/proftpd/proftpd.SlackBuild
+-rwxr-xr-x 1 root root 4796 2024-05-31 21:47 ./source/n/proftpd/proftpd.SlackBuild
-rw-r--r-- 1 root root 826 2018-02-27 06:13 ./source/n/proftpd/slack-desc
drwxr-xr-x 2 root root 4096 2024-03-29 03:06 ./source/n/pssh
-rw-r--r-- 1 root root 43893 2023-03-22 05:48 ./source/n/pssh/pssh-2.3.5.tar.lz
@@ -15265,13 +15273,13 @@ drwxr-xr-x 2 root root 4096 2024-04-17 18:00 ./source/x/x11/src/lib
-rw-r--r-- 1 root root 468964 2023-10-03 16:13 ./source/x/x11/src/lib/libXpm-3.5.17.tar.xz
-rw-r--r-- 1 root root 257136 2022-10-17 22:23 ./source/x/x11/src/lib/libXpresent-1.0.1.tar.xz
-rw-r--r-- 1 root root 282928 2023-10-04 23:59 ./source/x/x11/src/lib/libXrandr-1.5.4.tar.xz
--rw-r--r-- 1 root root 302900 2022-10-22 01:15 ./source/x/x11/src/lib/libXrender-0.9.11.tar.xz
--rw-r--r-- 1 root root 261400 2022-12-04 23:33 ./source/x/x11/src/lib/libXres-1.2.2.tar.xz
--rw-r--r-- 1 root root 688084 2023-04-09 20:50 ./source/x/x11/src/lib/libXt-1.3.0.tar.xz
--rw-r--r-- 1 root root 287636 2022-09-27 01:11 ./source/x/x11/src/lib/libXtst-1.2.4.tar.xz
--rw-r--r-- 1 root root 276020 2022-12-04 23:45 ./source/x/x11/src/lib/libXv-1.0.12.tar.xz
--rw-r--r-- 1 root root 278492 2024-02-04 22:52 ./source/x/x11/src/lib/libXvMC-1.0.14.tar.xz
--rw-r--r-- 1 root root 267760 2022-12-04 23:53 ./source/x/x11/src/lib/libXxf86dga-1.1.6.tar.xz
+-rw-r--r-- 1 root root 302900 2022-10-22 01:15 ./source/x/x11/src/lib/libXrender-0.9.11.tar.xz
+-rw-r--r-- 1 root root 261400 2022-12-04 23:33 ./source/x/x11/src/lib/libXres-1.2.2.tar.xz
+-rw-r--r-- 1 root root 688084 2023-04-09 20:50 ./source/x/x11/src/lib/libXt-1.3.0.tar.xz
+-rw-r--r-- 1 root root 287636 2022-09-27 01:11 ./source/x/x11/src/lib/libXtst-1.2.4.tar.xz
+-rw-r--r-- 1 root root 276020 2022-12-04 23:45 ./source/x/x11/src/lib/libXv-1.0.12.tar.xz
+-rw-r--r-- 1 root root 278492 2024-02-04 22:52 ./source/x/x11/src/lib/libXvMC-1.0.14.tar.xz
+-rw-r--r-- 1 root root 267760 2022-12-04 23:53 ./source/x/x11/src/lib/libXxf86dga-1.1.6.tar.xz
-rw-r--r-- 1 root root 251004 2018-07-05 16:49 ./source/x/x11/src/lib/libXxf86misc-1.0.4.tar.xz
-rw-r--r-- 1 root root 265384 2022-09-27 00:55 ./source/x/x11/src/lib/libXxf86vm-1.1.5.tar.xz
-rw-r--r-- 1 root root 266952 2023-06-03 19:07 ./source/x/x11/src/lib/libdmx-1.1.5.tar.xz
@@ -15350,7 +15358,7 @@ drwxr-xr-x 2 root root 4096 2024-05-23 17:31 ./source/x/xterm
-rw-r--r-- 1 root root 1089216 2024-05-22 23:23 ./source/x/xterm/xterm-392.tar.lz
-rwxr-xr-x 1 root root 4901 2024-02-13 18:37 ./source/x/xterm/xterm.SlackBuild
-rw-r--r-- 1 root root 44 2023-05-29 18:07 ./source/x/xterm/xterm.url
-drwxr-xr-x 53 root root 4096 2024-05-30 21:50 ./source/xap
+drwxr-xr-x 53 root root 4096 2024-05-31 22:04 ./source/xap
-rw-r--r-- 1 root root 223 2022-10-09 20:11 ./source/xap/FTBFSlog
drwxr-xr-x 2 root root 4096 2024-05-10 21:52 ./source/xap/MPlayer
-rw-r--r-- 1 root root 222707 2017-10-10 01:18 ./source/xap/MPlayer/Blue-1.13.tar.bz2
@@ -15555,10 +15563,11 @@ drwxr-xr-x 2 root root 4096 2016-07-03 18:05 ./source/xap/mozilla-thunderb
-rw-r--r-- 1 root root 651883636 2024-04-24 15:29 ./source/xap/mozilla-thunderbird/thunderbird-125.0.source.tar.xz
-rw-r--r-- 1 root root 833 2024-04-24 15:29 ./source/xap/mozilla-thunderbird/thunderbird-125.0.source.tar.xz.asc
-rw-r--r-- 1 root root 3378 2005-03-08 05:13 ./source/xap/mozilla-thunderbird/thunderbird.desktop
-drwxr-xr-x 2 root root 4096 2024-05-30 21:29 ./source/xap/mpv
+drwxr-xr-x 2 root root 4096 2024-05-31 22:01 ./source/xap/mpv
-rw-r--r-- 1 root root 731 2024-05-30 21:48 ./source/xap/mpv/doinst.sh
+-rw-r--r-- 1 root root 17426 2024-05-31 22:00 ./source/xap/mpv/dynamically_generate_desktop_file_protocols.patch
-rw-r--r-- 1 root root 2364695 2024-04-17 19:18 ./source/xap/mpv/mpv-0.38.0.tar.lz
--rwxr-xr-x 1 root root 4835 2024-05-30 21:29 ./source/xap/mpv/mpv.SlackBuild
+-rwxr-xr-x 1 root root 4944 2024-05-31 23:38 ./source/xap/mpv/mpv.SlackBuild
-rw-r--r-- 1 root root 34 2024-05-30 20:47 ./source/xap/mpv/mpv.url
-rw-r--r-- 1 root root 953 2024-05-30 20:53 ./source/xap/mpv/slack-desc
drwxr-xr-x 2 root root 4096 2024-01-19 19:47 ./source/xap/network-manager-applet
diff --git a/slackware64/d/maketag b/slackware64/d/maketag
index 871a82f82..bc4720efd 100644
--- a/slackware64/d/maketag
+++ b/slackware64/d/maketag
@@ -54,6 +54,7 @@ done." 22 72 12 \
"libtool" "GNU libtool library support script" "on" \
"llvm" "LLVM compiler toolkit" "on" \
"lua" "light-weight embeddable scripting language" "on" \
+"luajit" "Just-In-Time Lua compiler" "on" \
"m4" "GNU m4 macro processor" "on" \
"make" "GNU make" "on" \
"mercurial" "Distributed source management system" "on" \
@@ -96,7 +97,7 @@ if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
> $TMP/SeTnewtag
for pkg in \
-Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
+Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua luajit m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
; do
echo "$pkg: SKP" >> $TMP/SeTnewtag
done
@@ -104,7 +105,7 @@ Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer c
fi
cat /dev/null > $TMP/SeTnewtag
for PACKAGE in \
-Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
+Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua luajit m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
; do
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/d/maketag.ez b/slackware64/d/maketag.ez
index 871a82f82..bc4720efd 100644
--- a/slackware64/d/maketag.ez
+++ b/slackware64/d/maketag.ez
@@ -54,6 +54,7 @@ done." 22 72 12 \
"libtool" "GNU libtool library support script" "on" \
"llvm" "LLVM compiler toolkit" "on" \
"lua" "light-weight embeddable scripting language" "on" \
+"luajit" "Just-In-Time Lua compiler" "on" \
"m4" "GNU m4 macro processor" "on" \
"make" "GNU make" "on" \
"mercurial" "Distributed source management system" "on" \
@@ -96,7 +97,7 @@ if [ $? = 1 -o $? = 255 ]; then
rm -f $TMP/SeTpkgs
> $TMP/SeTnewtag
for pkg in \
-Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
+Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua luajit m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
; do
echo "$pkg: SKP" >> $TMP/SeTnewtag
done
@@ -104,7 +105,7 @@ Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer c
fi
cat /dev/null > $TMP/SeTnewtag
for PACKAGE in \
-Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
+Cython autoconf autoconf-archive automake binutils bison cargo-vendor-filterer cbindgen ccache check clinfo clisp cmake cscope cvs dev86 distcc doxygen flex gcc gcc-g++ gcc-gdc gcc-gfortran gcc-gm2 gcc-gnat gcc-go gcc-objc gdb gettext-tools git gnucobol gperf guile gyp help2man icecream indent intltool kernel-headers libgccjit libtool llvm lua luajit m4 make mercurial meson nasm ninja nv-codec-headers opencl-headers oprofile p2c pahole parallel patchelf perl pkg-config pmake poke python-pip python-setuptools python2 python3 rcs re2c rinutils ruby rust rust-bindgen sassc scons slacktrack strace subversion swig tree-sitter vala valgrind yasm \
; do
if grep "\(^\| \)$PACKAGE\( \|$\)" $TMP/SeTpkgs 1> /dev/null 2> /dev/null ; then
echo "$PACKAGE: ADD" >> $TMP/SeTnewtag
diff --git a/slackware64/d/tagfile b/slackware64/d/tagfile
index cccc36a1d..ddc95ad1c 100644
--- a/slackware64/d/tagfile
+++ b/slackware64/d/tagfile
@@ -41,6 +41,7 @@ libgccjit:ADD
libtool:OPT
llvm:REC
lua:REC
+luajit:REC
m4:REC
make:ADD
mercurial:REC
diff --git a/source/d/luajit/fetch-luajit.sh b/source/d/luajit/fetch-luajit.sh
new file mode 100755
index 000000000..d5201499c
--- /dev/null
+++ b/source/d/luajit/fetch-luajit.sh
@@ -0,0 +1,62 @@
+#!/bin/sh
+
+# Copyright 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+PKGNAM=luajit
+
+# Pull a stable branch + patches
+BRANCH=${1:-master}
+
+# Clear download area:
+rm -rf ${PKGNAM}
+
+# Clone repository:
+git clone https://luajit.org/git/luajit.git
+
+pushd luajit
+ PATCH="$(git show -s --format=%ct)"
+popd
+
+# checkout $BRANCH:
+( cd ${PKGNAM}
+ git checkout $BRANCH || exit 1
+ # Add patch version:
+ echo $PATCH > .relver
+ # Use patchlevel, not ROLLING:
+ sed -i "s/ROLLING/$PATCH/g" etc/luajit.pc src/luajit_rolling.h
+)
+MAJOR=$(grep majver= ${PKGNAM}/etc/luajit.pc | cut -f 2 -d =)
+MINOR=$(grep minver= ${PKGNAM}/etc/luajit.pc | cut -f 2 -d =)
+PATCH=$(grep relver= ${PKGNAM}/etc/luajit.pc | cut -f 2 -d =)
+HEADISAT="$( cd ${PKGNAM} && git log -1 --format=%h )"
+DATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%Y%m%d )"
+LONGDATE="$( cd ${PKGNAM} && git log -1 --format=%cd --date=format:%c )"
+# Cleanup. We're not packing up the whole git repo.
+( cd ${PKGNAM} && find . -type d -name ".git*" -exec rm -rf {} \; 2> /dev/null )
+mv ${PKGNAM} ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}
+tar cf ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}
+plzip -9 -f ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar
+rm -rf ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}
+touch -d "$LONGDATE" ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar.lz
+echo
+echo "${PKGNAM} branch $BRANCH with HEAD at $HEADISAT packaged as ${PKGNAM}-${MAJOR}.${MINOR}.${PATCH}.tar.lz"
+echo
diff --git a/source/d/luajit/luajit.SlackBuild b/source/d/luajit/luajit.SlackBuild
new file mode 100755
index 000000000..8f9ab0c7a
--- /dev/null
+++ b/source/d/luajit/luajit.SlackBuild
@@ -0,0 +1,137 @@
+#!/bin/bash
+
+# Copyright 2018 Erik Falor , Logan, Utah, USA
+# Copyright 2024 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=luajit
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+NUMJOBS=${NUMJOBS:-" -j $(expr $(nproc) + 1) "}
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+ LIBDIRSUFFIX=""
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+# Enable Lua 5.2 features:
+sed -i -e '/-DLUAJIT_ENABLE_LUA52COMPAT/s/^#//' src/Makefile
+
+# preserve timestamps:
+sed -i -e '/install -m/s/-m/-p -m/' Makefile
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make $NUMJOBS \
+ Q= \
+ PREFIX=/usr \
+ MULTILIB=lib${LIBDIRSUFFIX} \
+ INSTALL_LIB=/usr/lib${LIBDIRSUFFIX} \
+ INSTALL_MAN=/usr/man/man1 || exit 1
+
+CFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS" \
+make install \
+ Q= \
+ DESTDIR=$PKG \
+ PREFIX=/usr \
+ MULTILIB=lib${LIBDIRSUFFIX} \
+ INSTALL_LIB=$PKG/usr/lib${LIBDIRSUFFIX} \
+ INSTALL_MAN=$PKG/usr/man/man1 || exit 1
+
+# No static library:
+rm -f $PKG/usr/lib${LIBDIRSUFFIX}/libluajit*.a
+
+# Strip binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress manual pages:
+find $PKG/usr/man -type f -exec gzip -9 {} \+
+for i in $( find $PKG/usr/man -type l ) ; do
+ ln -s $( readlink $i ).gz $i.gz
+ rm $i
+done
+
+# Add a documentation directory:
+mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION
+cp -a \
+ COPYRIGHT* README* \
+ $PKG/usr/doc/${PKGNAM}-$VERSION
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/d/luajit/slack-desc b/source/d/luajit/slack-desc
new file mode 100644
index 000000000..367c9e126
--- /dev/null
+++ b/source/d/luajit/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.
+# Line up the first '|' above the ':' following the base package name, and
+# the '|' on the right side marks the last column you can put a character in.
+# You must make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+luajit: luajit (Just-In-Time Lua compiler)
+luajit:
+luajit: LuaJIT is a Just-In-Time (JIT) compiler for the Lua programming
+luajit: language.
+luajit:
+luajit: Homepage: https://luajit.org/
+luajit:
+luajit:
+luajit:
+luajit:
+luajit:
diff --git a/source/n/openssh/openssh.SlackBuild b/source/n/openssh/openssh.SlackBuild
index 642194ff7..161ee7bf0 100755
--- a/source/n/openssh/openssh.SlackBuild
+++ b/source/n/openssh/openssh.SlackBuild
@@ -107,7 +107,6 @@ CFLAGS="$SLKCFLAGS" \
--sysconfdir=/etc/ssh \
$PAM_OPTIONS \
$SHADOW_OPTIONS \
- --with-md5-passwords \
--with-libedit \
--with-tcp-wrappers \
--with-default-path=/usr/local/sbin:/usr/sbin:/sbin:/usr/local/bin:/usr/bin:/bin \
diff --git a/source/n/proftpd/proftpd.SlackBuild b/source/n/proftpd/proftpd.SlackBuild
index 902c1de66..b918d1a57 100755
--- a/source/n/proftpd/proftpd.SlackBuild
+++ b/source/n/proftpd/proftpd.SlackBuild
@@ -25,11 +25,11 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=proftpd
VERSION=1.3.8b
DIRVER=1.3.8b
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
-PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl:mod_ldap"
+PROFTPD_MODS="mod_radius:mod_ban:mod_readme:mod_ratio:mod_tls:mod_wrap2:mod_wrap2_file:mod_ctrls_admin:mod_quotatab:mod_quotatab_file:mod_sftp:mod_facl:mod_ldap"
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/xap/mpv/dynamically_generate_desktop_file_protocols.patch b/source/xap/mpv/dynamically_generate_desktop_file_protocols.patch
new file mode 100644
index 000000000..33320e1bc
--- /dev/null
+++ b/source/xap/mpv/dynamically_generate_desktop_file_protocols.patch
@@ -0,0 +1,462 @@
+From f59d358752c2a63c94635511cd963bebb2706d64 Mon Sep 17 00:00:00 2001
+From: Dudemanguy
+Date: Wed, 15 May 2024 09:03:14 -0500
+Subject: [PATCH 1/4] av_common: parent mp_get_lavf_demuxer contents to the
+ list
+
+The only usage of this function is freed in mpv's generic property code,
+so no other changes are needed.
+---
+ common/av_common.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/common/av_common.c b/common/av_common.c
+index 1a23d766b365..142699d4b4c6 100644
+--- a/common/av_common.c
++++ b/common/av_common.c
+@@ -265,7 +265,7 @@ char **mp_get_lavf_demuxers(void)
+ const AVInputFormat *cur = av_demuxer_iterate(&iter);
+ if (!cur)
+ break;
+- MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(NULL, cur->name));
++ MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(list, cur->name));
+ }
+ MP_TARRAY_APPEND(NULL, list, num, NULL);
+ return list;
+
+From 6692f87b61d48e1523d6e0ef3d311ffff6e89a6e Mon Sep 17 00:00:00 2001
+From: Dudemanguy
+Date: Wed, 15 May 2024 19:22:32 -0500
+Subject: [PATCH 2/4] stream: implement get_protocols method for stream_lavf
+
+Previously, all stream protocols were a static list in mpv. This is okay
+for own builtin stuff, but for protocols that depend on ffmpeg it's not
+so great. Support for certain protocols may or may not be enabled in a
+user's ffmpeg and the protocol list that mpv generates should ideally
+match this. Fix this by implementing a get_protocols method for
+stream_lavf that will have different results depending on the ffmpeg mpv
+is built against. We keep the safe and unsafe protocols separation. The
+former is essentially a whitelist. Any protocol that is found in ffmpeg
+but is not in the safe whitelist is considered unsafe. In the stream
+list, ffmpeg is moved to the bottom so any possible protocols that are
+added in the future don't automatically take precedence over any builtin
+mpv ones.
+---
+ common/av_common.c | 12 +++++
+ common/av_common.h | 1 +
+ stream/stream.c | 44 ++++++++++++-------
+ stream/stream.h | 2 +
+ stream/stream_lavf.c | 102 ++++++++++++++++++++++++++++++++++++++-----
+ 5 files changed, 136 insertions(+), 25 deletions(-)
+
+diff --git a/common/av_common.c b/common/av_common.c
+index 142699d4b4c6..a4fa5981ff9f 100644
+--- a/common/av_common.c
++++ b/common/av_common.c
+@@ -271,6 +271,18 @@ char **mp_get_lavf_demuxers(void)
+ return list;
+ }
+
++char **mp_get_lavf_protocols(void)
++{
++ char **list = NULL;
++ int num = 0;
++ void *opaque = NULL;
++ const char *name;
++ while ((name = avio_enum_protocols(&opaque, 0)))
++ MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(list, name));
++ MP_TARRAY_APPEND(NULL, list, num, NULL);
++ return list;
++}
++
+ int mp_codec_to_av_codec_id(const char *codec)
+ {
+ int id = AV_CODEC_ID_NONE;
+diff --git a/common/av_common.h b/common/av_common.h
+index c584085890c2..b019aa88e17a 100644
+--- a/common/av_common.h
++++ b/common/av_common.h
+@@ -42,6 +42,7 @@ void mp_set_avcodec_threads(struct mp_log *l, AVCodecContext *avctx, int threads
+ void mp_add_lavc_decoders(struct mp_decoder_list *list, enum AVMediaType type);
+ void mp_add_lavc_encoders(struct mp_decoder_list *list);
+ char **mp_get_lavf_demuxers(void);
++char **mp_get_lavf_protocols(void);
+ int mp_codec_to_av_codec_id(const char *codec);
+ const char *mp_codec_from_av_codec_id(int codec_id);
+ bool mp_codec_is_lossless(const char *codec);
+diff --git a/stream/stream.c b/stream/stream.c
+index 06dd92930c01..eca44e4afb37 100644
+--- a/stream/stream.c
++++ b/stream/stream.c
+@@ -66,8 +66,6 @@ static const stream_info_t *const stream_list[] = {
+ #if HAVE_CDDA
+ &stream_info_cdda,
+ #endif
+- &stream_info_ffmpeg,
+- &stream_info_ffmpeg_unsafe,
+ &stream_info_avdevice,
+ #if HAVE_DVBIN
+ &stream_info_dvb,
+@@ -92,6 +90,8 @@ static const stream_info_t *const stream_list[] = {
+ &stream_info_slice,
+ &stream_info_fd,
+ &stream_info_cb,
++ &stream_info_ffmpeg,
++ &stream_info_ffmpeg_unsafe,
+ };
+
+ // Because of guarantees documented on STREAM_BUFFER_SIZE.
+@@ -325,12 +325,17 @@ static int stream_create_instance(const stream_info_t *sinfo,
+ if (!sinfo->local_fs)
+ return STREAM_NO_MATCH;
+ } else {
+- for (int n = 0; sinfo->protocols && sinfo->protocols[n]; n++) {
+- path = match_proto(url, sinfo->protocols[n]);
++ char **get_protocols = sinfo->get_protocols ? sinfo->get_protocols() : NULL;
++ char **protocols = get_protocols ? get_protocols : (char **)sinfo->protocols;
++
++ for (int n = 0; protocols && protocols[n]; n++) {
++ path = match_proto(url, protocols[n]);
+ if (path)
+ break;
+ }
+
++ talloc_free(get_protocols);
++
+ if (!path)
+ return STREAM_NO_MATCH;
+ }
+@@ -864,16 +869,17 @@ char **stream_get_proto_list(void)
+ for (int i = 0; i < MP_ARRAY_SIZE(stream_list); i++) {
+ const stream_info_t *stream_info = stream_list[i];
+
+- if (!stream_info->protocols)
+- continue;
++ char **get_protocols = stream_info->get_protocols ? stream_info->get_protocols() : NULL;
++ char **protocols = get_protocols ? get_protocols : (char **)stream_info->protocols;
+
+- for (int j = 0; stream_info->protocols[j]; j++) {
+- if (*stream_info->protocols[j] == '\0')
+- continue;
++ for (int j = 0; protocols && protocols[j]; j++) {
++ if (*protocols[j] == '\0')
++ continue;
+
+- MP_TARRAY_APPEND(NULL, list, num,
+- talloc_strdup(NULL, stream_info->protocols[j]));
++ MP_TARRAY_APPEND(NULL, list, num, talloc_strdup(list, protocols[j]));
+ }
++
++ talloc_free(get_protocols);
+ }
+ MP_TARRAY_APPEND(NULL, list, num, NULL);
+ return list;
+@@ -888,7 +894,6 @@ void stream_print_proto_list(struct mp_log *log)
+ for (int i = 0; list[i]; i++) {
+ mp_info(log, " %s://\n", list[i]);
+ count++;
+- talloc_free(list[i]);
+ }
+ talloc_free(list);
+ mp_info(log, "\nTotal: %d protocols\n", count);
+@@ -899,10 +904,19 @@ bool stream_has_proto(const char *proto)
+ for (int i = 0; i < MP_ARRAY_SIZE(stream_list); i++) {
+ const stream_info_t *stream_info = stream_list[i];
+
+- for (int j = 0; stream_info->protocols && stream_info->protocols[j]; j++) {
+- if (strcmp(stream_info->protocols[j], proto) == 0)
+- return true;
++ bool match = false;
++ char **get_protocols = stream_info->get_protocols ? stream_info->get_protocols() : NULL;
++ char **protocols = get_protocols ? get_protocols : (char **)stream_info->protocols;
++
++ for (int j = 0; protocols && protocols[j]; j++) {
++ if (strcmp(protocols[j], proto) == 0) {
++ match = true;
++ break;
++ }
+ }
++
++ talloc_free(get_protocols);
++ return match;
+ }
+
+ return false;
+diff --git a/stream/stream.h b/stream/stream.h
+index 58b55e1a43ca..866affe1fef0 100644
+--- a/stream/stream.h
++++ b/stream/stream.h
+@@ -114,6 +114,8 @@ typedef struct stream_info_st {
+ // Alternative to open(). Only either open() or open2() can be set.
+ int (*open2)(struct stream *st, const struct stream_open_args *args);
+ const char *const *protocols;
++ // Alternative to protocols. For stream_lavf.
++ char **(*get_protocols)(void);
+ bool can_write; // correctly checks for READ/WRITE modes
+ bool local_fs; // supports STREAM_LOCAL_FS_ONLY
+ int stream_origin; // 0 or set of STREAM_ORIGIN_*; if 0, the same origin
+diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
+index a2db55146668..30c823c58f62 100644
+--- a/stream/stream_lavf.c
++++ b/stream/stream_lavf.c
+@@ -238,6 +238,96 @@ void mp_setup_av_network_options(AVDictionary **dict, const char *target_fmt,
+ talloc_free(temp);
+ }
+
++#define PROTO(...) (const char *[]){__VA_ARGS__, NULL}
++
++// List of safe protocols and their aliases
++static const char **safe_protos[] = {
++ PROTO("data"),
++ PROTO("gopher"),
++ PROTO("gophers"),
++ PROTO("http", "dav", "webdav"),
++ PROTO("httpproxy"),
++ PROTO("https", "davs", "webdavs"),
++ PROTO("ipfs"),
++ PROTO("ipns"),
++ PROTO("mmsh", "mms", "mmshttp"),
++ PROTO("mmst"),
++ PROTO("rist"),
++ PROTO("rtmp"),
++ PROTO("rtmpe"),
++ PROTO("rtmps"),
++ PROTO("rtmpt"),
++ PROTO("rtmpte"),
++ PROTO("rtmpts"),
++ PROTO("rtp"),
++ PROTO("srt"),
++ PROTO("srtp"),
++ NULL,
++};
++
++static char **get_safe_protocols(void)
++{
++ int num = 0;
++ char **protocols = NULL;
++ char **ffmpeg_demuxers = mp_get_lavf_demuxers();
++ char **ffmpeg_protos = mp_get_lavf_protocols();
++
++ for (int i = 0; ffmpeg_protos[i]; i++) {
++ for (int j = 0; safe_protos[j]; j++) {
++ if (strcmp(ffmpeg_protos[i], safe_protos[j][0]) != 0)
++ continue;
++ for (int k = 0; safe_protos[j][k]; k++)
++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, safe_protos[j][k]));
++ break;
++ }
++ }
++
++ // rtsp is a demuxer not protocol in ffmpeg so it is handled separately
++ for (int i = 0; ffmpeg_demuxers[i]; i++) {
++ if (strcmp("rtsp", ffmpeg_demuxers[i]) == 0) {
++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "rtsp"));
++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "rtsps"));
++ break;
++ }
++ }
++
++ MP_TARRAY_APPEND(NULL, protocols, num, NULL);
++
++ talloc_free(ffmpeg_demuxers);
++ talloc_free(ffmpeg_protos);
++
++ return protocols;
++}
++
++static char **get_unsafe_protocols(void)
++{
++ int num = 0;
++ char **protocols = NULL;
++ char **safe_protocols = get_safe_protocols();
++ char **ffmpeg_protos = mp_get_lavf_protocols();
++
++ for (int i = 0; ffmpeg_protos[i]; i++) {
++ bool safe_protocol = false;
++ for (int j = 0; safe_protocols[j]; j++) {
++ if (strcmp(ffmpeg_protos[i], safe_protocols[j]) == 0) {
++ safe_protocol = true;
++ break;
++ }
++ }
++ if (!safe_protocol)
++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, ffmpeg_protos[i]));
++ }
++
++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "ffmpeg"));
++ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, "lavf"));
++
++ MP_TARRAY_APPEND(NULL, protocols, num, NULL);
++
++ talloc_free(ffmpeg_protos);
++ talloc_free(safe_protocols);
++ return protocols;
++}
++
+ // Escape http URLs with unescaped, invalid characters in them.
+ // libavformat's http protocol does not do this, and a patch to add this
+ // in a 100% safe case (spaces only) was rejected.
+@@ -431,12 +431,7 @@ done:
+ const stream_info_t stream_info_ffmpeg = {
+ .name = "ffmpeg",
+ .open = open_f,
+- .protocols = (const char *const[]){
+- "rtmp", "rtsp", "rtsps", "http", "https", "mms", "mmst", "mmsh", "mmshttp",
+- "rtp", "httpproxy", "rtmpe", "rtmps", "rtmpt", "rtmpte", "rtmpts", "srt",
+- "rist", "srtp", "gopher", "gophers", "data", "ipfs", "ipns", "dav",
+- "davs", "webdav", "webdavs",
+- NULL },
++ .get_protocols = get_safe_protocols,
+ .can_write = true,
+ .stream_origin = STREAM_ORIGIN_NET,
+ };
+@@ -448,10 +443,7 @@ const stream_info_t stream_info_ffmpeg = {
+ const stream_info_t stream_info_ffmpeg_unsafe = {
+ .name = "ffmpeg",
+ .open = open_f,
+- .protocols = (const char *const[]){
+- "lavf", "ffmpeg", "udp", "ftp", "tcp", "tls", "unix", "sftp", "md5",
+- "concat", "smb",
+- NULL },
++ .get_protocols = get_unsafe_protocols,
+ .stream_origin = STREAM_ORIGIN_UNSAFE,
+ .can_write = true,
+ };
+
+From 0f4fa329357f27d0c57f8f13b426d7450a29cfa4 Mon Sep 17 00:00:00 2001
+From: Dudemanguy
+Date: Tue, 14 May 2024 13:32:18 -0500
+Subject: [PATCH 3/4] build: dynamically generate mpv.desktop file protocols
+
+If we can run the built mpv binary, then it is possible to use a custom
+target that reads the protocols we have available in mpv and write the
+mpv.desktop file based on the output. For cases where this is not
+possible (e.g. cross compiling), then just install the unmodified
+mpv.desktop file like before. Fixes #8731 and fixes #14124.
+---
+ TOOLS/gen-mpv-desktop.py | 45 ++++++++++++++++++++++++++++++++++++++++
+ meson.build | 17 ++++++++++++++-
+ 2 files changed, 61 insertions(+), 1 deletion(-)
+ create mode 100755 TOOLS/gen-mpv-desktop.py
+
+diff --git a/TOOLS/gen-mpv-desktop.py b/TOOLS/gen-mpv-desktop.py
+new file mode 100755
+index 000000000000..2b05de1ec4cc
+--- /dev/null
++++ b/TOOLS/gen-mpv-desktop.py
+@@ -0,0 +1,45 @@
++#!/usr/bin/env python3
++
++# Modify X-KDE-Protocols in the mpv.desktop file based on output from
++# mpv --list-protocols.
++
++#
++# This file is part of mpv.
++#
++# mpv is free software; you can redistribute it and/or
++# modify it under the terms of the GNU Lesser General Public
++# License as published by the Free Software Foundation; either
++# version 2.1 of the License, or (at your option) any later version.
++#
++# mpv is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY; without even the implied warranty of
++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++# GNU Lesser General Public License for more details.
++#
++# You should have received a copy of the GNU Lesser General Public
++# License along with mpv. If not, see .
++#
++
++import sys
++from subprocess import check_output
++
++if __name__ == "__main__":
++ with open(sys.argv[1], "r", encoding="UTF-8") as f:
++ next(f)
++ mpv_desktop = dict([line.split("=", 1) for line in f])
++
++ if not mpv_desktop["X-KDE-Protocols"]:
++ raise ValueError("Missing X-KDE-Protocols entry in mpv.desktop file")
++
++ mpv_protocols = check_output([sys.argv[2], "--list-protocols"], encoding="UTF-8")
++ mpv_protocols = set(line.strip(" :/") for line in mpv_protocols.splitlines() if "://" in line)
++ if len(mpv_protocols) == 0:
++ raise ValueError("Unable to parse any protocols from mpv '--list-protocols'")
++
++ protocol_list = set(mpv_desktop["X-KDE-Protocols"].strip().split(","))
++ mpv_desktop["X-KDE-Protocols"] = ",".join(sorted(mpv_protocols & protocol_list)) + "\n"
++
++ with open(sys.argv[3], "w", encoding="UTF-8") as f:
++ f.write("[Desktop Entry]" + "\n")
++ for key, value in mpv_desktop.items():
++ f.write(f"{key}={value}")
+diff --git a/meson.build b/meson.build
+index c14bf47d5614..ae1eb9cfd903 100644
+--- a/meson.build
++++ b/meson.build
+@@ -581,6 +581,7 @@ tools_directory = join_paths(source_root, 'TOOLS')
+ docutils_wrapper = find_program(join_paths(tools_directory, 'docutils-wrapper.py'))
+ file2string = find_program(join_paths(tools_directory, 'file2string.py'))
+ matroska = find_program(join_paths(tools_directory, 'matroska.py'))
++mpv_desktop = find_program(join_paths(tools_directory, 'gen-mpv-desktop.py'))
+
+ ebml_defs = custom_target('ebml_defs.inc',
+ output: 'ebml_defs.inc',
+@@ -1796,7 +1797,6 @@ if get_option('cplayer')
+ zsh_install_dir = join_paths(datadir, 'zsh', 'site-functions')
+ install_data('etc/_mpv.zsh', install_dir: zsh_install_dir, rename: '_mpv')
+
+- install_data('etc/mpv.desktop', install_dir: join_paths(datadir, 'applications'))
+ install_data('etc/mpv.metainfo.xml', install_dir: join_paths(datadir, 'metainfo'))
+ install_data('etc/encoding-profiles.conf', install_dir: join_paths(confdir, 'mpv'))
+
+@@ -1827,6 +1827,21 @@ if get_option('cplayer')
+ command: [osxbundle, mpv.full_path(), '@SOURCE_ROOT@'],
+ )
+ endif
++
++ if not win32 and not darwin
++ if meson.can_run_host_binaries()
++ mpv_desktop_path = join_paths(source_root, 'etc', 'mpv.desktop')
++ custom_target('mpv.desktop',
++ depends: mpv,
++ output: 'mpv.desktop',
++ command: [mpv_desktop, mpv_desktop_path, mpv.full_path(), '@OUTPUT@'],
++ install: true,
++ install_dir: join_paths(datadir, 'applications'),
++ )
++ else
++ install_data('etc/mpv.desktop', install_dir: join_paths(datadir, 'applications'))
++ endif
++ endif
+ endif
+
+ if get_option('tests')
+
+From 00506d51892c48cd91d3c88423f31df7b9328499 Mon Sep 17 00:00:00 2001
+From: Dudemanguy
+Date: Wed, 22 May 2024 10:27:40 -0500
+Subject: [PATCH 4/4] stream_lavf: don't add ffmpeg bluray or dvd protocols
+
+The naming of these conflict with existing mpv protocols, so skip if we
+get them. Users can still use them via lavf://bluray: or lavf://dvd: if
+they wish.
+---
+ stream/stream_lavf.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
+index 30c823c58f62..369f9cecc402 100644
+--- a/stream/stream_lavf.c
++++ b/stream/stream_lavf.c
+@@ -314,6 +314,10 @@ static char **get_unsafe_protocols(void)
+ break;
+ }
+ }
++ // Skip to avoid name conflict with builtin mpv protocol.
++ if (strcmp(ffmpeg_protos[i], "bluray") == 0 || strcmp(ffmpeg_protos[i], "dvd") == 0)
++ continue;
++
+ if (!safe_protocol)
+ MP_TARRAY_APPEND(NULL, protocols, num, talloc_strdup(protocols, ffmpeg_protos[i]));
+ }
diff --git a/source/xap/mpv/mpv.SlackBuild b/source/xap/mpv/mpv.SlackBuild
index 6fa808a8e..97c30b6e3 100755
--- a/source/xap/mpv/mpv.SlackBuild
+++ b/source/xap/mpv/mpv.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mpv
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,8 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+cat $CWD/dynamically_generate_desktop_file_protocols.patch | patch -p1 --verbose || exit 1
+
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -121,6 +123,7 @@ meson setup \
-Dpipewire=enabled \
-Dsdl2-audio=enabled \
-Dopenal=enabled \
+ -Dlua=luajit \
.. || exit 1
"${NINJA:=ninja}" $NUMJOBS || exit 1
DESTDIR=$PKG $NINJA install || exit 1