[SCM] libdvdcss-pkg/master: updating symbol-visibility.patch from upstream trunk

[onlyjob-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 0f04539f860ccecbe1060446c935de0fb02da924
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Sat Sep 22 12:21:34 2012 +1000

    updating symbol-visibility.patch from upstream trunk
    
     Thanks to Fabian Greffrath

diff --git a/libdvdcss/debian/patches/r255_symbol-visibility.patch b/libdvdcss/debian/patches/r255_symbol-visibility.patch
new file mode 100644
index 0000000..e424b85
--- /dev/null
+++ b/libdvdcss/debian/patches/r255_symbol-visibility.patch
@@ -0,0 +1,46 @@
+Last-Update: 2012-09-22
+Author: Dmitry Smirnov <onlyjob at member.fsf.org>
+From: Fabian Greffrath <fabian at greffrath.com>
+Origin: http://svn.videolan.org/comp.php?repname=libdvdcss&compare[]=%2F at 254&compare[]=%2F at 255
+Description: backported (r255) patch to set appropriate symbol visibility attributes (ELF)
+ libdvdcss.so contains many internal symbols that are not marked as such
+ and thus confuse utilities like dpkg-gensymbols
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -185,6 +185,24 @@
+ CFLAGS="${CFLAGS_save}"
+ 
+ dnl
++dnl  Check if the compiler supports ELF visibility
++dnl
++CFLAGS_save="$CFLAGS"
++
++AC_CACHE_CHECK([if \$CC supports ELF visibility],
++    [ac_cv_c_visibility],
++    [CFLAGS="-fvisibility=hidden ${CFLAGS_save}"
++     AC_TRY_COMPILE([],
++                    [__attribute__((visibility("default"))) extern int visible],
++                    ac_cv_c_visibility=yes, ac_cv_c_visibility=no)])
++if test "${ac_cv_c_visibility}" != "no"; then
++    CFLAGS_save="-fvisibility=hidden ${CFLAGS_save}";
++    AC_DEFINE(HAVE_VISIBILITY, 1, Support ELF visibility.)
++fi
++
++CFLAGS="${CFLAGS_save}"
++
++dnl
+ dnl  Use 64 bits offsets
+ dnl
+ CFLAGS="-D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DDVDCSS_DIST ${CFLAGS}"
+--- a/src/dvdcss/dvdcss.h
++++ b/src/dvdcss/dvdcss.h
+@@ -60,6 +60,8 @@
+ #define LIBDVDCSS_EXPORT __declspec(dllexport) extern
+ #elif defined(LIBDVDCSS_IMPORTS)
+ #define LIBDVDCSS_EXPORT __declspec(dllimport) extern
++#elif defined(HAVE_VISIBILITY)
++#define LIBDVDCSS_EXPORT __attribute__((visibility("default"))) extern
+ #else
+ #define LIBDVDCSS_EXPORT extern
+ #endif
diff --git a/libdvdcss/debian/patches/series b/libdvdcss/debian/patches/series
index 63c767a..b28621d 100644
--- a/libdvdcss/debian/patches/series
+++ b/libdvdcss/debian/patches/series
@@ -1 +1 @@
-symbol-visibility.patch
+r255_symbol-visibility.patch
diff --git a/libdvdcss/debian/patches/symbol-visibility.patch b/libdvdcss/debian/patches/symbol-visibility.patch
deleted file mode 100644
index b26aa70..0000000
--- a/libdvdcss/debian/patches/symbol-visibility.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Last-Update: 2012-09-04
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Forwarded: http://mailman.videolan.org/pipermail/libdvdcss-devel/2012-January/000619.html
-Description: Set appropriate symbol visibility attributes
- libdvdcss.so contains many internal symbols  that are not marked as such
- and thus confuse utilities like dpkg-gensymbols
- To be used with "-fvisibility=hidden" appended to CFLAGS.
-
---- a/src/dvdcss/dvdcss.h
-+++ b/src/dvdcss/dvdcss.h
-@@ -60,6 +60,8 @@
- #define LIBDVDCSS_EXPORT __declspec(dllexport) extern
- #elif defined(LIBDVDCSS_IMPORTS)
- #define LIBDVDCSS_EXPORT __declspec(dllimport) extern
-+#elif defined(__GNUC__) && __GNUC__ >= 4
-+#define LIBDVDCSS_EXPORT __attribute__((visibility("default"))) extern
- #else
- #define LIBDVDCSS_EXPORT extern
- #endif
diff --git a/libdvdcss/debian/rules b/libdvdcss/debian/rules
index 66053a9..9e644c7 100755
--- a/libdvdcss/debian/rules
+++ b/libdvdcss/debian/rules
@@ -4,9 +4,6 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# needed for proper symbols export, see patches/symbol-visibility.patch
-export DEB_CFLAGS_MAINT_APPEND=-fvisibility=hidden
-
 %:
 	dh $@ --parallel --with autoreconf
 

-- 
libdvdcss-pkg packaging