From f083b4a06f3e71e6ef184bc90bc069ba1fef8aee Mon Sep 17 00:00:00 2001 From: Muhammad Moinur Rahman Date: Tue, 20 May 2025 07:03:49 +0200 Subject: [PATCH] multimedia/xawtv: Remove port Personal/recreational applications, not aligned with broad server focus --- .portsignore | 1 + multimedia/Makefile | 1 - multimedia/xawtv/Makefile | 95 ----------- multimedia/xawtv/distinfo | 3 - multimedia/xawtv/files/patch-Makefile.in | 28 ---- .../xawtv/files/patch-common__vbi-data.c | 16 -- multimedia/xawtv/files/patch-configure | 55 ------- .../xawtv/files/patch-console__fbtools.c | 15 -- .../xawtv/files/patch-console__scantv.c | 14 -- .../xawtv/files/patch-console__showqt.c | 18 --- .../xawtv/files/patch-console__vbi-tty.c | 152 ------------------ .../patch-libng__contrib-plugins__Subdir.mk | 11 -- .../files/patch-libng__plugins__drv0-bsd.c | 131 --------------- .../xawtv/files/patch-libng_plugins_Subdir.mk | 13 -- .../xawtv/files/patch-scripts-subtitles | 17 -- multimedia/xawtv/files/patch-x11__Subdir.mk | 28 ---- multimedia/xawtv/pkg-descr | 2 - multimedia/xawtv/pkg-plist | 100 ------------ 18 files changed, 1 insertion(+), 699 deletions(-) delete mode 100644 multimedia/xawtv/Makefile delete mode 100644 multimedia/xawtv/distinfo delete mode 100644 multimedia/xawtv/files/patch-Makefile.in delete mode 100644 multimedia/xawtv/files/patch-common__vbi-data.c delete mode 100644 multimedia/xawtv/files/patch-configure delete mode 100644 multimedia/xawtv/files/patch-console__fbtools.c delete mode 100644 multimedia/xawtv/files/patch-console__scantv.c delete mode 100644 multimedia/xawtv/files/patch-console__showqt.c delete mode 100644 multimedia/xawtv/files/patch-console__vbi-tty.c delete mode 100644 multimedia/xawtv/files/patch-libng__contrib-plugins__Subdir.mk delete mode 100644 multimedia/xawtv/files/patch-libng__plugins__drv0-bsd.c delete mode 100644 multimedia/xawtv/files/patch-libng_plugins_Subdir.mk delete mode 100644 multimedia/xawtv/files/patch-scripts-subtitles delete mode 100644 multimedia/xawtv/files/patch-x11__Subdir.mk delete mode 100644 multimedia/xawtv/pkg-descr delete mode 100644 multimedia/xawtv/pkg-plist diff --git a/.portsignore b/.portsignore index 548f3ea4dfbf..03417aea7b68 100644 --- a/.portsignore +++ b/.portsignore @@ -5951,6 +5951,7 @@ multimedia/vlc multimedia/webcamoid multimedia/winff multimedia/wlrobs +multimedia/xawtv multimedia/xfce4-parole multimedia/zart net-im/beebeep diff --git a/multimedia/Makefile b/multimedia/Makefile index 0466e36c5f7d..a727879f305a 100644 --- a/multimedia/Makefile +++ b/multimedia/Makefile @@ -260,7 +260,6 @@ SUBDIR += x264 SUBDIR += x265 SUBDIR += xanim - SUBDIR += xawtv SUBDIR += xine SUBDIR += xporthdmv SUBDIR += xvid diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile deleted file mode 100644 index 3b19f696f96f..000000000000 --- a/multimedia/xawtv/Makefile +++ /dev/null @@ -1,95 +0,0 @@ -PORTNAME= xawtv -PORTVERSION= 3.107 -PORTREVISION= 2 -CATEGORIES= multimedia -MASTER_SITES= http://linuxtv.org/downloads/xawtv/ - -MAINTAINER= oliver@FreeBSD.org -COMMENT= TV viewing application and a few TV utilities -WWW= https://linuxtv.org/ - -LICENSE= GPLv2 -LICENSE_FILE= ${WRKSRC}/COPYING - -ONLY_FOR_ARCHS= amd64 armv7 i386 powerpc powerpc64 powerpc64le - -BUILD_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:x11-fonts/tv-fonts -RUN_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:x11-fonts/tv-fonts -LIB_DEPENDS= libpng.so:graphics/png - -USES= cpe gmake iconv jpeg motif ncurses perl5 tar:bzip2 pkgconfig xorg - -CPE_VENDOR= linuxtv - -OPTIONS_DEFINE= AALIB DV ZVBI -OPTIONS_DEFINE_i386= MMX -OPTIONS_DEFAULT= AALIB -OPTIONS_SUB= yes - -ZVBI_DESC= Enable libzvbi support - -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX= ${PREFIX}/share -USE_XORG= x11 xaw -CPPFLAGS+= -I${WRKSRC}/common -LIBS+= -L${LOCALBASE}/lib -MAKE_ENV= verbose=yes -USE_LDCONFIG= yes - -FILES_LIBJPEG= console/Subdir.mk x11/Subdir.mk libng/plugins/Subdir.mk - -CONFIGURE_ARGS= --enable-alsa=no --enable-quicktime=no --enable-gl=no - -.include - -.if ${PORT_OPTIONS:MAALIB} -CONFIGURE_ARGS+=--enable-aa -LIB_DEPENDS+= libaa.so:graphics/aalib -.else -CONFIGURE_ARGS+=--disable-aa -.endif - -.if ${PORT_OPTIONS:MZVBI} -LIB_DEPENDS+= libzvbi.so:devel/libzvbi -CONFIGURE_ARGS+=--enable-zvbi -.else -CONFIGURE_ARGS+=--enable-zvbi=no -.endif - -.if ${PORT_OPTIONS:MDV} -LIB_DEPENDS+= libdv.so:multimedia/libdv -CONFIGURE_ARGS+=--enable-dv -.else -CONFIGURE_ARGS+=--enable-dv=no -.endif - -.if ${PORT_OPTIONS:MMMX} -CONFIGURE_ARGS+=--enable-mmx -CFLAGS+= -DMMX=1 -.endif - -PLIST_SUB+= X11PREFIX=${LOCALBASE} - -post-patch: - @${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g; \ - s|/usr/local|${LOCALBASE}|g; \ - s|LIBV4L="yes"|LIBV4L="no"|g; \ - s|-lunicode|${ICONV_LIB} &|g' \ - ${WRKSRC}/configure - - @${REINPLACE_CMD} -e 's|-ldl||g' \ - ${WRKSRC}/console/Subdir.mk \ - ${WRKSRC}/x11/Subdir.mk - - @${REINPLACE_CMD} -e 's|linuxyesyes|bsdyesyes|g' \ - ${WRKSRC}/x11/Subdir.mk - - @${REINPLACE_CMD} -e 's|\(@CFLAGS@.*\)\$$(LIB_FLAGS) |\$$(LIB_FLAGS) \1|g; \ - s|-Llibng||g' \ - ${WRKSRC}/Makefile.in - -.for i in ${FILES_LIBJPEG} - @${REINPLACE_CMD} -e "s|-ljpeg|-L${LOCALBASE}/lib -ljpeg|g" ${WRKSRC}/$i -.endfor - -.include diff --git a/multimedia/xawtv/distinfo b/multimedia/xawtv/distinfo deleted file mode 100644 index a93afad38b9c..000000000000 --- a/multimedia/xawtv/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1607807528 -SHA256 (xawtv-3.107.tar.bz2) = c53bea63c155e5bc52821e1772cdae2da06a948be45544c7015277a02207b714 -SIZE (xawtv-3.107.tar.bz2) = 513384 diff --git a/multimedia/xawtv/files/patch-Makefile.in b/multimedia/xawtv/files/patch-Makefile.in deleted file mode 100644 index 27d0704bce9a..000000000000 --- a/multimedia/xawtv/files/patch-Makefile.in +++ /dev/null @@ -1,28 +0,0 @@ ---- Makefile.in.orig 2020-05-15 23:32:25 UTC -+++ Makefile.in -@@ -69,24 +69,11 @@ LIBV4L := @LIBV4L@ - FOUND_EXPLAIN := @FOUND_EXPLAIN@ - - # build final cflags --CFLAGS := @CFLAGS@ --CFLAGS += $(WARN_FLAGS) --CFLAGS += $(LFS_FLAGS) --CFLAGS += $(X11_FLAGS) --CFLAGS += $(LIB_FLAGS) --CFLAGS += $(QT_FLAGS) --CFLAGS += -DCONFIGFILE='"$(config)"' --CFLAGS += -DLIBDIR='"$(libdir)"' --CFLAGS += -DDATADIR='"$(datadir)"' --CFLAGS += -DVERSION='"$(VERSION)"' -+CFLAGS += @CFLAGS@ $(WARN_FLAGS) $(LFS_FLAGS) $(X11_FLAGS) $(LIB_FLAGS) $(QT_FLAGS) -DCONFIGFILE='"$(config)"' -DLIBDIR='"$(libdir)"' -DDATADIR='"$(datadir)"' -DVERSION='"$(VERSION)"' -fPIC - CXXFLAGS := $(CFLAGS) - - # for gcc3 - #CFLAGS += -std-gnu99 -- --# shared objects need -fPIC --%.so : CFLAGS += -fPIC --%.so : CXXFLAGS += -fPIC - - # libraries - LDLIBS := @LDLIBS@ diff --git a/multimedia/xawtv/files/patch-common__vbi-data.c b/multimedia/xawtv/files/patch-common__vbi-data.c deleted file mode 100644 index ce6027182d1e..000000000000 --- a/multimedia/xawtv/files/patch-common__vbi-data.c +++ /dev/null @@ -1,16 +0,0 @@ ---- common/vbi-data.c.orig 2020-05-15 23:32:25 UTC -+++ common/vbi-data.c -@@ -86,8 +86,11 @@ vbi_open(char *dev, int debug, int sim) - vbi->cap = vbi_capture_v4l2_new(dev,16,&services,-1,&vbi->err,debug); - if (NULL == vbi->cap) { - vbi->cap = vbi_capture_v4l_new(dev,16,&services,-1,&vbi->err,debug); -- if (NULL == vbi->cap) -- goto oops; -+ if (NULL == vbi->cap) { -+ vbi->cap = vbi_capture_bktr_new(dev,16,&services,-1,&vbi->err,debug); -+ if (NULL == vbi->cap) -+ goto oops; -+ } - } - vbi->par = vbi_capture_parameters(vbi->cap); - vbi->fd = vbi_capture_fd(vbi->cap); diff --git a/multimedia/xawtv/files/patch-configure b/multimedia/xawtv/files/patch-configure deleted file mode 100644 index 3b5a3d09664e..000000000000 --- a/multimedia/xawtv/files/patch-configure +++ /dev/null @@ -1,55 +0,0 @@ ---- configure.orig 2020-05-15 23:35:58 UTC -+++ configure -@@ -5296,7 +5296,7 @@ if ${ac_cv_lib_zvbi_vbi_capture_fd+:} false; then : - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lzvbi $LIBPTHREAD $LIBS" -+LIBS="-lunicode -lzvbi $LIBPTHREAD $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -5329,7 +5329,7 @@ $as_echo "$ac_cv_lib_zvbi_vbi_capture_fd" >&6; } - if test "x$ac_cv_lib_zvbi_vbi_capture_fd" = xyes; then : - - $as_echo "#define HAVE_ZVBI 1" >>confdefs.h -- FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lpthread -lm -lpng -lz" -+ FOUND_ZVBI="yes"; LIBZVBI="-lzvbi -lunicode -lpthread -lm -lpng -lz" - fi - - else -@@ -5431,7 +5431,7 @@ $as_echo "$ac_cv_lib_dv_dv_decoder_new" >&6; } - if test "x$ac_cv_lib_dv_dv_decoder_new" = xyes; then : - - $as_echo "#define HAVE_DV 1" >>confdefs.h -- FOUND_DV="yes"; LIBDV="-ldv -lm" -+ FOUND_DV="yes"; LIBDV="-ldv -lm $LIBPTHREAD $LIBS" - fi - - else -@@ -5966,23 +5966,14 @@ VERSION="`head -1 $srcdir/Changes`" - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 config directory" >&5 - $as_echo_n "checking for X11 config directory... " >&6; } --x11conf=/usr/lib/X11 --if test -d /etc/X11; then -- x11conf=/etc/X11 --fi -+x11conf=/etc/X11 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $x11conf" >&5 - $as_echo "$x11conf" >&6; } - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X11 app-defaults directory" >&5 - $as_echo_n "checking for X11 app-defaults directory... " >&6; } --resdir=/usr/lib/X11 --if test -d /usr/share/X11/app-defaults; then -- resdir=/usr/share/X11 --fi --if test -d /etc/X11/app-defaults; then -- resdir=/etc/X11 --fi -+resdir=/usr/X11R6/lib/X11 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $resdir/app-defaults" >&5 - $as_echo "$resdir/app-defaults" >&6; } - diff --git a/multimedia/xawtv/files/patch-console__fbtools.c b/multimedia/xawtv/files/patch-console__fbtools.c deleted file mode 100644 index 8d7ffe337009..000000000000 --- a/multimedia/xawtv/files/patch-console__fbtools.c +++ /dev/null @@ -1,15 +0,0 @@ ---- console/fbtools.c.orig 2020-05-15 23:32:25 UTC -+++ console/fbtools.c -@@ -2,6 +2,7 @@ - * some generic framebuffer device stuff - * - */ -+#ifdef WITH_LINUX_FB_H - - #include - #include -@@ -523,3 +524,4 @@ fb_catch_exit_signals(void) - fprintf(stderr,"Oops: %s\n",sys_siglist[termsig]); - exit(42); - } -+#endif diff --git a/multimedia/xawtv/files/patch-console__scantv.c b/multimedia/xawtv/files/patch-console__scantv.c deleted file mode 100644 index 26c2a0abc3a7..000000000000 --- a/multimedia/xawtv/files/patch-console__scantv.c +++ /dev/null @@ -1,14 +0,0 @@ ---- console/scantv.c.orig 2020-05-15 23:32:25 UTC -+++ console/scantv.c -@@ -261,7 +261,11 @@ main(int argc, char **argv) - fprintf(stderr,"no station\n"); - continue; - } -+#ifdef __FreeBSD__ /* Actually it won't work for FreeBSD... */ -+ name = NULL; -+#else - name = get_vbi_name(vbi); -+#endif - fprintf(stderr, "%s\n", name ? name : "???"); - if (NULL == name) { - sprintf(dummy,"unknown (%s)",chanlist[i].name); diff --git a/multimedia/xawtv/files/patch-console__showqt.c b/multimedia/xawtv/files/patch-console__showqt.c deleted file mode 100644 index e357719a8d41..000000000000 --- a/multimedia/xawtv/files/patch-console__showqt.c +++ /dev/null @@ -1,18 +0,0 @@ ---- console/showqt.c.orig 2020-05-15 23:32:25 UTC -+++ console/showqt.c -@@ -16,6 +16,15 @@ - # define PRIx64 "llx" - #endif - -+#if !defined(PRId64) -+#define PRId64 "lld" -+#endif -+ -+#if !defined(PRIx64) -+#define PRIx64 "llX" -+#endif -+ -+ - #if BYTE_ORDER == LITTLE_ENDIAN - # define SWAP2(x) ((((uint16_t)x>>8) & (uint16_t)0x00ff) |\ - (((uint16_t)x<<8) & (uint16_t)0xff00)) diff --git a/multimedia/xawtv/files/patch-console__vbi-tty.c b/multimedia/xawtv/files/patch-console__vbi-tty.c deleted file mode 100644 index f156032d7902..000000000000 --- a/multimedia/xawtv/files/patch-console__vbi-tty.c +++ /dev/null @@ -1,152 +0,0 @@ ---- console/vbi-tty.c.orig 2020-05-15 23:32:25 UTC -+++ console/vbi-tty.c -@@ -19,7 +19,7 @@ - #include - #include - --#include -+/*#include */ - - #include "vbi-data.h" - #include "vbi-tty.h" -@@ -65,7 +65,7 @@ static void tty_goto(int x, int y) - } - - /* --------------------------------------------------------------------- */ -- -+#ifdef WITH_LINUX_FB_H - static int have_fb = 0; - static int fb_fmt = VBI_PIXFMT_RGBA32_LE; - static int switch_last; -@@ -74,7 +74,7 @@ static void fb_clear(void) - { - fb_memset(fb_mem+fb_mem_offset,0,fb_fix.smem_len); - } -- -+#endif - /* --------------------------------------------------------------------- */ - - struct vbi_tty { -@@ -133,6 +133,7 @@ vbi_render_page(struct vbi_tty *tty) - vbi_fetch_vt_page(tty->vbi->dec,&tty->pg,tty->pgno,tty->subno, - VBI_WST_LEVEL_1p5,25,1); - vbi_fix_head(tty,tty->pg.text); -+#ifdef WITH_LINUX_FB_H - if (have_fb) { - vbi_draw_vt_page_region(&tty->pg, fb_fmt, - fb_mem + fb_mem_offset, -@@ -142,13 +143,16 @@ vbi_render_page(struct vbi_tty *tty) - 0,1); - - } else { -+#endif - len = vbi_export_txt(data,nl_langinfo(CODESET),25*41*8, - &tty->pg,&vbi_fullrect,VBI_ANSICOLOR); - tty_goto(0,0); - fwrite(data,len,1,stderr); - tty_goto(42,0); - free(data); -+#ifdef WITH_LINUX_FB_H - } -+#endif - } - - static void -@@ -169,6 +173,7 @@ vbi_render_head(struct vbi_tty *tty, int pgno, int sub - vbi_fetch_vt_page(tty->vbi->dec,&pg,pgno,subno, - VBI_WST_LEVEL_1p5,1,1); - vbi_fix_head(tty,pg.text); -+#ifdef WITH_LINUX_FB_H - if (have_fb) { - vbi_draw_vt_page_region(&pg, fb_fmt, - fb_mem + fb_mem_offset, -@@ -177,13 +182,16 @@ vbi_render_head(struct vbi_tty *tty, int pgno, int sub - pg.columns, 1, - 0,1); - } else { -+#endif - len = vbi_export_txt(data,nl_langinfo(CODESET),41*8, - &pg,&head,VBI_ANSICOLOR); - tty_goto(0,0); - fwrite(data,len,1,stderr); - tty_goto(42,0); - free(data); -+#ifdef WITH_LINUX_FB_H - } -+#endif - } - - static void -@@ -234,7 +242,7 @@ void vbi_tty(char *device, int debug, int sim) - vbi = vbi_open(device,debug,sim); - if (NULL == vbi) - exit(1); -- -+#ifdef WITH_LINUX_FB_H - if (0 /* 0 == fb_probe() */ ) { - have_fb = 1; - fb_init(NULL,NULL,0); -@@ -242,14 +250,21 @@ void vbi_tty(char *device, int debug, int sim) - fb_switch_init(); - switch_last = fb_switch_state; - } else { -+#endif - if (-1 != ioctl(0,TIOCGWINSZ,&win) && win.ws_row < 26) { - fprintf(stderr,"Terminal too small (need 26 rows, have %d)\n", - win.ws_row); - exit(1); - } -+#ifdef WITH_LINUX_FB_H - } -+#endif - tty_raw(); -+#ifdef WITH_LINUX_FB_H - have_fb ? fb_clear() : tty_clear(); -+#else -+ tty_clear(); -+#endif - - tty = malloc(sizeof(*tty)); - memset(tty,0,sizeof(*tty)); -@@ -266,14 +281,18 @@ void vbi_tty(char *device, int debug, int sim) - rc = select(vbi->fd+1,&set,NULL,NULL,&tv); - if (-1 == rc) { - tty_restore(); -+#ifdef WITH_LINUX_FB_H - if (have_fb) - fb_cleanup(); -+#endif - perror("select"); - exit(1); - } - if (0 == rc) { -+#ifdef WITH_LINUX_FB_H - if (have_fb) - fb_cleanup(); -+#endif - tty_restore(); - fprintf(stderr,"oops: timeout\n"); - exit(1); -@@ -291,7 +310,11 @@ void vbi_tty(char *device, int debug, int sim) - break; - case 'L' & 0x1f: - /* refresh */ -+#ifdef WITH_LINUX_FB_H - have_fb ? fb_clear() : tty_clear(); -+#else -+ tty_clear(); -+#endif - vbi_render_page(tty); - break; - case 'i': -@@ -341,8 +364,10 @@ void vbi_tty(char *device, int debug, int sim) - vbi_hasdata(vbi); - } - } -+#ifdef WITH_LINUX_FB_H - if (have_fb) - fb_cleanup(); -+#endif - tty_goto(0,0); - tty_restore(); - } diff --git a/multimedia/xawtv/files/patch-libng__contrib-plugins__Subdir.mk b/multimedia/xawtv/files/patch-libng__contrib-plugins__Subdir.mk deleted file mode 100644 index 99675dcd4118..000000000000 --- a/multimedia/xawtv/files/patch-libng__contrib-plugins__Subdir.mk +++ /dev/null @@ -1,11 +0,0 @@ ---- libng/contrib-plugins/Subdir.mk.orig 2020-05-15 23:32:25 UTC -+++ libng/contrib-plugins/Subdir.mk -@@ -18,7 +18,7 @@ libng/contrib-plugins/snd-alsa.so : LDLIBS := $(ALSA_L - - # linear-blend has mmx support ... - ifeq ($(USE_MMX),yes) --libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1 -+#libng/contrib-plugins/linear-blend.so : CFLAGS += -DMMX=1 - endif - - # global targets diff --git a/multimedia/xawtv/files/patch-libng__plugins__drv0-bsd.c b/multimedia/xawtv/files/patch-libng__plugins__drv0-bsd.c deleted file mode 100644 index 84e15701f3c7..000000000000 --- a/multimedia/xawtv/files/patch-libng__plugins__drv0-bsd.c +++ /dev/null @@ -1,131 +0,0 @@ ---- libng/plugins/drv0-bsd.c.orig 2020-05-15 23:32:25 UTC -+++ libng/plugins/drv0-bsd.c -@@ -23,10 +23,12 @@ - - #ifdef HAVE_DEV_IC_BT8XX_H - # include --#endif --#ifdef HAVE_MACHINE_IOCTL_BT848_H -+#elif defined(HAVE_MACHINE_IOCTL_BT848_H) - # include - # include -+#else -+# include -+# include - #endif - - #include "grab-ng.h" -@@ -129,7 +131,7 @@ static struct STRTAB inputs[] = { - { 3, "CSVIDEO" }, - { -1, NULL } - }; --static int inputs_map[] = { -+static long inputs_map[] = { - METEOR_INPUT_DEV1, - METEOR_INPUT_DEV0, - METEOR_INPUT_DEV_SVIDEO, -@@ -146,7 +148,7 @@ static struct STRTAB norms[] = { - { 6, "RSVD" }, - { -1, NULL } - }; --static int norms_map[] = { -+static long norms_map[] = { - BT848_IFORM_F_NTSCM, - BT848_IFORM_F_NTSCJ, - BT848_IFORM_F_PALBDGHI, -@@ -162,7 +164,7 @@ static struct STRTAB audio[] = { - { 2, "Intern" }, - { -1, NULL } - }; --static int audio_map[] = { -+static long audio_map[] = { - AUDIO_TUNER, - AUDIO_EXTERN, - AUDIO_INTERN, -@@ -244,7 +246,7 @@ static int signal_off = METEOR_SIG_MODE_MASK; - #define PREFIX "bktr: ioctl: " - - static int --xioctl(int fd, int cmd, void *arg) -+xioctl(int fd, unsigned long cmd, void *arg) - { - int rc; - -@@ -298,7 +300,7 @@ xioctl(int fd, int cmd, void *arg) - break; - } - default: -- fprintf(stderr,PREFIX "UNKNOWN(cmd=0x%x)",cmd); -+ fprintf(stderr,PREFIX "UNKNOWN(cmd=0x%x)",(int)cmd); - break; - } - fprintf(stderr,": %s\n",(rc == 0) ? "ok" : strerror(errno)); -@@ -482,7 +484,7 @@ static void bsd_get_min_size(void *handle, int *min_wi - /* ---------------------------------------------------------------------- */ - - static int --bsd_get_range(int id, int *get, int *set) -+bsd_get_range(int id, int *get, long *set) - { - switch (id) { - case ATTR_ID_HUE: -@@ -510,19 +512,20 @@ bsd_get_range(int id, int *get, int *set) - static int bsd_read_attr(struct ng_attribute *attr) - { - struct bsd_handle *h = attr->handle; -- int arg, get, set, i; -+ int get, i; -+ long arg, set; - int value = -1; - - switch (attr->id) { - case ATTR_ID_NORM: - if (-1 != xioctl(h->fd,BT848GFMT,&arg)) -- for (i = 0; i < sizeof(norms_map)/sizeof(int); i++) -+ for (i = 0; i < sizeof(norms_map)/sizeof(*norms_map); i++) - if (arg == norms_map[i]) - value = i; - break; - case ATTR_ID_INPUT: - if (-1 != xioctl(h->fd,METEORGINPUT,&arg)) -- for (i = 0; i < sizeof(inputs_map)/sizeof(int); i++) -+ for (i = 0; i < sizeof(inputs_map)/sizeof(*inputs_map); i++) - if (arg == inputs_map[i]) - value = i; - break; -@@ -540,7 +543,7 @@ static int bsd_read_attr(struct ng_attribute *attr) - break; - case ATTR_ID_COUNT+1: /* AUDIO */ - if (-1 != xioctl(h->tfd, BT848_GAUDIO, &arg)) -- for (i = 0; i < sizeof(audio_map)/sizeof(int); i++) -+ for (i = 0; i < sizeof(audio_map)/sizeof(*audio_map); i++) - if (arg == audio_map[i]) - value = i; - break; -@@ -553,7 +556,8 @@ static int bsd_read_attr(struct ng_attribute *attr) - static void bsd_write_attr(struct ng_attribute *attr, int value) - { - struct bsd_handle *h = attr->handle; -- int arg, get, set; -+ int get; -+ long arg, set; - - switch (attr->id) { - case ATTR_ID_NORM: -@@ -607,7 +611,15 @@ static void bsd_setfreq(void *handle, unsigned long fr - - static int bsd_tuned(void *handle) - { -- return 0; -+ struct bsd_handle *h = handle; -+ int signal; -+ -+ usleep(10000); -+ -+ if (-1 == xioctl(h->tfd, TVTUNER_GETSTATUS, &signal)) -+ return 0; -+ -+ return signal == 106 ? 1 : 0; - } - - /* ---------------------------------------------------------------------- */ diff --git a/multimedia/xawtv/files/patch-libng_plugins_Subdir.mk b/multimedia/xawtv/files/patch-libng_plugins_Subdir.mk deleted file mode 100644 index d5933e852265..000000000000 --- a/multimedia/xawtv/files/patch-libng_plugins_Subdir.mk +++ /dev/null @@ -1,13 +0,0 @@ ---- libng/plugins/Subdir.mk.orig 2020-05-15 23:32:25 UTC -+++ libng/plugins/Subdir.mk -@@ -28,9 +28,7 @@ TARGETS-plugins += \ - libng/plugins/drv0-libv4l.so - endif - ifeq ($(FOUND_OS),bsd) --TARGETS-plugins += \ -- libng/plugins/drv0-bsd.so \ -- libng/plugins/snd-oss.so -+TARGETS-plugins += libng/plugins/snd-oss.so - endif - - GONE-plugins := \ diff --git a/multimedia/xawtv/files/patch-scripts-subtitles b/multimedia/xawtv/files/patch-scripts-subtitles deleted file mode 100644 index f663bf811be9..000000000000 --- a/multimedia/xawtv/files/patch-scripts-subtitles +++ /dev/null @@ -1,17 +0,0 @@ ---- scripts/subtitles.orig 2020-05-15 23:32:25 UTC -+++ scripts/subtitles -@@ -1,4 +1,4 @@ --#! /bin/bash -+#! /bin/sh - # - # display teletext subtitles (PAL) in xawtv - # required: alevt-cap, xawtv-remote -@@ -12,7 +12,7 @@ device="/dev/vbi0" - ########################################################################## - # helpers - --function usage() { -+usage() { - cat <