bump to v2.2.0

diff --git a/ChangeLog b/ChangeLog
index 8ef4b35933d0c69d0b1f3ad10c4643183a42882a..118d88ae810470a3f809059cdaf0ad93ed012d17 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+libcec (2.2.0-1) unstable; urgency=low
+
+  * changed / added:
+    * read the physical address from X11 randr extension. credits: @smithereens
+    * support for Exynos HDMI. credits: @vamanea
+    * another vendor ID for Harman/Kardon. credits: @ksooo
+    * some 1.4 keycodes have been added. credits: @ksooo
+    * cec-client: fix typo prevent keycodes to be passed. credits: @popcornmix
+
+  * fixed:
+    * various Raspberry Pi fixes. credits: @mk01
+    * vendor specific handlers weren't used for Toshiba and Onkyo.
+      credits: @ksooo
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 24 Oct 2014 21:55:00 +0100
+
 libcec (2.1.4-2) unstable; urgency=low
 
   * fixed:

diff --git a/debian/changelog b/debian/changelog
index 8ef4b35933d0c69d0b1f3ad10c4643183a42882a..118d88ae810470a3f809059cdaf0ad93ed012d17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+libcec (2.2.0-1) unstable; urgency=low
+
+  * changed / added:
+    * read the physical address from X11 randr extension. credits: @smithereens
+    * support for Exynos HDMI. credits: @vamanea
+    * another vendor ID for Harman/Kardon. credits: @ksooo
+    * some 1.4 keycodes have been added. credits: @ksooo
+    * cec-client: fix typo prevent keycodes to be passed. credits: @popcornmix
+
+  * fixed:
+    * various Raspberry Pi fixes. credits: @mk01
+    * vendor specific handlers weren't used for Toshiba and Onkyo.
+      credits: @ksooo
+
+ -- Pulse-Eight Packaging <packaging@pulse-eight.com>  Fri, 24 Oct 2014 21:55:00 +0100
+
 libcec (2.1.4-2) unstable; urgency=low
 
   * fixed:

diff --git a/include/cectypes.h b/include/cectypes.h
index 5d6144ae5aac2f7a0a93912b2bfcafe316e71b54..3b3c0b9bfb34ab8d20c9a605914c3416160b483e 100644 (file)
--- a/include/cectypes.h
+++ b/include/cectypes.h
@@ -322,7 +322,7 @@ namespace CEC {
 /*!
  * libCEC's minor version number
  */
-#define CEC_LIB_VERSION_MINOR        1
+#define CEC_LIB_VERSION_MINOR        2
 
 #define MSGSTART                     0xFF
 #define MSGEND                       0xFE
@@ -1450,7 +1450,8 @@ typedef enum cec_client_version
   CEC_CLIENT_VERSION_2_1_2   = 0x2102,
   CEC_CLIENT_VERSION_2_1_3   = 0x2103,
   CEC_CLIENT_VERSION_2_1_4   = 0x2104,
-  CEC_CLIENT_VERSION_CURRENT = 0x2104
+  CEC_CLIENT_VERSION_2_2_0   = 0x2200,
+  CEC_CLIENT_VERSION_CURRENT = 0x2200
 } cec_client_version;
 
 typedef enum cec_server_version
@@ -1483,6 +1484,7 @@ typedef enum cec_server_version
   CEC_SERVER_VERSION_2_1_2   = 0x2102,
   CEC_SERVER_VERSION_2_1_3   = 0x2103,
   CEC_SERVER_VERSION_2_1_4   = 0x2104,
+  CEC_SERVER_VERSION_2_2_0   = 0x2200,
   CEC_SERVER_VERSION_CURRENT = 0x2104
 } cec_server_version;
 

diff --git a/project/libcec/libcec.rc b/project/libcec/libcec.rc
index a302d99a5e525516220209720fd37af914c16349..0505a8dccf2349fc9a184b93340f2d10f394fe4f 100644 (file)
Binary files a/project/libcec/libcec.rc and b/project/libcec/libcec.rc differ

