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

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 19 09:36:40 UTC 2011


The following commit has been merged in the master branch:
commit 64ec3e75133346db9eba40361e3b0f78f6ebe437
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Jun 19 11:26:43 2011 +0200

    refresh symbol-visibility.patch for new upstream

diff --git a/debian/patches/symbol-visibility.patch b/debian/patches/symbol-visibility.patch
index ad2a897..d06241a 100644
--- a/debian/patches/symbol-visibility.patch
+++ b/debian/patches/symbol-visibility.patch
@@ -1,24 +1,32 @@
 Author: Rickard Närström <rickard.narstrom at gmail.com>
 Subject: Hide symbols by default
 
-Index: ffms2/include/ffms.h
-===================================================================
---- ffms2.orig/include/ffms.h
-+++ ffms2/include/ffms.h
-@@ -45,6 +45,9 @@
- #	else
- #		define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
- #	endif
+--- a/include/ffms.h
++++ b/include/ffms.h
+@@ -42,12 +42,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
-Index: ffms2/Makefile.am
-===================================================================
---- ffms2.orig/Makefile.am
-+++ ffms2/Makefile.am
++#else
++#	define FFMS_CC
++#	define FFMS_API(ret) FFMS_EXTERN_C ret FFMS_CC
+ #endif
+ 
+ typedef struct {
+--- a/Makefile.am
++++ b/Makefile.am
 @@ -1,6 +1,9 @@
  ACLOCAL_AMFLAGS = -I m4
  AUTOMAKE_OPTIONS = foreign

-- 
ffms2 packaging



More information about the pkg-multimedia-commits mailing list