From: Jérôme Benoit <jerome.benoit@piment-noir.org>
Date: Tue, 27 Jan 2015 21:31:45 +0000 (+0100)
Subject: CEC_HDMI_PORT variable support for exynos hardware.
X-Git-Tag: debian/2.2.0-4_trusty^0
X-Git-Url: https://git.piment-noir.org/?a=commitdiff_plain;h=refs%2Fheads%2Fmaster;p=deb_libcec.git

CEC_HDMI_PORT variable support for exynos hardware.

Signed-off-by: Jérôme Benoit <jerome.benoit@piment-noir.org>
---

diff --git a/debian/changelog b/debian/changelog
index ffa49cc..c9f03a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libcec (2.2.0-4~trusty) trusty; urgency=low
+
+  * Reintroduce CEC_HDMI_PORT for exynos platform
+
+ -- Piment Noir Packaging <contact@piment-noir.org>  Tue, 27 Jan 2015 22:30:00 +0100
+
 libcec (2.2.0-3~trusty) trusty; urgency=low
 
   * Backport some fixes
diff --git a/debian/patches/0001_libcec_add-exynos-cec-variable.patch b/debian/patches/0001_libcec_add-exynos-cec-variable.patch
new file mode 100644
index 0000000..4e0024a
--- /dev/null
+++ b/debian/patches/0001_libcec_add-exynos-cec-variable.patch
@@ -0,0 +1,27 @@
+diff -Nur a/src/lib/adapter/Exynos/ExynosCECAdapterCommunication.cpp b/src/lib/adapter/Exynos/ExynosCECAdapterCommunication.cpp
+--- a/src/lib/adapter/Exynos/ExynosCECAdapterCommunication.cpp	2014-10-28 15:20:50.000000000 +0000
++++ b/src/lib/adapter/Exynos/ExynosCECAdapterCommunication.cpp	2015-01-25 23:42:05.324537990 +0000
+@@ -161,16 +161,14 @@
+ 
+ uint16_t CExynosCECAdapterCommunication::GetPhysicalAddress(void)
+ {
+-  uint16_t phys_addr = CEC_DEFAULT_PADDR;
++  char* addr_string = getenv("CEC_HDMI_PORT");
++  if (addr_string == NULL)
++    return CEC_DEFAULT_PHYSICAL_ADDRESS;
++  int addr_int = atoi(addr_string);
++  if (addr_int == 0)
++    return CEC_DEFAULT_PHYSICAL_ADDRESS;
+ 
+-  FILE *f = fopen(CEC_PADDR_NAME, "r");
+-  if(f) {
+-    if(fscanf(f, "%hu", &phys_addr) != 1)
+-      phys_addr = CEC_DEFAULT_PADDR;
+-
+-    fclose(f);
+-  }
+-  return phys_addr;
++  return 0x1000 * addr_int;
+ }
+ 
+ 
diff --git a/debian/patches/debian-packages-fixes.patch b/debian/patches/debian-packages-fixes.patch
deleted file mode 100644
index 00513f4..0000000
--- a/debian/patches/debian-packages-fixes.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- a/debian/changelog
-+++ b/debian/changelog
-@@ -154,7 +154,7 @@
- 
-  -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 8 Mar 2013 17:21:00 +0100
-  
-- libcec (2.1.0-1) unstable; urgency=low
-+libcec (2.1.0-1) unstable; urgency=low
- 
-   * changed / added:
-     * added vendor id for Denon
---- a/debian/libcec-get-orig-source
-+++ b/debian/libcec-get-orig-source
-@@ -4,7 +4,7 @@
- 
- LIBCEC_GIT_URL="git://github.com/Pulse-Eight/libcec.git"
- LIBCEC_GIT_BRANCH="release"
--LIBCEC_VERSION="1.6.1"
-+LIBCEC_VERSION="2.2.0"
- 
- rm -rf "libcec-${LIBCEC_VERSION}"
- git clone "$LIBCEC_GIT_URL" "libcec-${LIBCEC_VERSION}"
diff --git a/debian/patches/exynos-dpkg.patch b/debian/patches/exynos-dpkg.patch
deleted file mode 100644
index 279223f..0000000
--- a/debian/patches/exynos-dpkg.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/debian/rules
-+++ b/debian/rules
-@@ -6,3 +6,8 @@
- %:
- 	dh  $@ --parallel
- 
-+DEB_HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-+ifeq ($(DEB_HOST_ARCH),armhf)
-+override_dh_auto_configure:
-+	dh_auto_configure -- --enable-exynos
-+endif
diff --git a/debian/patches/gbp.conf.patch b/debian/patches/gbp.conf.patch
deleted file mode 100644
index 463c9e8..0000000
--- a/debian/patches/gbp.conf.patch
+++ /dev/null
@@ -1,6 +0,0 @@
---- a/debian/gbp.conf
-+++ b/debian/gbp.conf
-@@ -1,2 +1,2 @@
- [DEFAULT]
--pristine-tar = True
-+pristine-tar = False
diff --git a/debian/patches/series b/debian/patches/series
index 080ffee..8a46382 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,3 @@
-# upstreamed 
-#gbp.conf.patch
-#debian-packages-fixes.patch
-# backported
-#exynos-dpkg.patch
 abi_fix.patch
 thread_proto_fix.patch
+0001_libcec_add-exynos-cec-variable.patch