diff options
| author | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
|---|---|---|
| committer | Lexi Winter <ivy@FreeBSD.org> | 2025-12-01 03:19:41 +0000 |
| commit | 2e80774d0b20d167bc0a9e2b63dafbfb171c0d22 (patch) | |
| tree | 25f0138e1af8902b92dacc8cce09b267447c17db /multimedia/libdvdcss/files/patch-src-ioctl.c | |
| parent | f85f2b2d6e5b7ed869376eb4b180c3a74a5c5da9 (diff) | |
| parent | 1a30da80670973368b399f2b01fe9c04b91a1273 (diff) | |
Merge remote-tracking branch 'freebsd/main' into lf/mainlf/main
Diffstat (limited to 'multimedia/libdvdcss/files/patch-src-ioctl.c')
| -rw-r--r-- | multimedia/libdvdcss/files/patch-src-ioctl.c | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/multimedia/libdvdcss/files/patch-src-ioctl.c b/multimedia/libdvdcss/files/patch-src-ioctl.c new file mode 100644 index 000000000000..c7ec1ddb2ef8 --- /dev/null +++ b/multimedia/libdvdcss/files/patch-src-ioctl.c @@ -0,0 +1,31 @@ +--- src/ioctl.c.orig 2025-09-23 08:43:53 UTC ++++ src/ioctl.c +@@ -65,6 +65,10 @@ + # include <scsi/sg.h> + # include <stdlib.h> + #endif ++#ifdef HAVE_CAM_SCSI_SCSI_SG_H ++# include <cam/scsi/scsi_sg.h> ++# include <stdlib.h> ++#endif + #ifdef DVD_STRUCT_IN_DVD_H + # include <dvd.h> + #endif +@@ -1002,7 +1006,7 @@ int ioctl_ReadCPRMMediaId(int i_fd,int *p_agid, uint8_ + { + int i_ret; + +-#if defined( HAVE_LINUX_DVD_STRUCT ) && defined( HAVE_SCSI_SG_H ) ++#if (defined( HAVE_LINUX_DVD_STRUCT ) && defined( HAVE_SCSI_SG_H )) || (defined( HAVE_BSD_DVD_STRUCT ) && defined( HAVE_CAM_SCSI_SCSI_SG_H )) + struct sg_io_hdr io_hdr; + uint8_t sense[32] = {0}; + uint8_t cdb[12] = {0}; +@@ -1091,7 +1095,7 @@ int ioctl_ReadCPRMMKBPack(int i_fd, int *p_agid, int m + { + int i_ret; + +-#if defined( HAVE_LINUX_DVD_STRUCT ) && defined( HAVE_SCSI_SG_H ) ++#if (defined( HAVE_LINUX_DVD_STRUCT ) && defined( HAVE_SCSI_SG_H )) || (defined( HAVE_BSD_DVD_STRUCT ) && defined( HAVE_CAM_SCSI_SCSI_SG_H )) + uint8_t *sptd_buf = malloc( CPRM_MKB_PACK_SIZE + 4 ); + uint8_t cdb[12] = { 0 }; + uint8_t sense[32] = { 0 }; |