- updated for 0.6.0

[packages/dirac.git] / dirac-am.patch

diff --git a/dirac-am.patch b/dirac-am.patch
index 49519ddacfd4c89f7759480c5d1f09c5cb3418d0..c561642a9a4fd2e11bfcf906ba965c59bc5f7e70 100644 (file)
--- a/dirac-am.patch
+++ b/dirac-am.patch
@@ -34,9 +34,9 @@
  
  libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources)
  libdirac_instrument_la_CXXFLAGS = $(AM_CXXFLAGS)
---- dirac-0.5.0/libdirac_decoder/Makefile.am.orig      2004-11-22 14:54:47.000000000 +0100
-+++ dirac-0.5.0/libdirac_decoder/Makefile.am   2004-12-03 23:07:00.199615696 +0100
-@@ -9,16 +9,7 @@
+--- dirac-0.6.0/libdirac_decoder/Makefile.am.orig      2006-04-20 12:41:57.000000000 +0200
++++ dirac-0.6.0/libdirac_decoder/Makefile.am   2006-06-23 14:38:38.604440000 +0200
+@@ -9,17 +9,7 @@
  cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp \
               dirac_cppparser.cpp dirac_parser.cpp
  
@@ -49,14 +49,15 @@
 -libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources)
 -
 -libdirac_decoder_a_LIBADD = \
--               $(top_builddir)/libdirac_common/libdirac_common.a
+-               $(top_builddir)/libdirac_common/libdirac_common.a \
+-               $(top_builddir)/libdirac_byteio/libdirac_byteio.a 
  
  libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources)
- 
---- dirac-0.5.0/libdirac_encoder/Makefile.am.orig      2004-11-22 14:54:47.000000000 +0100
-+++ dirac-0.5.0/libdirac_encoder/Makefile.am   2004-12-03 23:07:19.411695016 +0100
-@@ -10,19 +10,7 @@
-               seq_compress.cpp dirac_encoder.cpp
+ libdirac_decoder_la_CXXFLAGS = $(AM_CXXFLAGS)
+--- dirac-0.6.0/libdirac_encoder/Makefile.am.orig      2006-04-20 12:41:57.000000000 +0200
++++ dirac-0.6.0/libdirac_encoder/Makefile.am   2006-06-23 14:38:59.504440000 +0200
+@@ -10,20 +10,7 @@
+               quant_chooser.cpp seq_compress.cpp dirac_encoder.cpp
  
  
 -if USE_MSVC
@@ -71,10 +72,11 @@
 -
 -libdirac_encoder_a_LIBADD = \
 -               $(top_builddir)/libdirac_motionest/libdirac_motionest.a \
--               $(top_builddir)/libdirac_common/libdirac_common.a
+-               $(top_builddir)/libdirac_common/libdirac_common.a \
+-               $(top_builddir)/libdirac_byteio/libdirac_byteio.a 
  
  libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources)
- libdirac_encoder_la_LIBADD = \
+ libdirac_encoder_la_CXXFLAGS = $(AM_CXXFLAGS)
 --- dirac-0.5.1/libdirac_common/Makefile.am.orig       2004-12-10 16:28:42.000000000 +0100
 +++ dirac-0.5.1/libdirac_common/Makefile.am    2005-03-03 13:09:50.814470720 +0100
 @@ -14,17 +14,9 @@