rpms/kdemultimedia/devel kdemultimedia-3.97.0-fix-findcdparanoia.patch, NONE, 1.1 kdemultimedia-3.97.0-flac113.patch, NONE, 1.1

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kdemultimedia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4560/devel

Added Files:
	kdemultimedia-3.97.0-fix-findcdparanoia.patch 
	kdemultimedia-3.97.0-flac113.patch 
Log Message:
Add patches.

kdemultimedia-3.97.0-fix-findcdparanoia.patch:

--- NEW FILE kdemultimedia-3.97.0-fix-findcdparanoia.patch ---
--- trunk/KDE/kdemultimedia/cmake/modules/FindCdparanoia.cmake	2007/12/16 13:56:27	749092
+++ trunk/KDE/kdemultimedia/cmake/modules/FindCdparanoia.cmake	2007/12/16 13:56:51	749093
@@ -7,42 +7,30 @@
 #
 
 # Copyright (c) 2006, Richard Laerkaeng, <richard at goteborg.utfors.se>
+# Copyright (c) 2007, Allen Winter, <winter at kde.org>
 #
 # Redistribution and use is allowed according to the terms of the BSD license.
 # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
 
-FIND_PROGRAM(CDPARANOIA_EXECUTABLE NAMES cdparanoia 
-# these paths should be searched automatically by cmake, so no need to specify them explicitely
-# but I'm not too sure about the /sbin ones, Alex
-#    PATHS /bin /sbin /usr/bin /usr/sbin /usr/local/bin /usr/local/sbin
-)
-
-FIND_PATH(CDPARANOIA_INCLUDE_DIR cdda_interface.h
-# /usr/include and /usr/local/include are also searched automatically, Alex
-#    /usr/include /usr/local/include
-)
-
-FIND_LIBRARY(CDPARANOIA_LIBRARY NAMES cdda_paranoia)
-FIND_LIBRARY(CDPARANOIA_IF_LIBRARY NAMES cdda_interface)
-
-
-IF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY  AND CDPARANOIA_INCLUDE_DIR)
-    SET(CDPARANOIA_LIBRARIES ${CDPARANOIA_LIBRARY} ${CDPARANOIA_IF_LIBRARY}  "-lm")
-    SET(CDPARANOIA_FOUND TRUE)
-
-    IF (NOT Cdparanoia_FIND_QUIETLY)
-      MESSAGE(STATUS "Found cdparanoia: ${CDPARANOIA_LIBRARIES}")
-    ENDIF(NOT Cdparanoia_FIND_QUIETLY)
-
-ELSE  (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY  AND CDPARANOIA_INCLUDE_DIR)
-
-    SET(CDPARANOIA_FOUND FALSE)
-    IF (Cdparanoia_FIND_REQUIRED)
-        MESSAGE(FATAL_ERROR "Could not find cdparanoia")
-    ENDIF (Cdparanoia_FIND_REQUIRED)
-    IF (NOT Cdparanoia_FIND_QUIETLY)
-       MESSAGE(STATUS "Did not find cdparanoia")
-    ENDIF(NOT Cdparanoia_FIND_QUIETLY)
-ENDIF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY  AND CDPARANOIA_INCLUDE_DIR)
+if (CDPARANOIA_INCLUDE_DIR AND CDPARANOIA_LIBRARIES)
+  # in cache already
+  SET(CDPARANOIA_FOUND TRUE)
 
+else (CDPARANOIA_INCLUDE_DIR AND CDPARANOIA_LIBRARIES)
 
+  FIND_PATH(CDPARANOIA_INCLUDE_DIR cdda_interface.h PATH_SUFFIXES cdda)
+
+  FIND_LIBRARY(CDPARANOIA_LIBRARY NAMES cdda_paranoia)
+  FIND_LIBRARY(CDPARANOIA_IF_LIBRARY NAMES cdda_interface)
+
+  IF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY)
+    SET(CDPARANOIA_LIBRARIES ${CDPARANOIA_LIBRARY} ${CDPARANOIA_IF_LIBRARY} "-lm")
+  ENDIF (CDPARANOIA_LIBRARY AND CDPARANOIA_IF_LIBRARY)
+
+  INCLUDE(FindPackageHandleStandardArgs)
+  FIND_PACKAGE_HANDLE_STANDARD_ARGS(Cdparanoia DEFAULT_MSG
+                                    CDPARANOIA_LIBRARIES CDPARANOIA_INCLUDE_DIR)
+
+  MARK_AS_ADVANCED(CDPARANOIA_INCLUDE_DIR CDPARANOIA_LIBRARIES)
+
+endif (CDPARANOIA_INCLUDE_DIR AND CDPARANOIA_LIBRARIES)

kdemultimedia-3.97.0-flac113.patch:

--- NEW FILE kdemultimedia-3.97.0-flac113.patch ---
Index: kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp
===================================================================
--- kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp	(revision 749997)
+++ kdemultimedia/kioslave/audiocd/plugins/flac/encoderflac.cpp	(working copy)
@@ -48,7 +48,16 @@ public:
     unsigned long data;
 };
 
-static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder,
+                                                    const FLAC__byte buffer[],
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
+                                                    unsigned bytes,
+#else
+                                                    size_t bytes,
+#endif
+                                                    unsigned samples,
+                                                    unsigned current_frame,
+                                                    void *client_data)
 {
     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
 
@@ -110,9 +119,11 @@ unsigned long EncoderFLAC::size(long tim
 long EncoderFLAC::readInit(long size) {
     kDebug(7117) << "EncoderFLAC::readInit() called";
     d->data = 0;
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
     FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
     FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
     FLAC__stream_encoder_set_client_data(d->encoder, d);
+#endif
 
     // The options match approximely those of flac compression-level-3
     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
@@ -125,7 +136,11 @@ long EncoderFLAC::readInit(long size) {
     if (size > 0)
         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
 
+#if !defined(FLAC_API_VERSION_CURRENT) || FLAC_API_VERSION_CURRENT <= 7
     FLAC__stream_encoder_init(d->encoder);
+#else
+    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
+#endif
     return d->data;
 }