From nobody Wed Nov 27 21:07:37 2024 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 4XzBpy0zd6z5fmxN; Wed, 27 Nov 2024 21:07:38 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XzBpy0QV1z4Nrh; Wed, 27 Nov 2024 21:07:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732741658; 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=VaAS7JY2o1iddIE4SlTL77qehSd6MznivPQZ0PjGVps=; b=cjLWTqkpXiD/t95HoD2ZEGzohF6YSUXdoeRza1CR7gn7JEiJtO0N9WNJPeyUUNycrXRBl5 QT59rk2iupYEm6bz/VxeLTLZ1jZLdkYkxXSy+OrY7kWs4pUOcg7bSqwS5BJqW1HjzcOK8g yvyMeHGKaFsCrt6/fYgpZASiClfz7lgexWR/oamRZlRGEDQrZEzwgB05zrfM/DrE/fUzVB g/iE2e+VAadOBSplvyrGv2DA3H/Qt3liJXggxlZUqbLWa6p1CAdAyrdmm9KRmHXPAvt6qP /JqIHQrBgv4JPWFM/QLYNLTcknMPRNQCh+Bw4ZQXu470CztlBlMDDYXdpwbR9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1732741658; 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=VaAS7JY2o1iddIE4SlTL77qehSd6MznivPQZ0PjGVps=; b=xEwiINzW8bij2sKY5OsTAxt5QqKKUM6bKFL1b2oXxHv+A2nd8K09iLZdFz739qO7DLtdeb 1qRP4G5hCTfcXYWmpzCLcsxkz4oHNIf6vn1Tc4a5WZ0jynDwQj+0owc8b0OY9xAN2Fs2M3 Yxbc6MHP7eqcTgoC9lnlPielj0C4eHXB9tsOTgr8O1+6UugzmgqFmDmy6HP+TUti2k/cP5 m2Kb7NB6As6WpAslIzhRlog2RYHihKxGA+y1GeuZBZ/7+lgxc9DvmehVNY7ZHADLezoUBh bFgmjf6ZZ0BenoUXadz3aH3eAqIq+met6lakIoFVz/U/Ln8b3z3iyXfUcptlfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1732741658; a=rsa-sha256; cv=none; b=SwlteJ4ZBf65XoIKv5mhTvU3Wmr/XD7tGLvWMdP47b7amMFuV0hKp2XkCP2aLSfor9zAUy 63GW7YwBqUb5ue4PAmhsbs/9bUM3GpjbMT3vQ+xACi0WyEWc532PlgUUtht8RMOGAHfkhi qHsxNUfw1/+dXHl1u2p2W8yMTwjIxn/BqhkEh7T8OYbne1tUxVYxwUHLTGHYB/jbPBr44P ocI9si7GpDMlEOMlN1wjKzrnwnU5FVppTAXNzbOYBi9uDhKL5322DkH1HABenf39QRxCmF Sgs4pBlhPsFWabya9BFAdbWLvNiYJYbp7ys3RZAAMIIm2zwZG8fZnp2f2EYYkQ== 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 4XzBpx6vdVz1PYJ; Wed, 27 Nov 2024 21:07:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4ARL7bVd078728; Wed, 27 Nov 2024 21:07:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4ARL7bEI078725; Wed, 27 Nov 2024 21:07:37 GMT (envelope-from git) Date: Wed, 27 Nov 2024 21:07:37 GMT Message-Id: <202411272107.4ARL7bEI078725@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: ee47fcd332c4 - main - multimedia/cx88: update to 1.5.5 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: ee47fcd332c4cc46806a6da14c170f2febceac55 Auto-Submitted: auto-generated The branch main has been updated by jah: URL: https://cgit.FreeBSD.org/ports/commit/?id=ee47fcd332c4cc46806a6da14c170f2febceac55 commit ee47fcd332c4cc46806a6da14c170f2febceac55 Author: Jason A. Harmening AuthorDate: 2024-11-27 21:03:24 +0000 Commit: Jason A. Harmening CommitDate: 2024-11-27 21:07:02 +0000 multimedia/cx88: update to 1.5.5 - Fix build on -current - Incorporate ports tree patches since 1.5.4 - Add confirmation/rejection messages for remote control port clients PR: 282992 Approved by: fuz --- multimedia/cx88/Makefile | 2 +- multimedia/cx88/distinfo | 6 +-- multimedia/cx88/files/patch-audio_cx88__audio.h | 18 -------- .../files/patch-cx23880_audio_cx23880__audio.c | 26 ------------ .../cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c | 26 ------------ .../files/patch-cx23880_video_cx23880__video.c | 26 ------------ .../files/patch-cx23885_avcore_cx23885__avcore.c | 39 ----------------- multimedia/cx88/files/patch-cx23885_cx23885.c | 49 ---------------------- multimedia/cx88/files/patch-iicdev_iicdev.c | 25 ----------- multimedia/cx88/files/patch-ir_cx88__ir.c | 25 ----------- multimedia/cx88/pkg-plist | 2 +- 11 files changed, 5 insertions(+), 239 deletions(-) diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile index c6a83a082826..5f79e653a797 100644 --- a/multimedia/cx88/Makefile +++ b/multimedia/cx88/Makefile @@ -1,5 +1,5 @@ PORTNAME= cx88 -DISTVERSION= 1.5.4 +DISTVERSION= 1.5.5 CATEGORIES= multimedia MASTER_SITES= https://corona.homeunix.net/distfiles/ports/cx88/ diff --git a/multimedia/cx88/distinfo b/multimedia/cx88/distinfo index 289277183557..e8a9902f5f8a 100644 --- a/multimedia/cx88/distinfo +++ b/multimedia/cx88/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1654378634 -SHA256 (cx88-1.5.4.tar.gz) = 36f1e33fbc9a74af9d074aea090a66c0c586bb8302e284921877e98044bb2dbc -SIZE (cx88-1.5.4.tar.gz) = 197655 +TIMESTAMP = 1732661485 +SHA256 (cx88-1.5.5.tar.gz) = 7318cd7d2089a7a582de73c006cc0106328f8f950698af6be56ccafc7285c2bc +SIZE (cx88-1.5.5.tar.gz) = 197646 diff --git a/multimedia/cx88/files/patch-audio_cx88__audio.h b/multimedia/cx88/files/patch-audio_cx88__audio.h deleted file mode 100644 index 238e17ecd2ad..000000000000 --- a/multimedia/cx88/files/patch-audio_cx88__audio.h +++ /dev/null @@ -1,18 +0,0 @@ ---- audio/cx88_audio.h.orig 2022-07-26 16:13:09 UTC -+++ audio/cx88_audio.h -@@ -127,9 +127,15 @@ extern driver_t cx88_pcm_driver; - - extern driver_t cx88_pcm_driver; - -+#if __FreeBSD_version >= 1400058 - #define CX88_PCM_DRIVER_MODULE(host) \ -+ DRIVER_MODULE(cx88pcm, host, cx88_pcm_driver, NULL, NULL); \ -+ MODULE_DEPEND(host, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); -+#else -+#define CX88_PCM_DRIVER_MODULE(host) \ - DRIVER_MODULE(cx88pcm, host, cx88_pcm_driver, pcm_devclass, NULL, NULL); \ - MODULE_DEPEND(host, sound, SOUND_MINVER, SOUND_PREFVER, SOUND_MAXVER); -+#endif - - int cx88_audio_setup( - cx88_audio_softc *sc, diff --git a/multimedia/cx88/files/patch-cx23880_audio_cx23880__audio.c b/multimedia/cx88/files/patch-cx23880_audio_cx23880__audio.c deleted file mode 100644 index 1cf621328235..000000000000 --- a/multimedia/cx88/files/patch-cx23880_audio_cx23880__audio.c +++ /dev/null @@ -1,26 +0,0 @@ ---- cx23880/audio/cx23880_audio.c.orig 2022-07-26 16:22:44 UTC -+++ cx23880/audio/cx23880_audio.c -@@ -1018,8 +1018,6 @@ static int cx23880_audio_shutdown(device_t dev) - return 0; - } - --static devclass_t cx23880_audio_devclass; -- - static device_method_t cx23880_audio_methods[] = - { - /* Device interface */ -@@ -1058,8 +1056,13 @@ static driver_t cx23880_audio_driver = - 0 - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE_ORDERED(cx23880audio, pci, cx23880_audio_driver, NULL, NULL, SI_ORDER_ANY); -+#else -+static devclass_t cx23880_audio_devclass; -+ - DRIVER_MODULE_ORDERED(cx23880audio, pci, cx23880_audio_driver, cx23880_audio_devclass, NULL, NULL, SI_ORDER_ANY); --DRIVER_MODULE_ORDERED(cx23880audio, cardbus, cx23880_audio_driver, cx23880_audio_devclass, NULL, NULL, SI_ORDER_ANY); -+#endif - - CX88_DRIVER_MODULE(cx23880audio); - CX88_I2C_DRIVER_MODULE(cx23880audio); diff --git a/multimedia/cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c b/multimedia/cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c deleted file mode 100644 index e1a2f5d5ecde..000000000000 --- a/multimedia/cx88/files/patch-cx23880_mpeg_cx23880__mpeg.c +++ /dev/null @@ -1,26 +0,0 @@ ---- cx23880/mpeg/cx23880_mpeg.c.orig 2022-07-26 16:16:15 UTC -+++ cx23880/mpeg/cx23880_mpeg.c -@@ -173,8 +173,6 @@ static int cx23880_mpeg_request_reconfig(device_t dev) - return cx88_mpeg_request_reconfig(&(sc->mpeg)); - } - --static devclass_t cx23880_mpeg_devclass; -- - /* DEVMETHODs */ - static device_method_t cx23880_mpeg_methods[] = - { -@@ -203,8 +201,13 @@ static driver_t cx23880_mpeg_driver = - 0 - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE_ORDERED(cx23880mpeg, pci, cx23880_mpeg_driver, NULL, NULL, SI_ORDER_ANY); -+#else -+static devclass_t cx23880_mpeg_devclass; -+ - DRIVER_MODULE_ORDERED(cx23880mpeg, pci, cx23880_mpeg_driver, cx23880_mpeg_devclass, NULL, NULL, SI_ORDER_ANY); --DRIVER_MODULE_ORDERED(cx23880mpeg, cardbus, cx23880_mpeg_driver, cx23880_mpeg_devclass, NULL, NULL, SI_ORDER_ANY); -+#endif - - CX88_DRIVER_MODULE(cx23880mpeg); - CX88_I2C_DRIVER_MODULE(cx23880mpeg); diff --git a/multimedia/cx88/files/patch-cx23880_video_cx23880__video.c b/multimedia/cx88/files/patch-cx23880_video_cx23880__video.c deleted file mode 100644 index 2a19b778079b..000000000000 --- a/multimedia/cx88/files/patch-cx23880_video_cx23880__video.c +++ /dev/null @@ -1,26 +0,0 @@ ---- cx23880/video/cx23880_video.c.orig 2022-07-26 16:17:40 UTC -+++ cx23880/video/cx23880_video.c -@@ -519,8 +519,6 @@ static int cx23880_video_request_reconfig(device_t dev - return cx88_video_request_reconfig(&(sc->video)); - } - --static devclass_t cx23880_video_devclass; -- - /* DEVMETHODs */ - static device_method_t cx23880_video_methods[] = - { -@@ -561,8 +559,13 @@ static driver_t cx23880_video_driver = - 0 - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE_ORDERED(cx23880video, pci, cx23880_video_driver, NULL, NULL, SI_ORDER_ANY); -+#else -+static devclass_t cx23880_video_devclass; -+ - DRIVER_MODULE_ORDERED(cx23880video, pci, cx23880_video_driver, cx23880_video_devclass, NULL, NULL, SI_ORDER_ANY); --DRIVER_MODULE_ORDERED(cx23880video, cardbus, cx23880_video_driver, cx23880_video_devclass, NULL, NULL, SI_ORDER_ANY); -+#endif - - CX88_DRIVER_MODULE(cx23880video); - CX88_I2C_DRIVER_MODULE(cx23880video); diff --git a/multimedia/cx88/files/patch-cx23885_avcore_cx23885__avcore.c b/multimedia/cx88/files/patch-cx23885_avcore_cx23885__avcore.c deleted file mode 100644 index f0667fc3a47a..000000000000 --- a/multimedia/cx88/files/patch-cx23885_avcore_cx23885__avcore.c +++ /dev/null @@ -1,39 +0,0 @@ ---- cx23885/avcore/cx23885_avcore.c.orig 2022-07-26 16:27:33 UTC -+++ cx23885/avcore/cx23885_avcore.c -@@ -45,9 +45,6 @@ - - #define CX23885AV_I2C_TIMEOUT (hz / 8) - --static devclass_t cx23885av_devclass; --static devclass_t cx23885adc_devclass; -- - typedef struct - { - uint32_t hactive; -@@ -1260,7 +1257,13 @@ static driver_t cx23885av_driver = - sizeof(cx23885av_softc) - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(cx23885av, iicbus, cx23885av_driver, NULL, NULL); -+#else -+static devclass_t cx23885av_devclass; -+ - DRIVER_MODULE(cx23885av, iicbus, cx23885av_driver, cx23885av_devclass, NULL, NULL); -+#endif - MODULE_DEPEND(cx23885av, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER); - MODULE_DEPEND(cx23885av, firmware, 1, 1, 1); - MODULE_DEPEND(cx23885av, cx88audiocore, CX88_AUDIO_MINVER, CX88_AUDIO_MODVER, CX88_AUDIO_MAXVER); -@@ -1318,6 +1321,12 @@ static driver_t cx23885adc_driver = - 0 - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(cx23885adc, iicbus, cx23885adc_driver, NULL, NULL); -+#else -+static devclass_t cx23885adc_devclass; -+ - DRIVER_MODULE(cx23885adc, iicbus, cx23885adc_driver, cx23885adc_devclass, NULL, NULL); -+#endif - MODULE_DEPEND(cx23885adc, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER); - MODULE_VERSION(cx23885adc, CX23885ADC_MODVER); diff --git a/multimedia/cx88/files/patch-cx23885_cx23885.c b/multimedia/cx88/files/patch-cx23885_cx23885.c deleted file mode 100644 index a19941930822..000000000000 --- a/multimedia/cx88/files/patch-cx23885_cx23885.c +++ /dev/null @@ -1,49 +0,0 @@ ---- cx23885/cx23885.c.orig 2022-07-26 16:24:23 UTC -+++ cx23885/cx23885.c -@@ -508,8 +508,6 @@ static int cx23885_suspend(device_t dev) - return error; - } - --static devclass_t cx23885_devclass; -- - /* DEVMETHODs */ - static device_method_t cx23885_methods[] = - { -@@ -532,8 +530,13 @@ static driver_t cx23885_driver = - 0 - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE_ORDERED(cx23885b, pci, cx23885_driver, NULL, NULL, SI_ORDER_ANY); -+#else -+static devclass_t cx23885_devclass; -+ - DRIVER_MODULE_ORDERED(cx23885b, pci, cx23885_driver, cx23885_devclass, NULL, NULL, SI_ORDER_ANY); --DRIVER_MODULE_ORDERED(cx23885b, cardbus, cx23885_driver, cx23885_devclass, NULL, NULL, SI_ORDER_ANY); -+#endif - - CX88_DRIVER_MODULE(cx23885b); - CX88_PCM_DRIVER_MODULE(cx23885b); -@@ -544,8 +547,6 @@ MODULE_VERSION(cx23885b, CX23885_MODVER); - MODULE_DEPEND(cx23885b, cx23885adc, CX23885ADC_MINVER, CX23885ADC_MODVER, CX23885ADC_MAXVER); - MODULE_VERSION(cx23885b, CX23885_MODVER); - --static devclass_t cx23885_i2c_devclass; -- - static int cx23885_i2c_probe(device_t dev) - { - device_set_desc(dev, "CX23885/7/8 I2C master"); -@@ -596,7 +597,13 @@ static driver_t cx23885_i2c_driver = - sizeof(cx88_i2c_softc) - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(cx23885i2c, cx23885b, cx23885_i2c_driver, NULL, NULL); -+#else -+static devclass_t cx23885_i2c_devclass; -+ - DRIVER_MODULE(cx23885i2c, cx23885b, cx23885_i2c_driver, cx23885_i2c_devclass, NULL, NULL); -+#endif - MODULE_DEPEND(cx23885i2c, cx23885b, CX23885_MINVER, CX23885_MODVER, CX23885_MAXVER); - CX88_I2C_DRIVER_MODULE(cx23885i2c); - MODULE_VERSION(cx23885i2c, 1); diff --git a/multimedia/cx88/files/patch-iicdev_iicdev.c b/multimedia/cx88/files/patch-iicdev_iicdev.c deleted file mode 100644 index a6efeed0cf00..000000000000 --- a/multimedia/cx88/files/patch-iicdev_iicdev.c +++ /dev/null @@ -1,25 +0,0 @@ ---- iicdev/iicdev.c.orig 2022-07-26 16:18:50 UTC -+++ iicdev/iicdev.c -@@ -59,8 +59,6 @@ typedef struct - struct sx lock; - } iicdev_softc; - --static devclass_t iicdev_devclass; -- - static int iicdev_probe(device_t dev); - static int iicdev_attach(device_t dev); - static int iicdev_detach(device_t dev); -@@ -233,7 +231,13 @@ static driver_t iicdev_driver = - sizeof(iicdev_softc) - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(iicdev, iicbus, iicdev_driver, NULL, NULL); -+#else -+static devclass_t iicdev_devclass; -+ - DRIVER_MODULE(iicdev, iicbus, iicdev_driver, iicdev_devclass, NULL, NULL); -+#endif - MODULE_DEPEND(iicdev, iicbus, IICBUS_MINVER, IICBUS_MODVER, IICBUS_MAXVER); - MODULE_VERSION(iicdev, IICDEV_MODVER); - diff --git a/multimedia/cx88/files/patch-ir_cx88__ir.c b/multimedia/cx88/files/patch-ir_cx88__ir.c deleted file mode 100644 index df2170707764..000000000000 --- a/multimedia/cx88/files/patch-ir_cx88__ir.c +++ /dev/null @@ -1,25 +0,0 @@ ---- ir/cx88_ir.c.orig 2022-07-26 16:20:13 UTC -+++ ir/cx88_ir.c -@@ -70,8 +70,6 @@ static unsigned int cx88_ir_biphase_decode(uint32_t *s - static int cx88_ir_request_reconfig(device_t dev); - static unsigned int cx88_ir_biphase_decode(uint32_t *samples, unsigned int num_samples); - --static devclass_t cx88_ir_devclass; -- - static d_open_t cx88_ir_open; - static d_close_t cx88_ir_close; - static d_read_t cx88_ir_read; -@@ -401,7 +399,12 @@ static driver_t cx88_ir_driver = - 0 - }; - -+#if __FreeBSD_version >= 1400058 -+DRIVER_MODULE(cx88ir, pci, cx88_ir_driver, NULL, NULL); -+#else -+static devclass_t cx88_ir_devclass; -+ - DRIVER_MODULE(cx88ir, pci, cx88_ir_driver, cx88_ir_devclass, NULL, NULL); --DRIVER_MODULE(cx88ir, cardbus, cx88_ir_driver, cx88_ir_devclass, NULL, NULL); -+#endif - CX88_DRIVER_MODULE(cx88ir); - MODULE_VERSION(cx88ir, 1); diff --git a/multimedia/cx88/pkg-plist b/multimedia/cx88/pkg-plist index 6877ce94af0b..0109abcb33b9 100644 --- a/multimedia/cx88/pkg-plist +++ b/multimedia/cx88/pkg-plist @@ -2,10 +2,10 @@ bin/cx88 %%EXAMPLESDIR%%/cx88.xml.sample %%EXAMPLESDIR%%/cx88_audio_enable.cpp %%EXAMPLESDIR%%/remote.cpp +%%EXAMPLESDIR%%/cx88_video_client.cpp %%EXAMPLESDIR%%/Makefile %%EXAMPLESDIR%%/cx88_audio_client.cpp %%EXAMPLESDIR%%/cx88_mpeg_client.cpp -%%EXAMPLESDIR%%/cx88_video_client.cpp %%EXAMPLESDIR%%/tuner_config include/cx88/cx88_common_ioctl.h include/cx88/cx88_mpeg_ioctl.h