[SCM] mediatomb/master: Fix a FTBFS when using gcc-4.7.
micove-guest at users.alioth.debian.org
micove-guest at users.alioth.debian.org
Sun Mar 4 04:52:16 UTC 2012
The following commit has been merged in the master branch:
commit 3fc323615caf6bf29da0ab47a74c838a5cc80a68
Author: Miguel Colon <debian.micove at gmail.com>
Date: Sat Mar 3 23:08:23 2012 -0500
Fix a FTBFS when using gcc-4.7.
gcc-4.7 should be released in about 3-4 weeks. Using rc1 from experimental
it failed to compile and this patch fixed the issue.
diff --git a/debian/patches/gcc_4.7_support.patch b/debian/patches/gcc_4.7_support.patch
new file mode 100644
index 0000000..de71349
--- /dev/null
+++ b/debian/patches/gcc_4.7_support.patch
@@ -0,0 +1,121 @@
+Description: Fix a FTBFS when using gcc-4.7
+Origin: other, http://pkgs.fedoraproject.org/gitweb/?p=mediatomb.git;a=commitdiff;h=b96e8410
+Last-Update: 2012-03-03
+
+diff -up ./src/hash/dbo_hash.h.gcc47 ./src/hash/dbo_hash.h
+--- ./src/hash/dbo_hash.h.gcc47 2012-01-14 11:55:22.520261056 -0500
++++ ./src/hash/dbo_hash.h 2012-01-14 12:01:48.965302982 -0500
+@@ -106,7 +106,7 @@ public:
+ inline bool remove(KT key)
+ {
+ struct dbo_hash_slot<KT, VT> *slot;
+- if (! search(key, &slot))
++ if (! this->search(key, &slot))
+ return false;
+ slot->key = deletedKey;
+ slot->value->release();
+@@ -136,7 +136,7 @@ public:
+ inline void put(KT key, zmm::Ref<VT> value)
+ {
+ struct dbo_hash_slot<KT, VT> *slot;
+- search(key, &slot);
++ this->search(key, &slot);
+ put(key, (hash_slot_t)slot, value);
+ }
+ void put(KT key, hash_slot_t destSlot, zmm::Ref<VT> value)
+@@ -162,7 +162,7 @@ public:
+ inline zmm::Ref<VT> get(KT key)
+ {
+ struct dbo_hash_slot<KT, VT> *slot;
+- bool found = search(key, &slot);
++ bool found = this->search(key, &slot);
+ if (found)
+ return zmm::Ref<VT>(slot->value);
+ else
+@@ -174,7 +174,7 @@ public:
+ inline zmm::Ref<VT> get(KT key, hash_slot_t *destSlot)
+ {
+ struct dbo_hash_slot<KT, VT> **slot = (struct dbo_hash_slot<KT, VT> **)destSlot;
+- bool found = search(key, slot);
++ bool found = this->search(key, slot);
+ if (found)
+ return zmm::Ref<VT>((*slot)->value);
+ else
+diff -up ./src/hash/dbr_hash.h.gcc47 ./src/hash/dbr_hash.h
+--- ./src/hash/dbr_hash.h.gcc47 2012-01-14 12:04:43.464643618 -0500
++++ ./src/hash/dbr_hash.h 2012-01-14 12:05:24.111120552 -0500
+@@ -124,7 +124,7 @@ public:
+ inline bool remove(KT key)
+ {
+ struct dbr_hash_slot<KT> *slot;
+- if (! search(key, &slot))
++ if (! this->search(key, &slot))
+ return false;
+ slot->key = deletedKey;
+ int array_slot = slot->array_slot;
+@@ -134,7 +134,7 @@ public:
+ return true;
+ }
+ data_array[array_slot] = data_array[--this->count];
+- if (! search(data_array[array_slot], &slot))
++ if (! this->search(data_array[array_slot], &slot))
+ {
+ log_debug("DBR-Hash-Error: (%d; array_slot=%d; count=%d)\n", data_array[array_slot], array_slot, this->count);
+ throw zmm::Exception(_("DBR-Hash-Error: key in data_array not found in hashtable"));
+@@ -146,7 +146,7 @@ public:
+ inline void put(KT key)
+ {
+ struct dbr_hash_slot<KT> *slot;
+- if (! search(key, &slot))
++ if (! this->search(key, &slot))
+ {
+ #ifdef TOMBDEBUG
+ if (this->count >= realCapacity)
+@@ -194,7 +194,7 @@ public:
+ inline bool exists(KT key)
+ {
+ struct dbr_hash_slot<KT> *slot;
+- return search(key, &slot);
++ return this->search(key, &slot);
+ }
+
+ /*
+diff -up ./src/hash/dso_hash.h.gcc47 ./src/hash/dso_hash.h
+--- ./src/hash/dso_hash.h.gcc47 2012-01-14 12:13:50.755582375 -0500
++++ ./src/hash/dso_hash.h 2012-01-14 12:14:42.511463035 -0500
+@@ -100,7 +100,7 @@ public:
+ inline bool remove(zmm::String key)
+ {
+ struct dso_hash_slot<VT> *slot;
+- if (! search(key, &slot))
++ if (! this->search(key, &slot))
+ return false;
+ slot->key->release();
+ slot->value->release();
+@@ -112,7 +112,7 @@ public:
+ inline void put(zmm::String key, zmm::Ref<VT> value)
+ {
+ struct dso_hash_slot<VT> *slot;
+- search(key, &slot);
++ this->search(key, &slot);
+ put(key, (hash_slot_t)slot, value);
+ }
+ void put(zmm::String key, hash_slot_t destSlot, zmm::Ref<VT> value)
+@@ -141,7 +141,7 @@ public:
+ inline zmm::Ref<VT> get(zmm::String key)
+ {
+ struct dso_hash_slot<VT> *slot;
+- bool found = search(key, &slot);
++ bool found = this->search(key, &slot);
+ if (found)
+ return zmm::Ref<VT>(slot->value);
+ else
+@@ -153,7 +153,7 @@ public:
+ inline zmm::Ref<VT> get(zmm::String key, hash_slot_t *destSlot)
+ {
+ struct dso_hash_slot<VT> **slot = (struct dso_hash_slot<VT> **)destSlot;
+- bool found = search(key, slot);
++ bool found = this->search(key, slot);
+ if (found)
+ return zmm::Ref<VT>((*slot)->value);
+ else
diff --git a/debian/patches/series b/debian/patches/series
index c01814b..14ca131 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,4 @@ gcc_4.6_support.patch
js_1.8_support.patch
js_parse.patch
libmozjs185_support.patch
+gcc_4.7_support.patch
--
MediaTomb packaging
More information about the pkg-multimedia-commits
mailing list