Hello community, here is the log from the commit of package cdparanoia checked in at Thu Aug 9 18:17:16 CEST 2007. -------- --- cdparanoia/cdparanoia.changes 2006-10-27 11:54:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/cdparanoia/cdparanoia.changes 2007-08-08 11:51:20.000000000 +0200 @@ -1,0 +2,10 @@ +Wed Aug 8 11:26:01 CEST 2007 - pgajdos@suse.cz + +- solved 'Lack of SG_IO interface support' [#295308] + * shortened gcc34.patch (leaved in hunks for utils.h only, removed + hunks for scsi_interface.c) + * new patch sgio.patch to solve error mentioned above + * new patch gcc34-2.patch (avoid persisting problems with + compilation -- memcpy macro) + +------------------------------------------------------------------- New: ---- cdparanoia-III-alpha9.8-gcc34-2.patch cdparanoia-III-alpha9.8-sgio.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cdparanoia.spec ++++++ --- /var/tmp/diff_new_pack.fa9394/_old 2007-08-09 18:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.fa9394/_new 2007-08-09 18:16:40.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package cdparanoia (Version IIIalpha9.8) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,11 +13,11 @@ Name: cdparanoia Provides: cdparano Obsoletes: cdparano -License: GNU General Public License (GPL) - all versions +License: GPL v2 or later Group: Productivity/Multimedia/CD/Grabbers Autoreqprov: on Version: IIIalpha9.8 -Release: 577 +Release: 617 Summary: A Program for Extracting, Verifying, and Fixing Audio Tracks from CDs URL: http://www.xiph.org/paranoia/index.html %define filever III-alpha9.8 @@ -29,6 +29,8 @@ Patch5: cdparanoia-III-alpha9.8-ide_majors.patch Patch6: cdparanoia-III-alpha9.8-strip.patch Patch7: cdparanoia-III-alpha9.8-dt_needed.patch +Patch8: cdparanoia-III-alpha9.8-sgio.patch +Patch9: cdparanoia-III-alpha9.8-gcc34-2.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -53,6 +55,8 @@ %patch5 %patch6 %patch7 +%patch8 -p 1 +%patch9 %build cp configure.guess config.guess @@ -98,7 +102,14 @@ /usr/include/* %_libdir/lib*.so* -%changelog -n cdparanoia +%changelog +* Wed Aug 08 2007 - pgajdos@suse.cz +- solved 'Lack of SG_IO interface support' [#295308] + * shortened gcc34.patch (leaved in hunks for utils.h only, removed + hunks for scsi_interface.c) + * new patch sgio.patch to solve error mentioned above + * new patch gcc34-2.patch (avoid persisting problems with + compilation -- memcpy macro) * Fri Oct 27 2006 - lnussel@suse.de - remove resmgr patch * Mon Jun 12 2006 - dmueller@suse.de ++++++ cdparanoia-III-alpha9.8-gcc34-2.patch ++++++ --- interface/scsi_interface.c +++ interface/scsi_interface.c @@ -586,7 +586,7 @@ unsigned char *mode; ((struct sg_info *)d->sg)->setup_scsi_cmd(d, SCSI_MODE_SELECT_10, 10, 16, 0); - memcpy(((struct sg_info *)d->sg)->dxferp,(char []) { + memcpy(((struct sg_info *)d->sg)->dxferp,((char []) { /* mode parameter header */ 0, 0, 0, 0, 0, 0, 0, 8, /* Block Descriptor Length */ @@ -594,7 +594,7 @@ 0, /* Density Code */ 0, 0, 0, /* # of Blocks */ 0, /* reserved */ - 0, 0, 0},/* Blocklen */ + 0, 0, 0}),/* Blocklen */ 16); mode = ((struct sg_info *)d->sg)->dxferp; @@ -614,7 +614,7 @@ unsigned char *mode; ((struct sg_info *)d->sg)->setup_scsi_cmd(d, SCSI_MODE_SELECT_6, 6, 12, 0); - memcpy(((struct sg_info *)d->sg)->dxferp,(char []) { + memcpy(((struct sg_info *)d->sg)->dxferp,((char []) { /* mode section */ 0, 0, 0, @@ -622,7 +622,7 @@ 0, /* Density Code */ 0, 0, 0, /* # of Blocks */ 0, /* reserved */ - 0, 0, 0},/* Blocklen */ + 0, 0, 0}),/* Blocklen */ 12); /* prepare to read cds in the previous mode */ ++++++ cdparanoia-III-alpha9.8-gcc34.patch ++++++ --- /var/tmp/diff_new_pack.fa9394/_old 2007-08-09 18:16:40.000000000 +0200 +++ /var/tmp/diff_new_pack.fa9394/_new 2007-08-09 18:16:40.000000000 +0200 @@ -1,236 +1,3 @@ ---- cdparanoia-III-alpha9.8/interface/scsi_interface.c -+++ cdparanoia-III-alpha9.8/interface/scsi_interface.c -@@ -288,7 +288,7 @@ - - static int mode_sense_atapi(cdrom_drive *d,int size,int page){ - memcpy(d->sg_buffer, -- (char []) {0x5A, /* MODE_SENSE */ -+ ((char []) {0x5A, /* MODE_SENSE */ - 0x00, /* reserved */ - 0x00, /* page */ - 0, /* reserved */ -@@ -297,7 +297,7 @@ - 0, /* reserved */ - 0, /* MSB (0) */ - 0, /* sizeof(modesense - SG_OFF) */ -- 0}, /* reserved */ -+ 0}), /* reserved */ - 10); - - d->sg_buffer[1]=d->lun<<5; -@@ -325,12 +325,12 @@ - - static int mode_sense_scsi(cdrom_drive *d,int size,int page){ - memcpy(d->sg_buffer, -- (char []) {0x1A, /* MODE_SENSE */ -+ ((char []) {0x1A, /* MODE_SENSE */ - 0x00, /* return block descriptor/lun */ - 0x00, /* page */ - 0, /* reserved */ - 0, /* sizeof(modesense - SG_OFF) */ -- 0}, /* control */ -+ 0}), /* control */ - 6); - - d->sg_buffer[1]=d->lun<<5; -@@ -353,7 +353,7 @@ - unsigned char *mode = d->sg_buffer + 18; - - memcpy(d->sg_buffer, -- (char []) { 0x55, /* MODE_SELECT */ -+ ((char []) { 0x55, /* MODE_SELECT */ - 0x10, /* no save page */ - 0, /* reserved */ - 0, /* reserved */ -@@ -372,7 +372,7 @@ - 0, /* Density Code */ - 0, 0, 0, /* # of Blocks */ - 0, /* reserved */ -- 0, 0, 0},/* Blocklen */ -+ 0, 0, 0}),/* Blocklen */ - 26); - - d->sg_buffer[1]|=d->lun<<5; -@@ -389,7 +389,7 @@ - unsigned char *mode = d->sg_buffer + 10; - - memcpy(d->sg_buffer, -- (char []) { 0x15, /* MODE_SELECT */ -+ ((char []) { 0x15, /* MODE_SELECT */ - 0x10, /* no save page */ - 0, /* reserved */ - 0, /* reserved */ -@@ -402,7 +402,7 @@ - 0, /* Density Code */ - 0, 0, 0, /* # of Blocks */ - 0, /* reserved */ -- 0, 0, 0},/* Blocklen */ -+ 0, 0, 0}),/* Blocklen */ - 18); - - /* prepare to read cds in the previous mode */ -@@ -470,7 +470,7 @@ - len lsb, flags */ - - /* read the header first */ -- memcpy(d->sg_buffer, (char []){ 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0}, 10); -+ memcpy(d->sg_buffer, ((char []){ 0x43, 0, 0, 0, 0, 0, 1, 0, 12, 0}), 10); - d->sg_buffer[1]=d->lun<<5; - - if (handle_scsi_cmd (d,10, 0, 12,'\377',1)){ -@@ -488,7 +488,7 @@ - } - - for (i = first; i <= last; i++){ -- memcpy(d->sg_buffer, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10); -+ memcpy(d->sg_buffer, ((char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}), 10); - d->sg_buffer[1]=d->lun<<5; - d->sg_buffer[6]=i; - -@@ -509,7 +509,7 @@ - } - } - -- memcpy(d->sg_buffer, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10); -+ memcpy(d->sg_buffer, ((char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}), 10); - d->sg_buffer[1]=d->lun<<5; - d->sg_buffer[6]=0xAA; - -@@ -541,7 +541,7 @@ - int i; - unsigned tracks; - -- memcpy(d->sg_buffer, (char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10); -+ memcpy(d->sg_buffer, ((char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 10); - d->sg_buffer[5]=1; - d->sg_buffer[8]=255; - -@@ -558,7 +558,7 @@ - } - - for (i = 0; i < tracks; i++){ -- memcpy(d->sg_buffer, (char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10); -+ memcpy(d->sg_buffer, ((char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 10); - d->sg_buffer[5]=i+1; - d->sg_buffer[8]=255; - -@@ -604,7 +604,7 @@ - - static int i_read_28 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0x28, 0, 0, 0, 0, 0, 0, 0, 0, 0},10); -+ memcpy(d->sg_buffer,((char []){0x28, 0, 0, 0, 0, 0, 0, 0, 0, 0}),10); - - if(d->fua) - d->sg_buffer[1]=0x08; -@@ -623,7 +623,7 @@ - - static int i_read_A8 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xA8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xA8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),12); - - if(d->fua) - d->sg_buffer[1]=0x08; -@@ -642,7 +642,7 @@ - - static int i_read_D4_10 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xd4, 0, 0, 0, 0, 0, 0, 0, 0, 0},10); -+ memcpy(d->sg_buffer,((char []){0xd4, 0, 0, 0, 0, 0, 0, 0, 0, 0}),10); - - if(d->fua) - d->sg_buffer[1]=0x08; -@@ -660,7 +660,7 @@ - - static int i_read_D4_12 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xd4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xd4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),12); - - if(d->fua) - d->sg_buffer[1]=0x08; -@@ -678,7 +678,7 @@ - - static int i_read_D5 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xd5, 0, 0, 0, 0, 0, 0, 0, 0, 0},10); -+ memcpy(d->sg_buffer,((char []){0xd5, 0, 0, 0, 0, 0, 0, 0, 0, 0}),10); - - if(d->fua) - d->sg_buffer[1]=0x08; -@@ -696,7 +696,7 @@ - - static int i_read_D8 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xd8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xd8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}),12); - - if(d->fua) - d->sg_buffer[1]=0x08; -@@ -719,7 +719,7 @@ - return(TR_ILLEGAL); - }*/ - -- memcpy(d->sg_buffer,(char []){0xbe, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xbe, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0}),12); - - d->sg_buffer[3] = (begin >> 16) & 0xFF; - d->sg_buffer[4] = (begin >> 8) & 0xFF; -@@ -733,7 +733,7 @@ - - static int i_read_mmc2 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xbe, 0, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xbe, 0, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0}),12); - - d->sg_buffer[3] = (begin >> 16) & 0xFF; - d->sg_buffer[4] = (begin >> 8) & 0xFF; -@@ -747,7 +747,7 @@ - - static int i_read_mmc3 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xbe, 4, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xbe, 4, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0}),12); - - d->sg_buffer[3] = (begin >> 16) & 0xFF; - d->sg_buffer[4] = (begin >> 8) & 0xFF; -@@ -782,7 +782,7 @@ - - static int i_read_msf (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xb9, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xb9, 0, 0, 0, 0, 0, 0, 0, 0, 0x10, 0, 0}),12); - - LBA_to_MSF(begin,d->sg_buffer+3,d->sg_buffer+4,d->sg_buffer+5); - LBA_to_MSF(begin+sectors,d->sg_buffer+6,d->sg_buffer+7,d->sg_buffer+8); -@@ -795,7 +795,7 @@ - - static int i_read_msf2 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xb9, 0, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xb9, 0, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0}),12); - - LBA_to_MSF(begin,d->sg_buffer+3,d->sg_buffer+4,d->sg_buffer+5); - LBA_to_MSF(begin+sectors,d->sg_buffer+6,d->sg_buffer+7,d->sg_buffer+8); -@@ -808,7 +808,7 @@ - - static int i_read_msf3 (cdrom_drive *d, void *p, long begin, long sectors){ - int ret; -- memcpy(d->sg_buffer,(char []){0xb9, 4, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0},12); -+ memcpy(d->sg_buffer,((char []){0xb9, 4, 0, 0, 0, 0, 0, 0, 0, 0xf8, 0, 0}),12); - - LBA_to_MSF(begin,d->sg_buffer+3,d->sg_buffer+4,d->sg_buffer+5); - LBA_to_MSF(begin+sectors,d->sg_buffer+6,d->sg_buffer+7,d->sg_buffer+8); -@@ -1381,7 +1381,7 @@ - - /* request vendor brand and model */ - unsigned char *scsi_inquiry(cdrom_drive *d){ -- memcpy(d->sg_buffer,(char[]){ 0x12,0,0,0,56,0},6); -+ memcpy(d->sg_buffer,((char[]){ 0x12,0,0,0,56,0}),6); - - if(handle_scsi_cmd(d,6, 0, 56,'\377',1)) { - cderror(d,"008: Unable to identify CDROM model\n"); --- cdparanoia-III-alpha9.8/interface/utils.h +++ cdparanoia-III-alpha9.8/interface/utils.h @@ -112,6 +112,7 @@ ++++++ cdparanoia-III-alpha9.8-sgio.patch ++++++ ++++ 1942 lines (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org