Merge branch 'master' into release

diff --git a/ChangeLog b/ChangeLog
index 2ec6ebb6e35edf808501541365d6282fd00da949..8ef4b35933d0c69d0b1f3ad10c4643183a42882a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+libcec (2.1.4-2) unstable; urgency=low
+
+  * fixed:
+    * OS X build
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Wed, 18 Dec 2013 02:14:00 +0100
+
 libcec (2.1.4-1) unstable; urgency=low
 
   * changed / added:

diff --git a/configure.ac b/configure.ac
index 772ca7f7aee7722389d9a1ecc1a92fcaf8da8f8c..510d851ccdac9d91d6bb6363944ff7e828ec39b4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -130,6 +130,7 @@ libs_client="$LIBS"
 use_udev="no"
 use_adapter_detection="yes"
 use_lockdev="no"
+SUPPRESS_MANGLING_WARNINGS=" -Wno-psabi"
 case "${host}" in
   *-*-linux*)
     ## search for udev if pkg-config was found
@@ -210,6 +211,7 @@ case "${host}" in
     AC_CHECK_HEADER(mach/mach_time.h,,AC_MSG_ERROR($msg_required_header_missing))
     AC_CHECK_HEADER(CoreVideo/CVHostTime.h,,AC_MSG_ERROR($msg_required_header_missing))
     AC_DEFINE([TARGET_DARWIN], [1], [Darwin target])
+    SUPPRESS_MANGLING_WARNINGS=""
     ;;
 esac
 
@@ -342,7 +344,7 @@ fi
 LIBS_LIBCEC="$LIBS"
 LIBS="$libs_client"
 
-CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers -Wno-psabi"
+CXXFLAGS="$CXXFLAGS -fPIC -Wall -Wextra -Wno-missing-field-initializers $SUPPRESS_MANGLING_WARNINGS"
 
 if test "x$use_debug" = "xyes"; then
   CXXFLAGS="$CXXFLAGS -g"

diff --git a/debian/changelog b/debian/changelog
index 2ec6ebb6e35edf808501541365d6282fd00da949..8ef4b35933d0c69d0b1f3ad10c4643183a42882a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libcec (2.1.4-2) unstable; urgency=low
+
+  * fixed:
+    * OS X build
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Wed, 18 Dec 2013 02:14:00 +0100
+
 libcec (2.1.4-1) unstable; urgency=low
 
   * changed / added: