multimedia/w_scan2: Updated for version 1.0.15.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 53 insertions, 15 deletions

diff --git a/multimedia/w_scan2/README b/multimedia/w_scan2/README
index cbfb41d4d0..87b85f41ff 100644
--- a/multimedia/w_scan2/README
+++ b/multimedia/w_scan2/README
@@ -12,13 +12,8 @@ The differences are:
 w_scan2 is a fork of the original w_scan
 from https://www.gen2vdr.de/wirbel/w_scan/index2.html
 
-main changes from w_scan to w_scan2
-- keep duplicate transponders by default because a stronger transponder
-  with the same ID might have a higher frequency and be discarded
-  simply because it's scanned later.
-- Also don't replace the current transponder with an advertised one by
-  default. The latter may have a lower signal strength.
-  https://stefantalpalaru.wordpress.com/2016/02/04/scan-all-the-things/
-- The old behaviour can be enabled with -d
-  (--delete-duplicate-transponders).
-- re-enable VHF band III in Europe
+
+adds optional LCN to channel names (channels.conf: mplayer/vdr/xine)
+LCN=yes ./sage.SlackBuild
+so that, if you want the channels sorted by LCN, you can run
+w_scan2 -c IT -X | sort > channels.conf
diff --git a/multimedia/w_scan2/lcn.diff b/multimedia/w_scan2/lcn.diff
new file mode 100644
index 0000000000..6e3529470c
--- /dev/null
+++ b/multimedia/w_scan2/lcn.diff
@@ -0,0 +1,40 @@
+
+--- src/dump-mplayer.c	2024-01-02 01:28:41.000000000 -0000
++++ src/dump-mplayer.c	2024-01-15 16:46:22.194419459 -0000
+@@ -35,7 +35,7 @@
+ {
+ 	int i;
+ 
+-	fprintf(f, "%s:", s->service_name);
++	fprintf(f, "[LCN-%.4d]%s:", s->logical_channel_number, s->service_name);
+ 	xine_dump_dvb_parameters(f, t, flags);
+ 	fprintf(f, ":%i", s->pmt_pid);
+     if (s->video_pid) {
+
+--- src/dump-vdr.c	2024-01-02 01:28:41.000000000 -0000
++++ src/dump-vdr.c	2024-01-15 16:46:19.737419311 -0000
+@@ -558,7 +558,7 @@
+ 
+ 	if (!flags->ca_select && s->scrambled)
+ 		return;
+-	fprintf(f, "%s", s->service_name);
++	fprintf(f, "[LCN-%.4d]%s", s->logical_channel_number, s->service_name);
+ 
+ 	if (flags->dump_provider)
+ 		fprintf(f, ";%s", s->provider_name);
+
+--- src/dump-xine.c	2024-01-02 01:28:41.000000000 -0000
++++ src/dump-xine.c	2024-01-15 16:46:17.076419151 -0000
+@@ -113,10 +113,10 @@
+ {
+ 	if (s->video_pid || s->audio_pid[0]) {
+ 		if (s->provider_name)
+-			fprintf(f, "%s(%s):", s->service_name,
++			fprintf(f, "[LCN-%.4d]%s(%s):", s->logical_channel_number, s->service_name,
+ 				s->provider_name);
+ 		else
+-			fprintf(f, "%s:", s->service_name);
++			fprintf(f, "[LCN-%.4d]%s:", s->logical_channel_number, s->service_name);
+ 		xine_dump_dvb_parameters(f, t, flags);
+ 		fprintf(f, ":%i:%i:%i", s->video_pid,
+ 			s->ac3_pid[0] ? s->ac3_pid[0] : s->audio_pid[0],
diff --git a/multimedia/w_scan2/w_scan2.SlackBuild b/multimedia/w_scan2/w_scan2.SlackBuild
index 3261ff0529..70cef05d8a 100644
--- a/multimedia/w_scan2/w_scan2.SlackBuild
+++ b/multimedia/w_scan2/w_scan2.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=w_scan2
-VERSION=${VERSION:-1.0.14}
+VERSION=${VERSION:-1.0.15}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -71,7 +71,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 
 rm -rf $PRGNAM-$VERSION
-unzip $CWD/$PRGNAM-$VERSION.zip
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 
 chown -R root:root .
@@ -81,6 +81,9 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+# adds optional LCN to channel names (channels.conf: mplayer/vdr/xine)
+[ "${LCN:-no}" != "no" ] && patch -p0 -i $CWD/lcn.diff
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/multimedia/w_scan2/w_scan2.info b/multimedia/w_scan2/w_scan2.info
index bcb7ceb1f5..91379ed098 100644
--- a/multimedia/w_scan2/w_scan2.info
+++ b/multimedia/w_scan2/w_scan2.info
@@ -1,8 +1,8 @@
 PRGNAM="w_scan2"
-VERSION="1.0.14"
+VERSION="1.0.15"
 HOMEPAGE="https://github.com/stefantalpalaru/w_scan2/"
-DOWNLOAD="https://github.com/stefantalpalaru/w_scan2/archive/1.0.14/w_scan2-1.0.14.zip"
-MD5SUM="11df05aa66da0240e62944e02940ed99"
+DOWNLOAD="https://github.com/stefantalpalaru/w_scan2/archive/1.0.15/w_scan2-1.0.15.tar.gz"
+MD5SUM="e046d7ac4e75d5ac4628627e795fe269"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""