[SCM] libdvbpsi/master: Hide internal symbols

[sramacher at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 9601de3e2c145c7584549a69fe49945251e346c0
Author: Sebastian Ramacher <sramacher at debian.org>
Date:   Sun Mar 22 15:18:22 2015 +0100

    Hide internal symbols

diff --git a/debian/libdvbpsi9.symbols b/debian/libdvbpsi9.symbols
index 915f271..6e67f16 100644
--- a/debian/libdvbpsi9.symbols
+++ b/debian/libdvbpsi9.symbols
@@ -165,7 +165,6 @@ libdvbpsi.so.9 libdvbpsi9 #MINVER#
  dvbpsi_cat_sections_decode at Base 1.1.0
  dvbpsi_cat_sections_gather at Base 1.1.0
  dvbpsi_cat_sections_generate at Base 1.1.0
- dvbpsi_debug at Base 1.1.0
  dvbpsi_decoder_delete at Base 1.1.0
  dvbpsi_decoder_new at Base 1.1.0
  dvbpsi_decoder_present at Base 1.1.0
@@ -186,7 +185,6 @@ libdvbpsi.so.9 libdvbpsi9 #MINVER#
  dvbpsi_eit_sections_decode at Base 1.1.0
  dvbpsi_eit_sections_gather at Base 1.1.0
  dvbpsi_eit_sections_generate at Base 1.1.0
- dvbpsi_error at Base 1.1.0
  dvbpsi_new at Base 1.1.0
  dvbpsi_nit_attach at Base 1.1.0
  dvbpsi_nit_delete at Base 1.1.0
@@ -264,4 +262,3 @@ libdvbpsi.so.9 libdvbpsi9 #MINVER#
  dvbpsi_tot_sections_decode at Base 1.1.0
  dvbpsi_tot_sections_gather at Base 1.1.0
  dvbpsi_tot_sections_generate at Base 1.1.0
- dvbpsi_warning at Base 1.1.0
diff --git a/debian/patches/hide-internal-symbols.patch b/debian/patches/hide-internal-symbols.patch
new file mode 100644
index 0000000..1199159
--- /dev/null
+++ b/debian/patches/hide-internal-symbols.patch
@@ -0,0 +1,47 @@
+Description: Hide internal symbols
+Author: Sebastian Ramacher <sramacher at debian.org>
+Last-Update: 2015-03-22
+
+--- libdvbpsi-1.2.0.orig/src/dvbpsi_private.h
++++ libdvbpsi-1.2.0/src/dvbpsi_private.h
+@@ -32,6 +32,14 @@
+ 
+ #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
+ 
++#ifndef HIDDEN
++# if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__)
++#  define HIDDEN __attribute__((visibility("hidden")))
++# else
++#  define HIDDEN
++# endif
++#endif
++
+ /*****************************************************************************
+  * Error management
+  *
+@@ -40,7 +48,7 @@
+  *****************************************************************************/
+ 
+ #ifdef HAVE_VARIADIC_MACROS
+-void dvbpsi_message(dvbpsi_t *dvbpsi, const int level, const char *fmt, ...);
++HIDDEN void dvbpsi_message(dvbpsi_t *dvbpsi, const int level, const char *fmt, ...);
+ 
+ #  define dvbpsi_error(hnd, src, str, x...)                             \
+         dvbpsi_message(hnd, DVBPSI_MSG_ERROR, "libdvbpsi error (%s): " str, src, ##x)
+@@ -49,11 +57,13 @@ void dvbpsi_message(dvbpsi_t *dvbpsi, co
+ #  define dvbpsi_debug(hnd, src, str, x...)                                  \
+         dvbpsi_message(hnd, DVBPSI_MSG_DEBUG, "libdvbpsi debug (%s): " str, src, ##x)
+ #else
+-void dvbpsi_error(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
+-void dvbpsi_warning(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
+-void dvbpsi_debug(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
++HIDDEN void dvbpsi_error(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
++HIDDEN void dvbpsi_warning(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
++HIDDEN void dvbpsi_debug(dvbpsi_t *dvbpsi, const char *src, const char *fmt, ...);
+ #endif
+ 
++#undef HIDDEN
++
+ #else
+ #error "Multiple inclusions of dvbpsi_private.h"
+ #endif
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..3efae35
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+hide-internal-symbols.patch

-- 
libdvbpsi packaging