- bump to mp4v2-trunk-r349.

- muxmp4.c minor updates to recent subtitle API changes.
- muxmp4.c do not set zero-length tags.
- renamed module libmp4v2 -> mp4v2.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@2446 b64f7644-9d1e-0410-96f1-a4d463321fa5

4 files changed, 19 insertions, 17 deletions

diff --git a/contrib/libmp4v2/module.defs b/contrib/libmp4v2/module.defs
deleted file mode 100644
index a46769075..000000000
--- a/contrib/libmp4v2/module.defs
+++ /dev/null
@@ -1,15 +0,0 @@
-$(eval $(call import.MODULE.defs,LIBMP4V2,libmp4v2))
-$(eval $(call import.CONTRIB.defs,LIBMP4V2))
-
-LIBMP4V2.FETCH.url = http://download.m0k.org/handbrake/contrib/libmp4v2-2.0-r290.tar.gz
-LIBMP4V2.EXTRACT.tarbase = libmp4v2
-
-## propagate more flags
-LIBMP4V2.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,LIBMP4V2.GCC,*archs *D .g .O)"
-LIBMP4V2.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,LIBMP4V2.GCC,*archs *D .g .O)"
-
-## save some build-time by disabling utils
-LIBMP4V2.CONFIGURE.extra += --disable-util
-
-## make sure gch is disabled; we get build errors on linux with gcc-4.3.x and -g3
-LIBMP4V2.CONFIGURE.extra += --disable-gch
diff --git a/contrib/libmp4v2/module.rules b/contrib/libmp4v2/module.rules
deleted file mode 100644
index 8169e6032..000000000
--- a/contrib/libmp4v2/module.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-$(eval $(call import.MODULE.rules,LIBMP4V2))
-$(eval $(call import.CONTRIB.rules,LIBMP4V2))
diff --git a/contrib/mp4v2/module.defs b/contrib/mp4v2/module.defs
new file mode 100644
index 000000000..cf1f7058d
--- /dev/null
+++ b/contrib/mp4v2/module.defs
@@ -0,0 +1,17 @@
+$(eval $(call import.MODULE.defs,MP4V2,mp4v2))
+$(eval $(call import.CONTRIB.defs,MP4V2))
+
+MP4V2.FETCH.url = http://download.m0k.org/handbrake/contrib/mp4v2-trunk-r349.tar.bz2
+
+## propagate more flags
+MP4V2.CONFIGURE.env.CFLAGS = CFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *D .g .O)"
+MP4V2.CONFIGURE.env.CXXFLAGS = CXXFLAGS="$(call fn.ARGS,MP4V2.GCC,*archs *D .g .O)"
+
+## save some build-time by disabling utils
+MP4V2.CONFIGURE.extra += --disable-util
+
+## make sure gch is disabled; we get build errors on linux with gcc-4.3.x and -g3
+## relatively safe to enable for darwin as it is unlikely to have that bugged version
+ifneq (darwin,$(BUILD.system))
+    MP4V2.CONFIGURE.extra += --disable-gch
+endif
diff --git a/contrib/mp4v2/module.rules b/contrib/mp4v2/module.rules
new file mode 100644
index 000000000..95686c429
--- /dev/null
+++ b/contrib/mp4v2/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,MP4V2))
+$(eval $(call import.CONTRIB.rules,MP4V2))