Re: [GnomeMeeting-devel-list] [PATCH suggestion] remove esound dependency

[Damien Sandras <dsandras seconix com>]

Hi Prakash,

All what esound is doing is suspending the sound daemon if it is used.
Do you think it is so bad to keep the dependancy on the library just for
that?

Le mardi 12 avril 2005 à 14:10 +0200, Prakash Punnoor a écrit :
> Hi,
> 
> for me esound is pita, so I'd like to remove its dependency which can be
> rather easily done. This is a suggestion for gnomemeeting 1.2.1. As I was a
> bit confused, I did the patch the opposite way, so use -R to apply it...
> 
> Hope you get something similar merged.
> 
> Cheers
> pièce jointe plain text document (gm-noesound.diff)
> --- configure.in	2005-04-12 13:51:39.783633904 +0200
> +++ configure.in~	2005-03-03 14:33:32.000000000 +0100
> @@ -75,23 +75,11 @@
>  dnl ###########################################################################
>  dnl PKG_CONFIG and required versions
>  dnl ###########################################################################
> -AC_CHECK_HEADER(esd.h)
> -
>  if test x"${disable_gnome}" = xyes; then
> -if test "${ac_cv_header_esd_h}" = "yes"; then
>  PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 libxml-2.0 >= 2.5.0)
> -else
> -PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 libxml-2.0 >= 2.5.0)
> -AC_DEFINE(NO_ESOUND,1 , no esound found)
> -fi
>  GNOMEMEETING_CFLAGS="$GNOMEMEETING_CFLAGS -DDISABLE_GNOME"
>  else
> -if test "${ac_cv_header_esd_h}" = "yes"; then
>  PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 esound >= 0.2.28 gconf-2.0 >= 2.2.0 libxml-2.0 >= 2.6.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0)
> -else
> -PKG_CHECK_MODULES(GNOMEMEETING, gtk+-2.0 >= 2.4.0 gthread-2.0 >= 2.4.0 gconf-2.0 >= 2.2.0 libxml-2.0 >= 2.6.0 libgnome-2.0 >= 2.2.0 libgnomeui-2.0 >= 2.2.0 gnome-vfs-2.0 >= 2.2.0)
> -AC_DEFINE(NO_ESOUND, 1, no esound found)
> -fi
>  PKG_CHECK_MODULES(EDS, libebook-1.2 >= 1.1.4,ebook12=yes,ebook12=no)
>  if test x"${ebook12}" = xno ; then
>  PKG_CHECK_MODULES(EDS, libebook-1.0 >= 0.0.94)
> --- src/sound_handling.h	2005-04-12 13:52:26.834481088 +0200
> +++ src/sound_handling.h~	2004-09-10 11:44:23.000000000 +0200
> @@ -42,7 +42,7 @@
>  #include "common.h"
>  #include "endpoint.h"
>  
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>  #include <esd.h>
>  #endif
>  
> --- src/sound_handling.cpp	2005-04-12 13:08:29.801371056 +0200
> +++ src/sound_handling.cpp~	2005-03-06 14:11:32.000000000 +0100
> @@ -90,7 +90,7 @@
>  void 
>  gnomemeeting_sound_daemons_suspend (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>    int esd_client = 0;
>    
>    /* Put ESD into standby mode */
> @@ -108,7 +108,7 @@
>  void 
>  gnomemeeting_sound_daemons_resume (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>    int esd_client = 0;
>  
>    /* Put ESD into normal mode */
> @@ -126,7 +126,7 @@
>  void 
>  gnomemeeting_mixers_mic_select (void)
>  {
> -#if !defined(WIN32) && !defined(NO_ESOUND)
> +#ifndef WIN32
>  #ifndef P_MACOSX
>    int rcsrc = 0;
>    int mixerfd = -1;                                                            
> _______________________________________________
> Gnomemeeting-devel-list mailing list
> Gnomemeeting-devel-list gnome org
> http://mail.gnome.org/mailman/listinfo/gnomemeeting-devel-list
-- 
 _      Damien Sandras
(o-     GnomeMeeting: http://www.gnomemeeting.org/
//\     FOSDEM 2005 : http://www.fosdem.org
v_/_    H.323 phone : callto:ils.seconix.com/dsandras seconix com