diff options
| -rw-r--r-- | ChangeLog.rss | 23 | ||||
| -rw-r--r-- | ChangeLog.txt | 11 | ||||
| -rw-r--r-- | FILELIST.TXT | 120 | ||||
| -rwxr-xr-x | recompress.sh | 2 | ||||
| -rwxr-xr-x | source/x/libglvnd/libglvnd.SlackBuild | 3 | ||||
| -rw-r--r-- | source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch | 245 | ||||
| -rw-r--r-- | source/xap/xine-ui/02_FTBFS.diff | 63 | ||||
| -rwxr-xr-x | source/xap/xine-ui/xine-ui.SlackBuild | 6 |
8 files changed, 409 insertions, 64 deletions
diff --git a/ChangeLog.rss b/ChangeLog.rss index 93eafeea..9d19a30f 100644 --- a/ChangeLog.rss +++ b/ChangeLog.rss @@ -11,10 +11,29 @@ <description>Tracking Slackware development in git.</description> <language>en-us</language> <id xmlns="http://www.w3.org/2005/Atom">urn:uuid:c964f45e-6732-11e8-bbe5-107b4450212f</id> - <pubDate>Sat, 2 Nov 2019 18:52:12 GMT</pubDate> - <lastBuildDate>Sun, 3 Nov 2019 07:59:43 GMT</lastBuildDate> + <pubDate>Sun, 3 Nov 2019 23:36:43 GMT</pubDate> + <lastBuildDate>Mon, 4 Nov 2019 07:59:44 GMT</lastBuildDate> <generator>maintain_current_git.sh v 1.11</generator> <item> + <title>Sun, 3 Nov 2019 23:36:43 GMT</title> + <pubDate>Sun, 3 Nov 2019 23:36:43 GMT</pubDate> + <link>https://git.slackware.nl/current/tag/?h=20191103233643</link> + <guid isPermaLink="false">20191103233643</guid> + <description> + <![CDATA[<pre> +ap/vim-8.1.2250-x86_64-1.txz: Upgraded. +l/fuse3-3.8.0-x86_64-1.txz: Upgraded. +l/orc-0.4.31-x86_64-1.txz: Upgraded. +t/fig2dev-3.2.7b-x86_64-1.txz: Upgraded. +x/libglvnd-1.2.0-x86_64-5.txz: Rebuilt. + Applied update-gl-h-to-match-mesa.patch from Arch to fix missing typedef + needed to compile VLC. Thanks to alienBOB. +xap/vim-gvim-8.1.2250-x86_64-1.txz: Upgraded. +xap/xine-ui-0.99.11-x86_64-1.txz: Upgraded. + </pre>]]> + </description> + </item> + <item> <title>Sat, 2 Nov 2019 18:52:12 GMT</title> <pubDate>Sat, 2 Nov 2019 18:52:12 GMT</pubDate> <link>https://git.slackware.nl/current/tag/?h=20191102185212</link> diff --git a/ChangeLog.txt b/ChangeLog.txt index 3f170576..db6dd8c4 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,3 +1,14 @@ +Sun Nov 3 23:36:43 UTC 2019 +ap/vim-8.1.2250-x86_64-1.txz: Upgraded. +l/fuse3-3.8.0-x86_64-1.txz: Upgraded. +l/orc-0.4.31-x86_64-1.txz: Upgraded. +t/fig2dev-3.2.7b-x86_64-1.txz: Upgraded. +x/libglvnd-1.2.0-x86_64-5.txz: Rebuilt. + Applied update-gl-h-to-match-mesa.patch from Arch to fix missing typedef + needed to compile VLC. Thanks to alienBOB. +xap/vim-gvim-8.1.2250-x86_64-1.txz: Upgraded. +xap/xine-ui-0.99.11-x86_64-1.txz: Upgraded. ++--------------------------+ Sat Nov 2 18:52:12 UTC 2019 a/aaa_terminfo-6.1_20191026-x86_64-1.txz: Upgraded. a/cryptsetup-2.2.2-x86_64-1.txz: Upgraded. diff --git a/FILELIST.TXT b/FILELIST.TXT index 227c6c47..dd7a0ab2 100644 --- a/FILELIST.TXT +++ b/FILELIST.TXT @@ -1,20 +1,20 @@ -Sat Nov 2 19:03:12 UTC 2019 +Sun Nov 3 23:48:22 UTC 2019 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 2019-11-02 18:52 . +drwxr-xr-x 12 root root 4096 2019-11-03 23:36 . -rw-r--r-- 1 root root 10064 2016-06-30 18:39 ./ANNOUNCE.14_2 -rw-r--r-- 1 root root 14642 2019-10-18 21:18 ./CHANGES_AND_HINTS.TXT --rw-r--r-- 1 root root 924505 2019-11-01 19:51 ./CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-01 19:51 ./CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 924505 2019-11-02 19:03 ./CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-02 19:03 ./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 726858 2019-11-02 18:52 ./ChangeLog.txt +-rw-r--r-- 1 root root 727329 2019-11-03 23:36 ./ChangeLog.txt drwxr-xr-x 3 root root 4096 2013-03-20 22:17 ./EFI drwxr-xr-x 2 root root 4096 2019-10-29 20:08 ./EFI/BOOT -rw-r--r-- 1 root root 1417216 2019-07-05 18:54 ./EFI/BOOT/bootx64.efi @@ -25,9 +25,9 @@ drwxr-xr-x 2 root root 4096 2019-10-29 20:08 ./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 1215823 2019-11-01 19:50 ./FILELIST.TXT +-rw-r--r-- 1 root root 1215823 2019-11-02 19:03 ./FILELIST.TXT -rw-r--r-- 1 root root 1572 2012-08-29 18:27 ./GPG-KEY --rw-r--r-- 1 root root 731858 2019-11-02 19:01 ./PACKAGES.TXT +-rw-r--r-- 1 root root 731858 2019-11-03 23:46 ./PACKAGES.TXT -rw-r--r-- 1 root root 8564 2016-06-28 21:33 ./README.TXT -rw-r--r-- 1 root root 3635 2019-10-29 19:28 ./README.initrd -rw-r--r-- 1 root root 34412 2017-12-01 17:44 ./README_CRYPT.TXT @@ -823,11 +823,11 @@ drwxr-xr-x 2 root root 4096 2012-09-20 18:06 ./patches -rw-r--r-- 1 root root 575 2012-09-20 18:06 ./patches/FILE_LIST -rw-r--r-- 1 root root 14 2012-09-20 18:06 ./patches/MANIFEST.bz2 -rw-r--r-- 1 root root 224 2012-09-20 18:06 ./patches/PACKAGES.TXT -drwxr-xr-x 18 root root 4096 2019-11-02 19:01 ./slackware64 --rw-r--r-- 1 root root 290319 2019-11-02 19:01 ./slackware64/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-02 19:01 ./slackware64/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 361651 2019-11-02 18:59 ./slackware64/FILE_LIST --rw-r--r-- 1 root root 3642037 2019-11-02 18:59 ./slackware64/MANIFEST.bz2 +drwxr-xr-x 18 root root 4096 2019-11-03 23:46 ./slackware64 +-rw-r--r-- 1 root root 290319 2019-11-03 23:46 ./slackware64/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-03 23:46 ./slackware64/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 361651 2019-11-03 23:43 ./slackware64/FILE_LIST +-rw-r--r-- 1 root root 3640936 2019-11-03 23:44 ./slackware64/MANIFEST.bz2 lrwxrwxrwx 1 root root 15 2009-08-23 23:34 ./slackware64/PACKAGES.TXT -> ../PACKAGES.TXT drwxr-xr-x 2 root root 28672 2019-11-02 18:58 ./slackware64/a -rw-r--r-- 1 root root 327 2018-06-24 18:44 ./slackware64/a/aaa_base-14.2-x86_64-5.txt @@ -1177,7 +1177,7 @@ drwxr-xr-x 2 root root 28672 2019-11-02 18:58 ./slackware64/a -rw-r--r-- 1 root root 540 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txt -rw-r--r-- 1 root root 56156 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:15 ./slackware64/a/zoo-2.10_22-x86_64-2.txz.asc -drwxr-xr-x 2 root root 20480 2019-10-30 19:39 ./slackware64/ap +drwxr-xr-x 2 root root 20480 2019-11-03 23:43 ./slackware64/ap -rw-r--r-- 1 root root 291 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txt -rw-r--r-- 1 root root 694880 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz -rw-r--r-- 1 root root 163 2018-04-13 13:17 ./slackware64/ap/a2ps-4.14-x86_64-7.txz.asc @@ -1408,9 +1408,9 @@ drwxr-xr-x 2 root root 20480 2019-10-30 19:39 ./slackware64/ap -rw-r--r-- 1 root root 375 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txt -rw-r--r-- 1 root root 14852 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 13:33 ./slackware64/ap/vbetool-1.2.2-x86_64-2.txz.asc --rw-r--r-- 1 root root 383 2019-10-18 19:39 ./slackware64/ap/vim-8.1.2174-x86_64-1.txt --rw-r--r-- 1 root root 7282612 2019-10-18 19:39 ./slackware64/ap/vim-8.1.2174-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-10-18 19:39 ./slackware64/ap/vim-8.1.2174-x86_64-1.txz.asc +-rw-r--r-- 1 root root 383 2019-11-03 22:15 ./slackware64/ap/vim-8.1.2250-x86_64-1.txt +-rw-r--r-- 1 root root 7326024 2019-11-03 22:15 ./slackware64/ap/vim-8.1.2250-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-03 22:15 ./slackware64/ap/vim-8.1.2250-x86_64-1.txz.asc -rw-r--r-- 1 root root 604 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txt -rw-r--r-- 1 root root 180908 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 13:34 ./slackware64/ap/vorbis-tools-1.4.0-x86_64-4.txz.asc @@ -2491,7 +2491,7 @@ drwxr-xr-x 2 root root 20480 2016-03-10 03:11 ./slackware64/kdei -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag -rw-r--r-- 1 root root 7544 2018-03-01 07:54 ./slackware64/kdei/maketag.ez -rw-r--r-- 1 root root 1500 2018-03-01 07:54 ./slackware64/kdei/tagfile -drwxr-xr-x 2 root root 69632 2019-11-02 18:58 ./slackware64/l +drwxr-xr-x 2 root root 69632 2019-11-03 23:43 ./slackware64/l -rw-r--r-- 1 root root 338 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txt -rw-r--r-- 1 root root 149752 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 14:13 ./slackware64/l/ConsoleKit2-1.0.0-x86_64-4.txz.asc @@ -2675,9 +2675,9 @@ drwxr-xr-x 2 root root 69632 2019-11-02 18:58 ./slackware64/l -rw-r--r-- 1 root root 370 2019-01-05 18:46 ./slackware64/l/fuse-2.9.9-x86_64-1.txt -rw-r--r-- 1 root root 137464 2019-01-05 18:46 ./slackware64/l/fuse-2.9.9-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-01-05 18:46 ./slackware64/l/fuse-2.9.9-x86_64-1.txz.asc --rw-r--r-- 1 root root 384 2019-09-28 19:03 ./slackware64/l/fuse3-3.7.0-x86_64-1.txt --rw-r--r-- 1 root root 130824 2019-09-28 19:03 ./slackware64/l/fuse3-3.7.0-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-09-28 19:03 ./slackware64/l/fuse3-3.7.0-x86_64-1.txz.asc +-rw-r--r-- 1 root root 384 2019-11-03 22:11 ./slackware64/l/fuse3-3.8.0-x86_64-1.txt +-rw-r--r-- 1 root root 131580 2019-11-03 22:11 ./slackware64/l/fuse3-3.8.0-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-03 22:11 ./slackware64/l/fuse3-3.8.0-x86_64-1.txz.asc -rw-r--r-- 1 root root 296 2018-04-13 14:33 ./slackware64/l/gamin-0.1.10-x86_64-6.txt -rw-r--r-- 1 root root 107456 2018-04-13 14:33 ./slackware64/l/gamin-0.1.10-x86_64-6.txz -rw-r--r-- 1 root root 163 2018-04-13 14:33 ./slackware64/l/gamin-0.1.10-x86_64-6.txz.asc @@ -3222,9 +3222,9 @@ drwxr-xr-x 2 root root 69632 2019-11-02 18:58 ./slackware64/l -rw-r--r-- 1 root root 404 2018-09-21 02:07 ./slackware64/l/opusfile-0.11-x86_64-1.txt -rw-r--r-- 1 root root 172720 2018-09-21 02:07 ./slackware64/l/opusfile-0.11-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-09-21 02:07 ./slackware64/l/opusfile-0.11-x86_64-1.txz.asc --rw-r--r-- 1 root root 446 2019-10-17 18:07 ./slackware64/l/orc-0.4.30-x86_64-1.txt --rw-r--r-- 1 root root 205872 2019-10-17 18:07 ./slackware64/l/orc-0.4.30-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-10-17 18:07 ./slackware64/l/orc-0.4.30-x86_64-1.txz.asc +-rw-r--r-- 1 root root 446 2019-11-03 18:40 ./slackware64/l/orc-0.4.31-x86_64-1.txt +-rw-r--r-- 1 root root 208200 2019-11-03 18:40 ./slackware64/l/orc-0.4.31-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-03 18:40 ./slackware64/l/orc-0.4.31-x86_64-1.txz.asc -rw-r--r-- 1 root root 429 2018-08-21 16:24 ./slackware64/l/pango-1.42.4-x86_64-1.txt -rw-r--r-- 1 root root 466080 2018-08-21 16:24 ./slackware64/l/pango-1.42.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-08-21 16:24 ./slackware64/l/pango-1.42.4-x86_64-1.txz.asc @@ -3901,10 +3901,10 @@ drwxr-xr-x 2 root root 36864 2019-11-01 19:46 ./slackware64/n -rw-r--r-- 1 root root 648 2018-04-13 21:23 ./slackware64/n/zd1211-firmware-1.5-fw-2.txt -rw-r--r-- 1 root root 31872 2018-04-13 21:23 ./slackware64/n/zd1211-firmware-1.5-fw-2.txz -rw-r--r-- 1 root root 163 2018-04-13 21:23 ./slackware64/n/zd1211-firmware-1.5-fw-2.txz.asc -drwxr-xr-x 2 root root 4096 2019-10-30 19:39 ./slackware64/t --rw-r--r-- 1 root root 484 2018-05-09 17:56 ./slackware64/t/fig2dev-3.2.7a-x86_64-1.txt --rw-r--r-- 1 root root 283032 2018-05-09 17:56 ./slackware64/t/fig2dev-3.2.7a-x86_64-1.txz --rw-r--r-- 1 root root 163 2018-05-09 17:56 ./slackware64/t/fig2dev-3.2.7a-x86_64-1.txz.asc +drwxr-xr-x 2 root root 4096 2019-11-03 23:43 ./slackware64/t +-rw-r--r-- 1 root root 484 2019-11-03 22:10 ./slackware64/t/fig2dev-3.2.7b-x86_64-1.txt +-rw-r--r-- 1 root root 284480 2019-11-03 22:10 ./slackware64/t/fig2dev-3.2.7b-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-03 22:10 ./slackware64/t/fig2dev-3.2.7b-x86_64-1.txz.asc -rwxr-xr-x 1 root root 2897 2009-06-24 22:06 ./slackware64/t/install-packages -rw-r--r-- 1 root root 446 2006-09-18 10:41 ./slackware64/t/install.end -rw-r--r-- 1 root root 1102 2018-03-01 07:55 ./slackware64/t/maketag @@ -3940,7 +3940,7 @@ drwxr-xr-x 2 root root 4096 2019-09-26 19:25 ./slackware64/tcl -rw-r--r-- 1 root root 227 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txt -rw-r--r-- 1 root root 1771556 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz -rw-r--r-- 1 root root 163 2018-11-24 19:32 ./slackware64/tcl/tk-8.6.9.1-x86_64-1.txz.asc -drwxr-xr-x 2 root root 65536 2019-11-02 18:59 ./slackware64/x +drwxr-xr-x 2 root root 65536 2019-11-03 23:43 ./slackware64/x -rw-r--r-- 1 root root 257 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txt -rw-r--r-- 1 root root 5074404 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:03 ./slackware64/x/anthy-9100h-x86_64-2.txz.asc @@ -4246,9 +4246,9 @@ drwxr-xr-x 2 root root 65536 2019-11-02 18:59 ./slackware64/x -rw-r--r-- 1 root root 346 2019-02-20 20:38 ./slackware64/x/libfontenc-1.1.4-x86_64-1.txt -rw-r--r-- 1 root root 27712 2019-02-20 20:38 ./slackware64/x/libfontenc-1.1.4-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-02-20 20:38 ./slackware64/x/libfontenc-1.1.4-x86_64-1.txz.asc --rw-r--r-- 1 root root 462 2019-10-29 19:09 ./slackware64/x/libglvnd-1.2.0-x86_64-4.txt --rw-r--r-- 1 root root 338492 2019-10-29 19:09 ./slackware64/x/libglvnd-1.2.0-x86_64-4.txz --rw-r--r-- 1 root root 163 2019-10-29 19:09 ./slackware64/x/libglvnd-1.2.0-x86_64-4.txz.asc +-rw-r--r-- 1 root root 462 2019-11-03 19:52 ./slackware64/x/libglvnd-1.2.0-x86_64-5.txt +-rw-r--r-- 1 root root 334248 2019-11-03 19:52 ./slackware64/x/libglvnd-1.2.0-x86_64-5.txz +-rw-r--r-- 1 root root 163 2019-11-03 19:52 ./slackware64/x/libglvnd-1.2.0-x86_64-5.txz.asc -rw-r--r-- 1 root root 378 2018-04-13 16:07 ./slackware64/x/libhangul-0.1.0-x86_64-2.txt -rw-r--r-- 1 root root 1865468 2018-04-13 16:07 ./slackware64/x/libhangul-0.1.0-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 16:07 ./slackware64/x/libhangul-0.1.0-x86_64-2.txz.asc @@ -4801,7 +4801,7 @@ drwxr-xr-x 2 root root 65536 2019-11-02 18:59 ./slackware64/x -rw-r--r-- 1 root root 213 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txt -rw-r--r-- 1 root root 25288 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 06:10 ./slackware64/x/xwud-1.0.5-x86_64-2.txz.asc -drwxr-xr-x 2 root root 12288 2019-11-01 19:46 ./slackware64/xap +drwxr-xr-x 2 root root 12288 2019-11-03 23:43 ./slackware64/xap -rw-r--r-- 1 root root 625 2019-10-14 18:05 ./slackware64/xap/MPlayer-20191014-x86_64-1.txt -rw-r--r-- 1 root root 2729400 2019-10-14 18:05 ./slackware64/xap/MPlayer-20191014-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-10-14 18:05 ./slackware64/xap/MPlayer-20191014-x86_64-1.txz.asc @@ -4900,9 +4900,9 @@ drwxr-xr-x 2 root root 12288 2019-11-01 19:46 ./slackware64/xap -rw-r--r-- 1 root root 115596 2018-04-13 17:38 ./slackware64/xap/seyon-2.20c-x86_64-4.txz -rw-r--r-- 1 root root 163 2018-04-13 17:38 ./slackware64/xap/seyon-2.20c-x86_64-4.txz.asc -rw-r--r-- 1 root root 586 2019-10-18 23:07 ./slackware64/xap/tagfile --rw-r--r-- 1 root root 503 2019-10-18 19:40 ./slackware64/xap/vim-gvim-8.1.2174-x86_64-1.txt --rw-r--r-- 1 root root 1380468 2019-10-18 19:40 ./slackware64/xap/vim-gvim-8.1.2174-x86_64-1.txz --rw-r--r-- 1 root root 163 2019-10-18 19:40 ./slackware64/xap/vim-gvim-8.1.2174-x86_64-1.txz.asc +-rw-r--r-- 1 root root 503 2019-11-03 22:16 ./slackware64/xap/vim-gvim-8.1.2250-x86_64-1.txt +-rw-r--r-- 1 root root 1383296 2019-11-03 22:16 ./slackware64/xap/vim-gvim-8.1.2250-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-03 22:16 ./slackware64/xap/vim-gvim-8.1.2250-x86_64-1.txz.asc -rw-r--r-- 1 root root 455 2018-04-13 17:42 ./slackware64/xap/windowmaker-0.95.8-x86_64-2.txt -rw-r--r-- 1 root root 1741516 2018-04-13 17:42 ./slackware64/xap/windowmaker-0.95.8-x86_64-2.txz -rw-r--r-- 1 root root 163 2018-04-13 17:42 ./slackware64/xap/windowmaker-0.95.8-x86_64-2.txz.asc @@ -4921,9 +4921,9 @@ drwxr-xr-x 2 root root 12288 2019-11-01 19:46 ./slackware64/xap -rw-r--r-- 1 root root 511 2019-10-14 18:01 ./slackware64/xap/xine-lib-1.2.9-x86_64-6.txt -rw-r--r-- 1 root root 3132908 2019-10-14 18:01 ./slackware64/xap/xine-lib-1.2.9-x86_64-6.txz -rw-r--r-- 1 root root 163 2019-10-14 18:01 ./slackware64/xap/xine-lib-1.2.9-x86_64-6.txz.asc --rw-r--r-- 1 root root 373 2019-04-03 22:04 ./slackware64/xap/xine-ui-0.99.10-x86_64-3.txt --rw-r--r-- 1 root root 1295068 2019-04-03 22:04 ./slackware64/xap/xine-ui-0.99.10-x86_64-3.txz --rw-r--r-- 1 root root 163 2019-04-03 22:04 ./slackware64/xap/xine-ui-0.99.10-x86_64-3.txz.asc +-rw-r--r-- 1 root root 373 2019-11-03 18:56 ./slackware64/xap/xine-ui-0.99.11-x86_64-1.txt +-rw-r--r-- 1 root root 1302736 2019-11-03 18:56 ./slackware64/xap/xine-ui-0.99.11-x86_64-1.txz +-rw-r--r-- 1 root root 163 2019-11-03 18:56 ./slackware64/xap/xine-ui-0.99.11-x86_64-1.txz.asc -rw-r--r-- 1 root root 508 2019-10-05 18:28 ./slackware64/xap/xlockmore-5.59-x86_64-1.txt -rw-r--r-- 1 root root 1232512 2019-10-05 18:28 ./slackware64/xap/xlockmore-5.59-x86_64-1.txz -rw-r--r-- 1 root root 163 2019-10-05 18:28 ./slackware64/xap/xlockmore-5.59-x86_64-1.txz.asc @@ -5035,11 +5035,11 @@ drwxr-xr-x 2 root root 4096 2019-02-17 23:51 ./slackware64/y -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag -rw-r--r-- 1 root root 1147 2018-03-01 07:55 ./slackware64/y/maketag.ez -rw-r--r-- 1 root root 14 2018-03-01 07:55 ./slackware64/y/tagfile -drwxr-xr-x 19 root root 4096 2019-11-02 19:03 ./source --rw-r--r-- 1 root root 470423 2019-11-02 19:03 ./source/CHECKSUMS.md5 --rw-r--r-- 1 root root 163 2019-11-02 19:03 ./source/CHECKSUMS.md5.asc --rw-r--r-- 1 root root 663880 2019-11-02 19:02 ./source/FILE_LIST --rw-r--r-- 1 root root 17911431 2019-11-02 19:02 ./source/MANIFEST.bz2 +drwxr-xr-x 19 root root 4096 2019-11-03 23:48 ./source +-rw-r--r-- 1 root root 470452 2019-11-03 23:48 ./source/CHECKSUMS.md5 +-rw-r--r-- 1 root root 163 2019-11-03 23:48 ./source/CHECKSUMS.md5.asc +-rw-r--r-- 1 root root 663909 2019-11-03 23:47 ./source/FILE_LIST +-rw-r--r-- 1 root root 17908797 2019-11-03 23:47 ./source/MANIFEST.bz2 -rw-r--r-- 1 root root 1314 2006-10-02 04:40 ./source/README.TXT drwxr-xr-x 110 root root 4096 2019-10-18 18:37 ./source/a -rw-r--r-- 1 root root 1034 2019-05-04 17:56 ./source/a/FTBFSlog @@ -6480,13 +6480,13 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/ap/vbetool -rw-r--r-- 1 root root 24915 2015-12-20 20:37 ./source/ap/vbetool/vbetool-1.2.2.tar.gz -rwxr-xr-x 1 root root 3202 2019-09-29 23:48 ./source/ap/vbetool/vbetool.SlackBuild -rw-r--r-- 1 root root 129 2008-11-24 18:23 ./source/ap/vbetool/vbetool.info -drwxr-xr-x 2 root root 4096 2019-10-18 19:38 ./source/ap/vim +drwxr-xr-x 2 root root 4096 2019-11-03 22:14 ./source/ap/vim -rw-r--r-- 1 root root 299348 2009-07-09 22:03 ./source/ap/vim/ctags-5.8.tar.xz -rw-r--r-- 1 root root 118 2006-08-23 23:20 ./source/ap/vim/doinst.sh.gz -rw-r--r-- 1 root root 8249 2006-01-19 17:01 ./source/ap/vim/gvim.png -rw-r--r-- 1 root root 834 2018-02-27 06:13 ./source/ap/vim/slack-desc.vim -rw-r--r-- 1 root root 959 2018-03-15 02:41 ./source/ap/vim/slack-desc.vim-gvim --rw-r--r-- 1 root root 9221109 2019-10-18 19:37 ./source/ap/vim/vim-8.1.2174.tar.lz +-rw-r--r-- 1 root root 9261775 2019-11-03 22:13 ./source/ap/vim/vim-8.1.2250.tar.lz -rwxr-xr-x 1 root root 6208 2019-09-29 23:48 ./source/ap/vim/vim-gvim.SlackBuild -rwxr-xr-x 1 root root 7582 2019-09-29 23:48 ./source/ap/vim/vim.SlackBuild -rw-r--r-- 1 root root 283 2019-01-11 20:43 ./source/ap/vim/vim.vimrc.diff.gz @@ -8439,10 +8439,10 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/fuse -rw-r--r-- 1 root root 392680 2019-01-05 18:34 ./source/l/fuse/fuse-2.9.9.tar.lz -rwxr-xr-x 1 root root 4814 2019-09-29 23:48 ./source/l/fuse/fuse.SlackBuild -rw-r--r-- 1 root root 821 2019-09-19 19:17 ./source/l/fuse/slack-desc -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/fuse3 +drwxr-xr-x 2 root root 4096 2019-11-03 22:11 ./source/l/fuse3 -rw-r--r-- 1 root root 336 2019-09-19 19:23 ./source/l/fuse3/doinst.sh.gz --rw-r--r-- 1 root root 1383700 2019-09-27 19:05 ./source/l/fuse3/fuse-3.7.0.tar.xz --rw-r--r-- 1 root root 1012 2019-09-27 19:05 ./source/l/fuse3/fuse-3.7.0.tar.xz.asc +-rw-r--r-- 1 root root 1416716 2019-11-03 09:56 ./source/l/fuse3/fuse-3.8.0.tar.xz +-rw-r--r-- 1 root root 1012 2019-11-03 09:56 ./source/l/fuse3/fuse-3.8.0.tar.xz.asc -rwxr-xr-x 1 root root 4970 2019-09-29 23:48 ./source/l/fuse3/fuse3.SlackBuild -rw-r--r-- 1 root root 836 2019-09-19 19:18 ./source/l/fuse3/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/gamin @@ -9428,9 +9428,8 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/opusfile -rw-r--r-- 1 root root 330505 2018-09-18 21:44 ./source/l/opusfile/opusfile-0.11.tar.lz -rwxr-xr-x 1 root root 4560 2019-09-29 23:48 ./source/l/opusfile/opusfile.SlackBuild -rw-r--r-- 1 root root 892 2018-02-27 06:12 ./source/l/opusfile/slack-desc -drwxr-xr-x 2 root root 4096 2019-10-17 18:02 ./source/l/orc --rw-r--r-- 1 root root 176340 2019-09-09 07:30 ./source/l/orc/orc-0.4.30.tar.xz --rw-r--r-- 1 root root 963 2019-09-09 07:30 ./source/l/orc/orc-0.4.30.tar.xz.asc +drwxr-xr-x 2 root root 4096 2019-11-03 18:40 ./source/l/orc +-rw-r--r-- 1 root root 177768 2019-11-02 11:28 ./source/l/orc/orc-0.4.31.tar.xz -rwxr-xr-x 1 root root 4530 2019-10-17 18:07 ./source/l/orc/orc.SlackBuild -rw-r--r-- 1 root root 929 2019-10-17 18:01 ./source/l/orc/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/l/pango @@ -10032,8 +10031,7 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/n/conntrack-tools -rw-r--r-- 1 root root 419949 2018-05-01 09:51 ./source/n/conntrack-tools/conntrack-tools-1.4.5.tar.lz -rwxr-xr-x 1 root root 3634 2019-09-29 23:48 ./source/n/conntrack-tools/conntrack-tools.SlackBuild -rw-r--r-- 1 root root 1092 2018-05-28 18:00 ./source/n/conntrack-tools/slack-desc -drwxr-xr-x 2 root root 4096 2019-11-01 19:05 ./source/n/crda --rw-r--r-- 1 root root 819 2015-01-30 19:14 ./source/n/crda/crda-3.18.tar.sign +drwxr-xr-x 2 root root 4096 2019-11-03 02:53 ./source/n/crda -rw-r--r-- 1 root root 61500 2019-11-01 18:08 ./source/n/crda/crda-4.14.tar.xz -rwxr-xr-x 1 root root 4281 2019-11-01 19:05 ./source/n/crda/crda.SlackBuild -rw-r--r-- 1 root root 113 2019-11-01 19:04 ./source/n/crda/crda.url @@ -10941,8 +10939,8 @@ drwxr-xr-x 2 root root 4096 2018-04-23 17:20 ./source/n/zd1211-firmware -rwxr-xr-x 1 root root 2234 2018-04-23 17:20 ./source/n/zd1211-firmware/zd1211-firmware.SlackBuild drwxr-xr-x 5 root root 4096 2018-02-24 20:15 ./source/t -rw-r--r-- 1 root root 82 2018-02-01 03:15 ./source/t/FTBFSlog -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/t/fig2dev --rw-r--r-- 1 root root 507288 2018-05-05 21:50 ./source/t/fig2dev/fig2dev-3.2.7a.tar.xz +drwxr-xr-x 2 root root 4096 2019-11-03 22:10 ./source/t/fig2dev +-rw-r--r-- 1 root root 512224 2019-10-28 21:53 ./source/t/fig2dev/fig2dev-3.2.7b.tar.xz -rwxr-xr-x 1 root root 4197 2019-09-29 23:48 ./source/t/fig2dev/fig2dev.SlackBuild -rw-r--r-- 1 root root 940 2018-02-27 06:12 ./source/t/fig2dev/slack-desc drwxr-xr-x 4 root root 4096 2019-10-06 18:50 ./source/t/texlive @@ -11073,12 +11071,13 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/libevdev -rw-r--r-- 1 root root 913 2018-02-27 06:13 ./source/x/libevdev/slack-desc drwxr-xr-x 3 root root 4096 2019-10-29 17:46 ./source/x/libglvnd -rw-r--r-- 1 root root 961606 2019-09-25 15:52 ./source/x/libglvnd/libglvnd-1.2.0.tar.lz --rwxr--r-- 1 root root 3720 2019-10-29 17:52 ./source/x/libglvnd/libglvnd.SlackBuild +-rwxr--r-- 1 root root 3805 2019-11-03 19:51 ./source/x/libglvnd/libglvnd.SlackBuild -rw-r--r-- 1 root root 44 2019-04-29 09:39 ./source/x/libglvnd/libglvnd.url -drwxr-xr-x 2 root root 4096 2019-10-29 17:46 ./source/x/libglvnd/patches +drwxr-xr-x 2 root root 4096 2019-11-03 19:51 ./source/x/libglvnd/patches -rw-r--r-- 1 root root 1122 2019-10-29 17:46 ./source/x/libglvnd/patches/193.patch.gz -rw-r--r-- 1 root root 1189 2019-10-29 17:46 ./source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch.gz -rw-r--r-- 1 root root 518 2019-10-29 17:46 ./source/x/libglvnd/patches/6f52473dac08c44b081b792874b4ce73122096da.patch.gz +-rw-r--r-- 1 root root 2743 2019-11-03 19:48 ./source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch.gz -rw-r--r-- 1 root root 950 2019-04-29 09:43 ./source/x/libglvnd/slack-desc drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/x/libhangul -rw-r--r-- 1 root root 2148068 2011-10-30 11:43 ./source/x/libhangul/libhangul-0.1.0.tar.xz @@ -12681,10 +12680,11 @@ drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/xine-lib -rw-r--r-- 1 root root 967 2018-02-27 06:13 ./source/xap/xine-lib/slack-desc -rw-r--r-- 1 root root 5180452 2018-01-11 13:01 ./source/xap/xine-lib/xine-lib-1.2.9.tar.xz -rwxr-xr-x 1 root root 4662 2019-10-14 17:59 ./source/xap/xine-lib/xine-lib.SlackBuild -drwxr-xr-x 2 root root 4096 2019-09-29 23:48 ./source/xap/xine-ui +drwxr-xr-x 2 root root 4096 2019-11-03 18:55 ./source/xap/xine-ui +-rw-rw-r-- 1 root root 810 2019-10-24 18:01 ./source/xap/xine-ui/02_FTBFS.diff.gz -rw-r--r-- 1 root root 828 2018-02-27 06:13 ./source/xap/xine-ui/slack-desc --rw-r--r-- 1 root root 1758778 2017-12-28 16:38 ./source/xap/xine-ui/xine-ui-0.99.10.tar.lz --rwxr-xr-x 1 root root 3379 2019-09-29 23:48 ./source/xap/xine-ui/xine-ui.SlackBuild +-rw-r--r-- 1 root root 1766233 2019-08-18 12:13 ./source/xap/xine-ui/xine-ui-0.99.11.tar.lz +-rwxr-xr-x 1 root root 3479 2019-11-03 18:56 ./source/xap/xine-ui/xine-ui.SlackBuild drwxr-xr-x 2 root root 4096 2019-10-05 18:28 ./source/xap/xlockmore -rw-r--r-- 1 root root 225 2002-02-23 22:23 ./source/xap/xlockmore/l-bob.README -rw-r--r-- 1 root root 27870 1998-04-01 15:09 ./source/xap/xlockmore/l-bob.xbm diff --git a/recompress.sh b/recompress.sh index 81ede5f2..c9227a3a 100755 --- a/recompress.sh +++ b/recompress.sh @@ -1045,6 +1045,7 @@ gzip ./source/xap/seyon/seyon_2.20c-16.diff gzip ./source/xap/ddd/doinst.sh gzip ./source/xap/ddd/strclass.C.diff gzip ./source/xap/ddd/machine_code_window_fix.diff +gzip ./source/xap/xine-ui/02_FTBFS.diff gzip ./source/xap/xgames/maze.diff gzip ./source/xap/xgames/xlander.fixes.diff gzip ./source/xap/xgames/xlander-2009-07-18.diff @@ -1190,6 +1191,7 @@ gzip ./source/x/x11/patch/xinit/xinit.remove.systemd.kludge.diff gzip ./source/x/x11/patch/xf86-video-intel/0001-sna-Avoid-clobbering-output-physical-size-with-xf86O.patch gzip ./source/x/x11/patch/xf86-video-s3virge/xf86-video-s3virge.xorg-server-1.20.x.diff gzip ./source/x/libglvnd/patches/6f52473dac08c44b081b792874b4ce73122096da.patch +gzip ./source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch gzip ./source/x/libglvnd/patches/193.patch gzip ./source/x/libglvnd/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch gzip ./source/x/xcm/xcm.udev.rules.diff diff --git a/source/x/libglvnd/libglvnd.SlackBuild b/source/x/libglvnd/libglvnd.SlackBuild index d58a38cf..5386bd9d 100755 --- a/source/x/libglvnd/libglvnd.SlackBuild +++ b/source/x/libglvnd/libglvnd.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=libglvnd VERSION=${VERSION:-$(echo libglvnd-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d- | rev)} -BUILD=${BUILD:-4} +BUILD=${BUILD:-5} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -81,6 +81,7 @@ find -L . \ zcat $CWD/patches/6f52473dac08c44b081b792874b4ce73122096da.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/51233cc52cbcbe25f8461830913c06f5b5bc9508.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/patches/193.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/patches/update-gl-h-to-match-mesa.patch.gz | patch -p1 --verbose || exit 1 if [ ! -r configure ]; then NOCONFIGURE=1 ./autogen.sh diff --git a/source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch b/source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch new file mode 100644 index 00000000..9e1f26a6 --- /dev/null +++ b/source/x/libglvnd/patches/update-gl-h-to-match-mesa.patch @@ -0,0 +1,245 @@ +From 5dfdc5a6dc60a3bdc63cd4510dabacba388da13a Mon Sep 17 00:00:00 2001 +From: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Tue, 22 Oct 2019 16:46:09 -0600 +Subject: [PATCH] Update GL/gl.h to match Mesa. + +Updated GL/gl.h to match the copy from Mesa at commit +a0829cf23b307ca44ab8c4505974fb7c8d71a35a. +--- + include/GL/gl.h | 147 ++++++------------------------------------------ + 1 file changed, 17 insertions(+), 130 deletions(-) + +diff --git a/include/GL/gl.h b/include/GL/gl.h +index 3f8cb62..2518dfb 100644 +--- a/include/GL/gl.h ++++ b/include/GL/gl.h +@@ -27,40 +27,24 @@ + #ifndef __gl_h_ + #define __gl_h_ + +-#if defined(USE_MGL_NAMESPACE) +-#include "gl_mangle.h" +-#endif +- +- + /********************************************************************** +- * Begin system-specific stuff. Do not do any of this when building +- * for SciTech SNAP, as this is all done before this header file is +- * included. ++ * Begin system-specific stuff. + */ +-#if !defined(__SCITECH_SNAP__) +- +-#if defined(__BEOS__) +-#include <stdlib.h> /* to get some BeOS-isms */ +-#endif +- +-#if !defined(OPENSTEP) && (defined(NeXT) || defined(NeXT_PDO)) +-#define OPENSTEP +-#endif + + #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) + #define __WIN32__ + #endif + +-#if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) ++#if defined(__WIN32__) && !defined(__CYGWIN__) + # if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */ + # define GLAPI __declspec(dllexport) + # elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */ + # define GLAPI __declspec(dllimport) + # else /* for use with static link lib build of Win32 edition only */ + # define GLAPI extern +-# endif /* _STATIC_MESA support */ ++# endif + # if defined(__MINGW32__) && defined(GL_NO_STDCALL) || defined(UNDER_CE) /* The generated DLLs by MingW with STDCALL are not compatible with the ones done by Microsoft's compilers */ +-# define GLAPIENTRY ++# define GLAPIENTRY + # else + # define GLAPIENTRY __stdcall + # endif +@@ -72,10 +56,6 @@ + # define GLAPIENTRY + #endif /* WIN32 && !CYGWIN */ + +-#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) +-# define PRAGMA_EXPORT_SUPPORTED 1 +-#endif +- + /* + * WINDOWS: Include windows.h here to define APIENTRY. + * It is also useful when applications include this file by +@@ -91,10 +71,6 @@ + #include <windows.h> + #endif + +-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED +-#pragma import on +-#endif +- + #ifndef GLAPI + #define GLAPI extern + #endif +@@ -116,15 +92,6 @@ + #define GLAPIENTRYP GLAPIENTRY * + #endif + +-#ifdef CENTERLINE_CLPP +-#define signed +-#endif +- +-#if defined(PRAGMA_EXPORT_SUPPORTED) +-#pragma export on +-#endif +- +-#endif /* !__SCITECH_SNAP__ */ + /* + * End system-specific stuff. + **********************************************************************/ +@@ -718,7 +685,7 @@ typedef double GLclampd; /* double precision float in [0,1] */ + #define GL_LIST_BIT 0x00020000 + #define GL_TEXTURE_BIT 0x00040000 + #define GL_SCISSOR_BIT 0x00080000 +-#define GL_ALL_ATTRIB_BITS 0x000FFFFF ++#define GL_ALL_ATTRIB_BITS 0xFFFFFFFF + + + /* OpenGL 1.1 */ +@@ -1738,6 +1705,7 @@ GLAPI void GLAPIENTRY glGetSeparableFilter( GLenum target, GLenum format, + + + ++ + /* + * OpenGL 1.3 + */ +@@ -2085,26 +2053,6 @@ typedef void (APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC) (GLenum target, const GLsh + + + +-#if GL_ARB_shader_objects +- +-#ifndef GL_MESA_shader_debug +-#define GL_MESA_shader_debug 1 +- +-#define GL_DEBUG_OBJECT_MESA 0x8759 +-#define GL_DEBUG_PRINT_MESA 0x875A +-#define GL_DEBUG_ASSERT_MESA 0x875B +- +-GLAPI GLhandleARB GLAPIENTRY glCreateDebugObjectMESA (void); +-GLAPI void GLAPIENTRY glClearDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType); +-GLAPI void GLAPIENTRY glGetDebugLogMESA (GLhandleARB obj, GLenum logType, GLenum shaderType, GLsizei maxLength, +- GLsizei *length, GLcharARB *debugLog); +-GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logType, GLenum shaderType); +- +-#endif /* GL_MESA_shader_debug */ +- +-#endif /* GL_ARB_shader_objects */ +- +- + /* + * ???. GL_MESA_packed_depth_stencil + * XXX obsolete +@@ -2121,60 +2069,6 @@ GLAPI GLsizei GLAPIENTRY glGetDebugLogLengthMESA (GLhandleARB obj, GLenum logTyp + #endif /* GL_MESA_packed_depth_stencil */ + + +-#ifndef GL_MESA_program_debug +-#define GL_MESA_program_debug 1 +- +-#define GL_FRAGMENT_PROGRAM_POSITION_MESA 0x8bb0 +-#define GL_FRAGMENT_PROGRAM_CALLBACK_MESA 0x8bb1 +-#define GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA 0x8bb2 +-#define GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA 0x8bb3 +-#define GL_VERTEX_PROGRAM_POSITION_MESA 0x8bb4 +-#define GL_VERTEX_PROGRAM_CALLBACK_MESA 0x8bb5 +-#define GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA 0x8bb6 +-#define GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA 0x8bb7 +- +-typedef void (*GLprogramcallbackMESA)(GLenum target, GLvoid *data); +- +-GLAPI void GLAPIENTRY glProgramCallbackMESA(GLenum target, GLprogramcallbackMESA callback, GLvoid *data); +- +-GLAPI void GLAPIENTRY glGetProgramRegisterfvMESA(GLenum target, GLsizei len, const GLubyte *name, GLfloat *v); +- +-#endif /* GL_MESA_program_debug */ +- +- +-#ifndef GL_MESA_texture_array +-#define GL_MESA_texture_array 1 +- +-/* GL_MESA_texture_array uses the same enum values as GL_EXT_texture_array. +- */ +-#ifndef GL_EXT_texture_array +- +-#ifdef GL_GLEXT_PROTOTYPES +-GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum target, +- GLenum attachment, GLuint texture, GLint level, GLint layer); +-#endif /* GL_GLEXT_PROTOTYPES */ +- +-#if 0 +-/* (temporarily) disabled because of collision with typedef in glext.h +- * that happens if apps include both gl.h and glext.h +- */ +-typedef void (APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC) (GLenum target, +- GLenum attachment, GLuint texture, GLint level, GLint layer); +-#endif +- +-#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 +-#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 +-#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A +-#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B +-#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C +-#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D +-#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF +-#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 +-#endif +- +-#endif +- +- + #ifndef GL_ATI_blend_equation_separate + #define GL_ATI_blend_equation_separate 1 + +@@ -2186,27 +2080,20 @@ typedef void (APIENTRYP PFNGLBLENDEQUATIONSEPARATEATIPROC) (GLenum modeRGB, GLen + #endif /* GL_ATI_blend_equation_separate */ + + +-/** +- ** NOTE!!!!! If you add new functions to this file, or update +- ** glext.h be sure to regenerate the gl_mangle.h file. See comments +- ** in that file for details. +- **/ +- +- +- +-/********************************************************************** +- * Begin system-specific stuff +- */ +-#if defined(PRAGMA_EXPORT_SUPPORTED) +-#pragma export off ++/* GL_OES_EGL_image */ ++#if !defined(GL_OES_EGL_image) && !defined(GL_EXT_EGL_image_storage) ++typedef void* GLeglImageOES; + #endif + +-#if defined(macintosh) && PRAGMA_IMPORT_SUPPORTED +-#pragma import off ++#ifndef GL_OES_EGL_image ++#define GL_OES_EGL_image 1 ++#ifdef GL_GLEXT_PROTOTYPES ++GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image); ++GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image); ++#endif ++typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image); ++typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image); + #endif +-/* +- * End system-specific stuff +- **********************************************************************/ + + + #ifdef __cplusplus +-- +2.22.0 + diff --git a/source/xap/xine-ui/02_FTBFS.diff b/source/xap/xine-ui/02_FTBFS.diff new file mode 100644 index 00000000..0e30f94a --- /dev/null +++ b/source/xap/xine-ui/02_FTBFS.diff @@ -0,0 +1,63 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -91,6 +91,7 @@ PKG_CHECK_MODULES([XINE], [libxine >= 1. + XINE_LIB_SHIMS + XINE_LIB_OPEN_CLOEXEC + XINE_LIB_SOCKET_CLOEXEC ++XINE_LIB_LIST_NEXT_VALUE + + CFLAGS="${CFLAGS} ${XINE_CFLAGS}" + +--- a/m4/_xine.m4 ++++ b/m4/_xine.m4 +@@ -241,3 +241,21 @@ AC_DEFUN([XINE_LIB_SOCKET_CLOEXEC], + LIBS="$tmp_LIBS" + ]) + ++dnl Test for xine_list_next_value function ++AC_DEFUN([XINE_LIB_LIST_NEXT_VALUE], ++ [AC_MSG_CHECKING([for xine_list_next_value within xine-lib]) ++ tmp_CFLAGS="$CFLAGS" ++ tmp_LIBS="$LIBS" ++ CFLAGS="$CFLAGS $XINE_CFLAGS" ++ LIBS="$LIBS $XINE_LIBS" ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([ ++ ],[ ++xine_list_next_value (); ++ ])], ++ [AC_DEFINE([HAVE_XINE_LIST_NEXT_VALUE], [1], [Define if xine-lib supports xine_list_next_value]) ++ AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no])]) ++ CFLAGS="$tmp_CFLAGS" ++ LIBS="$tmp_LIBS" ++ ]) +--- a/src/xitk/setup.c ++++ b/src/xitk/setup.c +@@ -32,6 +32,17 @@ + + #include <xine/list.h> + ++#ifdef HAVE_XINE_LIST_NEXT_VALUE ++# define _xine_list_next_value(_xlnv_list,_xlnv_ite) xine_list_next_value (_xlnv_list, _xlnv_ite) ++#else ++static inline void *_xine_list_next_value (xine_list_t *list, xine_list_iterator_t *ite) { ++ if (*ite) ++ *ite = xine_list_next (list, *ite); ++ else ++ *ite = xine_list_front (list); ++ return *ite ? xine_list_get_value (list, *ite) : NULL; ++} ++#endif + + #define WINDOW_WIDTH 630 + #define WINDOW_HEIGHT 530 +@@ -809,7 +820,7 @@ static void setup_change_section(xitk_wi + xitk_widget_t *sw; + xine_list_iterator_t ite = NULL; + while (1) { +- sw = xine_list_next_value (setup->widgets, &ite); ++ sw = _xine_list_next_value (setup->widgets, &ite); + if (!ite) + break; + xitk_destroy_widget (sw); diff --git a/source/xap/xine-ui/xine-ui.SlackBuild b/source/xap/xine-ui/xine-ui.SlackBuild index 4ec9ee50..3f3c366a 100755 --- a/source/xap/xine-ui/xine-ui.SlackBuild +++ b/source/xap/xine-ui/xine-ui.SlackBuild @@ -26,7 +26,7 @@ PKGNAM=xine-ui VERSION=${VERSION:-$(echo xine-ui-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} # I would use "-march=i586 -mcpu=i686" here as usual, but with XINE it's all or nothing. # I'd rather have it work well for the i686/Athlon crowd than suck for everyone. -BUILD=${BUILD:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -60,6 +60,10 @@ rm -rf xine-ui-$VERSION tar xvf $CWD/xine-ui-$VERSION.tar.?z || exit 1 cd xine-ui-$VERSION || exit 1 +# Fix missing function: +zcat $CWD/02_FTBFS.diff.gz | patch -p1 --verbose || exit 1 +autoreconf -vif + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ |