Attachment 255479 Details for Bug 282992 – proposed patch

proposed patch

patch_cx88.txt (text/plain), 11.23 KB, created by Jason A. Harmening on 2024-11-26 23:17:08 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason A. Harmening

Created: 2024-11-26 23:17:08 UTC

Size: 11.23 KB

patch

obsolete

>diff --git a/multimedia/cx88/Makefile b/multimedia/cx88/Makefile
>index c6a83a082..5f79e653a 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 289277183..e8a9902f5 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 238e17ecd..000000000
>--- 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 1cf621328..000000000
>--- 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 e1a2f5d5e..000000000
>--- 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 2a19b7780..000000000
>--- 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 f0667fc3a..000000000
>--- 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 a19941930..000000000
>--- 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 a6efeed0c..000000000
>--- 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 df2170707..000000000
>--- 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 6877ce94a..0109abcb3 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

Actions: View

Attachments on bug 282992: 255479