[packages/trousers] remove internal 'ht' symbol from global binding space to avoid binding with libmp3lame's 'ht' (const
pluto
pluto at pld-linux.org
Sun Sep 2 21:31:10 CEST 2012
commit a142905c0797a067d11c45676698df4f124de9a1
Author: Paweł Sikora <pawel.sikora at agmk.net>
Date: Sun Sep 2 21:28:07 2012 +0200
remove internal 'ht' symbol from global binding space to avoid binding with libmp3lame's 'ht' (const huffman table).
this fixes ugly crash during mplayer startup, release 2.
hide-internal-ht-symbol.patch | 21 +++++++++++++++++++++
trousers.spec | 4 +++-
2 files changed, 24 insertions(+), 1 deletion(-)
---
diff --git a/trousers.spec b/trousers.spec
index 1132184..b085f2b 100644
--- a/trousers.spec
+++ b/trousers.spec
@@ -7,12 +7,13 @@ Summary: TrouSerS - The open-source TCG Software Stack
Summary(pl.UTF-8): TrouSerS - programowy stos TCG o otwartych źródłach
Name: trousers
Version: 0.3.9
-Release: 1
+Release: 2
License: CPL v1.0
Group: Applications/System
Source0: http://downloads.sourceforge.net/trousers/%{name}-%{version}.tar.gz
# Source0-md5: 1322030eb2540ea0640cfe471b077f32
Patch0: %{name}-nouser.patch
+Patch1: hide-internal-ht-symbol.patch
URL: http://trousers.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake >= 1.6
@@ -85,6 +86,7 @@ Statyczna biblioteka TrouSerS.
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
# there is some unused variable causing warning
sed -i -e 's/-Werror //' configure.in
diff --git a/hide-internal-ht-symbol.patch b/hide-internal-ht-symbol.patch
new file mode 100644
index 0000000..ac3a3e2
--- /dev/null
+++ b/hide-internal-ht-symbol.patch
@@ -0,0 +1,21 @@
+--- trousers-0.3.9/src/include/hosttable.h.orig 2011-05-04 16:33:11.000000000 +0200
++++ trousers-0.3.9/src/include/hosttable.h 2012-09-02 21:18:31.891307206 +0200
+@@ -33,7 +33,6 @@
+ MUTEX_DECLARE(lock);
+ };
+
+-extern struct host_table *ht;
+ struct host_table_entry *get_table_entry(TCS_CONTEXT_HANDLE);
+ void put_table_entry(struct host_table_entry *);
+ TSS_RESULT __tspi_add_table_entry(TSS_HCONTEXT, BYTE *, int, struct host_table_entry **);
+--- trousers-0.3.9/src/tspi/rpc/hosttable.c.orig 2011-05-04 16:33:11.000000000 +0200
++++ trousers-0.3.9/src/tspi/rpc/hosttable.c 2012-09-02 21:18:44.017974230 +0200
+@@ -19,7 +19,7 @@
+ #include "hosttable.h"
+ #include "obj.h"
+
+-struct host_table *ht = NULL;
++static struct host_table *ht = NULL;
+
+ TSS_RESULT
+ host_table_init()
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/trousers.git/commitdiff/a142905c0797a067d11c45676698df4f124de9a1
More information about the pld-cvs-commit
mailing list