[PATCH] fix building alsa-tools with gtk+-2.x

[PATCH] fix building alsa-tools with gtk+-2.x

[Thierry Vignaud]

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

the following patch fixes building with devel packages gtk+-2 devel
files and not gtk+-1.2 devel files (a m4 macro was renamed between
gtk+-1.x and gtk+-2.x):


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: alsa-tools-1.0.11-gtk-buildfix.patch --]
[-- Type: text/x-patch, Size: 1008 bytes --]

--- ./echomixer/configure.in.tv	2006-05-04 12:58:29.000000000 +0200
+++ ./echomixer/configure.in	2006-05-04 12:57:59.000000000 +0200
@@ -15,7 +15,7 @@
 
 else
 
-AM_PATH_GTK(1.2.0)
+AM_PATH_GTK_2_0(1.2.0)
 AM_PATH_ALSA(1.0.0)
 ECHOMIXER_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
 ECHOMIXER_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
--- ./envy24control/configure.in.tv	2006-05-04 12:58:29.000000000 +0200
+++ ./envy24control/configure.in	2006-05-04 12:57:59.000000000 +0200
@@ -14,7 +14,7 @@
 
 else
 
-AM_PATH_GTK(1.0.1)
+AM_PATH_GTK_2_0(1.0.1)
 AM_PATH_ALSA(1.0.0)
 ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
 ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
--- ./rmedigicontrol/configure.in.tv	2006-05-04 12:58:29.000000000 +0200
+++ ./rmedigicontrol/configure.in	2006-05-04 12:57:59.000000000 +0200
@@ -14,7 +14,7 @@
 
 else
 
-AM_PATH_GTK(1.0.1)
+AM_PATH_GTK_2_0(1.0.1)
 AM_PATH_ALSA(1.0.0)
 RMEDIGICONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
 RMEDIGICONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"

Re: [PATCH] fix building alsa-tools with gtk+-2.x

[Takashi Iwai]

At Thu, 04 May 2006 14:23:21 +0200,
Thierry Vignaud wrote:
> 
> the following patch fixes building with devel packages gtk+-2 devel
> files and not gtk+-1.2 devel files (a m4 macro was renamed between
> gtk+-1.x and gtk+-2.x):

The patch looks wrong.  The relevant parts are in if-block for
gtk-1.x, and pkgconfig is used for gtk-2.x.

If you want to build only with gtk2, use configure.in-gtk2 instead.


Takashi

> 
> [2 alsa-tools-1.0.11-gtk-buildfix.patch <text/x-patch (7bit)>]
> --- ./echomixer/configure.in.tv	2006-05-04 12:58:29.000000000 +0200
> +++ ./echomixer/configure.in	2006-05-04 12:57:59.000000000 +0200
> @@ -15,7 +15,7 @@
>  
>  else
>  
> -AM_PATH_GTK(1.2.0)
> +AM_PATH_GTK_2_0(1.2.0)
>  AM_PATH_ALSA(1.0.0)
>  ECHOMIXER_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
>  ECHOMIXER_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
> --- ./envy24control/configure.in.tv	2006-05-04 12:58:29.000000000 +0200
> +++ ./envy24control/configure.in	2006-05-04 12:57:59.000000000 +0200
> @@ -14,7 +14,7 @@
>  
>  else
>  
> -AM_PATH_GTK(1.0.1)
> +AM_PATH_GTK_2_0(1.0.1)
>  AM_PATH_ALSA(1.0.0)
>  ENVY24CONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
>  ENVY24CONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"
> --- ./rmedigicontrol/configure.in.tv	2006-05-04 12:58:29.000000000 +0200
> +++ ./rmedigicontrol/configure.in	2006-05-04 12:57:59.000000000 +0200
> @@ -14,7 +14,7 @@
>  
>  else
>  
> -AM_PATH_GTK(1.0.1)
> +AM_PATH_GTK_2_0(1.0.1)
>  AM_PATH_ALSA(1.0.0)
>  RMEDIGICONTROL_CFLAGS="$CFLAGS $ALSA_CFLAGS $GTK_CFLAGS"
>  RMEDIGICONTROL_LIBS="$LIBS $ALSA_LIBS $GTK_LIBS"


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH] fix building alsa-tools with gtk+-2.x

