Attachment 234429 Details for Bug 264381 – proposed change

[patch] proposed change

patch_cx88.txt (text/plain), 6.82 KB, created by Jason A. Harmening on 2022-06-04 00:19:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason A. Harmening

Created: 2022-06-04 00:19:34 UTC

Size: 6.82 KB

patch

obsolete

>diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile
>index 6a6c43476..2da5e41c7 100644
>--- a/multimedia/cx88/Makefile
>+++ b/multimedia/cx88/Makefile
>@@ -1,46 +1,45 @@
> # Created by: Jason Harmening <jason.harmening@gmail.com>
> 
> PORTNAME=	cx88
>-PORTVERSION=	1.5.3
>-PORTREVISION=	2
>+DISTVERSION=	1.5.4
> CATEGORIES=	multimedia
>-MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
>+MASTER_SITES=	http://corona.homeunix.net/distfiles/ports/cx88/
> 
> MAINTAINER=	jah@FreeBSD.org
>-COMMENT=	Drivers for Conexant CX23880/1/2/3/5/7/8-based TV/radio capture cards
>+COMMENT=	Drivers for Conexant CX23880x-based PCI(e) TV/radio capture cards
> 
> LICENSE=	BSD2CLAUSE
> 
> LIB_DEPENDS=	libjson-c.so:devel/json-c
> BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:textproc/ezxml \
>-		libtuner>=1.1.4:multimedia/libtuner
>+		libtuner>=1.1.5:multimedia/libtuner
> 
> # XXX static libraries with PIE are currently unsupported
> MAKE_ARGS+=	WITHOUT_PIE=true
>-MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner LIBTUNER_HEADER=${LOCALBASE}/include/libtuner KMODDIR=${KMODDIR} PREFIX=${STAGEDIR}${PREFIX}
>+
>+MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner \
>+		LIBTUNER_HEADER=${LOCALBASE}/include/libtuner \
>+		KMODDIR=${KMODDIR} \
>+		PREFIX=${STAGEDIR}${PREFIX} \
>+		-D CX88_USE_IIC \
>+		DEFAULT_XML_CONFIG="${EXAMPLESDIR}/cx88.xml.sample"
>+
> MAKE_JOBS_UNSAFE=	yes
> USES=			kmod libedit pkgconfig uidfix
> USE_RC_SUBR=		cx88d
> 
>-OPTIONS_DEFINE=	DEBUG LINUX_COMPAT
>-
>-DEBUG_DESC=		Enable debugging and verbose driver output
>-LINUX_COMPAT_DESC=	Support for Linux DVB and radio API
>-
>-OPTIONS_DEFAULT=	LINUX_COMPAT
>+OPTIONS_DEFINE=	DEBUG LINUXCOMPAT VERBOSE
>+OPTIONS_DEFAULT=	LINUXCOMPAT
> 
>-.include <bsd.port.options.mk>
>+VERBOSE_DESC=		Enable verbose output
>+LINUXCOMPAT_DESC=	Support for Linux DVB and radio API
> 
>-.if ${PORT_OPTIONS:MDEBUG}
>-MAKE_ARGS+=	DIAGNOSTIC=0x7f -DDEBUG
>-.endif
>+DEBUG_IMPLIES=		VERBOSE
>+DEBUG_MAKE_ARGS+=	-DDEBUG
> 
>-.if ${PORT_OPTIONS:MLINUX_COMPAT}
>-BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
>-MAKE_ARGS+=	-D WITH_LINUX_COMPAT
>-.endif
>+VERBOSE_MAKE_ARGS+=	DIAGNOSTIC=0x7f
> 
>-MAKE_ARGS+=	-D CX88_USE_IIC
>-MAKE_ARGS+=	DEFAULT_XML_CONFIG="${EXAMPLESDIR}/cx88.xml.sample"
>+LINUXCOMPAT_BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
>+LINUXCOMPAT_MAKE_ARGS+=	-D WITH_LINUX_COMPAT
> 
> .include <bsd.port.mk>
>diff --git a/multimedia/cx88/distinfo b/multimedia/cx88/distinfo
>index c964f61e0..af4eb1a4e 100644
>--- a/multimedia/cx88/distinfo
>+++ b/multimedia/cx88/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1555662085
>-SHA256 (cx88-1.5.3.tar.gz) = 5c33fac5b035844298a09d5e3092c926e54ce52a96340cfc755fbef589d1c5dd
>-SIZE (cx88-1.5.3.tar.gz) = 196468
>+TIMESTAMP = 1654300709
>+SHA256 (cx88-1.5.4.tar.gz) = cf647ff8264fbe1dcddce6224a59bbc053a4e03a36aba26f161536dab28ea8a8
>+SIZE (cx88-1.5.4.tar.gz) = 197656
>diff --git a/multimedia/cx88/files/cx88d.in b/multimedia/cx88/files/cx88d.in
>old mode 100644
>new mode 100755
>diff --git a/multimedia/cx88/files/patch-client_Makefile b/multimedia/cx88/files/patch-client_Makefile
>deleted file mode 100644
>index 7be56a685..000000000
>--- a/multimedia/cx88/files/patch-client_Makefile
>+++ /dev/null
>@@ -1,20 +0,0 @@
>---- client/Makefile.orig	2016-10-30 22:50:26 UTC
>-+++ client/Makefile
>-@@ -21,7 +21,7 @@ STRIPFLAGS :=
>- CXXFLAGS+= -DCX88_USE_IIC
>- .endif
>- 
>--NO_MAN=
>-+MAN=
>- 
>- LDADD = -L$(LIBTUNER_LIB) -ltuner_static -lezxml -lpthread -ledit
>- 
>-@@ -32,7 +32,7 @@ LDADD += $(JSON_LDFLAGS)
>- 
>- .if defined(WITH_LINUX_COMPAT)
>- CXXFLAGS += -D_WITH_LINUX_COMPAT
>--LDADD += -L$(LOCALBASE)/lib -lcuse4bsd
>-+LDADD += -L$(LOCALBASE)/lib -lcuse
>- 
>- .if defined(WITH_HAL)
>- CXXFLAGS += -D_WITH_HAL
>diff --git a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__buffer.cpp b/multimedia/cx88/files/patch-client_dvb_cx88__dvb__buffer.cpp
>deleted file mode 100644
>index 60d373f17..000000000
>--- a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__buffer.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- client/dvb/cx88_dvb_buffer.cpp.orig	2012-10-04 22:36:01 UTC
>-+++ client/dvb/cx88_dvb_buffer.cpp
>-@@ -30,7 +30,7 @@
>- #include <new>
>- extern "C"
>- {
>--   #include <cuse4bsd.h>
>-+   #include <cuse.h>
>- }
>- #include "cx88_dvb_buffer.h"
>- 
>diff --git a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__capture.h b/multimedia/cx88/files/patch-client_dvb_cx88__dvb__capture.h
>deleted file mode 100644
>index 825d9d1d3..000000000
>--- a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__capture.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- client/dvb/cx88_dvb_capture.h.orig	2014-11-15 03:08:05 UTC
>-+++ client/dvb/cx88_dvb_capture.h
>-@@ -32,7 +32,7 @@
>- #include <list>
>- extern "C"
>- {
>--   #include <cuse4bsd.h>
>-+   #include <cuse.h>
>- }
>- #include "tuner_config.h"
>- #include "cx88_capture.h"
>diff --git a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux.cpp b/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux.cpp
>deleted file mode 100644
>index 0455b239c..000000000
>--- a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- client/dvb/cx88_dvb_demux.cpp.orig	2012-12-05 17:23:14 UTC
>-+++ client/dvb/cx88_dvb_demux.cpp
>-@@ -28,7 +28,7 @@
>- #include <sys/types.h>
>- extern "C"
>- {
>--   #include <cuse4bsd.h>
>-+   #include <cuse.h>
>- }
>- #include "../cx88_debug.h"
>- #include "cx88_dvb_demux.h"
>diff --git a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux__feed.cpp b/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux__feed.cpp
>deleted file mode 100644
>index 7c4fadadf..000000000
>--- a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux__feed.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- client/dvb/cx88_dvb_demux_feed.cpp.orig	2011-09-20 17:20:20 UTC
>-+++ client/dvb/cx88_dvb_demux_feed.cpp
>-@@ -1,7 +1,7 @@
>- #include <sys/types.h>
>- extern "C"
>- {
>--   #include <cuse4bsd.h>
>-+   #include <cuse.h>
>- }
>- #include "cx88_dvb_demux_feed.h"
>- 
>diff --git a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__frontend.cpp b/multimedia/cx88/files/patch-client_dvb_cx88__dvb__frontend.cpp
>deleted file mode 100644
>index 1462e815f..000000000
>--- a/multimedia/cx88/files/patch-client_dvb_cx88__dvb__frontend.cpp
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- client/dvb/cx88_dvb_frontend.cpp.orig	2014-11-15 03:08:05 UTC
>-+++ client/dvb/cx88_dvb_frontend.cpp
>-@@ -31,7 +31,7 @@
>- #include <new>
>- extern "C"
>- {
>--   #include <cuse4bsd.h>
>-+   #include <cuse.h>
>- }
>- #include "../cx88_debug.h"
>- #include "cx88_dvb_frontend.h"
>diff --git a/multimedia/cx88/files/patch-client_v4l_cx88__radio__capture.h b/multimedia/cx88/files/patch-client_v4l_cx88__radio__capture.h
>deleted file mode 100644
>index 1723024b9..000000000
>--- a/multimedia/cx88/files/patch-client_v4l_cx88__radio__capture.h
>+++ /dev/null
>@@ -1,11 +0,0 @@
>---- client/v4l/cx88_radio_capture.h.orig	2019-11-30 20:23:39 UTC
>-+++ client/v4l/cx88_radio_capture.h
>-@@ -32,7 +32,7 @@
>- #include <linux/videodev2.h>
>- extern "C"
>- {
>--   #include <cuse4bsd.h>
>-+   #include <cuse.h>
>- }
>- #include "cx88_capture.h"
>- #include "tuner_config.h"

Actions: View | Diff

Attachments on bug 264381: 234365 | 234399 | 234424 | 234428 | 234429 | 234450