svn commit: r545773 - in head/multimedia/w_scan2: . files

Rene Ladan rene at FreeBSD.org
Sat Aug 22 16:08:13 UTC 2020 

Author: rene
Date: Sat Aug 22 16:08:11 2020
New Revision: 545773
URL: https://svnweb.freebsd.org/changeset/ports/545773

Log:
  multimedia/w_scan2: add working fork of expiring multimedia/w_scan
  
  w_scan2 is a small channel scan tool which generates ATSC, DVB-C,
  DVB-S/S2 and DVB-T/T2 channels.conf files.
  
  It's based on the old "scan" tool from linuxtv-dvb-apps-1.1.0. The
  differences are:
  * no initial tuning data needed, because scanning without this data
    is exactly what a scan tool like this should do.
  * it detects automatically which DVB/ATSC card to use.
  * much more output formats, interfacing to other dtv software.
  
  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. More details here:
    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
  
  WWW: https://github.com/stefantalpalaru/w_scan2
  
  Suggested by:	hselasky

Added:
  head/multimedia/w_scan2/
     - copied from r545763, head/multimedia/w_scan/
  head/multimedia/w_scan2/files/patch-src_char-coding.c
     - copied, changed from r545763, head/multimedia/w_scan/files/patch-char-coding.c
  head/multimedia/w_scan2/files/patch-src_si__types.h
     - copied, changed from r545763, head/multimedia/w_scan/files/patch-si__types.h
Deleted:
  head/multimedia/w_scan2/files/patch-char-coding.c
  head/multimedia/w_scan2/files/patch-si__types.h
Modified:
  head/multimedia/w_scan2/Makefile
  head/multimedia/w_scan2/distinfo
  head/multimedia/w_scan2/pkg-descr

Modified: head/multimedia/w_scan2/Makefile
==============================================================================
--- head/multimedia/w_scan/Makefile	Sat Aug 22 12:37:27 2020	(r545763)
+++ head/multimedia/w_scan2/Makefile	Sat Aug 22 16:08:11 2020	(r545773)
@@ -1,11 +1,9 @@
 # Created by: Juergen Lock <nox at FreeBSD.org>
 # $FreeBSD$
 
-PORTNAME=	w_scan
-PORTVERSION=	20170107
-PORTREVISION=	2
+PORTNAME=	w_scan2
+PORTVERSION=	1.0.9
 CATEGORIES=	multimedia
-MASTER_SITES=	http://wirbel.htpc-forum.de/w_scan/
 
 MAINTAINER=	rene at FreeBSD.org
 COMMENT=	Perform frequency scans for DVB and ATSC transmissions
@@ -13,18 +11,16 @@ COMMENT=	Perform frequency scans for DVB and ATSC tran
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-DEPRECATED=	No longer developed since September 2017, MASTER_SITES gone
-EXPIRATION_DATE=2020-09-01
-
 BUILD_DEPENDS=	v4l_compat>=1.0.20120501:multimedia/v4l_compat
 
 GNU_CONFIGURE=	yes
-USES=		dos2unix gettext iconv localbase tar:bzip2
-DOS2UNIX_GLOB=	*.c *.h
-CFLAGS+=	-fcommon
+USES=		autoreconf gettext iconv localbase
 LDFLAGS+=	${ICONV_LIB}
 
-PORTDOCS=	COPYING ChangeLog README
+USE_GITHUB=	yes
+GH_ACCOUNT=	stefantalpalaru
+
+PORTDOCS=	COPYING ChangeLog README.md
 PLIST_FILES=	bin/${PORTNAME} \
 		man/man1/${PORTNAME}.1.gz
 

Modified: head/multimedia/w_scan2/distinfo
==============================================================================
--- head/multimedia/w_scan/distinfo	Sat Aug 22 12:37:27 2020	(r545763)
+++ head/multimedia/w_scan2/distinfo	Sat Aug 22 16:08:11 2020	(r545773)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499198536
-SHA256 (w_scan-20170107.tar.bz2) = 38e0f38a7bf06cff6d6ea01652ad4ee60da2cb0e937360468f936da785b46ffe
-SIZE (w_scan-20170107.tar.bz2) = 245517
+TIMESTAMP = 1598103820
+SHA256 (stefantalpalaru-w_scan2-1.0.9_GH0.tar.gz) = a2718e922302297f845961af54e615852be4f575bea63f3a90ed19a04d955f36
+SIZE (stefantalpalaru-w_scan2-1.0.9_GH0.tar.gz) = 232486

