[SCM] libdvdcss/master: updating symbol-visibility.patch from upstream trunk
onlyjob-guest at users.alioth.debian.org
onlyjob-guest at users.alioth.debian.org
Sat Sep 22 02:54:52 UTC 2012
The following commit has been merged in the master branch:
commit 33eb8b4e8b93e9e6ed8072dd6f185fea7a423326
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date: Sat Sep 22 12:35:24 2012 +1000
updating symbol-visibility.patch from upstream trunk
with updated patch extra CFLAGS no longer needed.
Thanks to Fabian Greffrath
diff --git a/debian/patches/r255_symbol-visibility.patch b/debian/patches/r255_symbol-visibility.patch
new file mode 100644
index 0000000..e424b85
--- /dev/null
+++ b/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/debian/patches/series b/debian/patches/series
index 63c767a..b28621d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-symbol-visibility.patch
+r255_symbol-visibility.patch
diff --git a/debian/patches/symbol-visibility.patch b/debian/patches/symbol-visibility.patch
deleted file mode 100644
index 7d0790e..0000000
--- a/debian/patches/symbol-visibility.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Set appropriate symbol visibility attributes
-Author: Fabian Greffrath <fabian+debian at greffrath.com>
-Forwarded: http://mailman.videolan.org/pipermail/libdvdcss-devel/2012-January/000619.html
-
---- 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/debian/rules b/debian/rules
index d8da637..55968de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,5 @@
#!/usr/bin/make -f
-CFLAGS = $(shell dpkg-buildflags --get CFLAGS) -fvisibility=hidden
-
%:
dh $@ --parallel
--
libdvdcss packaging
More information about the pkg-multimedia-commits
mailing list