[SCM] cinelerra-cv/master: Refresh 02_FTBFS.diff

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit efebf21b85d507424762cb82850b2c0aff107cbe
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Oct 10 01:04:21 2012 +0100

    Refresh 02_FTBFS.diff

diff --git a/debian/patches/02_FTBFS.diff b/debian/patches/02_FTBFS.diff
index 118bbe7..79657b9 100644
--- a/debian/patches/02_FTBFS.diff
+++ b/debian/patches/02_FTBFS.diff
@@ -1,10 +1,10 @@
 ---
- cinelerra/Makefile.in |    2 +-
+ cinelerra/Makefile.am |    1 +
  cinelerra/ffmpeg.C    |    2 ++
  cinelerra/file.C      |    2 ++
  cinelerra/fileac3.C   |    2 ++
  cinelerra/fileyuv.C   |    2 ++
- 5 files changed, 9 insertions(+), 1 deletion(-)
+ 5 files changed, 9 insertions(+)
 
 --- cinelerra-cv.orig/cinelerra/ffmpeg.C
 +++ cinelerra-cv/cinelerra/ffmpeg.C
@@ -49,14 +49,13 @@
  #include "fileyuv.h"
  #include "asset.h"
  #include "bchash.h"
---- cinelerra-cv.orig/cinelerra/Makefile.in
-+++ cinelerra-cv/cinelerra/Makefile.in
-@@ -392,7 +392,7 @@ LIBINTL = @LIBINTL@
- LIBOBJS = @LIBOBJS@
- LIBRAW1394_CFLAGS = @LIBRAW1394_CFLAGS@
- LIBRAW1394_LIBS = @LIBRAW1394_LIBS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ -lGLU -lGL
- LIBTOOL = @LIBTOOL@
- LIBX264_CFLAGS = @LIBX264_CFLAGS@
- LIBX264_LIBS = @LIBX264_LIBS@
+--- cinelerra-cv.orig/cinelerra/Makefile.am
++++ cinelerra-cv/cinelerra/Makefile.am
+@@ -679,6 +679,7 @@ cinelerra_LDADD = \
+ 	$(OPENEXR_LIBS) \
+ 	-lsndfile \
+ 	-lpng -ljpeg -ltiff -lz \
++	-lGLU -lGL \
+ 	$(SOUND_LDFLAGS) \
+ 	$(FIREWIRE_LDFLAGS) \
+ 	$(LIBDV_LIBS) \

-- 
cinelerra-cv packaging