Skip to content
Permalink
Browse files

Merge branch 'master' into release

  • Loading branch information
opdenkamp committed Dec 18, 2013
2 parents 25dd1b2 + 30d9194 commit 81e38211724bc6e8bd7a60f484433053ed682635
Showing with 17 additions and 1 deletion.
  1. +7 −0 ChangeLog
  2. +3 −1 configure.ac
  3. +7 −0 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:
@@ -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"
@@ -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:

0 comments on commit 81e3821

Please sign in to comment.
You can’t perform that action at this time.