From d9ba065fabd66575ff8b3572d357d9b39b712ef2 Mon Sep 17 00:00:00 2001 From: Wolfgang Ruppel Date: Thu, 21 Feb 2019 10:57:42 +0100 Subject: CMake fixed --- CMakeLists.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d75a4d7..cf5b240 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,9 +3,8 @@ cmake_minimum_required(VERSION 2.8.12) project(asdcplib) # The version number. -file(STRINGS configure VERSION_STRING REGEX "PACKAGE_VERSION=.*") -STRING(REGEX REPLACE "(.*)([\n*[.]]+).*" "\\2" ${VERSION_STRING} "${${VERSION_STRING}}") -STRING(REGEX REPLACE "(PACKAGE_VERSION=')(.*)'" "\\2" VERSION_STRING ${VERSION_STRING}) +file(STRINGS configure.ac VERSION_STRING REGEX "AC_INIT.*") +STRING(REGEX MATCH "[0-9]*[\\.][0-9]*[\\.][0-9]*" VERSION_STRING ${VERSION_STRING}) STRING(REGEX REPLACE "([0-9]+)[.].*" "\\1" VERSION_MAJOR ${VERSION_STRING}) STRING(REGEX REPLACE ".*[.]([0-9]+)[.].*" "\\1" VERSION_MINOR ${VERSION_STRING}) STRING(REGEX REPLACE ".*[.]+([0-9]+)" "\\1" VERSION_PATCH ${VERSION_STRING}) -- cgit v1.2.3 From c22d49a2d1bc4ee13c36484b22de2032015c7830 Mon Sep 17 00:00:00 2001 From: Wolfgang Ruppel Date: Thu, 21 Feb 2019 11:24:33 +0100 Subject: ISXDDataEssenceDescriptor_NamespaceURI UL fixed --- src/MDD.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/MDD.cpp b/src/MDD.cpp index 7a284e4..c8de004 100644 --- a/src/MDD.cpp +++ b/src/MDD.cpp @@ -1537,7 +1537,7 @@ static const ASDCP::MDDEntry s_MDD_Table[] = { { { 0x06, 0x0e, 0x2b, 0x34, 0x02, 0x53, 0x01, 0x05, // 494 0x0e, 0x09, 0x05, 0x02, 0x00, 0x00, 0x00, 0x00 }, {0}, false, "ISXDDataEssenceDescriptor" }, - { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 495 + { { 0x06, 0x0e, 0x2b, 0x34, 0x01, 0x01, 0x01, 0x05, // 495 0x0e, 0x09, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00 }, {0}, false, "ISXDDataEssenceDescriptor_NamespaceURI" }, { { 0x06, 0x0e, 0x2b, 0x34, 0x04, 0x01, 0x01, 0x05, // 496 -- cgit v1.2.3