diff --git a/project/testclient/testclient.rc b/project/testclient/testclient.rc
index 5990a9c2c2fa2646ecd8551d13a430c17a8fd3f1..8d422ec258fffb6eb04dd0a5b5cdcd6097c2b963 100644 (file)
Binary files a/project/testclient/testclient.rc and b/project/testclient/testclient.rc differ

diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs
index cb4952fa81dcf4906f98091c10fb4bb864bf9247..4f52c1b5bb8f856f81b6426c37af4d633e487e75 100644 (file)
--- a/src/CecSharpTester/Properties/AssemblyInfo.cs
+++ b/src/CecSharpTester/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.4.0")]
-[assembly: AssemblyFileVersion("2.1.4.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]

diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp
index 19f1b439feb6b4f8e5f5dcd1ac19beff689ec7dd..386b69cf637699cc4502c5cd31c75f21fba65b53 100644 (file)
--- a/src/LibCecSharp/AssemblyInfo.cpp
+++ b/src/LibCecSharp/AssemblyInfo.cpp
@@ -13,7 +13,7 @@ using namespace System::Security::Permissions;
 [assembly:AssemblyTrademarkAttribute("")];
 [assembly:AssemblyCultureAttribute("")];
 
-[assembly:AssemblyVersionAttribute("2.1.4.0")];
+[assembly:AssemblyVersionAttribute("2.2.0.0")];
 
 [assembly:ComVisible(false)];
 [assembly:CLSCompliantAttribute(true)];

diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h
index 563bb0a3e608dcf84c7dd9f86afb624bc2867aa1..74afce605671825b5f67dc62e2b00563810c5a18 100644 (file)
--- a/src/LibCecSharp/CecSharpTypes.h
+++ b/src/LibCecSharp/CecSharpTypes.h
@@ -1233,10 +1233,14 @@ namespace CecSharp
     /// v2.1.4
     /// </summary>
     Version2_1_4   = 0x2104,
-       /// <summary>
+    /// <summary>
+    /// v2.1.4
+    /// </summary>
+    Version2_2_0   = 0x2200,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2104
+    CurrentVersion = 0x2200
   };
 
   /// <summary>
@@ -1352,14 +1356,18 @@ namespace CecSharp
     /// v2.1.3
     /// </summary>
     Version2_1_3   = 0x2103,
-       /// <summary>
+    /// <summary>
     /// v2.1.4
     /// </summary>
     Version2_1_4   = 0x2104,
     /// <summary>
+    /// v2.2.0
+    /// </summary>
+    Version2_2_0   = 0x2200,
+    /// <summary>
     /// The current version
     /// </summary>
-    CurrentVersion = 0x2104
+    CurrentVersion = 0x2200
   };
 
   /// <summary>

diff --git a/src/LibCecTray/Properties/AssemblyInfo.cs b/src/LibCecTray/Properties/AssemblyInfo.cs
index 8d6e8ed8634b25b46765c3a5e799f95e712e06e8..ed4ac9fd8ebe2913d24522908ffda1c87340d914 100644 (file)
--- a/src/LibCecTray/Properties/AssemblyInfo.cs
+++ b/src/LibCecTray/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.4.0")]
-[assembly: AssemblyFileVersion("2.1.4.0")]
+[assembly: AssemblyVersion("2.2.0.0")]
+[assembly: AssemblyFileVersion("2.2.0.0")]

diff --git a/src/lib/CECTypeUtils.h b/src/lib/CECTypeUtils.h
index 0eccdcc6f5a28379f493fe0aaf2a798474ab1af8..64f5c21e4a1278d74ca75c198a0bf22b77ed69d3 100644 (file)
--- a/src/lib/CECTypeUtils.h
+++ b/src/lib/CECTypeUtils.h
@@ -589,6 +589,8 @@ namespace CEC
         return "2.1.3";
       case CEC_CLIENT_VERSION_2_1_4:
         return "2.1.4";
+      case CEC_CLIENT_VERSION_2_2_0:
+        return "2.2.0";
       default:
         return "Unknown";
       }
@@ -654,6 +656,8 @@ namespace CEC
         return "2.1.3";
       case CEC_SERVER_VERSION_2_1_4:
         return "2.1.4";
+      case CEC_SERVER_VERSION_2_2_0:
+        return "2.2.0";
       default:
         return "Unknown";
       }