Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Nov 2019 20:37:02 +0000 (UTC)
From:      Rene Ladan <rene@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518725 - in head/multimedia/cx88: . files
Message-ID:  <201911302037.xAUKb23t066502@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rene
Date: Sat Nov 30 20:37:02 2019
New Revision: 518725
URL: https://svnweb.freebsd.org/changeset/ports/518725

Log:
  multimedia/cx88: switch from CUSE4BSD to cuse, which is its in-tree successor.
  
  Suggested by:	jbeich

Added:
  head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__buffer.cpp   (contents, props changed)
  head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__capture.h   (contents, props changed)
  head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux.cpp   (contents, props changed)
  head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux__feed.cpp   (contents, props changed)
  head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__frontend.cpp   (contents, props changed)
  head/multimedia/cx88/files/patch-client_v4l_cx88__radio__capture.h   (contents, props changed)
Modified:
  head/multimedia/cx88/Makefile
  head/multimedia/cx88/files/patch-client_Makefile

Modified: head/multimedia/cx88/Makefile
==============================================================================
--- head/multimedia/cx88/Makefile	Sat Nov 30 20:21:13 2019	(r518724)
+++ head/multimedia/cx88/Makefile	Sat Nov 30 20:37:02 2019	(r518725)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cx88
 PORTVERSION=	1.5.3
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	ftp://corona.homeunix.net/ports/cx88/
 
@@ -35,7 +36,6 @@ MAKE_ARGS+=	DIAGNOSTIC=0x7f -DDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MLINUX_COMPAT}
-LIB_DEPENDS+=	libcuse4bsd.so:multimedia/cuse4bsd-kmod
 BUILD_DEPENDS+=	v4l_compat>=1.0.20100321:multimedia/v4l_compat
 MAKE_ARGS+=	-D WITH_LINUX_COMPAT
 .if ${PORT_OPTIONS:MHAL}

Modified: head/multimedia/cx88/files/patch-client_Makefile
==============================================================================
--- head/multimedia/cx88/files/patch-client_Makefile	Sat Nov 30 20:21:13 2019	(r518724)
+++ head/multimedia/cx88/files/patch-client_Makefile	Sat Nov 30 20:37:02 2019	(r518725)
@@ -1,6 +1,6 @@
---- client/Makefile.orig
+--- client/Makefile.orig	2016-10-30 22:50:26 UTC
 +++ client/Makefile
-@@ -21,7 +21,7 @@
+@@ -21,7 +21,7 @@ STRIPFLAGS :=
  CXXFLAGS+= -DCX88_USE_IIC
  .endif
  
@@ -9,3 +9,12 @@
  
  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

Added: head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__buffer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__buffer.cpp	Sat Nov 30 20:37:02 2019	(r518725)
@@ -0,0 +1,11 @@
+--- 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"
+ 

Added: head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__capture.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__capture.h	Sat Nov 30 20:37:02 2019	(r518725)
@@ -0,0 +1,11 @@
+--- 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"

Added: head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux.cpp	Sat Nov 30 20:37:02 2019	(r518725)
@@ -0,0 +1,11 @@
+--- 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"

Added: head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux__feed.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__demux__feed.cpp	Sat Nov 30 20:37:02 2019	(r518725)
@@ -0,0 +1,11 @@
+--- 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"
+ 

Added: head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__frontend.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/cx88/files/patch-client_dvb_cx88__dvb__frontend.cpp	Sat Nov 30 20:37:02 2019	(r518725)
@@ -0,0 +1,11 @@
+--- 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"

Added: head/multimedia/cx88/files/patch-client_v4l_cx88__radio__capture.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/multimedia/cx88/files/patch-client_v4l_cx88__radio__capture.h	Sat Nov 30 20:37:02 2019	(r518725)
@@ -0,0 +1,11 @@
+--- 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"



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911302037.xAUKb23t066502>