diff -Nru hollywood-1.18/bin/hollywood hollywood-1.20/bin/hollywood --- hollywood-1.18/bin/hollywood 2019-06-12 03:50:11.000000000 +0000 +++ hollywood-1.20/bin/hollywood 2019-11-07 13:30:48.000000000 +0000 @@ -34,7 +34,7 @@ # Allow for failed widgets splits=$(echo "$panes" | wc -l) pane=$((RANDOM % $splits)) - tmux split-window $dir -t ${PKG}.$pane "MPLAYER_OPTS='$MPLAYER_OPTS' nice -n 19 $WIDGET_DIR/$w" >/dev/null 2>&1 + tmux split-window $dir -t ${PKG}.$pane "nice -n 19 $WIDGET_DIR/$w" >/dev/null 2>&1 sleep 0.2 split=$((split+1)) if [ $split -ge $SPLITS ]; then @@ -43,16 +43,11 @@ done } -MPLAYER_OPTS="-nosound -speed 5" WIDGET_DIR="$(dirname $0)/../lib/$PKG" SPLITS=$(ls "$WIDGET_DIR" | wc -l) DELAY=10 while [ ! -z "$1" ]; do case "$1" in - --sound) - MPLAYER_OPTS="" - shift - ;; -d|--delay) DELAY="$2" shift 2 diff -Nru hollywood-1.18/ChangeLog hollywood-1.20/ChangeLog --- hollywood-1.18/ChangeLog 2019-06-13 00:06:20.000000000 +0000 +++ hollywood-1.20/ChangeLog 2019-11-29 21:05:41.000000000 +0000 @@ -1,4 +1,25 @@ -hollywood (1.18) released; urgency=medium +hollywood (1.20) released; urgency=medium + + * lib/hollywood/mplayer, share/hollywood/soundwave.mp4: + - added sound wave video (no sound) + - start at a random point, between 0 and 99 seconds into the video + - speed it up 100x + * debian/control: + - depends, rather than recommends + * debian/changelog: + - fix email + + -- Dustin Kirkland Fri, 29 Nov 2019 14:58:46 -0600 + +hollywood (1.19-0ubuntu1) focal; urgency=medium + + * bin/hollywood, debian/control, debian/copyright, lib/hollywood/apg, + share/hollywood/mi.mp4, share/man/man1/hollywood.1, TODO: + - Bug #944275: remove last remnants of old sound/video plugin + + -- Dustin Kirkland Thu, 07 Nov 2019 07:34:11 -0600 + +hollywood (1.18-0ubuntu1) eoan; urgency=medium * bin/wallstreet, debian/control, lib/wallstreet/newsbeuter => lib/wallstreet/newsboat, lib/wallstreet/ticker, lib/wallstreet/w3m, @@ -16,7 +37,7 @@ * debian/changelog: - merge in Debian maintainer changelogs, here upstream into this one - -- Dustin Kirkland Wed, 12 Jun 2019 19:00:15 -0500 + -- Dustin Kirkland Wed, 12 Jun 2019 19:07:14 -0500 hollywood (1.17-0ubuntu1) eoan; urgency=medium diff -Nru hollywood-1.18/debian/changelog hollywood-1.20/debian/changelog --- hollywood-1.18/debian/changelog 2019-06-13 00:00:15.000000000 +0000 +++ hollywood-1.20/debian/changelog 2019-11-29 20:58:46.000000000 +0000 @@ -1,4 +1,25 @@ -hollywood (1.18-0ubuntu1~eoan) eoan; urgency=medium +hollywood (1.20-0ubuntu1~eoan) eoan; urgency=medium + + * lib/hollywood/mplayer, share/hollywood/soundwave.mp4: + - added sound wave video (no sound) + - start at a random point, between 0 and 99 seconds into the video + - speed it up 100x + * debian/control: + - depends, rather than recommends + * debian/changelog: + - fix email + + -- Dustin Kirkland Fri, 29 Nov 2019 14:58:46 -0600 + +hollywood (1.19-0ubuntu1) focal; urgency=medium + + * bin/hollywood, debian/control, debian/copyright, lib/hollywood/apg, + share/hollywood/mi.mp4, share/man/man1/hollywood.1, TODO: + - Bug #944275: remove last remnants of old sound/video plugin + + -- Dustin Kirkland Thu, 07 Nov 2019 07:34:11 -0600 + +hollywood (1.18-0ubuntu1) eoan; urgency=medium * bin/wallstreet, debian/control, lib/wallstreet/newsbeuter => lib/wallstreet/newsboat, lib/wallstreet/ticker, lib/wallstreet/w3m, @@ -16,7 +37,7 @@ * debian/changelog: - merge in Debian maintainer changelogs, here upstream into this one - -- Dustin Kirkland Wed, 12 Jun 2019 19:00:15 -0500 + -- Dustin Kirkland Wed, 12 Jun 2019 19:07:14 -0500 hollywood (1.17-0ubuntu1) eoan; urgency=medium diff -Nru hollywood-1.18/debian/control hollywood-1.20/debian/control --- hollywood-1.18/debian/control 2019-06-13 00:00:15.000000000 +0000 +++ hollywood-1.20/debian/control 2019-11-29 20:57:42.000000000 +0000 @@ -25,10 +25,7 @@ moreutils, openssh-client, speedometer, - tmux, tree, -Suggests: - mplayer Description: fill your console with Hollywood melodrama technobabble This utility will split your console into a multiple panes of genuine technobabble, perfectly suitable for any Hollywood geek melodrama. diff -Nru hollywood-1.18/debian/copyright hollywood-1.20/debian/copyright --- hollywood-1.18/debian/copyright 2019-06-12 04:28:36.000000000 +0000 +++ hollywood-1.20/debian/copyright 2019-11-07 13:29:22.000000000 +0000 @@ -7,14 +7,6 @@ Copyright: 2014 Dustin Kirkland License: Apache-2.0 -Files: share/hollywood/mi.mp4 -Copyright: 2014 Dustin Kirkland -License: CC0-1.0 - Licensed under the Creative Comons Zero 1.0 Universal (CC0-1.0); - Public Domain Dedication. - You may obtain a copy of the License at: - https://creativecommons.org/publicdomain/zero/1.0/ - License: Apache-2.0 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff -Nru hollywood-1.18/lib/hollywood/apg hollywood-1.20/lib/hollywood/apg --- hollywood-1.18/lib/hollywood/apg 2019-06-12 04:07:01.000000000 +0000 +++ hollywood-1.20/lib/hollywood/apg 2019-07-17 15:21:02.000000000 +0000 @@ -18,6 +18,6 @@ trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT while true; do - apg -qlt -c /dev/urandom -n 1 | ccze -A -c default=$(printf "red\ngreen\nyellow\nblue\nmagenta\ncyan" | sort -R | head -n1) + apg -qlt -c /dev/urandom -n 1 -m 4 | ccze -A -c default=$(printf "red\ngreen\nyellow\nblue\nmagenta\ncyan" | sort -R | head -n1) sleep 0.2 done diff -Nru hollywood-1.18/lib/hollywood/mplayer hollywood-1.20/lib/hollywood/mplayer --- hollywood-1.18/lib/hollywood/mplayer 2019-06-12 04:07:01.000000000 +0000 +++ hollywood-1.20/lib/hollywood/mplayer 2019-11-29 20:53:37.000000000 +0000 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright 2014 Dustin Kirkland # @@ -18,4 +18,4 @@ trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT PKG=hollywood dir="$(dirname $0)/../../share/$PKG" -DISPLAY= mplayer -vo caca -loop 0 $MPLAYER_OPTS $dir/mi.mp4 +DISPLAY= mplayer -vo caca -loop 0 -ss $((RANDOM % 100)) -speed 100 $MPLAYER_OPTS $dir/soundwave.mp4 Binary files /tmp/tmpxlZ2UG/ZLIkO8vtVR/hollywood-1.18/share/hollywood/mi.mp4 and /tmp/tmpxlZ2UG/7_tKiO5l5F/hollywood-1.20/share/hollywood/mi.mp4 differ Binary files /tmp/tmpxlZ2UG/ZLIkO8vtVR/hollywood-1.18/share/hollywood/soundwave.mp4 and /tmp/tmpxlZ2UG/7_tKiO5l5F/hollywood-1.20/share/hollywood/soundwave.mp4 differ diff -Nru hollywood-1.18/share/man/man1/hollywood.1 hollywood-1.20/share/man/man1/hollywood.1 --- hollywood-1.18/share/man/man1/hollywood.1 2019-06-12 04:35:46.000000000 +0000 +++ hollywood-1.20/share/man/man1/hollywood.1 2019-11-07 13:31:14.000000000 +0000 @@ -3,13 +3,12 @@ hollywood \- fill your console with Hollywood melodrama technobabble .SH SYNOPSIS -\fBhollywood\fP [-s|--splits SPLITS] [-d|--delay DELAY] [--sound] +\fBhollywood\fP [-s|--splits SPLITS] [-d|--delay DELAY] .SH OPTIONS -d|--delay DELAY The delay in seconds before rearranging splits (default=10s) -s|--splits SPLITS The number of splits to divide your screen - --sound Enable the theme song (default sound=off) .SH DESCRIPTION diff -Nru hollywood-1.18/TODO hollywood-1.20/TODO --- hollywood-1.18/TODO 2016-05-10 00:15:48.000000000 +0000 +++ hollywood-1.20/TODO 2019-11-07 13:29:41.000000000 +0000 @@ -3,4 +3,3 @@ (many ncurses programs will complain if the window is too small) * factorize 'trap' commands ? * don't depend on $RANDOM (so that we can use $SHELL) -* play the mi.mp4 file on a loop