From nobody Fri Jun 10 03:44:25 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id E304683ED05; Fri, 10 Jun 2022 03:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LK6K56597z3wDX; Fri, 10 Jun 2022 03:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654832665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+7osm7/PucZaQMLFue58LAgx4pptzthS4EMuUAUnLM=; b=Th7GoXjDPKUqV5uutk3eIECk4rsyD0F4pJzncA4FY4ePpNxR/KD6Bq4OpBdwNvJp/gOokp BJzcP/FoOXF4x/uQXJ6oAT/PFSAmf6PXCfDFkAuAcCDFJRWmVVBNhBq43Il/B9Y9ZF/w+w wRfeArecYaJaGUTrlE1mSrfrwZn9iewletGVxeSOB6g3yPz2yGXUFk3wdSk6+GZo7kFMJ2 jDr/Hu45kd+qrF4jzsVP7CFJeNY30KDFzUjepuKrE+8PboHCk+t00RH7cVLGIvOkfbXliE ueJrAZO0Zyt8Rt4ZuW/my87rQbu65fZOu3uMnLmJ7fSLt+VZOBFyJ8Wah7bTeA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id B14C811603; Fri, 10 Jun 2022 03:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25A3iP8c008918; Fri, 10 Jun 2022 03:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25A3iPIW008917; Fri, 10 Jun 2022 03:44:25 GMT (envelope-from git) Date: Fri, 10 Jun 2022 03:44:25 GMT Message-Id: <202206100344.25A3iPIW008917@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason A. Harmening" Subject: git: 88aef5f532d0 - main - multimedia/cx88: update to 1.5.4 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jah X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88aef5f532d02d50b3bffd191092e8887629361f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654832665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X+7osm7/PucZaQMLFue58LAgx4pptzthS4EMuUAUnLM=; b=t3p0GnX2ZGp0ISDoTcWfWU8+jjAQkPZy8iwl7+VoV2zU8/ZDx8XfMEzDd8iFLmSh1q9lBF DWj3MK2wrtvZ+9KhndYHXlhiou0QNND9+CqR7cE1fwEyqryFhx+pFT6EobMUD+vO3XI/bW Elz7XmXv19p9H3UEloEaHbU4mS6yySv5EgTCjvC3chWOaEruD5E+/HsT+LgwopSIIsdRv8 78XDJq16toiuwiaadyRfjf/4XsamEAQ1oWs8GoZoCiLRtH6KiKq5IttfUfgQNzT0k76gcc 4HFQwb9skRatcJtsoA+S7l4pTKoK+C27ODwaoe176EMC/3IDcIsvdG0k7e4M1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654832665; a=rsa-sha256; cv=none; b=uKwgMqic4J2XMuL2ThnPl3ekitbiytQXAv4u29jaM/nbhJ/nlHvBHiy0RMas5qw9zRYE7N dcehgEByygkpvwB3GBZWdTfQBj3SEVVPsAbzMbZ1V4WCop1o0ajcwU3UFXuYkdxkKSfFtC YtX4aDyxikx5mDTxYxzQHsPwLQ00IkkpFraB0RmtZyR/BXoL/ifVg4hH3+6vJu3sbITUWu /ighI/w6OaGQCbnYXKHBBLgTOhjxWcai5kONKJ/cuAAFCYmsDwtc2KvN0GxAKszaBZRGTG aZG1D6/azuhBD76dEs2j4+5hUSQYhhj+9onkWNtG2ZrR/wYlBJVAnJqcc3sqvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jah (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=88aef5f532d02d50b3bffd191092e8887629361f commit 88aef5f532d02d50b3bffd191092e8887629361f Author: Jason A. Harmening AuthorDate: 2022-06-10 03:26:32 +0000 Commit: Jason A. Harmening CommitDate: 2022-06-10 03:42:55 +0000 multimedia/cx88: update to 1.5.4 --Fix build on -current after removal of iic_devclass --Fix typos in help strings --Incorporate ports tree patches since 2019 --Modernize port makefile and switch MASTER_SITES to https PR: 264381 Approved by: diizzy --- multimedia/cx88/Makefile | 43 +++++++++++----------- multimedia/cx88/distinfo | 6 +-- multimedia/cx88/files/cx88d.in | 0 multimedia/cx88/files/patch-client_Makefile | 20 ---------- .../files/patch-client_dvb_cx88__dvb__buffer.cpp | 11 ------ .../files/patch-client_dvb_cx88__dvb__capture.h | 11 ------ .../files/patch-client_dvb_cx88__dvb__demux.cpp | 11 ------ .../patch-client_dvb_cx88__dvb__demux__feed.cpp | 11 ------ .../files/patch-client_dvb_cx88__dvb__frontend.cpp | 11 ------ .../files/patch-client_v4l_cx88__radio__capture.h | 11 ------ multimedia/cx88/pkg-descr | 2 +- 11 files changed, 25 insertions(+), 112 deletions(-) diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile index 6a6c434762bd..93097b158c0f 100644 --- a/multimedia/cx88/Makefile +++ b/multimedia/cx88/Makefile @@ -1,46 +1,45 @@ # Created by: Jason Harmening PORTNAME= cx88 -PORTVERSION= 1.5.3 -PORTREVISION= 2 +DISTVERSION= 1.5.4 CATEGORIES= multimedia -MASTER_SITES= ftp://corona.homeunix.net/ports/cx88/ +MASTER_SITES= https://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 +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 diff --git a/multimedia/cx88/distinfo b/multimedia/cx88/distinfo index c964f61e0d49..289277183557 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 = 1654378634 +SHA256 (cx88-1.5.4.tar.gz) = 36f1e33fbc9a74af9d074aea090a66c0c586bb8302e284921877e98044bb2dbc +SIZE (cx88-1.5.4.tar.gz) = 197655 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 7be56a6857a0..000000000000 --- 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 60d373f171a7..000000000000 --- 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 - extern "C" - { -- #include -+ #include - } - #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 825d9d1d3924..000000000000 --- 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 - extern "C" - { -- #include -+ #include - } - #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 0455b239c3fc..000000000000 --- 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 - extern "C" - { -- #include -+ #include - } - #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 7c4fadadf563..000000000000 --- 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 - extern "C" - { -- #include -+ #include - } - #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 1462e815fdc0..000000000000 --- 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 - extern "C" - { -- #include -+ #include - } - #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 1723024b906c..000000000000 --- 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 - extern "C" - { -- #include -+ #include - } - #include "cx88_capture.h" - #include "tuner_config.h" diff --git a/multimedia/cx88/pkg-descr b/multimedia/cx88/pkg-descr index 8ff09ac36d85..252a0f730558 100644 --- a/multimedia/cx88/pkg-descr +++ b/multimedia/cx88/pkg-descr @@ -3,4 +3,4 @@ Conexant CX23880/1/2/3 and CX23885/7/8 chip families. This port includes the cx88 kernel drivers as well as a simple app for TV capture. It requires multimedia/libtuner for channel selection and peripheral configuration. -WWW: http://corona.homeunix.net/cx88wiki +WWW: https://corona.homeunix.net/cx88wiki