- up to 20110406

[packages/cinelerra-cv.git] / cinelerra-cv.spec

diff --git a/cinelerra-cv.spec b/cinelerra-cv.spec
index f8003fe398d3b0e826befcba1a08304aef852d84..8e18e9f5f958629dbdbb3f6f07c0dac92d814f3c 100644 (file)
--- a/cinelerra-cv.spec
+++ b/cinelerra-cv.spec
@@ -1,8 +1,8 @@
 # TODO:
 # - external libraries packages (is there any sense in that?)
 #
-%define                snap    20100109
-%define                rel             5
+%define                snap    20110406
+%define                rel             1
 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
@@ -12,9 +12,11 @@ License:     GPL
 Group:         X11/Applications
 # git clone git://git.cinelerra.org/j6t/cinelerra.git cinelerra-cv
 Source0:       %{name}-%{snap}.tar.bz2
-# Source0-md5: e130b134a9e691ae36d2bbb117fc530b
+# Source0-md5: c41bcabbc0c28b4575f6ff8631effed8
 Patch0:                %{name}-build.patch
-Patch1:                %{name}-libpng.patch
+Patch1:                %{name}-desktop.patch
+# http://bugs.cinelerra.org/raw-attachment/ticket/949/remove-support-v4l-buzz-k2-6-38.diff
+Patch2:                remove-support-v4l-buzz-k2-6-38.diff
 URL:           http://cinelerra.org/
 BuildRequires: OpenEXR-devel >= 1.2.1
 BuildRequires: OpenGL-GLU-devel
@@ -23,7 +25,6 @@ BuildRequires:        a52dec-libs-devel
 BuildRequires: alsa-lib-devel >= 1.0.8
 BuildRequires: autoconf
 BuildRequires: automake
-BuildRequires: esound-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: fftw3-devel
 BuildRequires: freetype-devel >= 2.1.4
@@ -99,9 +100,9 @@ Wersja społecznościowa.
 %setup -q -n %{name}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 find -name Makefile.am | xargs %{__sed} -i -e 's#^LIBTOOL =.*##g'
-%{__sed} -i -e 's/png_check_sig((unsigned char\*)test, 8)/!png_sig_cmp((unsigned char\*)test, 0, 8)/g' cinelerra/filepng.C
 
 %build
 rm -f m4/*.m4 *.m4
@@ -115,6 +116,7 @@ touch config.rpath
 
 %configure \
        CPPFLAGS="%{rpmcppflags} -I/usr/include/freetype2" \
+       CXXFLAGS="%{rpmcxxflags} -D__STDC_CONSTANT_MACROS=1" \
 %ifarch ppc
        --enable-altivec \
 %endif
@@ -122,6 +124,7 @@ touch config.rpath
        --enable-mmx \
        --enable-3dnow \
 %endif
+       --disable-esd \
        --enable-freetype2 \
        --with-external-ffmpeg \
        --with-alsa-prefix=%{_prefix} \