Author: charles Date: Thu Mar 3 13:19:53 2005 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- adjusted to 0.5.1
---- Files affected:
SOURCES:
dirac-am.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/dirac-am.patch
diff -u SOURCES/dirac-am.patch:1.1 SOURCES/dirac-am.patch:1.2
--- SOURCES/dirac-am.patch:1.1 Fri Dec 3 23:56:06 2004
+++ SOURCES/dirac-am.patch Thu Mar 3 14:19:48 2005
@@ -16,9 +16,9 @@
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 @@
+--- dirac-0.5.1/util/instrumentation/libdirac_instrument/Makefile.am.orig
2004-12-10 16:28:44.000000000 +0100
++++ dirac-0.5.1/util/instrumentation/libdirac_instrument/Makefile.am
2005-03-03 13:03:26.297926120 +0100
+@@ -7,15 +7,7 @@
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
@@ -29,11 +29,11 @@
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
+ 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 @@
@@ -75,24 +75,26 @@
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 @@
+--- 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 @@
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
+-libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources)
-else
-libdirac_common_a_AR = ar crv
noinst_LTLIBRARIES = libdirac_common.la
+ libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources)
+ libdirac_common_la_CXXFLAGS = $(AM_CXXFLAGS)
-endif
-
--libdirac_common_a_SOURCES = $(h_sources) $(cpp_sources)
- libdirac_common_la_SOURCES = $(h_sources) $(cpp_sources)
+ library_includedir=$(includedir)/$(GENERIC_LIBRARY_NAME)/libdirac_common
--- 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 @@
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/dirac-am.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
