Package: vcdimager
Version: 0.7.20-2
Followup-For: Bug #290685

Hi,

attached is a patch to make vcdimager compile again and thereby
makeing it installable again.

Compile tested on amd64 sarge and a clean i386 sid chroot.

MfG
        Goswin

-- System Information:
Debian Release: 3.1
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.8-frosties-1
Locale: LANG=en_US, LC_CTYPE=en_US

Versions of packages vcdimager depends on:
ii  libc6          2.3.2.ds1-19.0.0.2.pure64 GNU C Library: Shared libraries an
ii  libcdio0       0.68-2                    library to read and control CD-ROM
ii  libiso9660-0   0.68-2                    library to work with ISO9660 files
ii  libpopt0       1.7-5                     lib for parsing cmdline parameters
ii  libvcdinfo0    0.7.20-2                  library to extract information fro
ii  libxml2        2.6.11-5                  GNOME XML library
ii  zlib1g         1:1.2.2-4                 compression library - runtime

-- no debconf information
diff -u vcdimager-0.7.20/debian/changelog vcdimager-0.7.20/debian/changelog
--- vcdimager-0.7.20/debian/changelog
+++ vcdimager-0.7.20/debian/changelog
@@ -1,3 +1,14 @@
+vcdimager (0.7.20-2.1) unstable; urgency=low
+
+  * NMU by Goswin von Brederlow to fix FTBFS and uninstallable bug
+    (Closes: #290685)
+    + Fix type mismatch in image.c
+    + Fix for libcdio API changes
+    + Fix test/vcd20_nrg3.right to updated info string
+    + Fix test/Makefile.am to clean *.nrg files
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]>  Mon, 24 Jan 2004 11:06:15 +0200
+
 vcdimager (0.7.20-2) unstable; urgency=low
 
   * Fix pkg-config description for libvcdinfo since libvcd is a "private"
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/test/Makefile.am
+++ vcdimager-0.7.20/test/Makefile.am
@@ -42,4 +42,4 @@
 XFAIL_TESTS = testassert
 
 
-MOSTLYCLEANFILES = *.bin *.cue core.* *.dump
+MOSTLYCLEANFILES = *.bin *.cue core.* *.dump *.nrg
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/test/Makefile.in
+++ vcdimager-0.7.20/test/Makefile.in
@@ -247,7 +247,7 @@
 	testassert
 
 XFAIL_TESTS = testassert
-MOSTLYCLEANFILES = *.bin *.cue core.* *.dump
+MOSTLYCLEANFILES = *.bin *.cue core.* *.dump *.nrg
 all: all-am
 
 .SUFFIXES:
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/test/vcd20_nrg3.right
+++ vcdimager-0.7.20/test/vcd20_nrg3.right
@@ -1,4 +1,4 @@
-   INFO: detected v50 (32bit offsets) NRG magic
+   INFO: detected Nero version 5.0 (32-bit offsets) NRG magic
    INFO: SAO type image (ETNF) detected
 -------------------------------------------------------------------------------
 VCD/INFO.VCD
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/lib/image.c
+++ vcdimager-0.7.20/lib/image.c
@@ -76,7 +76,7 @@
 }
 
 int
