Merge pull request #990 from g-maxime/preparing-v18.08.1

Preparing v18.08.1
MediaArea · Sep 10, 2018 · d141406 · d141406
2 parents 4b2e9bf + 8fc8950
commit d141406
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 64 deletions.
diff --git a/History_DLL.txt b/History_DLL.txt
@@ -7,6 +7,10 @@ x Correction
 bug reports and feature request are here:
 https://sourceforge.net/p/mediainfo/_list/tickets
 
+Version 18.08.1, 2018-09-10
+--------------
+x Fix XML/MPEG-7/PBCore2 output discarding non ANSI characters
+
 Version 18.08, 2018-08-31
 --------------
 + Dolby Atmos (in E-AC-3 or TrueHD): support of bed channel count/configuration + objects count + complexity index

diff --git a/Project/CMake/CMakeLists.txt b/Project/CMake/CMakeLists.txt
@@ -6,7 +6,7 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
 
 set(MediaInfoLib_MAJOR_VERSION 18)
 set(MediaInfoLib_MINOR_VERSION 08)
-set(MediaInfoLib_PATCH_VERSION 0)
+set(MediaInfoLib_PATCH_VERSION 1)
 set(MediaInfoLib_VERSION ${MediaInfoLib_MAJOR_VERSION}.${MediaInfoLib_MINOR_VERSION})
 
 if (MediaInfoLib_PATCH_VERSION)

diff --git a/Project/GNU/Library/configure.ac b/Project/GNU/Library/configure.ac
@@ -5,7 +5,7 @@ dnl #########################################################################
 dnl -------------------------------------------------------------------------
 dnl Name and version
 dnl
-AC_INIT([libmediainfo], [18.08])
+AC_INIT([libmediainfo], [18.08.1])
 
 dnl -------------------------------------------------------------------------
 dnl Test if we are at the good place

diff --git a/Project/GNU/PKGBUILD b/Project/GNU/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: hydro <[email protected]>
 
 pkgname=libmediainfo
-pkgver=18.08
+pkgver=18.08.1
 pkgrel=1
 pkgdesc="shared library for mediainfo"
 arch=('i686' 'x86_64')

diff --git a/Project/GNU/libmediainfo.dsc b/Project/GNU/libmediainfo.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0-dbg
 Architecture: any all
-Version: 18.08-1
+Version: 18.08.1-1
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
@@ -16,11 +16,11 @@ Package-List:
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_18.08-1.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08-1.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_18.08-1.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_18.08.1-1.debian.tar.xz
diff --git a/Project/GNU/libmediainfo.spec b/Project/GNU/libmediainfo.spec
@@ -1,4 +1,4 @@
-%global libmediainfo_version      18.08
+%global libmediainfo_version      18.08.1
 %global libmediainfo_version_major      18
 %global libmediainfo_version_minor      08
 %global libzen_version            0.4.37
@@ -308,7 +308,7 @@ rm -f %{buildroot}%{_libdir}/%{name_without_0_ending}.la
 %endif
 
 %changelog
-* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 18.08-0
+* Sun Jan 01 2012 MediaArea.net SARL <[email protected]> - 18.08.1-0
 - See History.txt for more info and real dates
 - Previous packages made by Toni Graffy <[email protected]>
 - Fedora style made by Vasiliy N. Glazov <[email protected]>
diff --git a/Project/MSVC2013/Dll/MediaInfo.rc b/Project/MSVC2013/Dll/MediaInfo.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/Example/HowToUse.rc b/Project/MSVC2013/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2013/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/Dll/MediaInfo.rc b/Project/MSVC2015/Dll/MediaInfo.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/Example/HowToUse.rc b/Project/MSVC2015/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2015/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/Dll/MediaInfo.rc b/Project/MSVC2017/Dll/MediaInfo.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/Example/HowToUse.rc b/Project/MSVC2017/Example/HowToUse.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc b/Project/MSVC2017/ShellExtension/MediaInfoShellExt.rc
@@ -1,8 +1,8 @@
 #include <winresrc.h>
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 18,08,0,0
- PRODUCTVERSION 18,08,0,0
+ FILEVERSION 18,08,1,0
+ PRODUCTVERSION 18,08,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -19,10 +19,10 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "MediaArea.net"
             VALUE "FileDescription", "Most relevant technical and tag data for video and audio files"
-            VALUE "FileVersion", "18.08.0.0"
+            VALUE "FileVersion", "18.08.1.0"
             VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
             VALUE "ProductName", "MediaInfo"
-            VALUE "ProductVersion", "18.08.0.0"
+            VALUE "ProductVersion", "18.08.1.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/Project/OBS/deb9.debian/changelog b/Project/OBS/deb9.debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (18.08-1) experimental; urgency=medium
+libmediainfo (18.08.1-1) experimental; urgency=medium
 