[Thierry Vignaud]

Takashi Iwai <tiwai@suse.de> writes:

> > the following patch fixes building with devel packages gtk+-2
> > devel files and not gtk+-1.2 devel files (a m4 macro was renamed
> > between gtk+-1.x and gtk+-2.x):
> 
> The patch looks wrong.  The relevant parts are in if-block for
> gtk-1.x, and pkgconfig is used for gtk-2.x.

Indeed.
I understand the fix i proposed cannot be accepted as it.

Still, it does break running autoconf when gtk+-1 devel files are not
installed.
Here's the output of a build bot:


See http://qa.mandriva.com/build/iurt//cooker/x86_64/log/alsa-tools-1.0.11-2mdk.src.rpm/

Command failed: TMP=/home/builder/tmp/ sudo chroot /export/home/mandrake//iurt_unionfs/unionfs.1.1 /bin/su builder -c "rpm --rebuild /home/builder/rpm/SRPMS/alsa-tools-1.0.11-2mdk.src.rpm"
Installing /home/builder/rpm/SRPMS/alsa-tools-1.0.11-2mdk.src.rpm
Executing(%prep): /bin/sh -e /home/builder/rpm/tmp/rpm-tmp.48611
+ umask 022
+ cd /home/builder/rpm/BUILD
+ '[' 1 -eq 1 ']'
+ '[' 1 -eq 1 ']'
+ '[' 1 -eq 1 ']'
+ cd /home/builder/rpm/BUILD
+ rm -rf alsa-tools-1.0.11
+ /usr/bin/bzip2 -dc /home/builder/rpm/SOURCES/alsa-tools-1.0.11.tar.bz2
+ tar -xf -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ cd alsa-tools-1.0.11
+ /usr/bin/bzip2 -dc /home/builder/rpm/SOURCES/alsa-firmware-1.0.11.tar.bz2
+ tar -xf -
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ echo 'Patch #0 (alsa-tools-0.9.8-sscape_ctl.c.patch.bz2):'
Patch #0 (alsa-tools-0.9.8-sscape_ctl.c.patch.bz2):
+ /usr/bin/bzip2 -d
+ patch -p0 -s
patch unexpectedly ends in middle of line
+ STATUS=0
+ '[' 0 -ne 0 ']'
+ pushd envy24control
~/rpm/BUILD/alsa-tools-1.0.11/envy24control ~/rpm/BUILD/alsa-tools-1.0.11
+ touch NEWS ChangeLog
+ aclocal
aclocal:configure.in:17: warning: macro `AM_PATH_GTK' not found in library
+ autoconf
configure.in:17: error: possibly undefined macro: AM_PATH_GTK
      If this token and others are legitimate, please use m4_pattern_allow.
      See the Autoconf documentation.
error: Bad exit status from /home/builder/rpm/tmp/rpm-tmp.48611 (%prep)


RPM build errors:
    Bad exit status from /home/builder/rpm/tmp/rpm-tmp.48611 (%prep)


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642

Re: [PATCH] fix building alsa-tools with gtk+-2.x

[Takashi Iwai]

At Thu, 04 May 2006 15:23:20 +0200,
Thierry Vignaud wrote:
> 
> Takashi Iwai <tiwai@suse.de> writes:
> 
> > > the following patch fixes building with devel packages gtk+-2
> > > devel files and not gtk+-1.2 devel files (a m4 macro was renamed
> > > between gtk+-1.x and gtk+-2.x):
> > 
> > The patch looks wrong.  The relevant parts are in if-block for
> > gtk-1.x, and pkgconfig is used for gtk-2.x.
> 
> Indeed.
> I understand the fix i proposed cannot be accepted as it.
> 
> Still, it does break running autoconf when gtk+-1 devel files are not
> installed.

Yes, use configure.in-gtk in such a case, instead.


Takashi


-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642