[SCM] libebml packaging branch, master, updated. debian/0.7.7-3.1-11-gb4d0046
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sat May 29 15:06:57 UTC 2010
The following commit has been merged in the master branch:
commit 7ad4121febee6ea5ed1a42dfc77ab48f6306d46a
Author: Reinhard Tartler <siretart at tauware.de>
Date: Sat May 29 16:52:42 2010 +0200
remove debian/patches/020_invalid_cast.diff, applied upstream
diff --git a/debian/patches/020_invalid_cast.diff b/debian/patches/020_invalid_cast.diff
deleted file mode 100644
index 138e26a..0000000
--- a/debian/patches/020_invalid_cast.diff
+++ /dev/null
@@ -1,21 +0,0 @@
---- libebml-0.7.6.orig/ebml/EbmlTypes.h
-+++ libebml-0.7.6/ebml/EbmlTypes.h
-@@ -35,6 +35,7 @@
-
- #include <clocale>
- #include <string>
-+#include <stdint.h>
-
- #include "ebml/c/libebml_t.h"
- #include "ebml/EbmlConfig.h"
---- libebml-0.7.6.orig/ebml/EbmlCrc32.h
-+++ libebml-0.7.6/ebml/EbmlCrc32.h
-@@ -143,7 +143,7 @@
-
- inline bool IsAlignedOn(const void *p, unsigned int alignment)
- {
-- return IsPowerOf2(alignment) ? ModPowerOf2((unsigned long)p, alignment) == 0 : (unsigned long)p % alignment == 0;
-+ return IsPowerOf2(alignment) ? ModPowerOf2((uintptr_t)p, alignment) == 0 : (uintptr_t)p % alignment == 0;
- }
-
- template <class T>
diff --git a/debian/patches/series b/debian/patches/series
index 79275e7..736bb43 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-020_invalid_cast.diff -p1
030_g++-4.3.diff
--
libebml packaging
More information about the pkg-multimedia-commits
mailing list