[SCM] ffms2/master: refresh symbol-visibility.patch for new upstream

ricotz-guest at users.alioth.debian.org ricotz-guest at users.alioth.debian.org
Mon Jan 23 13:38:03 UTC 2012


The following commit has been merged in the master branch:
commit ba3424306a470fff292cc82437fdc44f4508da00
Author: Rico Tzschichholz <ricotz at t-online.de>
Date:   Mon Jan 23 14:37:09 2012 +0100

    refresh symbol-visibility.patch for new upstream

diff --git a/debian/patches/symbol-visibility.patch b/debian/patches/symbol-visibility.patch
index 860b012..dcb46a9 100644
--- a/debian/patches/symbol-visibility.patch
+++ b/debian/patches/symbol-visibility.patch
@@ -1,32 +1,10 @@
 Author: Rickard Närström <rickard.narstrom at gmail.com>
 Subject: Hide symbols by default
 
---- a/include/ffms.h
-+++ b/include/ffms.h
-@@ -40,12 +40,15 @@
- #		else
- #			define FFMS_API(ret) FFMS_EXTERN_C __declspec(dllimport) ret FFMS_CC
- #		endif
--#	else
--#		define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
--#	endif
--#else
--#	define FFMS_CC
--#	define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
-+#	else
-+#		define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
-+#	endif
-+#elif __GNUC__ >= 4
-+#	define FFMS_CC
-+#	define FFMS_API(ret) FFMS_EXTERN_C __attribute__((visibility("default"))) ret FFMS_CC
-+#else
-+#	define FFMS_CC
-+#	define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
- #endif
- 
- typedef struct FFMS_ErrorInfo {
---- a/Makefile.am
-+++ b/Makefile.am
+Index: ffms2/Makefile.am
+===================================================================
+--- ffms2.orig/Makefile.am
++++ ffms2/Makefile.am
 @@ -1,6 +1,9 @@
  ACLOCAL_AMFLAGS = -I m4
  AUTOMAKE_OPTIONS = foreign

-- 
ffms2 packaging



More information about the pkg-multimedia-commits mailing list