- updated for 0.4.1

Changed files:
    dirac-shared.patch -> 1.2

diff --git a/dirac-shared.patch b/dirac-shared.patch
index 692f02b046785bf3416a6b969215518a61e3f3bf..96a5b35e6a50147da6d0a755bca5e7308e62c2a4 100644 (file)
--- a/dirac-shared.patch
+++ b/dirac-shared.patch
@@ -1,41 +1,45 @@
-diff -urN aa/dirac-0.3.1/configure.ac dirac-0.3.1/configure.ac
---- aa/dirac-0.3.1/configure.ac        2004-06-08 18:03:15.000000000 +0200
-+++ dirac-0.3.1/configure.ac   2004-08-02 20:08:39.074281184 +0200
-@@ -54,7 +54,7 @@
- dnl -----------------------------------------------
- 
- AC_PROG_CXX
--AC_PROG_RANLIB
-+AC_PROG_LIBTOOL
- AM_SANITY_CHECK
- 
- dnl -----------------------------------------------
-diff -urN aa/dirac-0.3.1/decoder/Makefile.am dirac-0.3.1/decoder/Makefile.am
---- aa/dirac-0.3.1/decoder/Makefile.am 2004-05-14 19:20:33.000000000 +0200
-+++ dirac-0.3.1/decoder/Makefile.am    2004-08-02 20:14:45.932510256 +0200
-@@ -3,5 +3,5 @@
+diff -urN aa/dirac-0.4.1/configure.ac dirac-0.4.1/configure.ac
+--- aa/dirac-0.4.1/configure.ac        2004-08-26 13:02:52.000000000 +0200
++++ dirac-0.4.1/configure.ac   2004-08-26 15:38:38.714554768 +0200
+@@ -66,7 +66,7 @@
+               use_msvc=yes
+               ;;
+       *)
+-              AC_PROG_RANLIB
++              AC_PROG_LIBTOOL
+               ;;
+ esac
+ AM_CONDITIONAL(USE_MSVC, test x"$use_msvc" = "xyes")
+diff -urN aa/dirac-0.4.1/decoder/Makefile.am dirac-0.4.1/decoder/Makefile.am
+--- aa/dirac-0.4.1/decoder/Makefile.am 2004-08-25 18:58:10.000000000 +0200
++++ dirac-0.4.1/decoder/Makefile.am    2004-08-26 15:38:59.028466584 +0200
+@@ -4,7 +4,7 @@
  
  dirac_decoder_SOURCES = decmain.cpp
  
 -LDADD = ../libdirac_decoder/libdirac_decoder.a ../libdirac_common/libdirac_common.a
 +LDADD = ../libdirac_decoder/libdirac_decoder.la ../libdirac_common/libdirac_common.la
- DEFS = -I. -I.. -I../.. -I$(srcdir)
-diff -urN aa/dirac-0.3.1/encoder/Makefile.am dirac-0.3.1/encoder/Makefile.am
---- aa/dirac-0.3.1/encoder/Makefile.am 2004-05-14 19:20:33.000000000 +0200
-+++ dirac-0.3.1/encoder/Makefile.am    2004-08-02 20:14:38.347663328 +0200
-@@ -3,5 +3,5 @@
+ 
+ if USE_MSVC
+ CLEANFILES = *.pdb *.ilk
+diff -urN aa/dirac-0.4.1/encoder/Makefile.am dirac-0.4.1/encoder/Makefile.am
+--- aa/dirac-0.4.1/encoder/Makefile.am 2004-08-25 18:58:11.000000000 +0200
++++ dirac-0.4.1/encoder/Makefile.am    2004-08-26 15:39:22.011972560 +0200
+@@ -4,7 +4,7 @@
  
  dirac_encoder_SOURCES = encmain.cpp
  
 -LDADD = ../libdirac_encoder/libdirac_encoder.a ../libdirac_common/libdirac_common.a ../libdirac_motionest/libdirac_motionest.a
 +LDADD = ../libdirac_encoder/libdirac_encoder.la ../libdirac_common/libdirac_common.la ../libdirac_motionest/libdirac_motionest.la
