Attachment 144227 Details for Bug 190914 – Revised patch

[patch] Revised patch

cx88.diff.txt (text/plain), 2.77 KB, created by Thomas Zander on 2014-06-28 17:29:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thomas Zander

Created: 2014-06-28 17:29:06 UTC

Size: 2.77 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 359656)
>+++ Makefile	(working copy)
>@@ -2,23 +2,24 @@
> # $FreeBSD$
> 
> PORTNAME=	cx88
>-PORTVERSION=	1.4.9
>-CATEGORIES=	multimedia kld
>+PORTVERSION=	1.4.10
>+CATEGORIES=	multimedia
> MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
> 
> MAINTAINER=	jason.harmening@gmail.com
> COMMENT=	Drivers for Conexant CX23880/1/2/3/5/7/8-based TV/radio capture cards
> 
>-LICENSE=	BSD
>+LICENSE=	BSD2CLAUSE
> 
>+LIB_DEPENDS=	libjson-c.so:${PORTSDIR}/devel/json-c
> BUILD_DEPENDS=	${LOCALBASE}/lib/libezxml.a:${PORTSDIR}/textproc/ezxml \
>-		libtuner>=1.1.0:${PORTSDIR}/multimedia/libtuner
>+		libtuner>=1.1.2:${PORTSDIR}/multimedia/libtuner
> 
> KMODDIR=	/boot/modules
> PLIST_SUB+=	KMODDIR=${KMODDIR}
>-MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner LIBTUNER_HEADER=${LOCALBASE}/include/libtuner KMODDIR=${KMODDIR}
>+MAKE_ARGS+=	LIBTUNER_LIB=${LOCALBASE}/lib/libtuner LIBTUNER_HEADER=${LOCALBASE}/include/libtuner KMODDIR=${KMODDIR} PREFIX=${STAGEDIR}${PREFIX}
> MAKE_JOBS_UNSAFE=	yes
>-SSP_UNSAFE=	kernel module does not support ssp
>+USES=		kmod pkgconfig
> 
> OPTIONS_DEFINE=	DEBUG LINUX_COMPAT HAL
> 
>@@ -28,11 +29,10 @@
> 
> OPTIONS_DEFAULT=	LINUX_COMPAT
> 
>-NO_STAGE=	yes
> .include <bsd.port.options.mk>
> 
> .if ${PORT_OPTIONS:MDEBUG}
>-MAKE_ARGS+=	DIAGNOSTIC=0x7f
>+MAKE_ARGS+=	DIAGNOSTIC=0x7f -DDEBUG
> .endif
> 
> .if ${PORT_OPTIONS:MLINUX_COMPAT}
>@@ -41,7 +41,7 @@
> MAKE_ARGS+=	-D WITH_LINUX_COMPAT
> .if ${PORT_OPTIONS:MHAL}
> LIB_DEPENDS+=	libhal.so:${PORTSDIR}/sysutils/hal \
>-		dbus-1:${PORTSDIR}/devel/dbus
>+		libdbus-1.so:${PORTSDIR}/devel/dbus
> MAKE_ARGS+=	-D WITH_HAL
> .endif
> .endif
>@@ -52,8 +52,7 @@
> IGNORE=	requires kernel support for DRIVER_MODULE_ORDERED macro (FreeBSD 8.3+, FreeBSD 9.0+)
> .endif
> 
>-.if !exists(${SRC_BASE}/sys/Makefile)
>-IGNORE=		requires kernel source files
>-.endif
>+post-patch:
>+	${REINPLACE_CMD} -e 's|install cx88 |install -s cx88 |g' ${WRKSRC}/client/Makefile
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 359656)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (cx88-1.4.9.tar.gz) = e05c90dea79a1ddc1f96e53e0839f0f57eef17b118d3d1304043d9b1771e7b86
>-SIZE (cx88-1.4.9.tar.gz) = 191178
>+SHA256 (cx88-1.4.10.tar.gz) = afa2055fe21b4fda0d27d05a25c9da6c0b31036c2d7b5b49ccd899b1c60d9603
>+SIZE (cx88-1.4.10.tar.gz) = 193901
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 359656)
>+++ pkg-plist	(working copy)
>@@ -1,7 +1,7 @@
> bin/cx88
> %%EXAMPLESDIR%%/cx88.xml.sample
>+%%EXAMPLESDIR%%/cx88_audio_enable.cpp
> %%EXAMPLESDIR%%/remote.cpp
>-%%EXAMPLESDIR%%/cx88_audio_enable.cpp
> %%EXAMPLESDIR%%/cx88_mpeg_client.cpp
> %%EXAMPLESDIR%%/hd3k_analog_kbuf.cpp
> %%EXAMPLESDIR%%/tuner_config

Flags:

riggs: maintainer-approval?

Actions: View | Diff

Attachments on bug 190914: 143662 | 144227