svn commit: r528632 - in head: audio/tuneradio audio/xmradio multimedia/bsdbktr_tvtune multimedia/camserv multimedia/fxtv multimedia/xawtv multimedia/xawtv/files
Tobias Kortkamp
tobik at FreeBSD.org
Wed Mar 18 07:52:02 UTC 2020
Author: tobik
Date: Wed Mar 18 07:51:58 2020
New Revision: 528632
URL: https://svnweb.freebsd.org/changeset/ports/528632
Log:
Fix fallout of bktr(4) removal
Added:
head/multimedia/xawtv/files/patch-libng_plugins_Subdir.mk (contents, props changed)
Modified:
head/audio/tuneradio/Makefile
head/audio/xmradio/Makefile
head/multimedia/bsdbktr_tvtune/Makefile
head/multimedia/camserv/Makefile
head/multimedia/camserv/pkg-plist
head/multimedia/fxtv/Makefile
head/multimedia/xawtv/Makefile
head/multimedia/xawtv/pkg-plist
Modified: head/audio/tuneradio/Makefile
==============================================================================
--- head/audio/tuneradio/Makefile Wed Mar 18 07:44:56 2020 (r528631)
+++ head/audio/tuneradio/Makefile Wed Mar 18 07:51:58 2020 (r528632)
@@ -10,6 +10,10 @@ MASTER_SITES= http://www.lns.com/papers/tuneradio/ \
MAINTAINER= pozar at lns.com
COMMENT= Command line method of tuning a Brooktree FM tuner card
+.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
+IGNORE= needs bktr(4) which is no longer available on your FreeBSD version
+.endif
+
PLIST_FILES= bin/tuneradio
do-install:
Modified: head/audio/xmradio/Makefile
==============================================================================
--- head/audio/xmradio/Makefile Wed Mar 18 07:44:56 2020 (r528631)
+++ head/audio/xmradio/Makefile Wed Mar 18 07:51:58 2020 (r528632)
@@ -12,6 +12,9 @@ COMMENT= Motif based FM tuner (for use with bktr(4) dr
LICENSE= BSD2CLAUSE
+.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
+IGNORE= needs bktr(4) which is no longer available on your FreeBSD version
+.endif
ONLY_FOR_ARCHS= i386 amd64
USES= imake motif xorg
Modified: head/multimedia/bsdbktr_tvtune/Makefile
==============================================================================
--- head/multimedia/bsdbktr_tvtune/Makefile Wed Mar 18 07:44:56 2020 (r528631)
+++ head/multimedia/bsdbktr_tvtune/Makefile Wed Mar 18 07:51:58 2020 (r528632)
@@ -11,7 +11,11 @@ COMMENT= Console Brooktree (bktr) TV tuner
LICENSE= NONE
+.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
+IGNORE= needs bktr(4) which is no longer available on your FreeBSD version
+.endif
ONLY_FOR_ARCHS= i386
+
PLIST_FILES= bin/bsdbktr_tvtune
WRKSRC= ${WRKDIR}/${PORTNAME}
ALL_TARGET= bsdbktr_tvtune
Modified: head/multimedia/camserv/Makefile
==============================================================================
--- head/multimedia/camserv/Makefile Wed Mar 18 07:44:56 2020 (r528631)
+++ head/multimedia/camserv/Makefile Wed Mar 18 07:51:58 2020 (r528632)
@@ -23,9 +23,14 @@ INSTALL_TARGET= install-strip
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
-OPTIONS_DEFINE= IMLIB2 PIXBUF V4L DOCS
-OPTIONS_DEFAULT=IMLIB2
-OPTIONS_SUB= yes
+OPTIONS_DEFINE= BKTR IMLIB2 PIXBUF V4L DOCS
+OPTIONS_DEFAULT= BKTR IMLIB2
+.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
+OPTIONS_EXCLUDE= BKTR
+.endif
+OPTIONS_SUB= yes
+
+BKTR_DESC= bktr(4) support
IMLIB2_LIB_DEPENDS= libImlib2.so:graphics/imlib2
IMLIB2_CONFIGURE_OFF= ac_cv_path_IMLIB2_CONFIG=no
Modified: head/multimedia/camserv/pkg-plist
==============================================================================
--- head/multimedia/camserv/pkg-plist Wed Mar 18 07:44:56 2020 (r528631)
+++ head/multimedia/camserv/pkg-plist Wed Mar 18 07:51:58 2020 (r528632)
@@ -24,10 +24,10 @@ lib/camserv/libvideo_basic.a
lib/camserv/libvideo_basic.so
lib/camserv/libvideo_basic.so.0
lib/camserv/libvideo_basic.so.0.0.0
-lib/camserv/libvideo_fbsd_bttv.a
-lib/camserv/libvideo_fbsd_bttv.so
-lib/camserv/libvideo_fbsd_bttv.so.0
-lib/camserv/libvideo_fbsd_bttv.so.0.0.0
+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.a
+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so
+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so.0
+%%BKTR%%lib/camserv/libvideo_fbsd_bttv.so.0.0.0
%%V4L%%lib/camserv/libvideo_v4l.a
%%V4L%%lib/camserv/libvideo_v4l.so
%%V4L%%lib/camserv/libvideo_v4l.so.0
Modified: head/multimedia/fxtv/Makefile
==============================================================================
--- head/multimedia/fxtv/Makefile Wed Mar 18 07:44:56 2020 (r528631)
+++ head/multimedia/fxtv/Makefile Wed Mar 18 07:51:58 2020 (r528632)
@@ -12,6 +12,9 @@ COMMENT= X11-based TV display and capture application
LICENSE= BSD2CLAUSE
+.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
+IGNORE= needs bktr(4) which is no longer available on your FreeBSD version
+.endif
ONLY_FOR_ARCHS= amd64 i386
LIB_DEPENDS= libtiff.so:graphics/tiff \
Modified: head/multimedia/xawtv/Makefile
==============================================================================
--- head/multimedia/xawtv/Makefile Wed Mar 18 07:44:56 2020 (r528631)
+++ head/multimedia/xawtv/Makefile Wed Mar 18 07:51:58 2020 (r528632)
@@ -13,11 +13,19 @@ BUILD_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso88
RUN_DEPENDS= ${LOCALBASE}/share/fonts/misc/led-iso8859-1.pcf.gz:x11-fonts/tv-fonts
LIB_DEPENDS= libpng.so:graphics/png
-OPTIONS_DEFINE= AALIB DV QUICKTIME ZVBI
+OPTIONS_DEFINE= AALIB BKTR DV QUICKTIME ZVBI
OPTIONS_DEFINE_i386= MMX
-OPTIONS_DEFAULT= AALIB
+OPTIONS_DEFAULT= AALIB BKTR
+.if !exists(/usr/include/dev/bktr/ioctl_bt848.h)
+OPTIONS_EXCLUDE= BKTR
+.endif
+OPTIONS_SUB= yes
+
+BKTR_DESC= bktr(4) support
ZVBI_DESC= Enable libzvbi support
+BKTR_MAKE_ARGS= HAVE_BKTR=yes
+
USES= gmake iconv jpeg motif ncurses perl5 tar:bzip2 pkgconfig xorg
GNU_CONFIGURE= yes
USE_XORG= x11 xaw
@@ -34,28 +42,22 @@ FILES_LIBJPEG= console/Subdir.mk x11/Subdir.mk libng/p
.if ${PORT_OPTIONS:MAALIB}
CONFIGURE_ARGS+=--enable-aa
LIB_DEPENDS+= libaa.so:graphics/aalib
-PLIST_SUB+= AA=""
.else
CONFIGURE_ARGS+=--disable-aa
-PLIST_SUB+= AA="@comment "
.endif
.if ${PORT_OPTIONS:MZVBI}
LIB_DEPENDS+= libzvbi.so:devel/libzvbi
CONFIGURE_ARGS+=--enable-zvbi
-PLIST_SUB+= ZVBI=""
.else
CONFIGURE_ARGS+=--enable-zvbi=no
-PLIST_SUB+= ZVBI="@comment "
.endif
.if ${PORT_OPTIONS:MDV}
LIB_DEPENDS+= libdv.so:multimedia/libdv
CONFIGURE_ARGS+=--enable-dv
-PLIST_SUB+= DV=
.else
CONFIGURE_ARGS+=--enable-dv=no
-PLIST_SUB+= DV="@comment "
.endif
.if ${PORT_OPTIONS:MMMX}
@@ -66,10 +68,8 @@ CFLAGS+= -DMMX=1
.if ${PORT_OPTIONS:MQUICKTIME}
CONFIGURE_ARGS+=--enable-quicktime
LIB_DEPENDS+= libquicktime.so:multimedia/libquicktime
-PLIST_SUB+= QT=
.else
CONFIGURE_ARGS+=--enable-quicktime=no
-PLIST_SUB+= QT="@comment "
.endif
PLIST_SUB+= X11PREFIX=${LOCALBASE}
Added: head/multimedia/xawtv/files/patch-libng_plugins_Subdir.mk
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/multimedia/xawtv/files/patch-libng_plugins_Subdir.mk Wed Mar 18 07:51:58 2020 (r528632)
@@ -0,0 +1,16 @@
+--- libng/plugins/Subdir.mk.orig 2020-03-18 04:43:15 UTC
++++ libng/plugins/Subdir.mk
+@@ -28,9 +28,11 @@ TARGETS-plugins += \
+ libng/plugins/drv0-libv4l.so
+ endif
+ ifeq ($(FOUND_OS),bsd)
++ifeq ($(HAVE_BKTR),yes)
+ TARGETS-plugins += \
+- libng/plugins/drv0-bsd.so \
+- libng/plugins/snd-oss.so
++ libng/plugins/drv0-bsd.so
++endif
++TARGETS-plugins += libng/plugins/snd-oss.so
+ endif
+
+ GONE-plugins := \
Modified: head/multimedia/xawtv/pkg-plist
==============================================================================
--- head/multimedia/xawtv/pkg-plist Wed Mar 18 07:44:56 2020 (r528631)
+++ head/multimedia/xawtv/pkg-plist Wed Mar 18 07:51:58 2020 (r528632)
@@ -12,7 +12,7 @@ bin/showqt
bin/showriff
bin/streamer
bin/subtitles
-%%AA%%bin/ttv
+%%AALIB%%bin/ttv
bin/v4lctl
bin/webcam
bin/xawtv
@@ -20,7 +20,7 @@ bin/xawtv-remote
lib/xawtv/bilinear.so
lib/xawtv/conv-mjpeg.so
lib/xawtv/cubic.so
-lib/xawtv/drv0-bsd.so
+%%BKTR%%lib/xawtv/drv0-bsd.so
lib/xawtv/flt-disor.so
lib/xawtv/flt-gamma.so
lib/xawtv/flt-invert.so
@@ -29,11 +29,11 @@ lib/xawtv/linear-blend.so
lib/xawtv/linedoubler.so
lib/xawtv/read-avi.so
%%DV%%lib/xawtv/read-dv.so
-%%QT%%lib/xawtv/read-qt.so
+%%QUICKTIME%%lib/xawtv/read-qt.so
lib/xawtv/snd-oss.so
lib/xawtv/write-avi.so
%%DV%%lib/xawtv/write-dv.so
-%%QT%%lib/xawtv/write-qt.so
+%%QUICKTIME%%lib/xawtv/write-qt.so
man/man1/alevtd.1.gz
man/man1/dump-mixers.1.gz
man/man1/fbtv.1.gz
More information about the svn-ports-all
mailing list