- DEFS = -I.. -I. -I../.. -I$(srcdir)
-diff -urN aa/dirac-0.3.1/libdirac_common/Makefile.am dirac-0.3.1/libdirac_common/Makefile.am
---- aa/dirac-0.3.1/libdirac_common/Makefile.am 2004-05-12 10:21:52.000000000 +0200
-+++ dirac-0.3.1/libdirac_common/Makefile.am    2004-08-02 20:10:13.615908672 +0200
-@@ -11,9 +11,9 @@
+ 
+ if USE_MSVC
+ CLEANFILES = *.pdb *.ilk
+diff -urN aa/dirac-0.4.1/libdirac_common/Makefile.am dirac-0.4.1/libdirac_common/Makefile.am
+--- aa/dirac-0.4.1/libdirac_common/Makefile.am 2004-08-25 18:58:11.000000000 +0200
++++ dirac-0.4.1/libdirac_common/Makefile.am    2004-08-26 15:40:09.227794664 +0200
+@@ -10,9 +10,9 @@
                mv_codec.cpp pic_io.cpp upconvert.cpp wavelet_utils.cpp \
-               cmd_line.cpp
+               cmd_line.cpp dirac_assertions.cpp
  
 -lib_LIBRARIES = libdirac_common.a
 +lib_LTLIBRARIES = libdirac_common.la
@@ -43,14 +47,14 @@ diff -urN aa/dirac-0.3.1/libdirac_common/Makefile.am dirac-0.3.1/libdirac_common
 -libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources)
 +libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources)
  
- library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_common
  library_include_HEADERS = $(h_sources)
-diff -urN aa/dirac-0.3.1/libdirac_decoder/Makefile.am dirac-0.3.1/libdirac_decoder/Makefile.am
---- aa/dirac-0.3.1/libdirac_decoder/Makefile.am        2004-05-11 18:11:17.000000000 +0200
-+++ dirac-0.3.1/libdirac_decoder/Makefile.am   2004-08-02 20:10:47.919693704 +0200
-@@ -5,9 +5,9 @@
- 
- cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp
+diff -urN aa/dirac-0.4.1/libdirac_decoder/Makefile.am dirac-0.4.1/libdirac_decoder/Makefile.am
+--- aa/dirac-0.4.1/libdirac_decoder/Makefile.am        2004-08-25 18:58:12.000000000 +0200
++++ dirac-0.4.1/libdirac_decoder/Makefile.am   2004-08-26 15:45:19.620607784 +0200
+@@ -6,9 +6,9 @@
+ cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp \
+              dirac_cppparser.cpp dirac_parser.cpp
  
 -lib_LIBRARIES = libdirac_decoder.a
 +lib_LTLIBRARIES = libdirac_decoder.la
@@ -58,14 +62,14 @@ diff -urN aa/dirac-0.3.1/libdirac_decoder/Makefile.am dirac-0.3.1/libdirac_decod
 -libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources)
 +libdirac_decoder_la_SOURCES = $(h_sources) $(cpp_sources)
  
- library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_decoder
  library_include_HEADERS = $(h_sources)
-diff -urN aa/dirac-0.3.1/libdirac_encoder/Makefile.am dirac-0.3.1/libdirac_encoder/Makefile.am
---- aa/dirac-0.3.1/libdirac_encoder/Makefile.am        2004-05-11 18:11:17.000000000 +0200
-+++ dirac-0.3.1/libdirac_encoder/Makefile.am   2004-08-02 20:10:34.675707096 +0200
-@@ -5,9 +5,9 @@
+diff -urN aa/dirac-0.4.1/libdirac_encoder/Makefile.am dirac-0.4.1/libdirac_encoder/Makefile.am
+--- aa/dirac-0.4.1/libdirac_encoder/Makefile.am        2004-08-25 18:58:12.000000000 +0200
++++ dirac-0.4.1/libdirac_encoder/Makefile.am   2004-08-26 15:45:42.139184440 +0200
+@@ -4,9 +4,9 @@
  
- cpp_sources = comp_compress.cpp frame_compress.cpp seq_compress.cpp
+ cpp_sources = comp_compress.cpp frame_compress.cpp quality_monitor.cpp seq_compress.cpp
  
 -lib_LIBRARIES = libdirac_encoder.a
 +lib_LTLIBRARIES = libdirac_encoder.la
@@ -73,14 +77,14 @@ diff -urN aa/dirac-0.3.1/libdirac_encoder/Makefile.am dirac-0.3.1/libdirac_encod
 -libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources)
 +libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources)
  
- library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_encoder
  library_include_HEADERS = $(h_sources)
-diff -urN aa/dirac-0.3.1/libdirac_motionest/Makefile.am dirac-0.3.1/libdirac_motionest/Makefile.am
---- aa/dirac-0.3.1/libdirac_motionest/Makefile.am      2004-05-11 18:11:17.000000000 +0200
-+++ dirac-0.3.1/libdirac_motionest/Makefile.am 2004-08-02 20:10:25.724067952 +0200
-@@ -5,9 +5,9 @@
+diff -urN aa/dirac-0.4.1/libdirac_motionest/Makefile.am dirac-0.4.1/libdirac_motionest/Makefile.am
+--- aa/dirac-0.4.1/libdirac_motionest/Makefile.am      2004-08-25 18:58:12.000000000 +0200
++++ dirac-0.4.1/libdirac_motionest/Makefile.am 2004-08-26 15:44:00.462641624 +0200
+@@ -4,9 +4,9 @@
  
- cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp
+ cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp pixel_match.cpp
  
 -lib_LIBRARIES = libdirac_motionest.a
 +lib_LTLIBRARIES = libdirac_motionest.la
@@ -88,22 +92,36 @@ diff -urN aa/dirac-0.3.1/libdirac_motionest/Makefile.am dirac-0.3.1/libdirac_mot
 -libdirac_motionest_a_SOURCES = $(h_sources) $(cpp_sources)
 +libdirac_motionest_la_SOURCES = $(h_sources) $(cpp_sources)
  
- library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_motionest
  library_include_HEADERS = $(h_sources)
-diff -urN aa/dirac-0.3.1/picheader/Makefile.am dirac-0.3.1/picheader/Makefile.am
---- aa/dirac-0.3.1/picheader/Makefile.am       2004-05-14 19:20:33.000000000 +0200
-+++ dirac-0.3.1/picheader/Makefile.am  2004-08-02 20:14:55.842003784 +0200
-@@ -2,5 +2,5 @@
+diff -urN aa/dirac-0.4.1/picheader/Makefile.am dirac-0.4.1/picheader/Makefile.am
+--- aa/dirac-0.4.1/picheader/Makefile.am       2004-08-25 18:58:12.000000000 +0200
++++ dirac-0.4.1/picheader/Makefile.am  2004-08-26 15:45:58.186744840 +0200
+@@ -4,7 +4,7 @@
  
  make_header_SOURCES = headmain.cpp
  
 -LDADD = ../libdirac_common/libdirac_common.a
 +LDADD = ../libdirac_common/libdirac_common.la
- DEFS = -I.. -I. -I../.. -I$(srcdir)
-diff -urN aa/dirac-0.3.1/util/conversion/common/Makefile.am dirac-0.3.1/util/conversion/common/Makefile.am
---- aa/dirac-0.3.1/util/conversion/common/Makefile.am  2004-05-28 16:15:54.000000000 +0200
-+++ dirac-0.3.1/util/conversion/common/Makefile.am     2004-08-02 20:09:56.197556664 +0200
-@@ -5,9 +5,9 @@
+ 
+ if USE_MSVC
+ CLEANFILES = *.pdb *.ilk
+diff -urN aa/dirac-0.4.1/unit_tests/Makefile.am dirac-0.4.1/unit_tests/Makefile.am
+--- aa/dirac-0.4.1/unit_tests/Makefile.am      2004-08-25 18:58:13.000000000 +0200
++++ dirac-0.4.1/unit_tests/Makefile.am 2004-08-26 15:45:36.198087624 +0200
+@@ -8,7 +8,7 @@
+                                                arrays_test.h \
+                                                arrays_test.cpp
+ 
+-LDADD = ../libdirac_encoder/libdirac_encoder.a ../libdirac_common/libdirac_common.a ../libdirac_motionest/libdirac_motionest.a -ldl -lcppunit
++LDADD = ../libdirac_encoder/libdirac_encoder.la ../libdirac_common/libdirac_common.la ../libdirac_motionest/libdirac_motionest.la -ldl -lcppunit
+ 
+ if USE_MSVC
+ CLEANFILES = *.pdb *.ilk
+diff -urN aa/dirac-0.4.1/util/conversion/common/Makefile.am dirac-0.4.1/util/conversion/common/Makefile.am
+--- aa/dirac-0.4.1/util/conversion/common/Makefile.am  2004-08-25 18:58:14.000000000 +0200
++++ dirac-0.4.1/util/conversion/common/Makefile.am     2004-08-26 15:43:27.154705200 +0200
+@@ -4,9 +4,9 @@
  
  cpp_sources = setstdiomode.cpp bitmap.cpp
  
@@ -115,15 +133,42 @@ diff -urN aa/dirac-0.3.1/util/conversion/common/Makefile.am dirac-0.3.1/util/con
  
  library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
  library_include_HEADERS = $(h_sources)
-diff -urN aa/dirac-0.3.1/util/conversion/Makefile.am dirac-0.3.1/util/conversion/Makefile.am
---- aa/dirac-0.3.1/util/conversion/Makefile.am 2004-05-28 16:27:19.000000000 +0200
-+++ dirac-0.3.1/util/conversion/Makefile.am    2004-08-02 20:14:16.012058856 +0200
-@@ -16,7 +16,7 @@
+diff -urN aa/dirac-0.4.1/util/conversion/Makefile.am dirac-0.4.1/util/conversion/Makefile.am
+--- aa/dirac-0.4.1/util/conversion/Makefile.am 2004-08-25 18:58:13.000000000 +0200
++++ dirac-0.4.1/util/conversion/Makefile.am    2004-08-26 15:44:28.521376048 +0200
+@@ -17,7 +17,7 @@
  UYVYtoRGB_SOURCES=UYVYtoRGB.cpp
  BMPtoRGB_SOURCES=BMPtoRGB.cpp
  
 -LDADD = common/libconv_common.a
 +LDADD = common/libconv_common.la
- DEFS = -I.. -I. -I../.. -Icommon/ -I$(srcdir)
  
- SUBDIRS=common
+ if USE_MSVC
+ CLEANFILES = *.pdb *.ilk
+diff -urN aa/dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am
+--- aa/dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am        2004-08-25 18:58:15.000000000 +0200
++++ dirac-0.4.1/util/instrumentation/libdirac_instrument/Makefile.am   2004-08-26 15:45:03.377077176 +0200
+@@ -4,9 +4,9 @@
+ 
+ cpp_sources = overlay.cpp draw_overlay.cpp motion_colour.cpp motion_arrows.cpp motion_colour_arrows.cpp sad.cpp pred_mode.cpp split_mode.cpp overlay_symbols.cpp
+ 
+-lib_LIBRARIES = libdirac_instrument.a
++lib_LTLIBRARIES = libdirac_instrument.la
+ 
+-libdirac_instrument_a_SOURCES = $(h_sources) $(cpp_sources)
++libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources)
+ 
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)
+ library_include_HEADERS = $(h_sources)
+diff -urN aa/dirac-0.4.1/util/instrumentation/Makefile.am dirac-0.4.1/util/instrumentation/Makefile.am
+--- aa/dirac-0.4.1/util/instrumentation/Makefile.am    2004-08-25 18:58:14.000000000 +0200
++++ dirac-0.4.1/util/instrumentation/Makefile.am       2004-08-26 15:44:51.066948600 +0200
+@@ -8,7 +8,7 @@
+ 
+ dirac_instrumentation_SOURCES = $(h_sources) $(cpp_sources)
+ 
+-LDADD = ../../libdirac_encoder/libdirac_encoder.a ../../libdirac_common/libdirac_common.a ../../libdirac_motionest/libdirac_motionest.a libdirac_instrument/libdirac_instrument.a
++LDADD = ../../libdirac_encoder/libdirac_encoder.la ../../libdirac_common/libdirac_common.la ../../libdirac_motionest/libdirac_motionest.la libdirac_instrument/libdirac_instrument.la
+ 
+ if USE_MSVC
+ CLEANFILES = *.pdb *.ilk