On 2014-08-17 16:10:23, Sebastian Ramacher wrote: > the attached debdiff contains two patches.
And here is the patch. Cheers -- Sebastian Ramacher
diff -Nru freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/changelog
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/changelog
--- freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/changelog 2014-08-12
00:34:33.000000000 +0200
+++ freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/changelog 2014-08-17
16:03:32.000000000 +0200
@@ -1,3 +1,14 @@
+freerdp (1.1.0~git20140809.1.b07a5c1+dfsg-2.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * debian/patches/1001-hide-sse-symbols.patch: Do not export optimized
+ primitives. They do not need to be part of the public ABI. (Closes:
+ #758155)
+ * debian/patches/1002-update-pkg-config-file.patch: Add missing
+ -lfreerdp-client to pkg-config file. (Closes: #758257)
+
+ -- Sebastian Ramacher <sramac...@debian.org> Sun, 17 Aug 2014 13:04:04 +0200
+
freerdp (1.1.0~git20140809.1.b07a5c1+dfsg-2) unstable; urgency=medium
* debian/libfreerdp1.symbols:
diff -Nru freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/libfreerdp1.symbols
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/libfreerdp1.symbols
--- freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/libfreerdp1.symbols
2014-08-11 23:46:37.000000000 +0200
+++ freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/libfreerdp1.symbols
2014-08-17 13:04:33.000000000 +0200
@@ -1777,21 +1777,6 @@
primitives_init_shift_opt@Base 1.1.0~beta1+git20130629
primitives_init_sign@Base 1.1.0~beta1+git20130629
primitives_init_sign_opt@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_RGBToRGB_16s8u_P3AC4R@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_RGBToYCbCr_16s16s_P3P3@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_alphaComp_argb@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_lShiftC_16s@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_lShiftC_16u@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_rShiftC_16s@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_rShiftC_16u@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_set_32s@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_set_32u@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_set_8u@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse2_yCbCrToRGB_16s16s_P3P3@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse3_add_16s@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse3_andC_32u@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)sse3_orC_32u@Base 1.1.0~beta1+git20130629
- (arch=!ppc64el)ssse3_sign_16s@Base 1.1.0~beta1+git20130629
libfreerdp-rail.so.1.1 libfreerdp1 #MINVER#
icon_cache_free@Base 1.1.0~beta1+git20130629
icon_cache_get@Base 1.1.0~beta1+git20130629
diff -Nru
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1001-hide-sse-symbols.patch
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1001-hide-sse-symbols.patch
---
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1001-hide-sse-symbols.patch
1970-01-01 01:00:00.000000000 +0100
+++
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1001-hide-sse-symbols.patch
2014-08-17 15:58:22.000000000 +0200
@@ -0,0 +1,178 @@
+Description: Do not export optimized implementations of the primitives
+ They are only used in the test suite and via function pointers. There is no
+ need to expose them via the public ABI of libfreerdp-primitives.
+Author: Sebastian Ramacher <sramac...@debian.org>
+Last-Update: 2014-08-17
+
+--- a/libfreerdp/primitives/prim_templates.h
++++ b/libfreerdp/primitives/prim_templates.h
+@@ -20,6 +20,13 @@
+ #ifndef __PRIM_TEMPLATES_H_INCLUDED__
+ #define __PRIM_TEMPLATES_H_INCLUDED__
+
++
++#if __GNUC__ >= 4
++ #define PRIMITIVES_HIDDEN __attribute__ ((visibility("hidden")))
++#else
++ #define PRIMITIVES_HIDDEN
++#endif
++
+ /* These are prototypes for SSE (potentially NEON) routines that do a
+ * simple SSE operation over an array of data. Since so much of this
+ * code is shared except for the operation itself, these prototypes are
+@@ -44,7 +51,7 @@
+ * SCD = Source, Constant, Destination
+ */
+ #define SSE3_SCD_ROUTINE(_name_, _type_, _fallback_, _op_, _slowWay_) \
+-pstatus_t _name_(const _type_ *pSrc, INT32 val, _type_ *pDst, INT32 len) \
++PRIMITIVES_HIDDEN pstatus_t _name_(const _type_ *pSrc, INT32 val, _type_
*pDst, INT32 len) \
+ { \
+ int shifts; \
+ UINT32 offBeatMask; \
+@@ -188,7 +195,7 @@
+ * PRE = preload xmm0 with the constant.
+ */
+ #define SSE3_SCD_PRE_ROUTINE(_name_, _type_, _fallback_, _op_, _slowWay_) \
+-pstatus_t _name_(const _type_ *pSrc, _type_ val, _type_ *pDst, INT32 len) \
++PRIMITIVES_HIDDEN pstatus_t _name_(const _type_ *pSrc, _type_ val, _type_
*pDst, INT32 len) \
+ { \
+ int shifts; \
+ UINT32 offBeatMask; \
+@@ -293,7 +300,7 @@
+ * SSD = Source1, Source2, Destination
+ */
+ #define SSE3_SSD_ROUTINE(_name_, _type_, _fallback_, _op_, _slowWay_) \
+-pstatus_t _name_(const _type_ *pSrc1, const _type_ *pSrc2, _type_ *pDst,
INT32 len) \
++PRIMITIVES_HIDDEN pstatus_t _name_(const _type_ *pSrc1, const _type_ *pSrc2,
_type_ *pDst, INT32 len) \
+ { \
+ int shifts; \
+ UINT32 offBeatMask; \
+--- a/libfreerdp/primitives/prim_colors_opt.c
++++ b/libfreerdp/primitives/prim_colors_opt.c
+@@ -66,7 +66,7 @@
+ #endif /* DO_PREFETCH */
+
+
/*---------------------------------------------------------------------------*/
+-pstatus_t sse2_yCbCrToRGB_16s16s_P3P3(
++PRIMITIVES_HIDDEN pstatus_t sse2_yCbCrToRGB_16s16s_P3P3(
+ const INT16 *pSrc[3],
+ int srcStep,
+ INT16 *pDst[3],
+@@ -206,7 +206,7 @@
+ /* The encodec YCbCr coeffectients are represented as 11.5 fixed-point
+ * numbers. See the general code above.
+ */
+-pstatus_t sse2_RGBToYCbCr_16s16s_P3P3(
++PRIMITIVES_HIDDEN pstatus_t sse2_RGBToYCbCr_16s16s_P3P3(
+ const INT16 *pSrc[3],
+ int srcStep,
+ INT16 *pDst[3],
+@@ -359,7 +359,7 @@
+ #define XMM_ALL_ONES \
+ _mm_set1_epi32(0xFFFFFFFFU)
+
+-pstatus_t sse2_RGBToRGB_16s8u_P3AC4R(
++PRIMITIVES_HIDDEN pstatus_t sse2_RGBToRGB_16s8u_P3AC4R(
+ const INT16 *pSrc[3], /* 16-bit R,G, and B arrays */
+ INT32 srcStep, /* bytes between rows in source data */
+ BYTE *pDst, /* 32-bit interleaved ARGB
(ABGR?) data */
+@@ -440,7 +440,7 @@
+
+
/*---------------------------------------------------------------------------*/
+ #ifdef WITH_NEON
+-pstatus_t neon_yCbCrToRGB_16s16s_P3P3(
++PRIMITIVES_HIDDEN pstatus_t neon_yCbCrToRGB_16s16s_P3P3(
+ const INT16 *pSrc[3],
+ int srcStep,
+ INT16 *pDst[3],
+--- a/libfreerdp/primitives/prim_set_opt.c
++++ b/libfreerdp/primitives/prim_set_opt.c
+@@ -30,13 +30,14 @@
+ # include <ipps.h>
+ #endif /* WITH_IPP */
+
++#include "prim_templates.h"
+ #include "prim_internal.h"
+ #include "prim_set.h"
+
+ /* =========================================================================
*/
+ #ifdef WITH_SSE2
+ # if !defined(WITH_IPP) || defined(ALL_PRIMITIVES_VERSIONS)
+-pstatus_t sse2_set_8u(
++PRIMITIVES_HIDDEN pstatus_t sse2_set_8u(
+ BYTE val,
+ BYTE *pDst,
+ INT32 len)
+@@ -103,7 +104,7 @@
+ /* -------------------------------------------------------------------------
*/
+ #ifdef WITH_SSE2
+ # if !defined(WITH_IPP) || defined(ALL_PRIMITIVES_VERSIONS)
+-pstatus_t sse2_set_32u(
++PRIMITIVES_HIDDEN pstatus_t sse2_set_32u(
+ UINT32 val,
+ UINT32 *pDst,
+ INT32 len)
+@@ -174,7 +175,7 @@
+ }
+
+ /* -------------------------------------------------------------------------
*/
+-pstatus_t sse2_set_32s(
++PRIMITIVES_HIDDEN pstatus_t sse2_set_32s(
+ INT32 val,
+ INT32 *pDst,
+ INT32 len)
+@@ -187,7 +188,7 @@
+
+ #ifdef WITH_IPP
+ /* -------------------------------------------------------------------------
*/
+-pstatus_t ipp_wrapper_set_32u(
++PRIMITIVES_HIDDEN pstatus_t ipp_wrapper_set_32u(
+ UINT32 val,
+ UINT32 *pDst,
+ INT32 len)
+--- a/libfreerdp/primitives/prim_alphaComp_opt.c
++++ b/libfreerdp/primitives/prim_alphaComp_opt.c
+@@ -37,6 +37,7 @@
+ #include <ippi.h>
+ #endif /* WITH_IPP */
+
++#include "prim_templates.h"
+ #include "prim_internal.h"
+ #include "prim_alphaComp.h"
+
+@@ -45,7 +46,7 @@
+ #ifdef WITH_SSE2
+ #if !defined(WITH_IPP) || defined(ALL_PRIMITIVES_VERSIONS)
+
+-pstatus_t sse2_alphaComp_argb(
++PRIMITIVES_HIDDEN pstatus_t sse2_alphaComp_argb(
+ const BYTE *pSrc1, INT32 src1Step,
+ const BYTE *pSrc2, INT32 src2Step,
+ BYTE *pDst, INT32 dstStep,
+@@ -196,7 +197,7 @@
+
+ #ifdef WITH_IPP
+ /* -------------------------------------------------------------------------
*/
+-pstatus_t ipp_alphaComp_argb(
++PRIMITIVES_HIDDEN pstatus_t ipp_alphaComp_argb(
+ const BYTE *pSrc1, INT32 src1Step,
+ const BYTE *pSrc2, INT32 src2Step,
+ BYTE *pDst, INT32 dstStep,
+--- a/libfreerdp/primitives/prim_sign_opt.c
++++ b/libfreerdp/primitives/prim_sign_opt.c
+@@ -26,13 +26,14 @@
+ #include <tmmintrin.h>
+ #endif /* WITH_SSE2 */
+
++#include "prim_templates.h"
+ #include "prim_internal.h"
+ #include "prim_sign.h"
+
+
+ #ifdef WITH_SSE2
+ /* -------------------------------------------------------------------------
*/
+-pstatus_t ssse3_sign_16s(
++PRIMITIVES_HIDDEN pstatus_t ssse3_sign_16s(
+ const INT16 *pSrc,
+ INT16 *pDst,
+ INT32 len)
diff -Nru
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1002-update-pkg-config-file.patch
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1002-update-pkg-config-file.patch
---
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1002-update-pkg-config-file.patch
1970-01-01 01:00:00.000000000 +0100
+++
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/1002-update-pkg-config-file.patch
2014-08-17 15:56:25.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Add missing -lfreerdp-client
+Author: Sebastian Ramacher <sramac...@debian.org>
+Last-Update: 2014-08-17
+
+diff --git a/freerdp.pc.in b/freerdp.pc.in
+index 59e2b44..70288dd 100644
+--- a/freerdp.pc.in
++++ b/freerdp.pc.in
+@@ -8,6 +8,6 @@ Description: A free remote desktop protocol client
+ URL: http://www.freerdp.com/
+ Version: @FREERDP_VERSION_FULL@
+ Requires:
+-Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-core
-lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail -lfreerdp-utils
-lwinpr-sspi -lwinpr-rpc -lwinpr-utils
++Libs: -L${libdir} -lfreerdp-cache -lfreerdp-codec -lfreerdp-client
-lfreerdp-core -lfreerdp-crypto -lfreerdp-gdi -lfreerdp-locale -lfreerdp-rail
-lfreerdp-utils -lwinpr-sspi -lwinpr-rpc -lwinpr-utils
+ Cflags: -I${includedir}
+
diff -Nru freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/series
freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/series
--- freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/series
1970-01-01 01:00:00.000000000 +0100
+++ freerdp-1.1.0~git20140809.1.b07a5c1+dfsg/debian/patches/series
2014-08-17 15:06:51.000000000 +0200
@@ -0,0 +1,2 @@
+1001-hide-sse-symbols.patch
+1002-update-pkg-config-file.patch
signature.asc
Description: Digital signature