-vcd_image_sink_write (VcdImageSink *obj, void *buf, uint32_t lsn)
+vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn)
 {
   vcd_assert (obj != NULL);
 
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/lib/info.c
+++ vcdimager-0.7.20/lib/info.c
@@ -1806,7 +1806,7 @@
   }
 
   if (obj->vcd_type == VCD_TYPE_SVCD || obj->vcd_type == VCD_TYPE_HQVCD) {
-    statbuf = iso9660_fs_stat (obj->img, "MPEGAV", true);
+    statbuf = iso9660_fs_stat (obj->img, "MPEGAV");
     
     if (NULL != statbuf) {
       vcd_warn ("non compliant /MPEGAV folder detected!");
@@ -1814,7 +1814,7 @@
     }
     
 
-    statbuf = iso9660_fs_stat (obj->img, "SVCD/TRACKS.SVD;1", true);
+    statbuf = iso9660_fs_stat (obj->img, "SVCD/TRACKS.SVD;1");
     if (NULL != statbuf) {
       lsn_t lsn = statbuf->lsn;
       if (statbuf->size != ISO_BLOCKSIZE)
@@ -1836,7 +1836,7 @@
        iso9660_fs_readdir(img, "EXT", true) and then scanning for
        the files listed below.
     */
-    statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true);
+    statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1");
     if (NULL != statbuf) {
       lsn_t lsn        = statbuf->lsn;
       uint32_t secsize = statbuf->secsize;
@@ -1852,7 +1852,7 @@
         return VCDINFO_OPEN_ERROR;
     }
 
-    statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
+    statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
     if (NULL != statbuf) {
       lsn_t lsn        = statbuf->lsn;
       uint32_t secsize = statbuf->secsize;
@@ -1877,13 +1877,13 @@
        iso9660_fs_readdir(img, "SVCD", true) and then scanning for
        the files listed below.
     */
-    statbuf = iso9660_fs_stat (img, "MPEGAV", true);
+    statbuf = iso9660_fs_stat (img, "MPEGAV");
     if (NULL != statbuf) {
       vcd_warn ("non compliant /MPEGAV folder detected!");
       free(statbuf);
     }
     
-    statbuf = iso9660_fs_stat (img, "SVCD/TRACKS.SVD;1", true);
+    statbuf = iso9660_fs_stat (img, "SVCD/TRACKS.SVD;1");
     if (NULL == statbuf)
       vcd_warn ("mandatory /SVCD/TRACKS.SVD not found!");
     else {
@@ -1892,7 +1892,7 @@
       free(statbuf);
     }
     
-    statbuf = iso9660_fs_stat (img, "SVCD/SEARCH.DAT;1", true);
+    statbuf = iso9660_fs_stat (img, "SVCD/SEARCH.DAT;1");
     if (NULL == statbuf)
       vcd_warn ("mandatory /SVCD/SEARCH.DAT not found!");
     else {
@@ -1931,7 +1931,7 @@
     ;
   }
 
-  statbuf = iso9660_fs_stat (img, "EXT/SCANDATA.DAT;1", true);
+  statbuf = iso9660_fs_stat (img, "EXT/SCANDATA.DAT;1");
   if (statbuf != NULL) {
     lsn_t    lsn       = statbuf->lsn;
     uint32_t secsize   = statbuf->secsize;
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/frontends/cli/vcd-info.c
+++ vcdimager-0.7.20/frontends/cli/vcd-info.c
@@ -207,14 +207,14 @@
     return PBC_VCD2_NOPE;
 
   img = vcdinfo_get_cd_image(obj);
-  statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
+  statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
   if (NULL == statbuf)
     return PBC_VCD2_NO_LOT_X;
   if (statbuf->size != ISO_BLOCKSIZE * LOT_VCD_SIZE) {
     ret_status = PBC_VCD2_BAD_LOT_SIZE;
   } else {
     free(statbuf);
-    statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true);
+    statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1");
     if (NULL != statbuf) {
       ret_status = PBC_VCD2_EXT;
     } else {
@@ -1184,8 +1184,7 @@
                                  ((vcdinfo_get_VCD_type(obj) == VCD_TYPE_SVCD 
                              || vcdinfo_get_VCD_type(obj) == VCD_TYPE_HQVCD)
                                   ? "/SVCD/PSD.SVD;1" 
-                                  : "/VCD/PSD.VCD;1"),
-                                 true);
+                                  : "/VCD/PSD.VCD;1"));
       if (NULL == statbuf)
         vcd_warn ("no PSD file entry found in ISO9660 fs");
       else {
only in patch2:
unchanged:
--- vcdimager-0.7.20.orig/frontends/xml/vcd_xml_rip.c
+++ vcdimager-0.7.20/frontends/xml/vcd_xml_rip.c
@@ -781,7 +781,7 @@
 
   if (obj->vcd_type == VCD_TYPE_VCD2)
     {
-      statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1", true);
+      statbuf = iso9660_fs_stat (img, "EXT/LOT_X.VCD;1");
       if (statbuf != NULL) {
 	extended = true;
 	_lot_vcd_sector = statbuf->lsn;
@@ -790,7 +790,7 @@
 
       free(statbuf);
       if (extended &&
-	  NULL != (statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1", true))) {
+	  NULL != (statbuf = iso9660_fs_stat (img, "EXT/PSD_X.VCD;1"))) {
 	_psd_vcd_sector = statbuf->lsn;
 	_psd_size = statbuf->size;
 	free(statbuf);

Reply via email to