[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-devel
Subject:    Re: [PATCH]: Final: Re: kdemultimedia configure search ignores --with-extra-... ?
From:       Raphaël Junqueira <fenix () club-internet ! fr>
Date:       2002-05-31 19:06:23
[Download RAW message or body]

Le ven 31/05/2002 à 14:33, Pavel Troller a écrit :
> > 
> > Hi,
> > 
> >  here come the final patch with some misc compilation fixes.
> > 
> >  Can somebody review and commit this patch please? ;)
> > 
> > 
> >  Happy coding,
> >   FeniX
> Hi!
>   I'm afraid that Your patch has wrapped lines, because it was
> inserted directly to the mail body and Your MUA wrapped them.
> This causes problems during commit. Please could You sent it again
> but as a separate attachment ? [ I cannot commit it but I'm trying
> to speed things up before somebody other will tell You ].
>                                     
> 				  With regards, Pavel Troller
>  

Arghhhh 
  sorry it's my evolution who was buggy ;( i can't attach documents now (after 
update) without crash ;(((

  now i must send with kmail ;)

 FeniX

PS: how to convert evolution mail-box to kmail-box ?

["km.diff" (text/x-diff)]

Index: arts/modules/synth_osc_impl.cc
===================================================================
RCS file: /home/kde/kdemultimedia/arts/modules/synth_osc_impl.cc,v
retrieving revision 1.1
diff -u -u -r1.1 synth_osc_impl.cc
--- arts/modules/synth_osc_impl.cc	18 May 2002 15:14:28 -0000	1.1
+++ arts/modules/synth_osc_impl.cc	31 May 2002 17:50:07 -0000
@@ -128,7 +128,7 @@
 			freqs[n_freqs] = 20;
 			while (freqs[n_freqs] < 22000)
 			{
-				freqs[n_freqs + 1] = freqs[n_freqs] * sqrt(2);
+				freqs[n_freqs + 1] = freqs[n_freqs] * std::sqrt(2.0f);
 				n_freqs++;
 			}
 			arts_debug("Synth_OSC::waveForm: n_freqs = %d", n_freqs);
Index: k3b/configure.in.in
===================================================================
RCS file: /home/kde/kdemultimedia/k3b/configure.in.in,v
retrieving revision 1.21
diff -u -u -r1.21 configure.in.in
--- k3b/configure.in.in	28 May 2002 18:31:42 -0000	1.21
+++ k3b/configure.in.in	31 May 2002 17:50:08 -0000
@@ -1,11 +1,11 @@
 #MIN_CONFIG
 
-CCAS=$(CC)
-CCASFLAGS=$(CFLAGS)
+CCAS=${CC}
+CCASFLAGS=${CFLAGS}
 AC_SUBST(CCAS)
 AC_SUBST(CCASFLAGS)
-AS=$(CC)
-ASFLAGS=$(CFLAGS)
+AS=${CC}
+ASFLAGS=${CFLAGS}
 AC_SUBST(AS)
 AC_SUBST(ASFLAGS)
 
@@ -38,7 +38,7 @@
 
 if test "x$with_cdparanoia" = "xCHECK" ; then
   with_cdparanoia=NOTFOUND
-  search_incs="$kde_includes /usr/include /usr/local/include /usr/include/cdda \
/usr/local/include/cdda" +  search_incs="$kde_includes $kde_extra_includes \
/usr/include /usr/local/include /usr/include/cdda /usr/local/include/cdda"  \
AC_FIND_FILE(cdda_interface.h, $search_incs, para_incdir)  if test -r \
                $para_incdir/cdda_interface.h ; then
     test "x$para_incdir" != "x/usr/include" && CDPARANOIA_INCS="-I$para_incdir"
@@ -48,7 +48,7 @@
     with_cdparanoia=NOTFOUND
     # because of the horrible hack we need shared cdparanoia
     for ext in la so sl a ; do
-      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries /usr/lib /usr/local/lib,
+      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries $kde_extra_libs /usr/lib \
/usr/local/lib,  para_libdir)
       if test -r $para_libdir/libcdda_paranoia.$ext ; then
         if test "x$para_libdir" != "x/usr/lib" ; then
@@ -106,6 +106,8 @@
 
 OGG_VORBISLIBS=""
 AC_MSG_CHECKING(for ogg/vorbis headers)
+CPPFLAGS="$CPPFLAGS $KDE_INCLUDES $USER_INCLUDES"
+LDFLAGS="$LDFLAGS $KDE_LDFLAGS $USER_LDFLAGS"
 ogg_vorbis=no
 AC_TRY_COMPILE([
 		#include <vorbis/codec.h>
Index: kaudiocreator/cdconfigimp.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kaudiocreator/cdconfigimp.cpp,v
retrieving revision 1.6
diff -u -u -r1.6 cdconfigimp.cpp
--- kaudiocreator/cdconfigimp.cpp	30 May 2002 11:46:14 -0000	1.6
+++ kaudiocreator/cdconfigimp.cpp	31 May 2002 17:50:08 -0000
@@ -74,7 +74,7 @@
 #include "cdconfigimp.h"
 #include "cddb.h"
 
-using namespace KIO;
+//using namespace KIO;
 
 #define MAX_IPC_SIZE (1024*32)
 
Index: kioslave/audiocd/configure.in.in
===================================================================
RCS file: /home/kde/kdemultimedia/kioslave/audiocd/configure.in.in,v
retrieving revision 1.22
diff -u -u -r1.22 configure.in.in
--- kioslave/audiocd/configure.in.in	24 May 2002 22:49:02 -0000	1.22
+++ kioslave/audiocd/configure.in.in	31 May 2002 17:50:09 -0000
@@ -16,7 +16,7 @@
 
 if test "x$with_cdparanoia" = "xCHECK" ; then
   with_cdparanoia=NOTFOUND
-  search_incs="$kde_includes /usr/include /usr/local/include /usr/include/cdda \
/usr/local/include/cdda" +  search_incs="$kde_includes $kde_extra_includes \
/usr/include /usr/local/include /usr/include/cdda /usr/local/include/cdda"  \
AC_FIND_FILE(cdda_interface.h, $search_incs, para_incdir)  if test -r \
                $para_incdir/cdda_interface.h ; then
     test "x$para_incdir" != "x/usr/include" && CDPARANOIA_INCS="-I$para_incdir"
@@ -26,7 +26,7 @@
     with_cdparanoia=NOTFOUND
     # because of the horrible hack we need shared cdparanoia
     for ext in la so sl a ; do
-      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries /usr/lib /usr/local/lib,
+      AC_FIND_FILE(libcdda_paranoia.$ext, $kde_libraries $kde_extra_libs /usr/lib \
/usr/local/lib,  para_libdir)
       if test -r $para_libdir/libcdda_paranoia.$ext ; then
         if test "x$para_libdir" != "x/usr/lib" ; then
@@ -98,7 +98,7 @@
 
 if test "x$with_lame" = "xCHECK" ; then
   with_lame=NOTFOUND
-  search_incs="/usr/local/include $kde_includes /usr/include"
+  search_incs="/usr/local/include $kde_includes $kde_extra_includes /usr/include"
   AC_FIND_FILE(lame/lame.h, $search_incs, lame_incdir)
   if test -r $lame_incdir/lame/lame.h ; then
     test "x$lame_incdir" != "x/usr/include" && LAME_INCS="-I$lame_incdir"
@@ -107,7 +107,7 @@
   if test $with_lame = FOUND ; then
     with_lame=NOTFOUND
     for ext in la so sl a ; do
-      AC_FIND_FILE(libmp3lame.$ext, /usr/local/lib $kde_libraries /usr/lib,
+      AC_FIND_FILE(libmp3lame.$ext, /usr/local/lib $kde_libraries $kde_extra_libs \
/usr/lib,  lame_libdir)
       if test -r $lame_libdir/libmp3lame.$ext ; then
         if test "x$lame_libdir" != "x/usr/lib" ; then
@@ -246,7 +246,7 @@
 have_vorbis_value=1
 if test "x$with_vorbis" = "xCHECK" ; then
   with_vorbis=NOTFOUND
-  search_incs="$kde_includes /usr/local/include /usr/include"
+  search_incs="$kde_includes $kde_extra_includes /usr/local/include /usr/include"
   AC_FIND_FILE(vorbis/codec.h, $search_incs, vorbis_incdir)
   if test -r $vorbis_incdir/vorbis/codec.h ; then
     test "x$vorbis_incdir" != "x/usr/include" && VORBIS_INCS="-I$vorbis_incdir"
@@ -257,7 +257,7 @@
   if test $with_vorbis = FOUND ; then
     with_vorbis=NOTFOUND
     for ext in la so sl a ; do
-      AC_FIND_FILE(libvorbis.$ext, $kde_libraries /usr/local/lib /usr/lib,
+      AC_FIND_FILE(libvorbis.$ext, $kde_libraries $kde_extra_libs /usr/local/lib \
/usr/lib,  vorbis_libdir)
       if test -r $vorbis_libdir/libvorbis.$ext ; then
         if test "x$vorbis_libdir" != "x/usr/lib" ; then
Index: kmidi/alsa_a.cpp
===================================================================
RCS file: /home/kde/kdemultimedia/kmidi/alsa_a.cpp,v
retrieving revision 1.8
diff -u -u -r1.8 alsa_a.cpp
--- kmidi/alsa_a.cpp	24 Aug 2000 18:49:04 -0000	1.8
+++ kmidi/alsa_a.cpp	31 May 2002 17:50:09 -0000
@@ -254,7 +254,7 @@
                == 1 warning
                == -1 fails
  */
-static int set_playback_info (void* handle__,
+static int set_playback_info (snd_pcm_t*  handle__,
 			      uint32* encoding__, uint32* rate__,
 			      const int32 extra_param[5])
 {
 


>> Visit http://mail.kde.org/mailman/listinfo/kde-devel#unsub to unsubscribe <<

[prev in list] [next in list] [prev in thread] [next in thread] 

Configure | About | News | Add a list | Sponsored by KoreLogic