diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/a/sysvinit-scripts/scripts/rc.S | 2 | ||||
| -rwxr-xr-x | source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild | 2 | ||||
| -rw-r--r-- | source/ap/soma/ChangeLog.txt | 102 | ||||
| -rw-r--r-- | source/ap/soma/README | 106 | ||||
| -rw-r--r-- | source/ap/soma/slack-desc | 8 | ||||
| -rw-r--r-- | source/ap/soma/slack-desc.diff | 26 | ||||
| -rwxr-xr-x | source/ap/soma/soma.SlackBuild | 15 | ||||
| -rw-r--r-- | source/ap/soma/soma.SlackBuild.slack.diff | 49 | ||||
| -rw-r--r-- | source/ap/soma/soma.info | 11 | ||||
| -rwxr-xr-x | source/l/jansson/jansson.SlackBuild | 2 | ||||
| -rw-r--r-- | source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch | 100 | ||||
| -rwxr-xr-x | source/n/rp-pppoe/rp-pppoe.SlackBuild | 7 | ||||
| -rw-r--r-- | source/n/rp-pppoe/slack-desc | 2 | ||||
| -rw-r--r-- | source/n/samba/samba.url | 4 | ||||
| -rwxr-xr-x | source/x/vulkan-sdk/fetch-sources.sh | 8 | ||||
| -rwxr-xr-x | source/x/vulkan-sdk/vulkan-sdk.SlackBuild | 29 | ||||
| -rw-r--r-- | source/x/vulkan-sdk/vulkan-sdk.url | 4 |
17 files changed, 217 insertions, 260 deletions
diff --git a/source/a/sysvinit-scripts/scripts/rc.S b/source/a/sysvinit-scripts/scripts/rc.S index a382bd556..e53cd96da 100644 --- a/source/a/sysvinit-scripts/scripts/rc.S +++ b/source/a/sysvinit-scripts/scripts/rc.S @@ -231,7 +231,7 @@ fi # If we're using F2FS for the root filesystem, don't check it as it doesn't # allow checking a read-only filesystem: -if [ "$(cat /etc/fstab | tr '\t' ' ' | tr -s ' ' | grep ' / ' | cut -f 3 -d ' ')" = "f2fs" ]; then +if grep -q ' / f2fs ' /proc/mounts ; then echo "Remounting root device with read-write enabled." /sbin/mount -w -v -n -o remount / elif [ ! $READWRITE = yes ]; then diff --git a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild index aafd0143a..c5b91f4b0 100755 --- a/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild +++ b/source/a/sysvinit-scripts/sysvinit-scripts.SlackBuild @@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=sysvinit-scripts VERSION=${VERSION:-2.1} ARCH=noarch -BUILD=${BUILD:-22} +BUILD=${BUILD:-23} # 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 diff --git a/source/ap/soma/ChangeLog.txt b/source/ap/soma/ChangeLog.txt index 53e0860e8..08b8cc47c 100644 --- a/source/ap/soma/ChangeLog.txt +++ b/source/ap/soma/ChangeLog.txt @@ -1,26 +1,70 @@ -====================================================== +============================================================================== +Sun 18 Nov 03:52:51 UTC 2018 +3.2.0 +Add proxy support. +============================================================================== +Fri 16 Nov 00:05:05 UTC 2018 +3.1.1 +Update README +============================================================================== +Wed 14 Nov 22:51:50 UTC 2018 +3.1.0 +Improve timeout check. +============================================================================== +Version 3.0.8 +Precreate 'soma-status'. +Fix indentation. Vim was confused. +Fix killing of orphaned mencoder process if recording failed. +============================================================================== +Version 3.0.7 +Precreate 'soma-playing'. +============================================================================== +Version 3.0.6 +Rename options.conf/stations.conf -> .new +============================================================================== +Version 3.0.5 + +Bugs fixed: + +Finally fixed the flashing window bug with newer versions of dialog. Hopefully. +Sometimes menus were broken after choosing a station from the local genre list. + +Added: + +Recording. See RECORDING.txt or 'soma --record-info | less' for detailed info. + +Changes: + +Some new stations added and dead ones removed. +Removed TAG from the SlackBuild. +Added the doinst.sh.gz from Slackware -current and adjusted the SlackBuild +according to the diff that Pat uses. +============================================================================== +Version 3.0.4 +Somebody stole the ChangeLog. +============================================================================== Version 3.0.3 Add check for empty input in text input box. -====================================================== +============================================================================== Version 3.0.2 Edit purge files function slightly. -====================================================== +============================================================================== Version 3.0.1 Add new theme. Edit purge files function slightly to make it safer. -====================================================== +============================================================================== Version 3.0.0 Fixed BBC Radio 4 and BBC Radio 4 Extra URLs. Add menu options for genres, bookmarks and themes. Add schedules and volume indicators. Add more options for timeformat, caret etc. -====================================================== +============================================================================== Version 2.13.2 Fixes for new dialog in -current. -====================================================== +============================================================================== Version 2.13.1 Bugfix where sometimes station list is broken. -====================================================== +============================================================================== Version 2.13.0 Fix another scheduler bug. Add genre support. @@ -28,17 +72,17 @@ Move Theme option to main menu. Add time format option. Updated all broken BBC URLs. Removed some broken URLs. -====================================================== +============================================================================== Version 2.12.3 Fix scheduler bug. -====================================================== +============================================================================== Version 2.12.2 Fixed some options that were zeroing out if 'back' was pressed. -====================================================== +============================================================================== Version 2.12.1 Fixed missing output devices bug. -====================================================== +============================================================================== Version 2.12.0 Stations added: @@ -65,7 +109,7 @@ starts up so fast now that you just see a flicker. Enhancements: A vast improvement in loading speed due to new method of loading station list. -====================================================== +============================================================================== Version 2.11.3 Added: ABC Oldies,http://orion.shoutca.st:8569 @@ -80,7 +124,7 @@ Floyd Too,http://cirrus.turtil.net:9001 Major code overhaul. Added more themes + themes directory. -====================================================== +============================================================================== Version 2.11.2 Added: Radio Swing @@ -92,55 +136,55 @@ WITR 89.7 KKJZ FM 4625 KHz The Buzzer -====================================================== +============================================================================== Version 2.11.1 Add 3WK and Krypton stations. -====================================================== +============================================================================== Version 2.11.0 Add SAVE_LIST_AT_QUIT option. -====================================================== +============================================================================== Version 2.10.8 Set default CACHE is blank.. -====================================================== +============================================================================== Version 2.10.7 Add CACHE option. -====================================================== +============================================================================== Version 2.10.6 Add HD BBC stations. Support for .m3u8 URLs. -====================================================== +============================================================================== Version 2.10.5 Add function to add SETVOL to config. -====================================================== +============================================================================== Version 2.10.4 Clean up Name finding code. -====================================================== +============================================================================== Version 2.10.3 Fix Names containing colons. -======================================================= +============================================================================== Version 2.10.2 Tidy menu. -======================================================= +============================================================================== Version 2.10.1 Fix bug in mixer selection. -======================================================== +============================================================================== Version 2.10.0 Changed dialog theme back to original way. Added a 'greenrc' theme. -======================================================== +============================================================================== Version 2.9.2 Update stations URLS. Remove dead. -======================================================== +============================================================================== Version 2.9.1 Better station parsing. -======================================================== +============================================================================== Version 2.9.0 Add keyboard sortcuts for volume: keys 1-0 = 10% 20% ... 100% This volume is saved and reapplied on startup. Added a few new somafm stations and a couple of talk radio stations -========================================================= +============================================================================== Version 2.8.9 Use ~/.soma/dialogrc-$VERSION. Some fixes to the station 'tuner' function. -========================================================= +============================================================================== diff --git a/source/ap/soma/README b/source/ap/soma/README index d63eb8d36..20299b6f7 100644 --- a/source/ap/soma/README +++ b/source/ap/soma/README @@ -1,74 +1,102 @@ Soma - a dialog internet radio player -For help/usage see soma -h +Soma is an internet stream audio player. Any URL playable by mplayer +with or without the -playlist option should work. Extra stations can +be added in ~/.soma/stations.conf. -Soma started off as a way to play .pls playlists from SomaFM but can -also play .ram playlists too. In fact any url playable by mplayer -using the -playlist option should work. Extra stations can be added -in ~/.soma/stations.conf (up to 200). +Startup Flags: -Soma uses mplayer to play the streams and aplay to detect cards for -mixer so mplayer and alsa-utils need to be installed. + soma -l Go straight to bookmarks list + soma -b Go straight to stations browser for genre + soma -B Go straight to all stations browser + soma -g Go straight to local genre browser + soma -G Go straight to global genre browser + soma -d To start in debug mode + soma -h Help + soma --record-info Detailed recording info + + Config Files and Directories: + + User: Global: + + ~/.soma/options.conf /etc/soma/options.conf + ~/.soma/stations.conf /etc/soma/stations.conf + ~/.soma/themes/*rc /etc/soma/themes/*rc + ~/.soma/genres/*.conf /etc/soma/genres/*.conf + ~/.soma/bookmarks.conf + ~/.soma/schedules.conf + ~/.soma/recordings/ Key commands supported in status window: -( Volume -5 -) Volume +5 -1 - 0 Volume 10%, 20%, ... 100% (saved) -Space Pause/Play -d Disconnect/Reconnect -a Add schedule -b Station browser -m Mute toggle -s Scheduler -q Quit + 1 - 0 Volume 10% - 100% () Volume -5/+5 + Space Pause ` Volume 0 + a Add schedule A Toggle audio codec info + b Station browser (genre) B Station browser (all) + d Disconnect/Reconnect/Play/Stop D Toggle debug mode + g List genres h List local genres + j Add station to current genre k Bookmark current station + l Open bookmark list m Toggle mute + o Options menu q Quit + s Scheduler menu S Toggle schedules on/off + t Change theme ? Show keys + + Recording: -There are 3 config files: + r Open recording menu R Start/Stop recording -~/.soma/themes/*rcrc Specify the dialog colours. -~/.soma/options.conf A few extra options. -~/.soma/stations.conf User station list. +Dashboard indicators: -There are also: +[S] Schedules are set [-] Schedules are temporarily disabled +[R] A recording is in progress [0-100] Volume or [M] Mute -/etc/soma/options.conf Default options. -/etc/soma/themes/*rc Dialog configs. -/etc/soma/stations.conf Default station list. +Config Files: + +User: Global: + +~/.soma/options.conf /etc/soma/options.conf +~/.soma/stations.conf /etc/soma/stations.conf +~/.soma/bookmarks.conf /etc/soma/themes/*rc +~/.soma/themes/*rc /etc/soma/genres/*.conf +~/.soma/genres/*.conf +~/.soma/schedules.conf Stations should be added to the user list like this: Name,URL -You cannot use a comma , in the name or URL +You cannot use a comma , in the name or the URL. + +User stations are listed before global in all stations list. Custom genre and +theme files can be made and will be listed along with the default set. -I would be glad of any exra radio urls emailed to me so I can add to +I would be glad of any extra radio urls emailed to me so I can add to the default list. NOTES: -The Jack and NAS options for output device will only work if MPlayer is -built against them. +The Jack and NAS options for output device will only work if MPlayer is built +against them. -When changing/selecting soundcard output device you must press space on -the option. Just scrolling down and hitting Enter does nothing. +When changing/selecting soundcard output device you must press space on the +option. Just scrolling down and hitting Enter does nothing. BUGS: -Soma may induce the side effects of general well-being and profound -spiritual satisfaction. +Soma may induce the side effects of general well-being and profound spiritual +satisfaction. http://en.wikipedia.org/wiki/Soma http://en.wikipedia.org/wiki/Soma_(Brave_New_World) REAL BUGS: -Some people might find screen messes up the dialog colours. If you -have this line in ~/.screenrc: +Some people might find screen messes up the dialog colours. If you have this +line in ~/.screenrc: attrcolor b ".I" -You might want to comment it out and try again as it seems to turn off -the bold attribute. +You might want to comment it out and try again as it seems to turn off the bold +attribute. See the screen man page for more info. -Please mail me at dave@dawoodfall.net for new radio urls or bug -reports etc. +Please mail me at dave@dawoodfall.net for new radio urls or bug reports etc. diff --git a/source/ap/soma/slack-desc b/source/ap/soma/slack-desc index 1130b4403..8b4868ff0 100644 --- a/source/ap/soma/slack-desc +++ b/source/ap/soma/slack-desc @@ -6,12 +6,12 @@ # customary to leave one space after the ':'. |-----handy-ruler------------------------------------------------------| -soma: Soma - a command line/dialog internet radio player +soma: soma (a dialog/MPlayer internet radio player and recorder) soma: -soma: Soma is a frontend for mplayer to play radio playlists pls,m3u and -soma: ram. More will be added as it progresses. +soma: Soma handles playing any internet audio stream supported by MPlayer. +soma: It also supports playlists such as pls,m3u and ram. soma: -soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma +soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma soma: soma: soma: diff --git a/source/ap/soma/slack-desc.diff b/source/ap/soma/slack-desc.diff new file mode 100644 index 000000000..8e7d18007 --- /dev/null +++ b/source/ap/soma/slack-desc.diff @@ -0,0 +1,26 @@ +--- slack-desc.orig 2018-11-15 18:52:49.000000000 -0600 ++++ slack-desc 2018-11-28 16:37:00.644976546 -0600 +@@ -1,17 +1,17 @@ + # HOW TO EDIT THIS FILE: +-# The "handy ruler" below makes it easier to edit a package description. Line ++# 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 ++# 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 ':'. + + |-----handy-ruler------------------------------------------------------| +-soma: Soma - a dialog/mplayer internet radio player and recorder. ++soma: soma (a dialog/MPlayer internet radio player and recorder) + soma: +-soma: Soma handles playing any internet audio stream supported by mplayer. ++soma: Soma handles playing any internet audio stream supported by MPlayer. + soma: It also supports playlists such as pls,m3u and ram. + soma: +-soma: Homepage: http://www.dawoodfall.net/slackbuilds/noversion/soma ++soma: Homepage: http://tty1.uk/slackbuilds/noversion/soma + soma: + soma: + soma: diff --git a/source/ap/soma/soma.SlackBuild b/source/ap/soma/soma.SlackBuild index d8c6e961e..94250798e 100755 --- a/source/ap/soma/soma.SlackBuild +++ b/source/ap/soma/soma.SlackBuild @@ -2,7 +2,7 @@ # Slackware build script for soma # (C) 2010 David Woodfall <dave@dawoodfall.net> -# TMPROOT modification (C) Patrick Volkerding with thanks +# Modifications (C) Patrick Volkerding # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -25,10 +25,9 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=soma -VERSION=${VERSION:-3.0.4} +VERSION=${VERSION:-3.2.0} ARCH=noarch BUILD=${BUILD:-1} -#TAG=${TAG:-daw} # 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 @@ -62,17 +61,15 @@ mkdir -p $PKG/usr/bin $PKG/etc/soma/themes \ $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION install -m 755 soma $PKG/usr/bin/soma -install -m 644 options.conf $PKG/etc/soma/options.conf.new -install -m 644 stations.conf $PKG/etc/soma/stations.conf.new +install -m 644 options.conf.new $PKG/etc/soma +install -m 644 stations.conf.new $PKG/etc/soma install -m 644 themes/* $PKG/etc/soma/themes install -m 644 genres/* $PKG/etc/soma/genres -cp -a \ - $CWD/README $CWD/ChangeLog.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION +cp -a README *.txt $PKG/usr/doc/$PRGNAM-$VERSION cat $CWD/slack-desc > $PKG/install/slack-desc zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD.${PKGTYPE:-txz} diff --git a/source/ap/soma/soma.SlackBuild.slack.diff b/source/ap/soma/soma.SlackBuild.slack.diff deleted file mode 100644 index 71dfbcd0d..000000000 --- a/source/ap/soma/soma.SlackBuild.slack.diff +++ /dev/null @@ -1,49 +0,0 @@ ---- soma.SlackBuild.orig 2018-03-05 23:58:06.000000000 -0600 -+++ soma.SlackBuild 2018-06-04 23:45:17.325657453 -0500 -@@ -22,13 +22,22 @@ - # 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) -+ - PRGNAM=soma - VERSION=${VERSION:-3.0.4} - ARCH=noarch - BUILD=${BUILD:-1} --TAG=${TAG:-daw} -+#TAG=${TAG:-daw} -+ -+# 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 "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz}" -+ exit 0 -+fi - --CWD=$(pwd) - TMP=${TMP:-/tmp/daw} - PKG=$TMP/package-$PRGNAM - OUTPUT=${OUTPUT:-/tmp} -@@ -53,8 +62,8 @@ - $PKG/install $PKG/usr/doc/$PRGNAM-$VERSION - - install -m 755 soma $PKG/usr/bin/soma --install -m 644 options.conf $PKG/etc/soma --install -m 644 stations.conf $PKG/etc/soma -+install -m 644 options.conf $PKG/etc/soma/options.conf.new -+install -m 644 stations.conf $PKG/etc/soma/stations.conf.new - install -m 644 themes/* $PKG/etc/soma/themes - install -m 644 genres/* $PKG/etc/soma/genres - -@@ -62,8 +71,8 @@ - $CWD/README $CWD/ChangeLog.txt \ - $PKG/usr/doc/$PRGNAM-$VERSION - --cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild - cat $CWD/slack-desc > $PKG/install/slack-desc -+zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh - - cd $PKG --/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} -+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-txz} diff --git a/source/ap/soma/soma.info b/source/ap/soma/soma.info index 82cd97821..9064b6f13 100644 --- a/source/ap/soma/soma.info +++ b/source/ap/soma/soma.info @@ -1,11 +1,10 @@ PRGNAM="soma" -VERSION="3.0.4" -HOMEPAGE="http://www.dawoodfall.net/slackbuilds/noversion/soma/" -DOWNLOAD="http://www.dawoodfall.net/slackbuilds/noversion/soma/soma-3.0.4.tar.gz" -MD5SUM="f99857601879ab2a651f298304069716" +VERSION="3.2.0" +HOMEPAGE="http://dawoodfall.net/slackbuilds/noversion/soma/" +DOWNLOAD="http://unrealize.co.uk/source/soma-3.2.0.tar.gz" +MD5SUM="9a24b9dcb2a604c26cc32767758dfdc1" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="David Woodfall" -MAIL="dave@dawoodfall.net" -APPROVED="Me!" +EMAIL="dave@dawoodfall.net" diff --git a/source/l/jansson/jansson.SlackBuild b/source/l/jansson/jansson.SlackBuild index 3f75af78f..0fcac6294 100755 --- a/source/l/jansson/jansson.SlackBuild +++ b/source/l/jansson/jansson.SlackBuild @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=jansson VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch b/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch deleted file mode 100644 index 2b26edac7..000000000 --- a/source/n/rp-pppoe/rp-pppoe-3.12-bz1469960-new-kernel-header.patch +++ /dev/null @@ -1,100 +0,0 @@ -diff -up rp-pppoe-3.12/src/if.c.than rp-pppoe-3.12/src/if.c ---- rp-pppoe-3.12/src/if.c.than 2017-07-25 11:04:53.780466912 +0200 -+++ rp-pppoe-3.12/src/if.c 2017-07-25 11:05:35.951885962 +0200 -@@ -20,6 +20,12 @@ static char const RCSID[] = - - #include "pppoe.h" - -+#if defined(HAVE_LINUX_IF_H) -+#include <linux/if.h> -+#elif defined(HAVE_NET_IF_H) -+#include <net/if.h> -+#endif -+ - #ifdef HAVE_UNISTD_H - #include <unistd.h> - #endif -diff -up rp-pppoe-3.12/src/plugin.c.than rp-pppoe-3.12/src/plugin.c ---- rp-pppoe-3.12/src/plugin.c.than 2017-07-25 11:05:50.145353868 +0200 -+++ rp-pppoe-3.12/src/plugin.c 2017-07-25 11:07:00.068732535 +0200 -@@ -49,6 +49,11 @@ static char const RCSID[] = - #include <unistd.h> - #include <fcntl.h> - #include <signal.h> -+#if defined(HAVE_LINUX_IF_H) -+#include <linux/if.h> -+#elif defined(HAVE_NET_IF_H) -+#include <net/if.h> -+#endif - #include <net/ethernet.h> - #include <net/if_arp.h> - #include <linux/ppp_defs.h> -diff -up rp-pppoe-3.12/src/pppoe.h.than rp-pppoe-3.12/src/pppoe.h ---- rp-pppoe-3.12/src/pppoe.h.than 2017-07-25 11:07:38.141305245 +0200 -+++ rp-pppoe-3.12/src/pppoe.h 2017-07-25 11:08:34.409195838 +0200 -@@ -51,13 +51,6 @@ extern int IsSetID; - #include <sys/socket.h> - #endif - --/* Ugly header files on some Linux boxes... */ --#if defined(HAVE_LINUX_IF_H) --#include <linux/if.h> --#elif defined(HAVE_NET_IF_H) --#include <net/if.h> --#endif -- - #ifdef HAVE_NET_IF_TYPES_H - #include <net/if_types.h> - #endif -@@ -136,9 +129,6 @@ typedef unsigned long UINT32_t; - #ifdef HAVE_NETINET_IF_ETHER_H - #include <sys/types.h> - --#ifdef HAVE_SYS_SOCKET_H --#include <sys/socket.h> --#endif - #ifndef HAVE_SYS_DLPI_H - #include <netinet/if_ether.h> - #endif -diff -up rp-pppoe-3.12/src/pppoe-server.c.than rp-pppoe-3.12/src/pppoe-server.c ---- rp-pppoe-3.12/src/pppoe-server.c.than 2017-07-25 11:08:51.505554918 +0200 -+++ rp-pppoe-3.12/src/pppoe-server.c 2017-07-25 11:09:59.230016098 +0200 -@@ -26,6 +26,13 @@ static char const RCSID[] = - - #define _BSD_SOURCE 1 /* for gethostname */ - -+#include <sys/socket.h> -+#if defined(HAVE_LINUX_IF_H) -+#include <linux/if.h> -+#elif defined(HAVE_NET_IF_H) -+#include <net/if.h> -+#endif -+ - #include "pppoe-server.h" - #include "md5.h" - -diff -up rp-pppoe-3.12/src/relay.c.than rp-pppoe-3.12/src/relay.c ---- rp-pppoe-3.12/src/relay.c.than 2017-07-25 11:10:13.863467871 +0200 -+++ rp-pppoe-3.12/src/relay.c 2017-07-25 11:11:17.747074537 +0200 -@@ -18,11 +18,19 @@ static char const RCSID[] = - "$Id$"; - - #define _GNU_SOURCE 1 /* For SA_RESTART */ -- --#include "relay.h" -+#include "config.h" - - #include <signal.h> - -+#include <sys/socket.h> -+#if defined(HAVE_LINUX_IF_H) -+#include <linux/if.h> -+#elif defined(HAVE_NET_IF_H) -+#include <net/if.h> -+#endif -+ -+#include "relay.h" -+ - #ifdef HAVE_SYSLOG_H - #include <syslog.h> - #endif diff --git a/source/n/rp-pppoe/rp-pppoe.SlackBuild b/source/n/rp-pppoe/rp-pppoe.SlackBuild index f3b95e113..81305d795 100755 --- a/source/n/rp-pppoe/rp-pppoe.SlackBuild +++ b/source/n/rp-pppoe/rp-pppoe.SlackBuild @@ -23,8 +23,8 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=rp-pppoe -VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +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 @@ -63,7 +63,7 @@ rm -rf $PKG mkdir -p $TMP $PKG cd $TMP rm -rf rp-pppoe-$VERSION -tar xvf $CWD/rp-pppoe-$VERSION.tar.?z* || exit 1 +tar xvf $CWD/rp-pppoe-$VERSION.tar.?z || exit 1 cd rp-pppoe-$VERSION || exit 1 chown -R root:root . find . \ @@ -76,7 +76,6 @@ zcat $CWD/rp-pppoe-3.12-ip-allocation.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/rp-pppoe-3.12-plugin.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/rp-pppoe-3.12-pluginpath.patch.gz | patch -p1 --verbose || exit 1 zcat $CWD/rp-pppoe-manpages.patch.gz | patch -p1 --verbose || exit 1 -zcat $CWD/rp-pppoe-3.12-bz1469960-new-kernel-header.patch.gz | patch -p1 --verbose || exit 1 cd src diff --git a/source/n/rp-pppoe/slack-desc b/source/n/rp-pppoe/slack-desc index 4ae51c3fc..92175c008 100644 --- a/source/n/rp-pppoe/slack-desc +++ b/source/n/rp-pppoe/slack-desc @@ -16,4 +16,4 @@ rp-pppoe: The client is a user-mode program and does not require any kernel rp-pppoe: modifications. It is fully compliant with RFC 2516, the official rp-pppoe: PPPoE specification. rp-pppoe: -rp-pppoe: +rp-pppoe: Homepage: https://www.roaringpenguin.com/products/pppoe diff --git a/source/n/samba/samba.url b/source/n/samba/samba.url index 7e3058c84..438409946 100644 --- a/source/n/samba/samba.url +++ b/source/n/samba/samba.url @@ -1,2 +1,2 @@ -https://download.samba.org/pub/samba/stable/samba-4.9.2.tar.gz -https://download.samba.org/pub/samba/stable/samba-4.9.2.tar.asc +https://download.samba.org/pub/samba/stable/samba-4.9.3.tar.gz +https://download.samba.org/pub/samba/stable/samba-4.9.3.tar.asc diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh index 67ec96b9a..4a15b10eb 100755 --- a/source/x/vulkan-sdk/fetch-sources.sh +++ b/source/x/vulkan-sdk/fetch-sources.sh @@ -25,10 +25,10 @@ # github, and then look at the revisions listed in the external_revisions # directory to fetch the proper glslang, SPIRV-Headers, and SPIRV-Tools. # -# Example: VERSION=1.1.85.0 ./fetch-sources.sh +# Example: VERSION=1.1.92.1 ./fetch-sources.sh -VERSION=${VERSION:-1.1.85.0} -BRANCH=${BRANCH:-sdk-1.1.85} +VERSION=${VERSION:-1.1.92.1} +BRANCH=${BRANCH:-sdk-1.1.92} rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \ Vulkan-Headers-sdk-${VERSION}* \ @@ -52,7 +52,7 @@ GLSLANG_COMMIT=$(python3 - << EOF import json import tarfile with tarfile.open('Vulkan-ValidationLayers-sdk-$VERSION.tar') as layers: - known_good = layers.extractfile('Vulkan-ValidationLayers-sdk-1.1.85.0/scripts/known_good.json') + known_good = layers.extractfile('Vulkan-ValidationLayers-sdk-1.1.92.1/scripts/known_good.json') known_good_info = json.loads(known_good.read()) glslang = next(repo for repo in known_good_info['repos'] if repo['name'] == 'glslang') print(glslang['commit']) diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild index c79ac7386..34478a6a7 100755 --- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild +++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild @@ -29,8 +29,6 @@ PKGNAM=vulkan-sdk VERSION=${VERSION:-$(echo Vulkan-ValidationLayers-sdk-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} BUILD=${BUILD:-1} -NUMJOBS=${NUMJOBS:--j7} - # Automatically determine the architecture we're building on: MARCH=$( uname -m ) if [ -z "$ARCH" ]; then @@ -51,6 +49,8 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then exit 0 fi +NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} + if [ "$ARCH" = "i586" ]; then SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" @@ -77,8 +77,14 @@ SPIRV_TOOLS_VERSION=$(echo SPIRV-Tools-*.tar.?z | rev | cut -f 3- -d . | cut -f rm -rf $PKG mkdir -p $TMP $PKG + cd $TMP -rm -rf Vulkan-ValidationLayers-sdk-$VERSION Vulkan-Headers-sdk-$VERSION glslang-$GLSLANG_VERSION +# Clear existing tmp sources: +rm -rf glslang-${GLSLANG_VERSION} \ + Vulkan-Headers-sdk-$VERSION \ + Vulkan-Loader-sdk-$VERSION \ + Vulkan-ValidationLayers-sdk-$VERSION \ + Vulkan-Tools-sdk-$VERSION tar xvf $CWD/glslang-${GLSLANG_VERSION}.tar.?z || exit 1 cd glslang-$GLSLANG_VERSION/External @@ -116,7 +122,6 @@ make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 cd $TMP - tar xvf $CWD/Vulkan-Headers-sdk-$VERSION.tar.?z || exit 1 cd Vulkan-Headers-sdk-$VERSION @@ -138,8 +143,21 @@ cmake \ .. make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 -cd $TMP +# Make sure some SPIR-V headers are there: +HEADER_SOURCE_DIR="$TMP/glslang-${GLSLANG_VERSION}/External/spirv-tools/external/spirv-headers/include/spirv/unified1" +mkdir -p $PKG/usr/include/vulkan +for file in GLSL.std.450.h spirv.h spirv.hpp spirv.hpp11 spirv.json \ + spirv.lua spirv.py ; do + if [ -r $HEADER_SOURCE_DIR/$file -a ! -r $PKG/usr/include/vulkan/$file ]; then + cp -a --verbose $HEADER_SOURCE_DIR/$file $PKG/usr/include/vulkan/$file + chown root:root $PKG/usr/include/vulkan/$file + chmod 644 $PKG/usr/include/vulkan/$file + fi +done +unset HEADER_SOURCE_DIR + +cd $TMP tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.?z || exit 1 cd $TMP/Vulkan-Loader-sdk-$VERSION @@ -201,7 +219,6 @@ cd build make install DESTDIR=$PKG || exit 1 cd $TMP - tar xvf $CWD/Vulkan-Tools-sdk-$VERSION.tar.?z || exit 1 cd $TMP/Vulkan-Tools-sdk-$VERSION diff --git a/source/x/vulkan-sdk/vulkan-sdk.url b/source/x/vulkan-sdk/vulkan-sdk.url deleted file mode 100644 index 5dcdf19fd..000000000 --- a/source/x/vulkan-sdk/vulkan-sdk.url +++ /dev/null @@ -1,4 +0,0 @@ -https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-1.1.73.0/Vulkan-LoaderAndValidationLayers-sdk-1.1.73.0.tar.gz -https://github.com/KhronosGroup/glslang/archive/3bb4c48cd95892a5cfcd63df20fcc47fd51c97a0/glslang-3bb4c48cd95892a5cfcd63df20fcc47fd51c97a0.tar.gz -https://github.com/KhronosGroup/SPIRV-Headers/archive/12f8de9f04327336b699b1b80aa390ae7f9ddbf4/SPIRV-Headers-12f8de9f04327336b699b1b80aa390ae7f9ddbf4.tar.gz -https://github.com/KhronosGroup/SPIRV-Tools/archive/26a698c34788bb69123a1f3789970a16cf4d9641/SPIRV-Tools-26a698c34788bb69123a1f3789970a16cf4d9641.tar.gz |