- merged releases/1.9.0 r331:333.

- doc fixups for 2.0.
enzo1982 · May 21, 2009 · f71e0e7 · f71e0e7
1 parent 3ad1b29
commit f71e0e7
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 695 deletions.
diff --git a/GNUmakefile.am b/GNUmakefile.am
@@ -6,6 +6,8 @@ check_PROGRAMS =
 
 ###############################################################################
 
+libmp4v2_la_LDFLAGS = -version-number $(PROJECT_version_major):$(PROJECT_version_minor):$(PROJECT_version_point) $(X_libmp4v2_la_LDFLAGS)
+
 libmp4v2_la_SOURCES = \
     src/3gp.cpp                          \
     src/atom_ac3.cpp                     \

diff --git a/configure.ac b/configure.ac
@@ -189,6 +189,21 @@ AC_SUBST([PROJECT_build])
 # checks for typedefs, structures, and compiler characteristics
 ###############################################################################
 
+###############################################################################
+# additional ldflags
+###############################################################################
+
+case ${host} in
+    *-*-darwin*)
+        X_libmp4v2_la_LDFLAGS='-Wl,-current_version,$(PROJECT_version_major).$(PROJECT_version_minor).$(PROJECT_version_point) -Wl,-compatibility_version,$(PROJECT_version_major).0.0'
+        ;;
+    *)
+        X_libmp4v2_la_LDFLAGS=
+        ;;
+esac
+
+AC_SUBST([X_libmp4v2_la_LDFLAGS])
+
 ###############################################################################
 # check for --disable-fvisibility
 ###############################################################################

diff --git a/doc/texi/ReleaseNotes.texi b/doc/texi/ReleaseNotes.texi
@@ -16,8 +16,8 @@
 [TODO]
 
 @chapter Breaking Changes
-@section Removed deprecated metadata API from 1.9.0 .
-The following functions have been removed and replaced with iTMF Tags and/or iTMF Generic API. Detailed documentation can be found under API modules section.
+@section Removed deprecated metadata/free-form API.
+The following functions have been removed and replaced with iTMF Generic and Tags API. Detailed documentation can be found under API modules section.
 
 DeleteMetadataAtom(),
 DeleteMetadataFreeForm(),
@@ -42,13 +42,6 @@ SetMetadataTrack(),
 SetMetadataUint16(),
 SetMetadataUint8().
 
-@section Command-line utilities
-The command-line utilities have been totally rewritten and enhanced. Help usage has been made more consistent. Invoke the appropriate utility in the following fashion for more details:
-
-@example
-@i{command} --help
-@end example
-
 @appendix Changelog
 @appendixsection Version 2.0
 @include changelog/version-2.0.texi

diff --git a/doc/texi/build/platform.linux.texi b/doc/texi/build/platform.linux.texi
@@ -3,7 +3,7 @@ Building on @value{OS.linux} is well supported as it is used by maintainers of t
 
 @itemize @bullet
 @item Intel 32-bit or 64-bit hardware
-@item Fedora 9, gcc 4.3.0
+@item Fedora 10, gcc 4.3.2
 @item gcc 3.4.0 or higher is reported to work
 @end itemize
 

diff --git a/doc/texi/build/platform.osx.texi b/doc/texi/build/platform.osx.texi
@@ -3,7 +3,7 @@ Building on @value{OS.osx} is well supported as it is used by maintainers of thi
 
 @itemize @bullet
 @item Mac Intel hardware
-@item Mac OS X 10.5.6
+@item Mac OS X 10.5.7
 @item Xcode-3.1.2
 @item gcc 4.0.1 (Apple Inc. build 5493)
 @item gcc 4.2.1 (Apple Inc. build 5570)

diff --git a/doc/texi/changelog/version-2.0.texi b/doc/texi/changelog/version-2.0.texi
@@ -1,5 +1,5 @@
 @enumerate
 @item
-Removed deprecated metadata/free-form API. Replacement is iTMF Generic and Tags API.
+Removed deprecated metadata/free-form API and replaced with iTMF Generic and Tags API.
 
 @end enumerate
diff --git a/vstudio9.0/include/mp4v2/project.h b/vstudio9.0/include/mp4v2/project.h
@@ -6,24 +6,24 @@
 #define MP4V2_PROJECT_name            "MP4v2"
 #define MP4V2_PROJECT_name_lower      "mp4v2"
 #define MP4V2_PROJECT_name_upper      "MP4V2"
-#define MP4V2_PROJECT_name_formal     "MP4v2 2.0-r305"
+#define MP4V2_PROJECT_name_formal     "MP4v2 2.0-r335"
 #define MP4V2_PROJECT_url_website     "http://code.google.com/p/mp4v2"
 #define MP4V2_PROJECT_url_downloads   "http://code.google.com/p/mp4v2/downloads/list"
 #define MP4V2_PROJECT_url_discussion  "http://groups.google.com/group/mp4v2"
 #define MP4V2_PROJECT_irc             "irc://irc.freenode.net/handbrake"
 #define MP4V2_PROJECT_bugreport       "<[email protected]>"
-#define MP4V2_PROJECT_version         "2.0-r305"
+#define MP4V2_PROJECT_version         "2.0-r335"
 #define MP4V2_PROJECT_version_hex     0x00020000
 #define MP4V2_PROJECT_version_major   2
 #define MP4V2_PROJECT_version_minor   0
 #define MP4V2_PROJECT_version_point   0
 #define MP4V2_PROJECT_repo_url        "https://mp4v2.googlecode.com/svn/trunk"
 #define MP4V2_PROJECT_repo_root       "https://mp4v2.googlecode.com/svn"
 #define MP4V2_PROJECT_repo_uuid       "6e6572fa-98a6-11dd-ad9f-f77439c74b79"
-#define MP4V2_PROJECT_repo_rev        305
-#define MP4V2_PROJECT_repo_date       "2009-05-17 06:47:46 -0400 (Sun, 17 May 2009)"
+#define MP4V2_PROJECT_repo_rev        335
+#define MP4V2_PROJECT_repo_date       "2009-05-21 15:33:05 -0400 (Thu, 21 May 2009)"
 #define MP4V2_PROJECT_repo_type       "developer"
-#define MP4V2_PROJECT_build           "Mon May 18 05:38:17 EDT 2009"
+#define MP4V2_PROJECT_build           "Thu May 21 16:06:08 EDT 2009"
 
 /*****************************************************************************/
 

diff --git a/vstudio9.0/mp4dump/mp4dump.vcproj b/vstudio9.0/mp4dump/mp4dump.vcproj