From: Jan Rękorajski <baggins@pld-linux.org>
Date: Thu, 3 Jun 2010 15:26:15 +0000 (+0000)
Subject: - rel 9
X-Git-Tag: auto/th/cinelerra-cv-2_1-0_20100109_9
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fcinelerra-cv.git;a=commitdiff_plain;h=9a2d9fed59a3960deeed049477f557c78846cba1

- 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 eb558c5..49ebaf8 100644
--- a/cinelerra-cv-build.patch
+++ b/cinelerra-cv-build.patch
@@ -13,6 +13,21 @@
  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 @@
diff --git a/cinelerra-cv.spec b/cinelerra-cv.spec
index 7a02fae..49f2796 100644
--- a/cinelerra-cv.spec
+++ b/cinelerra-cv.spec
@@ -2,7 +2,7 @@
 # - 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