devel/libcdio libcdio-gcc4.patch,NONE,1.1 libcdio.spec,1.5,1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/devel/libcdio
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31867

Modified Files:
	libcdio.spec 
Added Files:
	libcdio-gcc4.patch 
Log Message:
Fix FC4 build, build with dep tracking disabled.

libcdio-gcc4.patch:

--- NEW FILE libcdio-gcc4.patch ---
diff -Naru libcdio-0.70.orig/lib/cdio.c libcdio-0.70.new/lib/cdio.c
--- libcdio-0.70.orig/lib/cdio.c	2004-08-29 06:55:24.000000000 +0300
+++ libcdio-0.70.new/lib/cdio.c	2005-03-18 15:48:40.000000000 +0200
@@ -848,7 +848,7 @@
   if (cdio == NULL) return -1;
   
   if (cdio->op.read)
-    return cdio->op.read (cdio->env, buf, size);
+    return (cdio->op.read) (cdio->env, buf, size);
   return -1;
 }
 
diff -Naru libcdio-0.70.orig/lib/_cdio_stream.c libcdio-0.70.new/lib/_cdio_stream.c
--- libcdio-0.70.orig/lib/_cdio_stream.c	2004-02-07 20:53:02.000000000 +0200
+++ libcdio-0.70.new/lib/_cdio_stream.c	2005-03-18 15:46:44.000000000 +0200
@@ -145,7 +145,7 @@
 
   if (!_cdio_stream_open_if_necessary(obj)) return 0;
 
-  read_bytes = obj->op.read(obj->user_data, ptr, size*nmemb);
+  read_bytes = (obj->op.read)(obj->user_data, ptr, size*nmemb);
   obj->position += read_bytes;
 
   return read_bytes;
diff -Naru libcdio-0.70.orig/src/cd-drive.c libcdio-0.70.new/src/cd-drive.c
--- libcdio-0.70.orig/src/cd-drive.c	2004-08-27 14:53:38.000000000 +0300
+++ libcdio-0.70.new/src/cd-drive.c	2005-03-18 15:51:43.000000000 +0200
@@ -140,7 +140,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 
 static void 
 _log_handler (cdio_log_level_t level, const char message[])
diff -Naru libcdio-0.70.orig/src/cd-info.c libcdio-0.70.new/src/cd-info.c
--- libcdio-0.70.orig/src/cd-info.c	2004-09-02 04:33:57.000000000 +0300
+++ libcdio-0.70.new/src/cd-info.c	2005-03-18 15:53:49.000000000 +0200
@@ -371,7 +371,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 #ifdef HAVE_CDDB
 static cddb_log_handler_t gl_default_cddb_log_handler = NULL;
 #endif
diff -Naru libcdio-0.70.orig/src/iso-info.c libcdio-0.70.new/src/iso-info.c
--- libcdio-0.70.orig/src/iso-info.c	2004-06-19 22:15:15.000000000 +0300
+++ libcdio-0.70.new/src/iso-info.c	2005-03-18 15:55:57.000000000 +0200
@@ -133,7 +133,6 @@
 
 /* CDIO logging routines */
 
-static cdio_log_handler_t gl_default_cdio_log_handler = NULL;
 
 static void 
 _log_handler (cdio_log_level_t level, const char message[])


Index: libcdio.spec
===================================================================
RCS file: /cvs/extras/devel/libcdio/libcdio.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- libcdio.spec	3 Mar 2005 22:41:31 -0000	1.5
+++ libcdio.spec	18 Mar 2005 14:02:21 -0000	1.6
@@ -1,15 +1,16 @@
 Name:           libcdio
 Version:        0.70
-Release:        1
+Release:        2
 Summary:        CD-ROM input and control library
 
 Group:          Applications/Multimedia
 License:        GPL
 URL:            http://www.gnu.org/software/libcdio/
 Source0:        http://ftp.gnu.org/gnu/libcdio/libcdio-0.70.tar.gz
+Patch0:         %{name}-gcc4.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libcddb-devel
+BuildRequires:  libcddb-devel >= 0.9.4
 BuildRequires:  pkgconfig
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
@@ -33,10 +34,11 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
-%configure --disable-vcd-info
+%configure --disable-vcd-info --disable-dependency-tracking
 # Parallel build fails
 make
 
@@ -84,6 +86,10 @@
 
 
 %changelog
+* Fri Mar 18 2005 Ville Skyttä <ville.skytta at iki.fi> - 0.70-2
+- Fix FC4 build (#151468).
+- Build with dependency tracking disabled.
+
 * Sun Sep  5 2004 Marius L. Jøhndal <mariuslj at ifi.uio.no> - 0:0.70-0.fdr.1
 - Updated to 0.70.