- rel 9

- remove ESD stanza from configure.in, it prevented rebuilding of ac/am stuff

Changed files:
    cinelerra-cv-build.patch -> 1.7
    cinelerra-cv.spec -> 1.35

diff --git a/cinelerra-cv-build.patch b/cinelerra-cv-build.patch
index eb558c57fa9668d4c4a82bc78d5f0f675cf6a859..49ebaf8a167bc384559198f13a62637ea8c620ca 100644 (file)
--- a/cinelerra-cv-build.patch
+++ b/cinelerra-cv-build.patch
@@ -13,6 +13,21 @@
  AM_GNU_GETTEXT_VERSION(0.12.1)
  AM_PROG_AS
  
  AM_GNU_GETTEXT_VERSION(0.12.1)
  AM_PROG_AS
  

+@@ -99,14 +99,6 @@
+       LIBS=`echo "$LIBS" | sed -e s/-lasound//g`
+ fi
+ 
+-if test "x$enable_esd" = "xyes"; then
+-      AM_PATH_ESD(,[esound=yes])
+-      if test "x$esound" = xyes; then
+-              SOUND_CFLAGS="$ESD_CFLAGS -DHAVE_ESOUND $SOUND_CFLAGS"
+-              SOUND_LDFLAGS="$ESD_LIBS $SOUND_LDFLAGS"
+-              enable_esd=ok
+-      fi
+-fi
+ AC_SUBST(SOUND_CFLAGS)
+ AC_SUBST(SOUND_LDFLAGS)
+ ############### END OF SOUND

 --- cinelerra-cv-2.1/cinelerra/Makefile.am.org 2006-11-26 01:42:58.101122750 +0100
 +++ cinelerra-cv-2.1/cinelerra/Makefile.am     2006-11-26 01:43:09.741850250 +0100
 @@ -19,26 +19,26 @@
 --- cinelerra-cv-2.1/cinelerra/Makefile.am.org 2006-11-26 01:42:58.101122750 +0100
 +++ cinelerra-cv-2.1/cinelerra/Makefile.am     2006-11-26 01:43:09.741850250 +0100
 @@ -19,26 +19,26 @@

diff --git a/cinelerra-cv.spec b/cinelerra-cv.spec
index 7a02faebee39eca5bd7239ae4602ee3ff75eb4a4..49f2796915f9b79a5246de67105815fe8c4fcb19 100644 (file)
--- a/cinelerra-cv.spec
+++ b/cinelerra-cv.spec
@@ -2,7 +2,7 @@
 # - external libraries packages (is there any sense in that?)
 #
 %define                snap    20100109
 # - external libraries packages (is there any sense in that?)
 #
 %define                snap    20100109

-%define                rel             8
+%define                rel             9

 Summary:       Cinelerra - capturing, editing and production of audio/video material
 Summary(pl.UTF-8):     Cinelerra - nagrywanie, obróbka i produkcja materiału audio/video
 Name:          cinelerra-cv
 Summary:       Cinelerra - capturing, editing and production of audio/video material
 Summary(pl.UTF-8):     Cinelerra - nagrywanie, obróbka i produkcja materiału audio/video
 Name:          cinelerra-cv