Copied and modified: head/multimedia/w_scan2/files/patch-src_char-coding.c (from r545763, head/multimedia/w_scan/files/patch-char-coding.c)
==============================================================================
--- head/multimedia/w_scan/files/patch-char-coding.c	Sat Aug 22 12:37:27 2020	(r545763, copy source)
+++ head/multimedia/w_scan2/files/patch-src_char-coding.c	Sat Aug 22 16:08:11 2020	(r545773)
@@ -1,35 +1,35 @@
---- char-coding.c.orig	2016-06-20 13:13:56 UTC
-+++ char-coding.c
-@@ -250,6 +250,10 @@ void char_coding(char **inbuf, size_t * 
-      // Fallback method: copy all printable chars from *inbuf to *outbuf.
-      size_t i;
-      size_t pos = 0;
+--- src/char-coding.c.orig	2020-08-22 13:49:25 UTC
++++ src/char-coding.c
+@@ -340,14 +340,31 @@ void char_coding(char **inbuf, size_t * inbytesleft, c
+ 		// Fallback method: copy all printable chars from *inbuf to *outbuf.
+ 		size_t i;
+ 		size_t pos = 0;
+-
 +#ifdef __FreeBSD__
-+     int to_utf = user_charset_id < iconv_codes_count() &&
-+         !strncmp(iconv_codes[user_charset_id], "UTF", sizeof "UTF" - 1);
++		int to_utf = user_charset_id < iconv_codes_count() &&
++		    !strncmp(iconv_codes[user_charset_id], "UTF", sizeof "UTF" - 1);
 +#endif
- 
-      for (i = 0; i < nsrc; i++) {  
-          switch((uint8_t) *(psrc + i)) {
-@@ -257,7 +261,21 @@ void char_coding(char **inbuf, size_t * 
-                //case 0xA0 ... 0xFF:
-                     // printable chars ISO-6937-2
-                     // Figure A.1: Character code table 00 - Latin alphabet
+ 		for (i = 0; i < nsrc; i++) {
+ 			switch ((uint8_t) * (psrc + i)) {
+ 				//case 0x20 ... 0x7E:
+ 				//case 0xA0 ... 0xFF:
+ 				// printable chars ISO-6937-2
+ 				// Figure A.1: Character code table 00 - Latin alphabet
 +#ifdef __FreeBSD__
-+               case 0x80 ... 0xFF:
-+                    // the iconv used on FreeBSD doesn't know about the
-+                    // default DVB charset ISO_6937-2 so we'll end up here
-+                    // for 8-bit chars in channel names that are (usually
-+                    // wrongly) specified as the default charset - and if
-+                    // we are converting to utf those will create invalid
-+                    // encodings.
-+                    if (to_utf)
-+                        continue;
-+                    // FALLTHRU
-+               case 0x01 ... 0x7F:
++			case 0x80 ... 0xFF:
++				// the iconv used on FreeBSD doesn't know about the
++				// default DVB charset ISO-6397-2 so we'll end up here
++				// for 8-bit chars in channel names that are (usually
++				// wrongly) specified as the default charset - and if
++				// we are converting to UTF those will create invalid
++				// encodings.
++				if (to_utf)
++					continue;
++				// FALLTHRU
++			case 0x01 ... 0x7F:
 +#else
-                case 0x01 ... 0xFF: // 20121202: don't touch anything; leave it as it is.
+ 			case 0x01 ... 0xFF:	// 20121202: don't touch anything; leave it as it is.
 +#endif
-                     *(pdest + pos++) = *(psrc + i);
-                default:;
-                }
+ 				*(pdest + pos++) = *(psrc + i);
+ 			default:;
+ 			}

Copied and modified: head/multimedia/w_scan2/files/patch-src_si__types.h (from r545763, head/multimedia/w_scan/files/patch-si__types.h)
==============================================================================
--- head/multimedia/w_scan/files/patch-si__types.h	Sat Aug 22 12:37:27 2020	(r545763, copy source)
+++ head/multimedia/w_scan2/files/patch-src_si__types.h	Sat Aug 22 16:08:11 2020	(r545773)
@@ -1,6 +1,6 @@
---- si_types.h.orig	2020-04-14 20:31:04 UTC
-+++ si_types.h
-@@ -27,6 +27,7 @@
+--- src/si_types.h.orig	2020-08-22 13:49:25 UTC
++++ src/si_types.h
+@@ -23,6 +23,7 @@
  #define __SI_TYPES_H
  
  #include <stdint.h>

Modified: head/multimedia/w_scan2/pkg-descr
==============================================================================
--- head/multimedia/w_scan/pkg-descr	Sat Aug 22 12:37:27 2020	(r545763)
+++ head/multimedia/w_scan2/pkg-descr	Sat Aug 22 16:08:11 2020	(r545773)
@@ -1,7 +1,24 @@
-w_scan is a small channel scan tool for vdr which generates ATSC, DVB-C,
-DVB-S/S2 and DVB-T channels.conf files.
-It's 50% "scan" from linuxtv-dvb-apps-1.1.0, the differences are:
+w_scan2 is a small channel scan tool which generates ATSC, DVB-C,
+DVB-S/S2 and DVB-T/T2 channels.conf files.
 
-- no initial tuning data needed, because scanning without this data is exactly
-  what a scan tool like this should do
-- it detects automatically which DVB/ATSC card to use.
+It's based on the old "scan" tool from linuxtv-dvb-apps-1.1.0. The
+differences are:
+* no initial tuning data needed, because scanning without this data
+  is exactly what a scan tool like this should do.
+* it detects automatically which DVB/ATSC card to use.
+* much more output formats, interfacing to other dtv software.
+
+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. More details here:
+  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
+
+WWW: https://github.com/stefantalpalaru/w_scan2

More information about the svn-ports-all mailing list