From 2e82cff0a171a476e5d323ca95749d214e90df59 Mon Sep 17 00:00:00 2001 From: Lars Op den Kamp Date: Sat, 3 Mar 2012 15:22:17 +0100 Subject: [PATCH] updated changelog and bumped version numbers for v1.5.2 --- ChangeLog | 10 ++++++++++ debian/changelog | 10 ++++++++++ include/cectypes.h | 6 ++++-- project/cec-config.rc | Bin 3232 -> 3232 bytes project/libcec.rc | Bin 3202 -> 3202 bytes project/testclient.rc | Bin 3230 -> 3230 bytes src/CecSharpTester/Properties/AssemblyInfo.cs | 4 ++-- src/LibCecSharp/AssemblyInfo.cpp | 2 +- src/LibCecSharp/CecSharpTypes.h | 6 ++++-- src/cec-config-gui/Properties/AssemblyInfo.cs | 4 ++-- src/lib/CECProcessor.cpp | 8 ++++++-- src/lib/LibCEC.cpp | 2 +- 12 files changed, 40 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index d407e38..15d5a73 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +libcec (1.5-3) unstable; urgency=low + + * fixed: + * OS-X compilation + * default to firmware version 1 after 3 tries. some versions didn't send a + version. + * fixed cec-config win32 compilation + + -- Pulse-Eight Packaging Sat, 03 Mar 2012 15:21:00 +0100 + libcec (1.5-2) unstable; urgency=low * changed/added: diff --git a/debian/changelog b/debian/changelog index d407e38..15d5a73 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +libcec (1.5-3) unstable; urgency=low + + * fixed: + * OS-X compilation + * default to firmware version 1 after 3 tries. some versions didn't send a + version. + * fixed cec-config win32 compilation + + -- Pulse-Eight Packaging Sat, 03 Mar 2012 15:21:00 +0100 + libcec (1.5-2) unstable; urgency=low * changed/added: diff --git a/include/cectypes.h b/include/cectypes.h index 76056cd..095416e 100644 --- a/include/cectypes.h +++ b/include/cectypes.h @@ -948,14 +948,16 @@ typedef enum cec_client_version { CEC_CLIENT_VERSION_PRE_1_5 = 0, CEC_CLIENT_VERSION_1_5_0 = 0x1500, - CEC_CLIENT_VERSION_1_5_1 = 0x1501 + CEC_CLIENT_VERSION_1_5_1 = 0x1501, + CEC_CLIENT_VERSION_1_5_2 = 0x1502 } cec_client_version; typedef enum cec_server_version { CEC_SERVER_VERSION_PRE_1_5 = 0, CEC_SERVER_VERSION_1_5_0 = 0x1500, - CEC_SERVER_VERSION_1_5_1 = 0x1501 + CEC_SERVER_VERSION_1_5_1 = 0x1501, + CEC_SERVER_VERSION_1_5_2 = 0x1502 } cec_server_version; typedef struct libcec_configuration diff --git a/project/cec-config.rc b/project/cec-config.rc index 07a63248875c3c6fca4c41ca481af8df236331e8..180f4f050acf9882a287d1144d293a21bf783876 100644 GIT binary patch delta 48 zcmZ1=xj=G*A2XxTWPfHuMx)J*%-lfE=3X{WCT1fBy~*;dl9O3Dg(k1#h2y<=nsawp5PN=|;pA+-4! H#~fw=XMhfR delta 52 zcmZpYY?9pI$INIj*`L{v(O`2Uvp6%W0fQcc!Q_SPx|>h2y<=nsawp5PN=|;pA+-4! H#~fw=W_}KG diff --git a/project/testclient.rc b/project/testclient.rc index 1a3b7792d3e6d20e08702572f047441c9fbbec2f..15edfb5a5f2080c5845050e16f3992e72fee829d 100644 GIT binary patch delta 50 zcmbOyIZtwfA2XxTWPfHuMx)J*%!16!MhtqBsA7B;Re1uJa2_~@l1IIdM07!8R A_5c6? delta 50 zcmbOyIZtwfA2XxDWPfHuMuW|b%!16!1`K+WsA7B;Re1uJa2_~@l1IIdM07rui A?f?J) diff --git a/src/CecSharpTester/Properties/AssemblyInfo.cs b/src/CecSharpTester/Properties/AssemblyInfo.cs index 0f04238..e12aca9 100644 --- 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("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.5.2.0")] +[assembly: AssemblyFileVersion("1.5.2.0")] diff --git a/src/LibCecSharp/AssemblyInfo.cpp b/src/LibCecSharp/AssemblyInfo.cpp index ef09f79..5dfbef2 100644 --- 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("1.5.0.0")]; +[assembly:AssemblyVersionAttribute("1.5.2.0")]; [assembly:ComVisible(false)]; [assembly:CLSCompliantAttribute(true)]; diff --git a/src/LibCecSharp/CecSharpTypes.h b/src/LibCecSharp/CecSharpTypes.h index 65fa7cd..8cdaa89 100644 --- a/src/LibCecSharp/CecSharpTypes.h +++ b/src/LibCecSharp/CecSharpTypes.h @@ -327,14 +327,16 @@ namespace CecSharp { VersionPre1_5 = 0, Version1_5_0 = 0x1500, - Version1_5_1 = 0x1501 + Version1_5_1 = 0x1501, + Version1_5_2 = 0x1502 }; public enum class CecServerVersion { VersionPre1_5 = 0, Version1_5_0 = 0x1500, - Version1_5_1 = 0x1501 + Version1_5_1 = 0x1501, + Version1_5_2 = 0x1502 }; public ref class CecAdapter diff --git a/src/cec-config-gui/Properties/AssemblyInfo.cs b/src/cec-config-gui/Properties/AssemblyInfo.cs index b99c553..a1206f9 100644 --- a/src/cec-config-gui/Properties/AssemblyInfo.cs +++ b/src/cec-config-gui/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("1.5.0.0")] -[assembly: AssemblyFileVersion("1.5.0.0")] +[assembly: AssemblyVersion("1.5.2.0")] +[assembly: AssemblyFileVersion("1.5.2.0")] diff --git a/src/lib/CECProcessor.cpp b/src/lib/CECProcessor.cpp index 96e82ce..b455ac8 100644 --- a/src/lib/CECProcessor.cpp +++ b/src/lib/CECProcessor.cpp @@ -78,7 +78,7 @@ CCECProcessor::CCECProcessor(CLibCEC *controller, const char *strDeviceName, con m_iLastTransmission(0) { m_configuration.Clear(); - m_configuration.serverVersion = CEC_SERVER_VERSION_1_5_1; + m_configuration.serverVersion = CEC_SERVER_VERSION_1_5_2; // client version < 1.5.0 m_configuration.clientVersion = (uint32_t)CEC_CLIENT_VERSION_PRE_1_5; @@ -1374,6 +1374,8 @@ const char *CCECProcessor::ToString(const cec_client_version version) return "1.5.0"; case CEC_CLIENT_VERSION_1_5_1: return "1.5.1"; + case CEC_CLIENT_VERSION_1_5_2: + return "1.5.2"; default: return "Unknown"; } @@ -1388,7 +1390,9 @@ const char *CCECProcessor::ToString(const cec_server_version version) case CEC_SERVER_VERSION_1_5_0: return "1.5.0"; case CEC_SERVER_VERSION_1_5_1: - return "1.5.1"; + return "1.5.1"; + case CEC_SERVER_VERSION_1_5_2: + return "1.5.2"; default: return "Unknown"; } diff --git a/src/lib/LibCEC.cpp b/src/lib/LibCEC.cpp index b36d254..ab05822 100644 --- a/src/lib/LibCEC.cpp +++ b/src/lib/LibCEC.cpp @@ -60,7 +60,7 @@ CLibCEC::CLibCEC(libcec_configuration *configuration) : m_callbacks(configuration->callbacks), m_cbParam(configuration->callbackParam) { - configuration->serverVersion = CEC_SERVER_VERSION_1_5_1; + configuration->serverVersion = CEC_SERVER_VERSION_1_5_2; m_cec = new CCECProcessor(this, configuration); } -- 2.34.1