-  * Upstream version 18.08
+  * Upstream version 18.08.1
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <[email protected]>  Mon, 02 Nov 2015 10:30:00 +0100

diff --git a/Project/OBS/deb9.dsc b/Project/OBS/deb9.dsc
@@ -2,7 +2,7 @@ Format: 3.0 (quilt)
 Source: libmediainfo
 Binary: libmediainfo-dev, libmediainfo0v5, python-mediainfodll, python3-mediainfodll, libmediainfo-doc libmediainfo0v5-dbg
 Architecture: any all
-Version: 18.08-1deb9
+Version: 18.08.1-1deb9
 Maintainer: MediaArea.net SARL <[email protected]>
 Homepage: http://MediaArea.net/MediaInfo
 Standards-Version: 3.9.6
@@ -16,11 +16,11 @@ Package-List:
  python-mediainfodll deb python optional arch=all
  python3-mediainfodll deb python optional arch=all
 Checksums-Sha1:
- 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz
- 0000000000000000000000000000000000000000 000000 libmediainfo_18.08-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz
+ 0000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1deb9.debian.tar.xz
 Checksums-Sha256:
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz
- 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08-1deb9.debian.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz
+ 0000000000000000000000000000000000000000000000000000000000000000 000000 libmediainfo_18.08.1-1deb9.debian.tar.xz
 Files:
- 00000000000000000000000000000000 000000 libmediainfo_18.08.orig.tar.xz
- 00000000000000000000000000000000 000000 libmediainfo_18.08-1deb9.debian.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_18.08.1.orig.tar.xz
+ 00000000000000000000000000000000 000000 libmediainfo_18.08.1-1deb9.debian.tar.xz
diff --git a/Project/Solaris/mkpkg b/Project/Solaris/mkpkg
@@ -9,7 +9,7 @@ release=`uname -r`
 
 #Creation of known directories and filenames
 name="libmediainfo0"
-version="18.08"
+version="18.08.1"
 Home=`pwd`
 install_prefix=${Home}/mk_package
 packagecreation_prefix=${Home}/create_package

diff --git a/Project/version.txt b/Project/version.txt
@@ -1 +1 @@
-18.08
+18.08.1
diff --git a/Source/Install/MediaInfo_DLL_Windows_i386.nsi b/Source/Install/MediaInfo_DLL_Windows_i386.nsi
@@ -5,7 +5,7 @@ RequestExecutionLevel admin
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
 !define PRODUCT_VERSION "18.08"
-!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0"
+!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.1.0"
 !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"
 !define COMPANY_REGISTRY "Software\MediaArea.net"
 !define PRODUCT_REGISTRY "Software\MediaArea.net\MediaInfo.dll"

diff --git a/Source/Install/MediaInfo_DLL_Windows_x64.nsi b/Source/Install/MediaInfo_DLL_Windows_x64.nsi
@@ -5,7 +5,7 @@ RequestExecutionLevel admin
 !define PRODUCT_NAME "MediaInfo"
 !define PRODUCT_PUBLISHER "MediaArea.net"
 !define PRODUCT_VERSION "18.08"
-!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.0.0"
+!define PRODUCT_VERSION4 "${PRODUCT_VERSION}.1.0"
 !define PRODUCT_WEB_SITE "http://MediaArea.net/MediaInfo"
 !define COMPANY_REGISTRY "Software\MediaArea.net"
 !define PRODUCT_REGISTRY "Software\MediaArea.net\MediaInfo.dll"

diff --git a/Source/MediaInfo/MediaInfo_Config.cpp b/Source/MediaInfo/MediaInfo_Config.cpp
@@ -133,7 +133,7 @@ namespace MediaInfoLib
 {
 
 //---------------------------------------------------------------------------
-const Char*  MediaInfo_Version=__T("MediaInfoLib - v18.08");
+const Char*  MediaInfo_Version=__T("MediaInfoLib - v18.08.1");
 const Char*  MediaInfo_Url=__T("http://MediaArea.net/MediaInfo");
       Ztring EmptyZtring;       //Use it when we can't return a reference to a true Ztring
 const Ztring EmptyZtring_Const; //Use it when we can't return a reference to a true Ztring, const version

diff --git a/debian/changelog b/debian/changelog
@@ -1,6 +1,6 @@
-libmediainfo (18.08-1) experimental; urgency=medium
+libmediainfo (18.08.1-1) experimental; urgency=medium
 
-  * Upstream version 18.08
+  * Upstream version 18.08.1
     For details, see https://github.com/MediaArea/MediaInfoLib/blob/master/History_DLL.txt
 
  -- MediaArea <[email protected]>  Mon, 02 Nov 2015 10:30:00 +0100