Date: Sun, 11 Oct 1998 02:20:12 -0600 (MDT) From: "Kenneth D. Merry" <ken@plutotech.com> To: jseger@FreeBSD.ORG (Justin M. Seger) Cc: cvs-committers@FreeBSD.ORG, cvs-all@FreeBSD.ORG Subject: Re: cvs commit: ports/audio/kdemultimedia Makefile ports/audio/workman Makefile Message-ID: <199810110820.CAA15330@panzer.plutotech.com> In-Reply-To: <199810110731.AAA14071@freefall.freebsd.org> from "Justin M. Seger" at "Oct 11, 98 00:31:38 am"
next in thread | previous in thread | raw e-mail | index | archive | help
--ELM908094012-15065-0_ Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Justin M. Seger wrote... > jseger 1998/10/11 00:31:38 PDT > > Modified files: > audio/kdemultimedia Makefile > audio/workman Makefile > Log: > Mark BROKEN for current. Can't find scsi.h > > Revision Changes Path > 1.20 +6 -1 ports/audio/kdemultimedia/Makefile > 1.8 +6 -1 ports/audio/workman/Makefile This can probably be fixed. I think it's kscd that breaks the kdemultimedia build. Both workman and kscd (which is supposedly based on workman) use the CD driver's ioctl interface, which hasn't changed in CAM. I tried commenting out the includes of scsi.h and sys/scsiio.h from plat_freebsd.c in the kscd directory, and it compiled just fine. I just tried the same in workman, and it compiles fine as well. I don't have a stable box to test this on, so someone else will have to try it out. IMO, neither program should be including SCSI header files, since they use the ioctl interface to the CD driver. Anyway, patches are attached. They are versus the ports as patched by the ports tree. The workman patch undoes some of the stuff that's done in patch-aa. (The reason I did them like that is just in case you want to make these patches conditional on 3.0. I suppose it's possible that some header pollution in 2.x might be fixed in 3.0, and that's why you don't need the SCSI headers in 3.0. Testing this on a -stable box will tell you what the real scoop is.) Ken -- Kenneth Merry ken@plutotech.com --ELM908094012-15065-0_ Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: attachment; filename=kscd.diffs.101198 Content-Description: kscd.diffs.101198 Content-Transfer-Encoding: 7bit *** kscd/plat_freebsd.c.orig Sun Oct 11 02:01:53 1998 --- kscd/plat_freebsd.c Sun Oct 11 02:07:48 1998 *************** *** 51,57 **** #include <string.h> #include <sys/ioctl.h> #include <sys/cdio.h> - #include <sys/scsiio.h> #ifdef __NetBSD__ --- 51,56 ---- *************** *** 62,70 **** #include "/sys/scsi/scsi_all.h" #include "/sys/scsi/scsi_cd.h" - #else - #include <scsi.h> - #include <sys/scsiio.h> #endif #include "struct.h" --- 61,66 ---- --ELM908094012-15065-0_ Content-Type: text/plain; charset=ISO-8859-1 Content-Disposition: attachment; filename=workman.diffs.101198 Content-Description: workman.diffs.101198 Content-Transfer-Encoding: 7bit *** plat_freebsd.c.ports_patched Sun Oct 11 02:11:46 1998 --- plat_freebsd.c Sun Oct 11 02:12:29 1998 *************** *** 25,44 **** #include <string.h> #include <sys/ioctl.h> #include <sys/cdio.h> - #include <sys/scsiio.h> #ifdef __NetBSD__ #define MSF_MINUTES 1 #define MSF_SECONDS 2 #define MSF_FRAMES 3 #include "/sys/scsi/scsi_all.h" #include "/sys/scsi/scsi_cd.h" - #else - /* - #include <scsi/scsi_all.h> - #include <scsi/scsi_cd.h> - */ - #include <scsi.h> - #include <sys/scsiio.h> #endif #include "struct.h" --- 25,36 ---- --ELM908094012-15065-0_-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199810110820.CAA15330>