wok-next rev 21070
Rename cdparanoia
| author | Aleksej Bobylev <al.bobylev@gmail.com> |
|---|---|
| date | Wed Dec 12 02:29:05 2018 +0200 (2018-12-12) |
| parents | c4829e4dff2f |
| children | 4d9f82dabdbb |
| files | asunder/receipt cdparanoia-III/receipt cdparanoia-III/stuff/patches/cdparanoia-III-10.2-gcc_fixes-1.patch cdparanoia-III/stuff/patches/series cdparanoia/.icon.png cdparanoia/receipt cdparanoia/stuff/patches/cdparanoia-III-10.2-gcc_fixes-1.patch cdparanoia/stuff/patches/series deadbeef/receipt gst0-plugins-base/receipt gst1-plugins-base/receipt mplayer-svn/receipt mplayer/receipt rubyripper/receipt tazpkg-desc-ru/stuff/packages-desc.ru |
line diff
1.1 --- a/asunder/receipt Wed Dec 12 01:52:32 2018 +0200 1.2 +++ b/asunder/receipt Wed Dec 12 02:29:05 2018 +0200 1.3 @@ -11,7 +11,7 @@ 1.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.5 WGET_URL="$WEB_SITE/releases/$TARBALL" 1.6 1.7 -BUILD_DEPENDS="gtk2-dev alsa-lib-dev libcddb-dev cdparanoia-III-dev \ 1.8 +BUILD_DEPENDS="gtk2-dev alsa-lib-dev libcddb-dev cdparanoia-dev \ 1.9 xorg-libXdamage-dev intltool" 1.10 1.11 compile_rules() { 1.12 @@ -24,7 +24,7 @@ 1.13 1.14 genpkg_rules() { 1.15 copy @std 1.16 - DEPENDS="atk gdk-pixbuf glib gtk2 libcddb cdparanoia-III" 1.17 + DEPENDS="atk gdk-pixbuf glib gtk2 libcddb cdparanoia" 1.18 SUGGESTED="lame flac" 1.19 TAGS="audio rip" 1.20 }
2.1 --- a/cdparanoia-III/receipt Wed Dec 12 01:52:32 2018 +0200 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,31 +0,0 @@ 2.4 -# SliTaz package receipt v2. 2.5 - 2.6 -PACKAGE="cdparanoia-III" 2.7 -VERSION="10.2" 2.8 -CATEGORY="multimedia" 2.9 -SHORT_DESC="An audio extraction tool for sampling CDs" 2.10 -MAINTAINER="devel@slitaz.org" 2.11 -LICENSE="GPL2 LGPL2.1" 2.12 -WEB_SITE="https://www.xiph.org/paranoia/" 2.13 -REPOLOGY="cdparanoia" 2.14 - 2.15 -TARBALL="$PACKAGE-$VERSION.src.tgz" 2.16 -WGET_URL="http://downloads.xiph.org/releases/cdparanoia/$TARBALL" 2.17 - 2.18 -SPLIT="$PACKAGE-dev" 2.19 - 2.20 -compile_rules() { 2.21 - # Use DESTDIR 2.22 - sed -i 's|\$([A-Z]*DIR)|$(DESTDIR)&|' Makefile.in 2.23 - 2.24 - ./configure $CONFIGURE_ARGS && 2.25 - make -j1 && 2.26 - make install 2.27 -} 2.28 - 2.29 -genpkg_rules() { 2.30 - case $PACKAGE in 2.31 - cdparanoia-III) copy @std;; 2.32 - *-dev) copy @dev;; 2.33 - esac 2.34 -}
3.1 --- a/cdparanoia-III/stuff/patches/cdparanoia-III-10.2-gcc_fixes-1.patch Wed Dec 12 01:52:32 2018 +0200 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,586 +0,0 @@ 3.4 -Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 3.5 -Date: 2008-12-03 3.6 -Initial Package Version: III-10.2 3.7 -Upstream Status: unknown 3.8 -Origin: gentoo, who describe it as a gcc-4.3 patch 3.9 -Description: Renames a variable from 'private' to 'private_data'. This is 3.10 -apparently intended to allow the package to be compiled with gcc-4.3 and later. 3.11 -The header file cdda_interface.h is used by c++ code in kdemultimedia-4.1.2 3.12 -which barfs on the use of private _even_in_g++-4.2.2_. 3.13 - 3.14 -diff -urp cdparanoia-III-10.2.orig/interface/cdda_interface.h cdparanoia-III-10.2/interface/cdda_interface.h 3.15 ---- cdparanoia-III-10.2.orig/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100 3.16 -+++ cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-25 00:18:02.000000000 +0100 3.17 -@@ -84,7 +84,7 @@ typedef struct cdrom_drive{ 3.18 - int is_atapi; 3.19 - int is_mmc; 3.20 - 3.21 -- cdda_private_data_t *private; 3.22 -+ cdda_private_data_t *private_data; 3.23 - void *reserved; 3.24 - unsigned char inqbytes[4]; 3.25 - 3.26 -diff -urp cdparanoia-III-10.2.orig/interface/cooked_interface.c cdparanoia-III-10.2/interface/cooked_interface.c 3.27 ---- cdparanoia-III-10.2.orig/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100 3.28 -+++ cdparanoia-III-10.2/interface/cooked_interface.c 2008-09-25 00:19:21.000000000 +0100 3.29 -@@ -13,13 +13,13 @@ 3.30 - static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ 3.31 - struct timespec tv1; 3.32 - struct timespec tv2; 3.33 -- int ret1=clock_gettime(d->private->clock,&tv1); 3.34 -+ int ret1=clock_gettime(d->private_data->clock,&tv1); 3.35 - int ret2=ioctl(fd, command,arg); 3.36 -- int ret3=clock_gettime(d->private->clock,&tv2); 3.37 -+ int ret3=clock_gettime(d->private_data->clock,&tv2); 3.38 - if(ret1<0 || ret3<0){ 3.39 -- d->private->last_milliseconds=-1; 3.40 -+ d->private_data->last_milliseconds=-1; 3.41 - }else{ 3.42 -- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 3.43 -+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 3.44 - } 3.45 - return ret2; 3.46 - } 3.47 -diff -urp cdparanoia-III-10.2.orig/interface/interface.c cdparanoia-III-10.2/interface/interface.c 3.48 ---- cdparanoia-III-10.2.orig/interface/interface.c 2008-09-11 11:43:52.000000000 +0100 3.49 -+++ cdparanoia-III-10.2/interface/interface.c 2008-09-25 00:19:47.000000000 +0100 3.50 -@@ -39,9 +39,9 @@ int cdda_close(cdrom_drive *d){ 3.51 - if(d->drive_model)free(d->drive_model); 3.52 - if(d->cdda_fd!=-1)close(d->cdda_fd); 3.53 - if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); 3.54 -- if(d->private){ 3.55 -- if(d->private->sg_hd)free(d->private->sg_hd); 3.56 -- free(d->private); 3.57 -+ if(d->private_data){ 3.58 -+ if(d->private_data->sg_hd)free(d->private_data->sg_hd); 3.59 -+ free(d->private_data); 3.60 - } 3.61 - 3.62 - free(d); 3.63 -@@ -127,7 +127,7 @@ long cdda_read_timed(cdrom_drive *d, voi 3.64 - } 3.65 - } 3.66 - } 3.67 -- if(ms)*ms=d->private->last_milliseconds; 3.68 -+ if(ms)*ms=d->private_data->last_milliseconds; 3.69 - return(sectors); 3.70 - } 3.71 - 3.72 -diff -urp cdparanoia-III-10.2.orig/interface/scan_devices.c cdparanoia-III-10.2/interface/scan_devices.c 3.73 ---- cdparanoia-III-10.2.orig/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100 3.74 -+++ cdparanoia-III-10.2/interface/scan_devices.c 2008-09-25 00:20:35.000000000 +0100 3.75 -@@ -264,11 +264,11 @@ cdrom_drive *cdda_identify_cooked(const 3.76 - d->interface=COOKED_IOCTL; 3.77 - d->bigendianp=-1; /* We don't know yet... */ 3.78 - d->nsectors=-1; 3.79 -- d->private=calloc(1,sizeof(*d->private)); 3.80 -+ d->private_data=calloc(1,sizeof(*d->private_data)); 3.81 - { 3.82 - /* goddamnit */ 3.83 - struct timespec tv; 3.84 -- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 3.85 -+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 3.86 - } 3.87 - idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); 3.88 - return(d); 3.89 -@@ -674,15 +674,15 @@ cdrom_drive *cdda_identify_scsi(const ch 3.90 - d->bigendianp=-1; /* We don't know yet... */ 3.91 - d->nsectors=-1; 3.92 - d->messagedest = messagedest; 3.93 -- d->private=calloc(1,sizeof(*d->private)); 3.94 -+ d->private_data=calloc(1,sizeof(*d->private_data)); 3.95 - { 3.96 - /* goddamnit */ 3.97 - struct timespec tv; 3.98 -- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 3.99 -+ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 3.100 - } 3.101 - if(use_sgio){ 3.102 - d->interface=SGIO_SCSI; 3.103 -- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); 3.104 -+ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); 3.105 - g_fd=d->cdda_fd=dup(d->ioctl_fd); 3.106 - }else{ 3.107 - version=verify_SG_version(d,messagedest,messages); 3.108 -@@ -696,8 +696,8 @@ cdrom_drive *cdda_identify_scsi(const ch 3.109 - } 3.110 - 3.111 - /* malloc our big buffer for scsi commands */ 3.112 -- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); 3.113 -- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; 3.114 -+ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); 3.115 -+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; 3.116 - } 3.117 - 3.118 - { 3.119 -@@ -772,9 +772,9 @@ cdda_identify_scsi_fail: 3.120 - if(i_fd!=-1)close(i_fd); 3.121 - if(g_fd!=-1)close(g_fd); 3.122 - if(d){ 3.123 -- if(d->private){ 3.124 -- if(d->private->sg_hd)free(d->private->sg_hd); 3.125 -- free(d->private); 3.126 -+ if(d->private_data){ 3.127 -+ if(d->private_data->sg_hd)free(d->private_data->sg_hd); 3.128 -+ free(d->private_data); 3.129 - } 3.130 - free(d); 3.131 - } 3.132 -@@ -821,7 +821,7 @@ cdrom_drive *cdda_identify_test(const ch 3.133 - d->interface=TEST_INTERFACE; 3.134 - d->bigendianp=-1; /* We don't know yet... */ 3.135 - d->nsectors=-1; 3.136 -- d->private=calloc(1,sizeof(*d->private)); 3.137 -+ d->private_data=calloc(1,sizeof(*d->private_data)); 3.138 - d->drive_model=copystring("File based test interface"); 3.139 - idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); 3.140 - 3.141 -diff -urp cdparanoia-III-10.2.orig/interface/scsi_interface.c cdparanoia-III-10.2/interface/scsi_interface.c 3.142 ---- cdparanoia-III-10.2.orig/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100 3.143 -+++ cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-25 00:22:40.000000000 +0100 3.144 -@@ -15,13 +15,13 @@ 3.145 - static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ 3.146 - struct timespec tv1; 3.147 - struct timespec tv2; 3.148 -- int ret1=clock_gettime(d->private->clock,&tv1); 3.149 -+ int ret1=clock_gettime(d->private_data->clock,&tv1); 3.150 - int ret2=ioctl(fd, command,arg); 3.151 -- int ret3=clock_gettime(d->private->clock,&tv2); 3.152 -+ int ret3=clock_gettime(d->private_data->clock,&tv2); 3.153 - if(ret1<0 || ret3<0){ 3.154 -- d->private->last_milliseconds=-1; 3.155 -+ d->private_data->last_milliseconds=-1; 3.156 - }else{ 3.157 -- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 3.158 -+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 3.159 - } 3.160 - return ret2; 3.161 - } 3.162 -@@ -96,7 +96,7 @@ static void tweak_SG_buffer(cdrom_drive 3.163 - static void clear_garbage(cdrom_drive *d){ 3.164 - fd_set fdset; 3.165 - struct timeval tv; 3.166 -- struct sg_header *sg_hd=d->private->sg_hd; 3.167 -+ struct sg_header *sg_hd=d->private_data->sg_hd; 3.168 - int flag=0; 3.169 - 3.170 - /* clear out any possibly preexisting garbage */ 3.171 -@@ -185,7 +185,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.172 - struct timespec tv2; 3.173 - int tret1,tret2; 3.174 - int status = 0; 3.175 -- struct sg_header *sg_hd=d->private->sg_hd; 3.176 -+ struct sg_header *sg_hd=d->private_data->sg_hd; 3.177 - long writebytes=SG_OFF+cmd_len+in_size; 3.178 - 3.179 - /* generic scsi device services */ 3.180 -@@ -195,7 +195,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.181 - 3.182 - memset(sg_hd,0,sizeof(sg_hd)); 3.183 - memset(sense_buffer,0,SG_MAX_SENSE); 3.184 -- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); 3.185 -+ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); 3.186 - sg_hd->twelve_byte = cmd_len == 12; 3.187 - sg_hd->result = 0; 3.188 - sg_hd->reply_len = SG_OFF + out_size; 3.189 -@@ -209,7 +209,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.190 - tell if the command failed. Scared yet? */ 3.191 - 3.192 - if(bytecheck && out_size>in_size){ 3.193 -- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 3.194 -+ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 3.195 - /* the size does not remove cmd_len due to the way the kernel 3.196 - driver copies buffers */ 3.197 - writebytes+=(out_size-in_size); 3.198 -@@ -243,7 +243,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.199 - } 3.200 - 3.201 - sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); 3.202 -- tret1=clock_gettime(d->private->clock,&tv1); 3.203 -+ tret1=clock_gettime(d->private_data->clock,&tv1); 3.204 - errno=0; 3.205 - status = write(d->cdda_fd, sg_hd, writebytes ); 3.206 - 3.207 -@@ -289,7 +289,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.208 - } 3.209 - } 3.210 - 3.211 -- tret2=clock_gettime(d->private->clock,&tv2); 3.212 -+ tret2=clock_gettime(d->private_data->clock,&tv2); 3.213 - errno=0; 3.214 - status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); 3.215 - sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); 3.216 -@@ -313,7 +313,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.217 - if(bytecheck && in_size+cmd_len<out_size){ 3.218 - long i,flag=0; 3.219 - for(i=in_size;i<out_size;i++) 3.220 -- if(d->private->sg_buffer[i]!=bytefill){ 3.221 -+ if(d->private_data->sg_buffer[i]!=bytefill){ 3.222 - flag=1; 3.223 - break; 3.224 - } 3.225 -@@ -326,9 +326,9 @@ static int sg2_handle_scsi_cmd(cdrom_dri 3.226 - 3.227 - errno=0; 3.228 - if(tret1<0 || tret2<0){ 3.229 -- d->private->last_milliseconds=-1; 3.230 -+ d->private_data->last_milliseconds=-1; 3.231 - }else{ 3.232 -- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; 3.233 -+ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; 3.234 - } 3.235 - return(0); 3.236 - } 3.237 -@@ -347,7 +347,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 3.238 - 3.239 - memset(&hdr,0,sizeof(hdr)); 3.240 - memset(sense,0,sizeof(sense)); 3.241 -- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); 3.242 -+ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); 3.243 - 3.244 - hdr.cmdp = cmd; 3.245 - hdr.cmd_len = cmd_len; 3.246 -@@ -355,7 +355,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 3.247 - hdr.mx_sb_len = SG_MAX_SENSE; 3.248 - hdr.timeout = 50000; 3.249 - hdr.interface_id = 'S'; 3.250 -- hdr.dxferp = d->private->sg_buffer; 3.251 -+ hdr.dxferp = d->private_data->sg_buffer; 3.252 - hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ 3.253 - 3.254 - /* scary buffer fill hack */ 3.255 -@@ -400,7 +400,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 3.256 - if(bytecheck && in_size<out_size){ 3.257 - long i,flag=0; 3.258 - for(i=in_size;i<out_size;i++) 3.259 -- if(d->private->sg_buffer[i]!=bytefill){ 3.260 -+ if(d->private_data->sg_buffer[i]!=bytefill){ 3.261 - flag=1; 3.262 - break; 3.263 - } 3.264 -@@ -412,7 +412,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 3.265 - } 3.266 - 3.267 - /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ 3.268 -- /* d->private->last_milliseconds = hdr.duration; */ 3.269 -+ /* d->private_data->last_milliseconds = hdr.duration; */ 3.270 - 3.271 - errno = 0; 3.272 - return 0; 3.273 -@@ -445,9 +445,9 @@ static int test_unit_ready(cdrom_drive * 3.274 - 3.275 - handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); 3.276 - 3.277 -- key = d->private->sg_buffer[2] & 0xf; 3.278 -- ASC = d->private->sg_buffer[12]; 3.279 -- ASCQ = d->private->sg_buffer[13]; 3.280 -+ key = d->private_data->sg_buffer[2] & 0xf; 3.281 -+ ASC = d->private_data->sg_buffer[12]; 3.282 -+ ASCQ = d->private_data->sg_buffer[13]; 3.283 - 3.284 - if(key == 2 && ASC == 4 && ASCQ == 1) return 0; 3.285 - return 1; 3.286 -@@ -492,7 +492,7 @@ static int mode_sense_atapi(cdrom_drive 3.287 - if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); 3.288 - 3.289 - { 3.290 -- unsigned char *b=d->private->sg_buffer; 3.291 -+ unsigned char *b=d->private_data->sg_buffer; 3.292 - if(b[0])return(1); /* Handles only up to 256 bytes */ 3.293 - if(b[6])return(1); /* Handles only up to 256 bytes */ 3.294 - 3.295 -@@ -604,8 +604,8 @@ static int mode_select(cdrom_drive *d,in 3.296 - static unsigned int get_orig_sectorsize(cdrom_drive *d){ 3.297 - if(mode_sense(d,12,0x01))return(-1); 3.298 - 3.299 -- d->orgdens = d->private->sg_buffer[4]; 3.300 -- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); 3.301 -+ d->orgdens = d->private_data->sg_buffer[4]; 3.302 -+ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); 3.303 - } 3.304 - 3.305 - /* switch CDROM scsi drives to given sector size */ 3.306 -@@ -664,8 +664,8 @@ static int scsi_read_toc (cdrom_drive *d 3.307 - return(-4); 3.308 - } 3.309 - 3.310 -- first=d->private->sg_buffer[2]; 3.311 -- last=d->private->sg_buffer[3]; 3.312 -+ first=d->private_data->sg_buffer[2]; 3.313 -+ last=d->private_data->sg_buffer[3]; 3.314 - tracks=last-first+1; 3.315 - 3.316 - if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { 3.317 -@@ -683,7 +683,7 @@ static int scsi_read_toc (cdrom_drive *d 3.318 - return(-5); 3.319 - } 3.320 - { 3.321 -- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); 3.322 -+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); 3.323 - 3.324 - d->disc_toc[i-first].bFlags=toc->bFlags; 3.325 - d->disc_toc[i-first].bTrack=i; 3.326 -@@ -704,7 +704,7 @@ static int scsi_read_toc (cdrom_drive *d 3.327 - return(-2); 3.328 - } 3.329 - { 3.330 -- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); 3.331 -+ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); 3.332 - 3.333 - d->disc_toc[i-first].bFlags=toc->bFlags; 3.334 - d->disc_toc[i-first].bTrack=0xAA; 3.335 -@@ -738,7 +738,7 @@ static int scsi_read_toc2 (cdrom_drive * 3.336 - } 3.337 - 3.338 - /* copy to our structure and convert start sector */ 3.339 -- tracks = d->private->sg_buffer[1]; 3.340 -+ tracks = d->private_data->sg_buffer[1]; 3.341 - if (tracks > MAXTRK) { 3.342 - cderror(d,"003: CDROM reporting illegal number of tracks\n"); 3.343 - return(-3); 3.344 -@@ -754,33 +754,33 @@ static int scsi_read_toc2 (cdrom_drive * 3.345 - return(-5); 3.346 - } 3.347 - 3.348 -- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; 3.349 -+ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; 3.350 - d->disc_toc[i].bTrack = i + 1; 3.351 - 3.352 - d->disc_toc[i].dwStartSector= d->adjust_ssize * 3.353 -- (((signed char)(d->private->sg_buffer[2])<<24) | 3.354 -- (d->private->sg_buffer[3]<<16)| 3.355 -- (d->private->sg_buffer[4]<<8)| 3.356 -- (d->private->sg_buffer[5])); 3.357 -+ (((signed char)(d->private_data->sg_buffer[2])<<24) | 3.358 -+ (d->private_data->sg_buffer[3]<<16)| 3.359 -+ (d->private_data->sg_buffer[4]<<8)| 3.360 -+ (d->private_data->sg_buffer[5])); 3.361 - } 3.362 - 3.363 - d->disc_toc[i].bFlags = 0; 3.364 - d->disc_toc[i].bTrack = i + 1; 3.365 -- memcpy (&foo, d->private->sg_buffer+2, 4); 3.366 -- memcpy (&bar, d->private->sg_buffer+6, 4); 3.367 -+ memcpy (&foo, d->private_data->sg_buffer+2, 4); 3.368 -+ memcpy (&bar, d->private_data->sg_buffer+6, 4); 3.369 - d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + 3.370 - be32_to_cpu(bar)); 3.371 - 3.372 - d->disc_toc[i].dwStartSector= d->adjust_ssize * 3.373 -- ((((signed char)(d->private->sg_buffer[2])<<24) | 3.374 -- (d->private->sg_buffer[3]<<16)| 3.375 -- (d->private->sg_buffer[4]<<8)| 3.376 -- (d->private->sg_buffer[5]))+ 3.377 -+ ((((signed char)(d->private_data->sg_buffer[2])<<24) | 3.378 -+ (d->private_data->sg_buffer[3]<<16)| 3.379 -+ (d->private_data->sg_buffer[4]<<8)| 3.380 -+ (d->private_data->sg_buffer[5]))+ 3.381 - 3.382 -- ((((signed char)(d->private->sg_buffer[6])<<24) | 3.383 -- (d->private->sg_buffer[7]<<16)| 3.384 -- (d->private->sg_buffer[8]<<8)| 3.385 -- (d->private->sg_buffer[9])))); 3.386 -+ ((((signed char)(d->private_data->sg_buffer[6])<<24) | 3.387 -+ (d->private_data->sg_buffer[7]<<16)| 3.388 -+ (d->private_data->sg_buffer[8]<<8)| 3.389 -+ (d->private_data->sg_buffer[9])))); 3.390 - 3.391 - 3.392 - d->cd_extra = FixupTOC(d,tracks+1); 3.393 -@@ -817,7 +817,7 @@ static int i_read_28 (cdrom_drive *d, vo 3.394 - cmd[8] = sectors; 3.395 - if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.396 - return(ret); 3.397 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.398 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.399 - return(0); 3.400 - } 3.401 - 3.402 -@@ -836,7 +836,7 @@ static int i_read_A8 (cdrom_drive *d, vo 3.403 - cmd[9] = sectors; 3.404 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.405 - return(ret); 3.406 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.407 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.408 - return(0); 3.409 - } 3.410 - 3.411 -@@ -854,7 +854,7 @@ static int i_read_D4_10 (cdrom_drive *d, 3.412 - cmd[8] = sectors; 3.413 - if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.414 - return(ret); 3.415 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.416 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.417 - return(0); 3.418 - } 3.419 - 3.420 -@@ -872,7 +872,7 @@ static int i_read_D4_12 (cdrom_drive *d, 3.421 - cmd[9] = sectors; 3.422 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.423 - return(ret); 3.424 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.425 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.426 - return(0); 3.427 - } 3.428 - 3.429 -@@ -890,7 +890,7 @@ static int i_read_D5 (cdrom_drive *d, vo 3.430 - cmd[8] = sectors; 3.431 - if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.432 - return(ret); 3.433 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.434 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.435 - return(0); 3.436 - } 3.437 - 3.438 -@@ -908,7 +908,7 @@ static int i_read_D8 (cdrom_drive *d, vo 3.439 - cmd[9] = sectors; 3.440 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.441 - return(ret); 3.442 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.443 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.444 - return(0); 3.445 - } 3.446 - 3.447 -@@ -922,7 +922,7 @@ static int i_read_mmc (cdrom_drive *d, v 3.448 - cmd[8] = sectors; 3.449 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.450 - return(ret); 3.451 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.452 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.453 - return(0); 3.454 - } 3.455 - 3.456 -@@ -936,7 +936,7 @@ static int i_read_mmcB (cdrom_drive *d, 3.457 - cmd[8] = sectors; 3.458 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.459 - return(ret); 3.460 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.461 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.462 - return(0); 3.463 - } 3.464 - 3.465 -@@ -950,7 +950,7 @@ static int i_read_mmc2 (cdrom_drive *d, 3.466 - cmd[8] = sectors; 3.467 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.468 - return(ret); 3.469 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.470 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.471 - return(0); 3.472 - } 3.473 - 3.474 -@@ -964,7 +964,7 @@ static int i_read_mmc2B (cdrom_drive *d, 3.475 - cmd[8] = sectors; 3.476 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.477 - return(ret); 3.478 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.479 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.480 - return(0); 3.481 - } 3.482 - 3.483 -@@ -978,7 +978,7 @@ static int i_read_mmc3 (cdrom_drive *d, 3.484 - cmd[8] = sectors; 3.485 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.486 - return(ret); 3.487 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.488 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.489 - return(0); 3.490 - } 3.491 - 3.492 -@@ -992,7 +992,7 @@ static int i_read_mmc3B (cdrom_drive *d, 3.493 - cmd[8] = sectors; 3.494 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.495 - return(ret); 3.496 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.497 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.498 - return(0); 3.499 - } 3.500 - 3.501 -@@ -1026,7 +1026,7 @@ static int i_read_msf (cdrom_drive *d, v 3.502 - 3.503 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.504 - return(ret); 3.505 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.506 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.507 - return(0); 3.508 - } 3.509 - 3.510 -@@ -1039,7 +1039,7 @@ static int i_read_msf2 (cdrom_drive *d, 3.511 - 3.512 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.513 - return(ret); 3.514 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.515 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.516 - return(0); 3.517 - } 3.518 - 3.519 -@@ -1052,7 +1052,7 @@ static int i_read_msf3 (cdrom_drive *d, 3.520 - 3.521 - if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 3.522 - return(ret); 3.523 -- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.524 -+ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 3.525 - return(0); 3.526 - } 3.527 - 3.528 -@@ -1275,7 +1275,7 @@ long scsi_read_msf3 (cdrom_drive *d, voi 3.529 - static int count_2352_bytes(cdrom_drive *d){ 3.530 - long i; 3.531 - for(i=2351;i>=0;i--) 3.532 -- if(d->private->sg_buffer[i]!=(unsigned char)'\177') 3.533 -+ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') 3.534 - return(((i+3)>>2)<<2); 3.535 - 3.536 - return(0); 3.537 -@@ -1284,7 +1284,7 @@ static int count_2352_bytes(cdrom_drive 3.538 - static int verify_nonzero(cdrom_drive *d){ 3.539 - long i,flag=0; 3.540 - for(i=0;i<2352;i++) 3.541 -- if(d->private->sg_buffer[i]!=0){ 3.542 -+ if(d->private_data->sg_buffer[i]!=0){ 3.543 - flag=1; 3.544 - break; 3.545 - } 3.546 -@@ -1625,7 +1625,7 @@ static int check_mmc(cdrom_drive *d){ 3.547 - d->is_mmc=0; 3.548 - if(mode_sense(d,22,0x2A)==0){ 3.549 - 3.550 -- b=d->private->sg_buffer; 3.551 -+ b=d->private_data->sg_buffer; 3.552 - b+=b[3]+4; 3.553 - 3.554 - if((b[0]&0x3F)==0x2A){ 3.555 -@@ -1673,7 +1673,7 @@ unsigned char *scsi_inquiry(cdrom_drive 3.556 - cderror(d,"008: Unable to identify CDROM model\n"); 3.557 - return(NULL); 3.558 - } 3.559 -- return (d->private->sg_buffer); 3.560 -+ return (d->private_data->sg_buffer); 3.561 - } 3.562 - 3.563 - int scsi_init_drive(cdrom_drive *d){ 3.564 -@@ -1742,8 +1742,8 @@ int scsi_init_drive(cdrom_drive *d){ 3.565 - check_cache(d); 3.566 - 3.567 - d->error_retry=1; 3.568 -- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); 3.569 -- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; 3.570 -+ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); 3.571 -+ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; 3.572 - d->report_all=1; 3.573 - return(0); 3.574 - } 3.575 -diff -urp cdparanoia-III-10.2.orig/interface/test_interface.c cdparanoia-III-10.2/interface/test_interface.c 3.576 ---- cdparanoia-III-10.2.orig/interface/test_interface.c 2008-09-11 21:33:30.000000000 +0100 3.577 -+++ cdparanoia-III-10.2/interface/test_interface.c 2008-09-25 00:22:46.000000000 +0100 3.578 -@@ -66,9 +66,9 @@ static long test_read(cdrom_drive *d, vo 3.579 - if(!fd)fd=fdopen(d->cdda_fd,"r"); 3.580 - 3.581 - if(begin<lastread) 3.582 -- d->private->last_milliseconds=20; 3.583 -+ d->private_data->last_milliseconds=20; 3.584 - else 3.585 -- d->private->last_milliseconds=sectors; 3.586 -+ d->private_data->last_milliseconds=sectors; 3.587 - 3.588 - #ifdef CDDA_TEST_UNDERRUN 3.589 - sectors-=1;
4.1 --- a/cdparanoia-III/stuff/patches/series Wed Dec 12 01:52:32 2018 +0200 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,4 +0,0 @@ 4.4 -# taken from BLFS 4.5 -# <http://www.linuxfromscratch.org/patches/blfs/8.0/cdparanoia-III-10.2-gcc_fixes-1.patch> 4.6 - 4.7 -cdparanoia-III-10.2-gcc_fixes-1.patch
5.1 Binary file cdparanoia/.icon.png has changed
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 6.2 +++ b/cdparanoia/receipt Wed Dec 12 02:29:05 2018 +0200 6.3 @@ -0,0 +1,25 @@ 6.4 +# SliTaz package receipt v2. 6.5 + 6.6 +PACKAGE="cdparanoia" 6.7 +VERSION="10.2" 6.8 +CATEGORY="multimedia" 6.9 +SHORT_DESC="An audio extraction tool for sampling CDs" 6.10 +MAINTAINER="devel@slitaz.org" 6.11 +LICENSE="GPL2 LGPL2.1" 6.12 +WEB_SITE="https://www.xiph.org/paranoia/" 6.13 + 6.14 +TARBALL="$PACKAGE-III-$VERSION.src.tgz" 6.15 +WGET_URL="http://downloads.xiph.org/releases/$PACKAGE/$TARBALL" 6.16 + 6.17 +SPLIT="$PACKAGE-dev" 6.18 + 6.19 +TAGS_std="Xiph.org" 6.20 + 6.21 +compile_rules() { 6.22 + # Use DESTDIR 6.23 + sed -i 's|\$([A-Z]*DIR)|$(DESTDIR)&|' Makefile.in 6.24 + 6.25 + ./configure $CONFIGURE_ARGS && 6.26 + make -j1 && 6.27 + make install 6.28 +}
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 7.2 +++ b/cdparanoia/stuff/patches/cdparanoia-III-10.2-gcc_fixes-1.patch Wed Dec 12 02:29:05 2018 +0200 7.3 @@ -0,0 +1,586 @@ 7.4 +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> 7.5 +Date: 2008-12-03 7.6 +Initial Package Version: III-10.2 7.7 +Upstream Status: unknown 7.8 +Origin: gentoo, who describe it as a gcc-4.3 patch 7.9 +Description: Renames a variable from 'private' to 'private_data'. This is 7.10 +apparently intended to allow the package to be compiled with gcc-4.3 and later. 7.11 +The header file cdda_interface.h is used by c++ code in kdemultimedia-4.1.2 7.12 +which barfs on the use of private _even_in_g++-4.2.2_. 7.13 + 7.14 +diff -urp cdparanoia-III-10.2.orig/interface/cdda_interface.h cdparanoia-III-10.2/interface/cdda_interface.h 7.15 +--- cdparanoia-III-10.2.orig/interface/cdda_interface.h 2008-09-11 11:43:52.000000000 +0100 7.16 ++++ cdparanoia-III-10.2/interface/cdda_interface.h 2008-09-25 00:18:02.000000000 +0100 7.17 +@@ -84,7 +84,7 @@ typedef struct cdrom_drive{ 7.18 + int is_atapi; 7.19 + int is_mmc; 7.20 + 7.21 +- cdda_private_data_t *private; 7.22 ++ cdda_private_data_t *private_data; 7.23 + void *reserved; 7.24 + unsigned char inqbytes[4]; 7.25 + 7.26 +diff -urp cdparanoia-III-10.2.orig/interface/cooked_interface.c cdparanoia-III-10.2/interface/cooked_interface.c 7.27 +--- cdparanoia-III-10.2.orig/interface/cooked_interface.c 2008-08-26 10:55:22.000000000 +0100 7.28 ++++ cdparanoia-III-10.2/interface/cooked_interface.c 2008-09-25 00:19:21.000000000 +0100 7.29 +@@ -13,13 +13,13 @@ 7.30 + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ 7.31 + struct timespec tv1; 7.32 + struct timespec tv2; 7.33 +- int ret1=clock_gettime(d->private->clock,&tv1); 7.34 ++ int ret1=clock_gettime(d->private_data->clock,&tv1); 7.35 + int ret2=ioctl(fd, command,arg); 7.36 +- int ret3=clock_gettime(d->private->clock,&tv2); 7.37 ++ int ret3=clock_gettime(d->private_data->clock,&tv2); 7.38 + if(ret1<0 || ret3<0){ 7.39 +- d->private->last_milliseconds=-1; 7.40 ++ d->private_data->last_milliseconds=-1; 7.41 + }else{ 7.42 +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 7.43 ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 7.44 + } 7.45 + return ret2; 7.46 + } 7.47 +diff -urp cdparanoia-III-10.2.orig/interface/interface.c cdparanoia-III-10.2/interface/interface.c 7.48 +--- cdparanoia-III-10.2.orig/interface/interface.c 2008-09-11 11:43:52.000000000 +0100 7.49 ++++ cdparanoia-III-10.2/interface/interface.c 2008-09-25 00:19:47.000000000 +0100 7.50 +@@ -39,9 +39,9 @@ int cdda_close(cdrom_drive *d){ 7.51 + if(d->drive_model)free(d->drive_model); 7.52 + if(d->cdda_fd!=-1)close(d->cdda_fd); 7.53 + if(d->ioctl_fd!=-1 && d->ioctl_fd!=d->cdda_fd)close(d->ioctl_fd); 7.54 +- if(d->private){ 7.55 +- if(d->private->sg_hd)free(d->private->sg_hd); 7.56 +- free(d->private); 7.57 ++ if(d->private_data){ 7.58 ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); 7.59 ++ free(d->private_data); 7.60 + } 7.61 + 7.62 + free(d); 7.63 +@@ -127,7 +127,7 @@ long cdda_read_timed(cdrom_drive *d, voi 7.64 + } 7.65 + } 7.66 + } 7.67 +- if(ms)*ms=d->private->last_milliseconds; 7.68 ++ if(ms)*ms=d->private_data->last_milliseconds; 7.69 + return(sectors); 7.70 + } 7.71 + 7.72 +diff -urp cdparanoia-III-10.2.orig/interface/scan_devices.c cdparanoia-III-10.2/interface/scan_devices.c 7.73 +--- cdparanoia-III-10.2.orig/interface/scan_devices.c 2008-08-26 10:55:22.000000000 +0100 7.74 ++++ cdparanoia-III-10.2/interface/scan_devices.c 2008-09-25 00:20:35.000000000 +0100 7.75 +@@ -264,11 +264,11 @@ cdrom_drive *cdda_identify_cooked(const 7.76 + d->interface=COOKED_IOCTL; 7.77 + d->bigendianp=-1; /* We don't know yet... */ 7.78 + d->nsectors=-1; 7.79 +- d->private=calloc(1,sizeof(*d->private)); 7.80 ++ d->private_data=calloc(1,sizeof(*d->private_data)); 7.81 + { 7.82 + /* goddamnit */ 7.83 + struct timespec tv; 7.84 +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 7.85 ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 7.86 + } 7.87 + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",description); 7.88 + return(d); 7.89 +@@ -674,15 +674,15 @@ cdrom_drive *cdda_identify_scsi(const ch 7.90 + d->bigendianp=-1; /* We don't know yet... */ 7.91 + d->nsectors=-1; 7.92 + d->messagedest = messagedest; 7.93 +- d->private=calloc(1,sizeof(*d->private)); 7.94 ++ d->private_data=calloc(1,sizeof(*d->private_data)); 7.95 + { 7.96 + /* goddamnit */ 7.97 + struct timespec tv; 7.98 +- d->private->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 7.99 ++ d->private_data->clock=(clock_gettime(CLOCK_MONOTONIC,&tv)<0?CLOCK_REALTIME:CLOCK_MONOTONIC); 7.100 + } 7.101 + if(use_sgio){ 7.102 + d->interface=SGIO_SCSI; 7.103 +- d->private->sg_buffer=(unsigned char *)(d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); 7.104 ++ d->private_data->sg_buffer=(unsigned char *)(d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE)); 7.105 + g_fd=d->cdda_fd=dup(d->ioctl_fd); 7.106 + }else{ 7.107 + version=verify_SG_version(d,messagedest,messages); 7.108 +@@ -696,8 +696,8 @@ cdrom_drive *cdda_identify_scsi(const ch 7.109 + } 7.110 + 7.111 + /* malloc our big buffer for scsi commands */ 7.112 +- d->private->sg_hd=malloc(MAX_BIG_BUFF_SIZE); 7.113 +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; 7.114 ++ d->private_data->sg_hd=malloc(MAX_BIG_BUFF_SIZE); 7.115 ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; 7.116 + } 7.117 + 7.118 + { 7.119 +@@ -772,9 +772,9 @@ cdda_identify_scsi_fail: 7.120 + if(i_fd!=-1)close(i_fd); 7.121 + if(g_fd!=-1)close(g_fd); 7.122 + if(d){ 7.123 +- if(d->private){ 7.124 +- if(d->private->sg_hd)free(d->private->sg_hd); 7.125 +- free(d->private); 7.126 ++ if(d->private_data){ 7.127 ++ if(d->private_data->sg_hd)free(d->private_data->sg_hd); 7.128 ++ free(d->private_data); 7.129 + } 7.130 + free(d); 7.131 + } 7.132 +@@ -821,7 +821,7 @@ cdrom_drive *cdda_identify_test(const ch 7.133 + d->interface=TEST_INTERFACE; 7.134 + d->bigendianp=-1; /* We don't know yet... */ 7.135 + d->nsectors=-1; 7.136 +- d->private=calloc(1,sizeof(*d->private)); 7.137 ++ d->private_data=calloc(1,sizeof(*d->private_data)); 7.138 + d->drive_model=copystring("File based test interface"); 7.139 + idmessage(messagedest,messages,"\t\tCDROM sensed: %s\n",d->drive_model); 7.140 + 7.141 +diff -urp cdparanoia-III-10.2.orig/interface/scsi_interface.c cdparanoia-III-10.2/interface/scsi_interface.c 7.142 +--- cdparanoia-III-10.2.orig/interface/scsi_interface.c 2008-09-11 21:33:30.000000000 +0100 7.143 ++++ cdparanoia-III-10.2/interface/scsi_interface.c 2008-09-25 00:22:40.000000000 +0100 7.144 +@@ -15,13 +15,13 @@ 7.145 + static int timed_ioctl(cdrom_drive *d, int fd, int command, void *arg){ 7.146 + struct timespec tv1; 7.147 + struct timespec tv2; 7.148 +- int ret1=clock_gettime(d->private->clock,&tv1); 7.149 ++ int ret1=clock_gettime(d->private_data->clock,&tv1); 7.150 + int ret2=ioctl(fd, command,arg); 7.151 +- int ret3=clock_gettime(d->private->clock,&tv2); 7.152 ++ int ret3=clock_gettime(d->private_data->clock,&tv2); 7.153 + if(ret1<0 || ret3<0){ 7.154 +- d->private->last_milliseconds=-1; 7.155 ++ d->private_data->last_milliseconds=-1; 7.156 + }else{ 7.157 +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 7.158 ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000. + (tv2.tv_nsec-tv1.tv_nsec)/1000000.; 7.159 + } 7.160 + return ret2; 7.161 + } 7.162 +@@ -96,7 +96,7 @@ static void tweak_SG_buffer(cdrom_drive 7.163 + static void clear_garbage(cdrom_drive *d){ 7.164 + fd_set fdset; 7.165 + struct timeval tv; 7.166 +- struct sg_header *sg_hd=d->private->sg_hd; 7.167 ++ struct sg_header *sg_hd=d->private_data->sg_hd; 7.168 + int flag=0; 7.169 + 7.170 + /* clear out any possibly preexisting garbage */ 7.171 +@@ -185,7 +185,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.172 + struct timespec tv2; 7.173 + int tret1,tret2; 7.174 + int status = 0; 7.175 +- struct sg_header *sg_hd=d->private->sg_hd; 7.176 ++ struct sg_header *sg_hd=d->private_data->sg_hd; 7.177 + long writebytes=SG_OFF+cmd_len+in_size; 7.178 + 7.179 + /* generic scsi device services */ 7.180 +@@ -195,7 +195,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.181 + 7.182 + memset(sg_hd,0,sizeof(sg_hd)); 7.183 + memset(sense_buffer,0,SG_MAX_SENSE); 7.184 +- memcpy(d->private->sg_buffer,cmd,cmd_len+in_size); 7.185 ++ memcpy(d->private_data->sg_buffer,cmd,cmd_len+in_size); 7.186 + sg_hd->twelve_byte = cmd_len == 12; 7.187 + sg_hd->result = 0; 7.188 + sg_hd->reply_len = SG_OFF + out_size; 7.189 +@@ -209,7 +209,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.190 + tell if the command failed. Scared yet? */ 7.191 + 7.192 + if(bytecheck && out_size>in_size){ 7.193 +- memset(d->private->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 7.194 ++ memset(d->private_data->sg_buffer+cmd_len+in_size,bytefill,out_size-in_size); 7.195 + /* the size does not remove cmd_len due to the way the kernel 7.196 + driver copies buffers */ 7.197 + writebytes+=(out_size-in_size); 7.198 +@@ -243,7 +243,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.199 + } 7.200 + 7.201 + sigprocmask (SIG_BLOCK, &(d->sigset), NULL ); 7.202 +- tret1=clock_gettime(d->private->clock,&tv1); 7.203 ++ tret1=clock_gettime(d->private_data->clock,&tv1); 7.204 + errno=0; 7.205 + status = write(d->cdda_fd, sg_hd, writebytes ); 7.206 + 7.207 +@@ -289,7 +289,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.208 + } 7.209 + } 7.210 + 7.211 +- tret2=clock_gettime(d->private->clock,&tv2); 7.212 ++ tret2=clock_gettime(d->private_data->clock,&tv2); 7.213 + errno=0; 7.214 + status = read(d->cdda_fd, sg_hd, SG_OFF + out_size); 7.215 + sigprocmask ( SIG_UNBLOCK, &(d->sigset), NULL ); 7.216 +@@ -313,7 +313,7 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.217 + if(bytecheck && in_size+cmd_len<out_size){ 7.218 + long i,flag=0; 7.219 + for(i=in_size;i<out_size;i++) 7.220 +- if(d->private->sg_buffer[i]!=bytefill){ 7.221 ++ if(d->private_data->sg_buffer[i]!=bytefill){ 7.222 + flag=1; 7.223 + break; 7.224 + } 7.225 +@@ -326,9 +326,9 @@ static int sg2_handle_scsi_cmd(cdrom_dri 7.226 + 7.227 + errno=0; 7.228 + if(tret1<0 || tret2<0){ 7.229 +- d->private->last_milliseconds=-1; 7.230 ++ d->private_data->last_milliseconds=-1; 7.231 + }else{ 7.232 +- d->private->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; 7.233 ++ d->private_data->last_milliseconds = (tv2.tv_sec-tv1.tv_sec)*1000 + (tv2.tv_nsec-tv1.tv_nsec)/1000000; 7.234 + } 7.235 + return(0); 7.236 + } 7.237 +@@ -347,7 +347,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 7.238 + 7.239 + memset(&hdr,0,sizeof(hdr)); 7.240 + memset(sense,0,sizeof(sense)); 7.241 +- memcpy(d->private->sg_buffer,cmd+cmd_len,in_size); 7.242 ++ memcpy(d->private_data->sg_buffer,cmd+cmd_len,in_size); 7.243 + 7.244 + hdr.cmdp = cmd; 7.245 + hdr.cmd_len = cmd_len; 7.246 +@@ -355,7 +355,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 7.247 + hdr.mx_sb_len = SG_MAX_SENSE; 7.248 + hdr.timeout = 50000; 7.249 + hdr.interface_id = 'S'; 7.250 +- hdr.dxferp = d->private->sg_buffer; 7.251 ++ hdr.dxferp = d->private_data->sg_buffer; 7.252 + hdr.flags = SG_FLAG_DIRECT_IO; /* direct IO if we can get it */ 7.253 + 7.254 + /* scary buffer fill hack */ 7.255 +@@ -400,7 +400,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 7.256 + if(bytecheck && in_size<out_size){ 7.257 + long i,flag=0; 7.258 + for(i=in_size;i<out_size;i++) 7.259 +- if(d->private->sg_buffer[i]!=bytefill){ 7.260 ++ if(d->private_data->sg_buffer[i]!=bytefill){ 7.261 + flag=1; 7.262 + break; 7.263 + } 7.264 +@@ -412,7 +412,7 @@ static int sgio_handle_scsi_cmd(cdrom_dr 7.265 + } 7.266 + 7.267 + /* Can't rely on .duration because we can't be certain kernel has HZ set to something useful */ 7.268 +- /* d->private->last_milliseconds = hdr.duration; */ 7.269 ++ /* d->private_data->last_milliseconds = hdr.duration; */ 7.270 + 7.271 + errno = 0; 7.272 + return 0; 7.273 +@@ -445,9 +445,9 @@ static int test_unit_ready(cdrom_drive * 7.274 + 7.275 + handle_scsi_cmd(d, cmd, 6, 0, 56, 0,0, sense); 7.276 + 7.277 +- key = d->private->sg_buffer[2] & 0xf; 7.278 +- ASC = d->private->sg_buffer[12]; 7.279 +- ASCQ = d->private->sg_buffer[13]; 7.280 ++ key = d->private_data->sg_buffer[2] & 0xf; 7.281 ++ ASC = d->private_data->sg_buffer[12]; 7.282 ++ ASCQ = d->private_data->sg_buffer[13]; 7.283 + 7.284 + if(key == 2 && ASC == 4 && ASCQ == 1) return 0; 7.285 + return 1; 7.286 +@@ -492,7 +492,7 @@ static int mode_sense_atapi(cdrom_drive 7.287 + if (handle_scsi_cmd (d, cmd, 10, 0, size+4,'\377',1,sense)) return(1); 7.288 + 7.289 + { 7.290 +- unsigned char *b=d->private->sg_buffer; 7.291 ++ unsigned char *b=d->private_data->sg_buffer; 7.292 + if(b[0])return(1); /* Handles only up to 256 bytes */ 7.293 + if(b[6])return(1); /* Handles only up to 256 bytes */ 7.294 + 7.295 +@@ -604,8 +604,8 @@ static int mode_select(cdrom_drive *d,in 7.296 + static unsigned int get_orig_sectorsize(cdrom_drive *d){ 7.297 + if(mode_sense(d,12,0x01))return(-1); 7.298 + 7.299 +- d->orgdens = d->private->sg_buffer[4]; 7.300 +- return(d->orgsize = ((int)(d->private->sg_buffer[10])<<8)+d->private->sg_buffer[11]); 7.301 ++ d->orgdens = d->private_data->sg_buffer[4]; 7.302 ++ return(d->orgsize = ((int)(d->private_data->sg_buffer[10])<<8)+d->private_data->sg_buffer[11]); 7.303 + } 7.304 + 7.305 + /* switch CDROM scsi drives to given sector size */ 7.306 +@@ -664,8 +664,8 @@ static int scsi_read_toc (cdrom_drive *d 7.307 + return(-4); 7.308 + } 7.309 + 7.310 +- first=d->private->sg_buffer[2]; 7.311 +- last=d->private->sg_buffer[3]; 7.312 ++ first=d->private_data->sg_buffer[2]; 7.313 ++ last=d->private_data->sg_buffer[3]; 7.314 + tracks=last-first+1; 7.315 + 7.316 + if (last > MAXTRK || first > MAXTRK || last<0 || first<0) { 7.317 +@@ -683,7 +683,7 @@ static int scsi_read_toc (cdrom_drive *d 7.318 + return(-5); 7.319 + } 7.320 + { 7.321 +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); 7.322 ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); 7.323 + 7.324 + d->disc_toc[i-first].bFlags=toc->bFlags; 7.325 + d->disc_toc[i-first].bTrack=i; 7.326 +@@ -704,7 +704,7 @@ static int scsi_read_toc (cdrom_drive *d 7.327 + return(-2); 7.328 + } 7.329 + { 7.330 +- scsi_TOC *toc=(scsi_TOC *)(d->private->sg_buffer+4); 7.331 ++ scsi_TOC *toc=(scsi_TOC *)(d->private_data->sg_buffer+4); 7.332 + 7.333 + d->disc_toc[i-first].bFlags=toc->bFlags; 7.334 + d->disc_toc[i-first].bTrack=0xAA; 7.335 +@@ -738,7 +738,7 @@ static int scsi_read_toc2 (cdrom_drive * 7.336 + } 7.337 + 7.338 + /* copy to our structure and convert start sector */ 7.339 +- tracks = d->private->sg_buffer[1]; 7.340 ++ tracks = d->private_data->sg_buffer[1]; 7.341 + if (tracks > MAXTRK) { 7.342 + cderror(d,"003: CDROM reporting illegal number of tracks\n"); 7.343 + return(-3); 7.344 +@@ -754,33 +754,33 @@ static int scsi_read_toc2 (cdrom_drive * 7.345 + return(-5); 7.346 + } 7.347 + 7.348 +- d->disc_toc[i].bFlags = d->private->sg_buffer[10]; 7.349 ++ d->disc_toc[i].bFlags = d->private_data->sg_buffer[10]; 7.350 + d->disc_toc[i].bTrack = i + 1; 7.351 + 7.352 + d->disc_toc[i].dwStartSector= d->adjust_ssize * 7.353 +- (((signed char)(d->private->sg_buffer[2])<<24) | 7.354 +- (d->private->sg_buffer[3]<<16)| 7.355 +- (d->private->sg_buffer[4]<<8)| 7.356 +- (d->private->sg_buffer[5])); 7.357 ++ (((signed char)(d->private_data->sg_buffer[2])<<24) | 7.358 ++ (d->private_data->sg_buffer[3]<<16)| 7.359 ++ (d->private_data->sg_buffer[4]<<8)| 7.360 ++ (d->private_data->sg_buffer[5])); 7.361 + } 7.362 + 7.363 + d->disc_toc[i].bFlags = 0; 7.364 + d->disc_toc[i].bTrack = i + 1; 7.365 +- memcpy (&foo, d->private->sg_buffer+2, 4); 7.366 +- memcpy (&bar, d->private->sg_buffer+6, 4); 7.367 ++ memcpy (&foo, d->private_data->sg_buffer+2, 4); 7.368 ++ memcpy (&bar, d->private_data->sg_buffer+6, 4); 7.369 + d->disc_toc[i].dwStartSector = d->adjust_ssize * (be32_to_cpu(foo) + 7.370 + be32_to_cpu(bar)); 7.371 + 7.372 + d->disc_toc[i].dwStartSector= d->adjust_ssize * 7.373 +- ((((signed char)(d->private->sg_buffer[2])<<24) | 7.374 +- (d->private->sg_buffer[3]<<16)| 7.375 +- (d->private->sg_buffer[4]<<8)| 7.376 +- (d->private->sg_buffer[5]))+ 7.377 ++ ((((signed char)(d->private_data->sg_buffer[2])<<24) | 7.378 ++ (d->private_data->sg_buffer[3]<<16)| 7.379 ++ (d->private_data->sg_buffer[4]<<8)| 7.380 ++ (d->private_data->sg_buffer[5]))+ 7.381 + 7.382 +- ((((signed char)(d->private->sg_buffer[6])<<24) | 7.383 +- (d->private->sg_buffer[7]<<16)| 7.384 +- (d->private->sg_buffer[8]<<8)| 7.385 +- (d->private->sg_buffer[9])))); 7.386 ++ ((((signed char)(d->private_data->sg_buffer[6])<<24) | 7.387 ++ (d->private_data->sg_buffer[7]<<16)| 7.388 ++ (d->private_data->sg_buffer[8]<<8)| 7.389 ++ (d->private_data->sg_buffer[9])))); 7.390 + 7.391 + 7.392 + d->cd_extra = FixupTOC(d,tracks+1); 7.393 +@@ -817,7 +817,7 @@ static int i_read_28 (cdrom_drive *d, vo 7.394 + cmd[8] = sectors; 7.395 + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.396 + return(ret); 7.397 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.398 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.399 + return(0); 7.400 + } 7.401 + 7.402 +@@ -836,7 +836,7 @@ static int i_read_A8 (cdrom_drive *d, vo 7.403 + cmd[9] = sectors; 7.404 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.405 + return(ret); 7.406 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.407 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.408 + return(0); 7.409 + } 7.410 + 7.411 +@@ -854,7 +854,7 @@ static int i_read_D4_10 (cdrom_drive *d, 7.412 + cmd[8] = sectors; 7.413 + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.414 + return(ret); 7.415 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.416 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.417 + return(0); 7.418 + } 7.419 + 7.420 +@@ -872,7 +872,7 @@ static int i_read_D4_12 (cdrom_drive *d, 7.421 + cmd[9] = sectors; 7.422 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.423 + return(ret); 7.424 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.425 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.426 + return(0); 7.427 + } 7.428 + 7.429 +@@ -890,7 +890,7 @@ static int i_read_D5 (cdrom_drive *d, vo 7.430 + cmd[8] = sectors; 7.431 + if((ret=handle_scsi_cmd(d,cmd,10,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.432 + return(ret); 7.433 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.434 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.435 + return(0); 7.436 + } 7.437 + 7.438 +@@ -908,7 +908,7 @@ static int i_read_D8 (cdrom_drive *d, vo 7.439 + cmd[9] = sectors; 7.440 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.441 + return(ret); 7.442 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.443 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.444 + return(0); 7.445 + } 7.446 + 7.447 +@@ -922,7 +922,7 @@ static int i_read_mmc (cdrom_drive *d, v 7.448 + cmd[8] = sectors; 7.449 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.450 + return(ret); 7.451 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.452 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.453 + return(0); 7.454 + } 7.455 + 7.456 +@@ -936,7 +936,7 @@ static int i_read_mmcB (cdrom_drive *d, 7.457 + cmd[8] = sectors; 7.458 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.459 + return(ret); 7.460 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.461 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.462 + return(0); 7.463 + } 7.464 + 7.465 +@@ -950,7 +950,7 @@ static int i_read_mmc2 (cdrom_drive *d, 7.466 + cmd[8] = sectors; 7.467 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.468 + return(ret); 7.469 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.470 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.471 + return(0); 7.472 + } 7.473 + 7.474 +@@ -964,7 +964,7 @@ static int i_read_mmc2B (cdrom_drive *d, 7.475 + cmd[8] = sectors; 7.476 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.477 + return(ret); 7.478 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.479 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.480 + return(0); 7.481 + } 7.482 + 7.483 +@@ -978,7 +978,7 @@ static int i_read_mmc3 (cdrom_drive *d, 7.484 + cmd[8] = sectors; 7.485 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.486 + return(ret); 7.487 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.488 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.489 + return(0); 7.490 + } 7.491 + 7.492 +@@ -992,7 +992,7 @@ static int i_read_mmc3B (cdrom_drive *d, 7.493 + cmd[8] = sectors; 7.494 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.495 + return(ret); 7.496 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.497 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.498 + return(0); 7.499 + } 7.500 + 7.501 +@@ -1026,7 +1026,7 @@ static int i_read_msf (cdrom_drive *d, v 7.502 + 7.503 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.504 + return(ret); 7.505 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.506 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.507 + return(0); 7.508 + } 7.509 + 7.510 +@@ -1039,7 +1039,7 @@ static int i_read_msf2 (cdrom_drive *d, 7.511 + 7.512 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.513 + return(ret); 7.514 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.515 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.516 + return(0); 7.517 + } 7.518 + 7.519 +@@ -1052,7 +1052,7 @@ static int i_read_msf3 (cdrom_drive *d, 7.520 + 7.521 + if((ret=handle_scsi_cmd(d,cmd,12,0,sectors * CD_FRAMESIZE_RAW,'\177',1,sense))) 7.522 + return(ret); 7.523 +- if(p)memcpy(p,d->private->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.524 ++ if(p)memcpy(p,d->private_data->sg_buffer,sectors*CD_FRAMESIZE_RAW); 7.525 + return(0); 7.526 + } 7.527 + 7.528 +@@ -1275,7 +1275,7 @@ long scsi_read_msf3 (cdrom_drive *d, voi 7.529 + static int count_2352_bytes(cdrom_drive *d){ 7.530 + long i; 7.531 + for(i=2351;i>=0;i--) 7.532 +- if(d->private->sg_buffer[i]!=(unsigned char)'\177') 7.533 ++ if(d->private_data->sg_buffer[i]!=(unsigned char)'\177') 7.534 + return(((i+3)>>2)<<2); 7.535 + 7.536 + return(0); 7.537 +@@ -1284,7 +1284,7 @@ static int count_2352_bytes(cdrom_drive 7.538 + static int verify_nonzero(cdrom_drive *d){ 7.539 + long i,flag=0; 7.540 + for(i=0;i<2352;i++) 7.541 +- if(d->private->sg_buffer[i]!=0){ 7.542 ++ if(d->private_data->sg_buffer[i]!=0){ 7.543 + flag=1; 7.544 + break; 7.545 + } 7.546 +@@ -1625,7 +1625,7 @@ static int check_mmc(cdrom_drive *d){ 7.547 + d->is_mmc=0; 7.548 + if(mode_sense(d,22,0x2A)==0){ 7.549 + 7.550 +- b=d->private->sg_buffer; 7.551 ++ b=d->private_data->sg_buffer; 7.552 + b+=b[3]+4; 7.553 + 7.554 + if((b[0]&0x3F)==0x2A){ 7.555 +@@ -1673,7 +1673,7 @@ unsigned char *scsi_inquiry(cdrom_drive 7.556 + cderror(d,"008: Unable to identify CDROM model\n"); 7.557 + return(NULL); 7.558 + } 7.559 +- return (d->private->sg_buffer); 7.560 ++ return (d->private_data->sg_buffer); 7.561 + } 7.562 + 7.563 + int scsi_init_drive(cdrom_drive *d){ 7.564 +@@ -1742,8 +1742,8 @@ int scsi_init_drive(cdrom_drive *d){ 7.565 + check_cache(d); 7.566 + 7.567 + d->error_retry=1; 7.568 +- d->private->sg_hd=realloc(d->private->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); 7.569 +- d->private->sg_buffer=((unsigned char *)d->private->sg_hd)+SG_OFF; 7.570 ++ d->private_data->sg_hd=realloc(d->private_data->sg_hd,d->nsectors*CD_FRAMESIZE_RAW + SG_OFF + 128); 7.571 ++ d->private_data->sg_buffer=((unsigned char *)d->private_data->sg_hd)+SG_OFF; 7.572 + d->report_all=1; 7.573 + return(0); 7.574 + } 7.575 +diff -urp cdparanoia-III-10.2.orig/interface/test_interface.c cdparanoia-III-10.2/interface/test_interface.c 7.576 +--- cdparanoia-III-10.2.orig/interface/test_interface.c 2008-09-11 21:33:30.000000000 +0100 7.577 ++++ cdparanoia-III-10.2/interface/test_interface.c 2008-09-25 00:22:46.000000000 +0100 7.578 +@@ -66,9 +66,9 @@ static long test_read(cdrom_drive *d, vo 7.579 + if(!fd)fd=fdopen(d->cdda_fd,"r"); 7.580 + 7.581 + if(begin<lastread) 7.582 +- d->private->last_milliseconds=20; 7.583 ++ d->private_data->last_milliseconds=20; 7.584 + else 7.585 +- d->private->last_milliseconds=sectors; 7.586 ++ d->private_data->last_milliseconds=sectors; 7.587 + 7.588 + #ifdef CDDA_TEST_UNDERRUN 7.589 + sectors-=1;
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/cdparanoia/stuff/patches/series Wed Dec 12 02:29:05 2018 +0200 8.3 @@ -0,0 +1,4 @@ 8.4 +# taken from BLFS 8.5 +# <http://www.linuxfromscratch.org/patches/blfs/8.0/cdparanoia-III-10.2-gcc_fixes-1.patch> 8.6 + 8.7 +cdparanoia-III-10.2-gcc_fixes-1.patch
9.1 --- a/deadbeef/receipt Wed Dec 12 01:52:32 2018 +0200 9.2 +++ b/deadbeef/receipt Wed Dec 12 02:29:05 2018 +0200 9.3 @@ -13,7 +13,7 @@ 9.4 9.5 BUILD_DEPENDS="gettext-dev intltool yasm zlib-dev jansson-dev gtk2-dev \ 9.6 alsa-lib-dev dbus-dev curl-dev libmad-dev libvorbis-dev libogg-dev flac-dev \ 9.7 -libsndfile-dev libcdio-dev libcddb-dev cdparanoia-III-dev xorg-libX11-dev \ 9.8 +libsndfile-dev libcdio-dev libcddb-dev cdparanoia-dev xorg-libX11-dev \ 9.9 imlib2-dev libjpeg-turbo-dev libpng16-dev libsamplerate-dev faad2-dev " 9.10 SPLIT="$PACKAGE-plugins $PACKAGE-dev" 9.11 9.12 @@ -39,7 +39,7 @@ 9.13 deadbeef-plugins) 9.14 copy @std @rm; rm -r $fs/usr/share 9.15 CAT="multimedia|extra plugins" 9.16 - DEPENDS="deadbeef atk cdparanoia-III faad2 flac gdk-pixbuf glib \ 9.17 + DEPENDS="deadbeef atk cdparanoia faad2 flac gdk-pixbuf glib \ 9.18 gtk2 imlib2 libcddb libcdio libcurl libogg libsamplerate \ 9.19 libsndfile zlib" 9.20 TAGS="music audio player MP3 Ogg ape"
10.1 --- a/gst0-plugins-base/receipt Wed Dec 12 01:52:32 2018 +0200 10.2 +++ b/gst0-plugins-base/receipt Wed Dec 12 02:29:05 2018 +0200 10.3 @@ -15,7 +15,7 @@ 10.4 10.5 BUILD_DEPENDS="gstreamer0-dev pango-dev alsa-lib-dev libogg-dev libtheora-dev \ 10.6 libtheora-enc libvorbis-dev eudev-dev xorg-libXv-dev xorg-libXvMC-dev \ 10.7 -util-linux-uuid-dev cdparanoia-III-dev orc-dev gobject-introspection-dev \ 10.8 +util-linux-uuid-dev cdparanoia-dev orc-dev gobject-introspection-dev \ 10.9 xorg-dev gettext-dev" 10.10 SPLIT="$PACKAGE-dev" 10.11 10.12 @@ -37,7 +37,7 @@ 10.13 case $PACKAGE in 10.14 *-base) 10.15 copy @std 10.16 - DEPENDS="alsa-lib cairo cdparanoia-III glib gstreamer0 libogg \ 10.17 + DEPENDS="alsa-lib cairo cdparanoia glib gstreamer0 libogg \ 10.18 libtheora-enc libvorbis libxml2 orc pango xorg-libX11 xorg-libXext \ 10.19 xorg-libXv zlib" 10.20 ;;
11.1 --- a/gst1-plugins-base/receipt Wed Dec 12 01:52:32 2018 +0200 11.2 +++ b/gst1-plugins-base/receipt Wed Dec 12 02:29:05 2018 +0200 11.3 @@ -13,7 +13,7 @@ 11.4 WGET_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$TARBALL" 11.5 11.6 BUILD_DEPENDS="gettext-dev valgrind-dev python gstreamer1-dev \ 11.7 -orc-dev xorg-libX11-dev xorg-libXv-dev alsa-lib-dev cdparanoia-III-dev \ 11.8 +orc-dev xorg-libX11-dev xorg-libXv-dev alsa-lib-dev cdparanoia-dev \ 11.9 libvorbis-dev libogg-dev opus-dev pango-dev libtheora-dev" 11.10 SPLIT="$PACKAGE-dev" 11.11 11.12 @@ -33,7 +33,7 @@ 11.13 case $PACKAGE in 11.14 gst1-plugins-base) 11.15 copy @std 11.16 - DEPENDS="alsa-lib cairo cdparanoia-III glib gstreamer1 libogg \ 11.17 + DEPENDS="alsa-lib cairo cdparanoia glib gstreamer1 libogg \ 11.18 libtheora-enc libvorbis opus orc pango xorg-libX11 xorg-libXext \ 11.19 xorg-libXv zlib" 11.20 ;;
12.1 --- a/mplayer-svn/receipt Wed Dec 12 01:52:32 2018 +0200 12.2 +++ b/mplayer-svn/receipt Wed Dec 12 02:29:05 2018 +0200 12.3 @@ -12,7 +12,8 @@ 12.4 TARBALL="$PACKAGE-$VERSION.tar.bz2" 12.5 WGET_URL="subversion|svn://svn.mplayerhq.hu/mplayer/trunk" 12.6 12.7 -BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-III-dev libmad-dev xorg-libXv-dev libtheora-dev subversion yasm" 12.8 +BUILD_DEPENDS="alsa-lib-dev gtk2-dev cdparanoia-dev libmad-dev xorg-libXv-dev \ 12.9 +libtheora-dev subversion yasm" 12.10 12.11 # This package is compiled against shared ffmpeg. Compiling with shared ffmpeg 12.12 # on svn version is always challenging. Tip: Try to use the same day ffmpeg and 12.13 @@ -106,7 +107,7 @@ 12.14 # Font 12.15 cd .. 12.16 ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf 12.17 - DEPENDS="gtk2 cdparanoia-III libmad xorg-libXv libtheora lame giflib \ 12.18 + DEPENDS="gtk2 cdparanoia libmad xorg-libXv libtheora lame giflib \ 12.19 xorg-libXScrnSaver xorg-libXxf86vm alsa-lib bzlib x264 libass" 12.20 PROVIDE="mplayer" 12.21 SUGGESTED="v4l-utils"
13.1 --- a/mplayer/receipt Wed Dec 12 01:52:32 2018 +0200 13.2 +++ b/mplayer/receipt Wed Dec 12 02:29:05 2018 +0200 13.3 @@ -14,7 +14,7 @@ 13.4 BUILD_DEPENDS="gtk2-dev libmad-dev xorg-libXv-dev libtheora-dev \ 13.5 alsa-lib-dev ncurses-dev lame-dev xorg-libXdamage-dev giflib-dev \ 13.6 xorg-libXxf86vm-dev esound-dev audiofile-dev libogg-dev libvorbis-dev \ 13.7 -xvidcore-dev zlib-dev xorg-xorgproto yasm cdparanoia-III-dev \ 13.8 +xvidcore-dev zlib-dev xorg-xorgproto yasm cdparanoia-dev \ 13.9 x264-dev enca-dev libmng-dev lirc-dev" 13.10 SPLIT="mencoder" 13.11 13.12 @@ -67,7 +67,7 @@ 13.13 # Font 13.14 cd .. 13.15 ln -s ../fonts/truetype/ttf-dejavu/DejaVuSans.ttf subfont.ttf 13.16 - DEPENDS="gtk2 cdparanoia-III libmad xorg-libXv libtheora alsa-lib \ 13.17 + DEPENDS="gtk2 cdparanoia libmad xorg-libXv libtheora alsa-lib \ 13.18 ncurses lame xorg-libXdamage giflib enca lirc xorg-libXxf86vm \ 13.19 esound libmng audiofile libvorbis libogg zlib xvidcore x264 \ 13.20 xorg-libXScrnSaver" 13.21 @@ -75,7 +75,7 @@ 13.22 mencoder) 13.23 copy /usr/bin/mencoder 13.24 CAT="multimedia|video and movie encoder" 13.25 - DEPENDS="libtheora alsa-lib cdparanoia-III expat libogg libvorbis \ 13.26 + DEPENDS="libtheora alsa-lib cdparanoia expat libogg libvorbis \ 13.27 fontconfig freetype x264 xvidcore jpeg libmad ncurses zlib lame \ 13.28 libpng16 giflib enca lirc" 13.29 ;;
14.1 --- a/rubyripper/receipt Wed Dec 12 01:52:32 2018 +0200 14.2 +++ b/rubyripper/receipt Wed Dec 12 02:29:05 2018 +0200 14.3 @@ -12,11 +12,11 @@ 14.4 TARBALL="$PACKAGE-$VERSION.tar.gz" 14.5 WGET_URL="https://github.com/bleskodev/rubyripper/archive/v$VERSION.tar.gz" 14.6 14.7 -BUILD_DEPENDS="ruby-dev ruby-gettext cdparanoia-III cd-discid flac \ 14.8 +BUILD_DEPENDS="ruby-dev ruby-gettext cdparanoia cd-discid flac \ 14.9 vorbis-tools lame vorbisgain mp3gain normalize" 14.10 14.11 COPY_std="@std *.png" # 128px icon 14.12 -DEPENDS="cd-discid cdparanoia-III flac normalize ruby" 14.13 +DEPENDS="cd-discid cdparanoia flac normalize ruby" 14.14 SUGGESTED="ruby-gtk2 lame vorbis-tools" 14.15 TAGS="audio CD ripper" 14.16
15.1 --- a/tazpkg-desc-ru/stuff/packages-desc.ru Wed Dec 12 01:52:32 2018 +0200 15.2 +++ b/tazpkg-desc-ru/stuff/packages-desc.ru Wed Dec 12 02:29:05 2018 +0200 15.3 @@ -216,8 +216,8 @@ 15.4 cclfox графический сервер для libccls 15.5 c-client поддержка формата почтового хранилища 15.6 cd-discid утилита CDDB DiscID 15.7 -cdparanoia-III-dev файлы разработчика для CDparanoia 15.8 -cdparanoia-III инструмент для оцифровки CD-аудио дисков 15.9 +cdparanoia-dev файлы разработчика для CDparanoia 15.10 +cdparanoia инструмент для оцифровки CD-аудио дисков 15.11 cdrdao записывает CD диски в режиме Disk-At-Once (DAO) 15.12 cdrkit утилита записи CD/DVD с интерфейсом командной строки 15.13 celestia симулятор видимого космоса в реальном времени