From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Sep 25 16:00:43 2003 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9A55016A4D5 for ; Thu, 25 Sep 2003 16:00:43 -0700 (PDT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 59A7843FF9 for ; Thu, 25 Sep 2003 16:00:39 -0700 (PDT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id h8PN0dFY080337 for ; Thu, 25 Sep 2003 16:00:39 -0700 (PDT) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id h8PN0dNv080336; Thu, 25 Sep 2003 16:00:39 -0700 (PDT) (envelope-from gnats) Resent-Date: Thu, 25 Sep 2003 16:00:39 -0700 (PDT) Resent-Message-Id: <200309252300.h8PN0dNv080336@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Vladimir Kushnir Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1042F16A4BF for ; Thu, 25 Sep 2003 15:52:07 -0700 (PDT) Received: from Stalker.alfacom.net (Stalker.Alfacom.net [193.108.124.1]) by mx1.FreeBSD.org (Postfix) with ESMTP id F285344025 for ; Thu, 25 Sep 2003 15:52:03 -0700 (PDT) (envelope-from vkushnir@Alfacom.net) Received: from kushnir1.kiev.ua (124-140.dialup.Alfacom.net [193.108.124.140]) by Stalker.alfacom.net (8.12.8/8.12.8) with ESMTP id h8PMpwLY024863 for ; Fri, 26 Sep 2003 01:51:59 +0300 (EEST) Received: from kushnir1.kiev.ua (localhost [127.0.0.1]) by kushnir1.kiev.ua (8.12.10/8.12.9) with ESMTP id h8PMpvBZ014764 for ; Fri, 26 Sep 2003 01:51:57 +0300 (EEST) (envelope-from vkushnir@kushnir1.kiev.ua) Received: (from vkushnir@localhost) by kushnir1.kiev.ua (8.12.10/8.12.9/Submit) id h8PMpvL6014763; Fri, 26 Sep 2003 01:51:57 +0300 (EEST) (envelope-from vkushnir) Message-Id: <200309252251.h8PMpvL6014763@kushnir1.kiev.ua> Date: Fri, 26 Sep 2003 01:51:57 +0300 (EEST) From: Vladimir Kushnir To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/57227: audio/dagrab fix to work under -CURRENT X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Vladimir Kushnir List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Sep 2003 23:00:43 -0000 >Number: 57227 >Category: ports >Synopsis: audio/dagrab fix to work under -CURRENT >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Thu Sep 25 16:00:39 PDT 2003 >Closed-Date: >Last-Modified: >Originator: Vladimir Kushnir >Release: FreeBSD 5.1-CURRENT i386 >Organization: >Environment: System: FreeBSD kushnir1.kiev.ua 5.1-CURRENT FreeBSD 5.1-CURRENT #11: Tue Sep 23 12:56:27 EEST 2003 root@kushnir1.kiev.ua:/usr/obj/usr/src/sys/KUSHNIR i386 >Description: Under FreeBSD-CURRENT, dagrab does not work because CDIOCREADAUDIO ioctl was removed. >How-To-Repeat: Try to use it. >Fix: Apply the patch below _after_ "make patch" was done in port NB: This patch is for -CURRENT --- patch-dagrab.c.1 begins here --- *** /usr/ports/audio/dagrab/work/dagrab-0.3.5/dagrab.c Wed Sep 24 01:39:03 2003 --- dagrab.c Wed Sep 24 01:42:20 2003 *************** *** 104,109 **** --- 104,110 ---- #include #include #include + #include #include #include #define CDDEVICE "/dev/cdrom" *************** *** 248,262 **** /*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32) jitter correction may be required inside the block. */ { ! struct ioc_read_audio ra; ! ! ra.address.lba=lba; ! ra.address_format=CD_LBA_FORMAT; ! ra.nframes=num; ! ra.buffer=buf; ! if(ioctl(cdrom_fd,CDIOCREADAUDIO,&ra)){ /*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/ ! fprintf(stderr,"\n%s: read raw ioctl failed at lba %d length %d: %s\n", progname,lba,num,strerror(errno)); exit(1); } --- 249,262 ---- /*NOTE: if num>CDROM_NBLOCKS_BUFFER as defined in ide_cd.c (8 in linux 2.0.32) jitter correction may be required inside the block. */ { ! int bsize = 2352; ! if(ioctl(cdrom_fd,CDRIOCSETBLOCKSIZE,&bsize) == -1) { ! fprintf(stderr, "setblocksize"); ! exit(1); ! } ! if (pread(cdrom_fd, buf, num*bsize, lba*bsize) != num*bsize){ /*fprintf(stderr,"%s: read raw ioctl failed \n",progname);*/ ! fprintf(stderr,"\n%s: read device at lba %d length %d: %s\n", progname,lba,num,strerror(errno)); exit(1); } *************** *** 687,693 **** } tl->starts[tl->max-tl->min+1]=ntohl(Te.entry.addr.lba); tl->types[tl->max-tl->min+1]=Te.entry.control&CDROM_DATA_TRACK; ! i=cddb_main(tl); if(i==-1) { fprintf(stderr,"%s: error retrieving cddb data\n",PROGNAME); --- 687,693 ---- } tl->starts[tl->max-tl->min+1]=ntohl(Te.entry.addr.lba); tl->types[tl->max-tl->min+1]=Te.entry.control&CDROM_DATA_TRACK; ! i=cddb_main(tl); if(i==-1) { fprintf(stderr,"%s: error retrieving cddb data\n",PROGNAME); *************** *** 1096,1101 **** --- 1096,1102 ---- } } }; + if(opt_verbose) fprintf(stderr, "sectors %3d overlap %3d key length %3d retrys %4d offset %3d\n", opt_blocks,opt_overlap,opt_keylen,opt_retrys,opt_ofs); --- patch-dagrab.c.1 ends here --- >Release-Note: >Audit-Trail: >Unformatted: