From da3afdadc442482b0de8eff2a6e0510c68e85fca Mon Sep 17 00:00:00 2001 From: Jakub Bogusz Date: Fri, 3 Dec 2004 22:56:06 +0000 Subject: [PATCH] - am workarounds + enable_static thinko Changed files: dirac-am.patch -> 1.1 --- dirac-am.patch | 106 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100644 dirac-am.patch diff --git a/dirac-am.patch b/dirac-am.patch new file mode 100644 index 0000000..3485224 --- /dev/null +++ b/dirac-am.patch @@ -0,0 +1,106 @@ +--- dirac-0.5.0/libdirac_motionest/Makefile.am.orig 2004-11-22 14:54:47.000000000 +0100 ++++ dirac-0.5.0/libdirac_motionest/Makefile.am 2004-12-03 23:07:48.958203264 +0100 +@@ -7,15 +7,7 @@ + + cpp_sources = block_match.cpp downconvert.cpp me_mode_decn.cpp me_subpel.cpp me_utils.cpp motion_estimate.cpp pixel_match.cpp + +-if USE_MSVC +-noinst_LIBRARIES = libdirac_motionest.a +-libdirac_motionest_a_AR = link.exe -lib /out:libdirac_motionest.a $(libdirac_motionest_a_OBJECTS) ; echo +-else +-libdirac_motionest_a_AR = ar crv + noinst_LTLIBRARIES = libdirac_motionest.la +-endif +- +-libdirac_motionest_a_SOURCES = $(h_sources) $(cpp_sources) + + libdirac_motionest_la_SOURCES = $(h_sources) $(cpp_sources) + +--- dirac-0.5.0/util/instrumentation/libdirac_instrument/Makefile.am.orig 2004-11-22 14:54:48.000000000 +0100 ++++ dirac-0.5.0/util/instrumentation/libdirac_instrument/Makefile.am 2004-12-03 23:08:44.080823352 +0100 +@@ -7,15 +7,8 @@ + + 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 gm_inliers.cpp + +-if USE_MSVC +-noinst_LIBRARIES = libdirac_instrument.a +-libdirac_instrument_a_AR = link.exe -lib /out:libdirac_instrument.a $(libdirac_instrument_a_OBJECTS) ; echo +-else + noinst_LTLIBRARIES = libdirac_instrument.la +-libdirac_instrument_a_AR = ar crv +-endif + +-libdirac_instrument_a_SOURCES = $(h_sources) $(cpp_sources) + libdirac_instrument_la_SOURCES = $(h_sources) $(cpp_sources) + + if USE_MSVC +--- 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 @@ + cpp_sources = comp_decompress.cpp frame_decompress.cpp seq_decompress.cpp \ + dirac_cppparser.cpp dirac_parser.cpp + +-if USE_MSVC +-lib_LIBRARIES = libdirac_decoder.a +-libdirac_decoder_a_AR = link -lib -out:libdirac_decoder.a $(libdirac_decoder_a_OBJECTS); link $(LIBFLAGS) -out:libdirac_decoder$(LIBEXT) $(LDFLAGS) $(libdirac_decoder_a_OBJECTS) $(libdirac_decoder_a_DEPENDENCIES); echo +-else + lib_LTLIBRARIES = libdirac_decoder.la +-endif +-libdirac_decoder_a_SOURCES = $(h_sources) $(cpp_sources) +- +-libdirac_decoder_a_LIBADD = \ +- $(top_builddir)/libdirac_common/libdirac_common.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 + + +-if USE_MSVC +-lib_LIBRARIES = libdirac_encoder.a +-libdirac_encoder_a_AR = link -lib -out:libdirac_encoder.a $(libdirac_encoder_a_OBJECTS); link $(LIBFLAGS) -out:libdirac_encoder$(LIBEXT) $(LDFLAGS) $(libdirac_encoder_a_OBJECTS) $(libdirac_encoder_a_DEPENDENCIES); echo +-else +-libdirac_encoder_a_AR = ar crv + lib_LTLIBRARIES = libdirac_encoder.la +-endif +- +-libdirac_encoder_a_SOURCES = $(h_sources) $(cpp_sources) +- +-libdirac_encoder_a_LIBADD = \ +- $(top_builddir)/libdirac_motionest/libdirac_motionest.a \ +- $(top_builddir)/libdirac_common/libdirac_common.a + + libdirac_encoder_la_SOURCES = $(h_sources) $(cpp_sources) + libdirac_encoder_la_LIBADD = \ +--- dirac-0.5.0/libdirac_common/Makefile.am.orig 2004-11-22 14:54:47.000000000 +0100 ++++ dirac-0.5.0/libdirac_common/Makefile.am 2004-12-03 23:07:32.027777080 +0100 +@@ -14,15 +14,7 @@ + cmd_line.cpp dirac_assertions.cpp + + +-if USE_MSVC +-noinst_LIBRARIES = libdirac_common.a +-libdirac_common_a_AR = link.exe -lib /out:libdirac_common.a $(libdirac_common_a_OBJECTS) ; echo +-else +-libdirac_common_a_AR = ar crv + noinst_LTLIBRARIES = libdirac_common.la +-endif +- +-libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources) + + libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources) + +--- dirac-0.5.0/configure.ac.orig 2004-11-26 14:28:30.000000000 +0100 ++++ dirac-0.5.0/configure.ac 2004-12-03 23:21:01.371738096 +0100 +@@ -240,7 +240,7 @@ + dnl ----------------------------------------------- + dnl Check if static libraries to be used on non-Windows platforms + dnl ----------------------------------------------- +-AM_CONDITIONAL(USE_STATIC, test x"$enable_static" = "xyes") ++AM_CONDITIONAL(USE_STATIC, false) + + dnl ----------------------------------------------- + dnl Setup valgrind and necessary args for memcheck -- 2.43.0