Bug 966078 - Apply libmkv patches from update.sh. r=doublec DONTBUILD
authorRalph Giles <giles@mozilla.com>
Thu, 30 Jan 2014 17:08:06 -0800
changeset 166177 26c71f15fe3cb04eb2c50771702bd5d1da1114af
parent 166176 da7b3853cbfd03892c27de8c8f1b654cfb9bac5f
child 166178 1dc5a6ee7a8a788a628df4dead9932620b78a1d7
push idunknown
push userunknown
push dateunknown
reviewersdoublec
bugs966078
milestone29.0a1
Bug 966078 - Apply libmkv patches from update.sh. r=doublec DONTBUILD The update script landed without code to apply the patch files we're carrying against upstream. It's better to do that automatically so there's less to remember when doing an update. Also add a patch apparently missing from the existing set to remove a spurious declaration for 'writeSimpleBock'.
media/libmkv/bock_fix.patch
media/libmkv/update.sh
new file mode 100644
--- /dev/null
+++ b/media/libmkv/bock_fix.patch
@@ -0,0 +1,16 @@
+diff --git a/third_party/libmkv/WebMElement.h b/third_party/libmkv/WebMElement.h
+index d9ad0a0..717e739 100644
+--- a/third_party/libmkv/WebMElement.h
++++ b/third_party/libmkv/WebMElement.h
+@@ -10,11 +10,6 @@
+ #ifndef MKV_CONTEXT_HPP
+ #define MKV_CONTEXT_HPP 1
+ 
+-void writeSimpleBock(EbmlGlobal *ebml, unsigned char trackNumber, unsigned short timeCode,
+-                     int isKeyframe, unsigned char lacingFlag, int  discardable,
+-                     unsigned char *data, unsigned long dataLength);
+-
+-
+ // these are helper functions
+ void writeHeader(EbmlGlobal *ebml);
+ void writeSegmentInformation(EbmlGlobal *ebml, EbmlLoc *startInfo, unsigned long timeCodeScale, double duration);
--- a/media/libmkv/update.sh
+++ b/media/libmkv/update.sh
@@ -25,9 +25,13 @@ if [ -n "$rev" ]; then
     echo "WARNING: updating from a dirty git repository."
   fi
   sed -i.bak -e "/The git commit ID used was/ s/[0-9a-f]\{40\}\(-dirty\)\{0,1\}\./$version./" README_MOZILLA
   rm README_MOZILLA.bak
 else
   echo "Remember to update README_MOZILLA with the version details."
 fi
 
-echo "please apply source_fix.patch and gecko_fix.patch"
+# Apply any patches against upstream here.
+patch -p1 < source_fix.patch
+patch -p1 < gecko_fix.patch
+patch -p1 < const_fix.patch
+patch -p3 < bock_fix.patch