Skip to content

Commit

Permalink
Merge pull request #784 from g-maxime/preparing-v24.06
Browse files Browse the repository at this point in the history
Preparing v24.06
  • Loading branch information
JeromeMartinez authored Jun 29, 2024
2 parents b95fd7f + 138489d commit b0b89e4
Show file tree
Hide file tree
Showing 30 changed files with 95 additions and 78 deletions.
8 changes: 8 additions & 0 deletions History_CLI.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,14 @@ x Correction
bug reports and feature request are here :
https://github.com/MediaArea/MediaConch_SourceCode

Version 24.06, 2024-06-29
-------------
Update to MediaInfo library 24.06, see MediaInfo change log for the list of changes in the file formats support
Add fields compare in policy checker
Remove Matroska related errors with new Matroska block additions
Supported platforms: minimum macOS version is now 10.13 (too much effort needed for building for older versions :( )
Supported platforms: this is the last version compatible with RHEL/CentOS 7, Debian 10, Mageia 8

Version 23.10, 2023-10-04
-------------
+ Support of MPEG-H in MPEG-TS
Expand Down
9 changes: 9 additions & 0 deletions History_GUI.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,15 @@ x Correction
bug reports and feature request are here :
https://github.com/MediaArea/MediaConch_SourceCode

Version 24.06, 2024-06-29
-------------
Update to MediaInfo library 24.06, see MediaInfo change log for the list of changes in the file formats support
Add fields compare in policy checker
Add 608/708 captions detection options
Remove Matroska related errors with new Matroska block additions
Supported platforms: minimum macOS version is now 10.13 (too much effort needed for building for older versions :( )
Supported platforms: this is the last version compatible with RHEL/CentOS 7, Debian 10, Mageia 8

Version 23.10, 2023-10-04
-------------
+ Support of MPEG-H in MPEG-TS
Expand Down
2 changes: 1 addition & 1 deletion Project/AppImage/Recipe.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ if ! grep "CentOS release 6\..*" /etc/centos-release ; then
fi

# Setup evironment
VERSION=23.10
VERSION=24.06

if [ "$(arch)" == "i386" ] ; then
ARCH="i686"
Expand Down
2 changes: 1 addition & 1 deletion Project/GNU/CLI/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dnl #########################################################################
dnl -------------------------------------------------------------------------
dnl Name and version
dnl
AC_INIT([mediaconch], [23.10.0])
AC_INIT([mediaconch], [24.06.0])

dnl -------------------------------------------------------------------------
dnl Test if we are at the good place
Expand Down
10 changes: 5 additions & 5 deletions Project/GNU/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# This PKGBUILD is for OBS

pkgname=('mediaconch' 'mediaconch-server' 'mediaconch-gui')
pkgver=23.10
pkgver=24.06
pkgrel=1
pkgdesc="Implementation checker and policy checker for video and audio files"
url="http://MediaArea.net/MediaConch"
Expand All @@ -13,7 +13,7 @@ md5sums=('00000000000000000000000000000000')
arch=('i686' 'x86_64')

# Buildtime dependencies for all packages need to be listed here
makedepends=('desktop-file-utils' 'libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webengine' 'libzen>=0.4.41' 'libmediainfo>=23.10')
makedepends=('desktop-file-utils' 'libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webengine' 'libzen>=0.4.41' 'libmediainfo>=24.06')
# OBS don't provide jansson
#makedepends=(${makedepends[@]} jansson)

Expand Down Expand Up @@ -49,7 +49,7 @@ build() {

package_mediaconch() {
pkgdesc="${pkgdesc} (CLI)"
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.41' 'libmediainfo>=23.10')
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.41' 'libmediainfo>=24.06')

cd "${srcdir}"/MediaConch/Project/GNU/CLI
make DESTDIR="${pkgdir}" install-strip
Expand All @@ -63,7 +63,7 @@ package_mediaconch() {

package_mediaconch-server() {
pkgdesc="${pkgdesc} (Server)"
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.41' 'libmediainfo>=23.10')
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'libzen>=0.4.41' 'libmediainfo>=24.06')
backup=('etc/mediaconch/MediaConch.rc')

cd "${srcdir}"/MediaConch/Project/GNU/Server
Expand All @@ -82,7 +82,7 @@ package_mediaconch-server() {

package_mediaconch-gui() {
pkgdesc="${pkgdesc} (GUI)"
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.41' 'libmediainfo>=23.10')
depends=('libxml2' 'libxslt' 'sqlite' 'libevent' 'qt5-base' 'qt5-webkit' 'libzen>=0.4.41' 'libmediainfo>=24.06')

cd "${srcdir}"/MediaConch
install -D -m 0755 Project/Qt/mediaconch-gui "${pkgdir}"/usr/bin/mediaconch-gui
Expand Down
2 changes: 1 addition & 1 deletion Project/GNU/Server/configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dnl #########################################################################
dnl -------------------------------------------------------------------------
dnl Name and version
dnl
AC_INIT([mediaconchd], [23.10.0])
AC_INIT([mediaconchd], [24.06.0])

dnl -------------------------------------------------------------------------
dnl Test if we are at the good place
Expand Down
16 changes: 8 additions & 8 deletions Project/GNU/mediaconch.dsc
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Format: 3.0 (quilt)
Source: mediaconch
Binary: mediaconch, mediaconch-dbg, mediaconch-server, mediaconch-server-dbg, libmediaconch0, libmediaconch0-dbg, libmediaconch-dev, mediaconch-gui, mediaconch-gui-dbg
Architecture: any
Version: 23.10-1
Version: 24.06-1
Maintainer: MediaArea.net SARL <[email protected]>
Homepage: http://MediaArea.net/MediaConch
Standards-Version: 3.9.6
Vcs-Git: https://github.com/MediaArea/MediaConch_SourceCode.git
Vcs-Browser: https://github.com/MediaArea/MediaConch_SourceCode
Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 23.10), libzen-dev (>= 0.4.41), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev, python3-all, dh-python
Build-Depends: debhelper (>= 9), dh-autoreconf, tofrodos, libmediainfo-dev (>= 24.06), libzen-dev (>= 0.4.41), qt5-qmake, qtbase5-dev, libqt5webkit5-dev, libxml2-dev, libxslt-dev, libsqlite3-dev, libjansson-dev, zlib1g-dev, pkg-config, automake, autoconf, libtool, libcurl4-gnutls-dev, libevent-dev, python3-all, dh-python
Package-List:
mediaconch deb utils optional arch=any
mediaconch-server deb utils optional arch=any
Expand All @@ -20,11 +20,11 @@ Package-List:
mediaconch-gui-dbg deb debug extra arch=any
libmediaconch0-dbg deb debug extra arch=any
Checksums-Sha1:
0000000000000000000000000000000000000000 000000 mediaconch_23.10.orig.tar.xz
0000000000000000000000000000000000000000 000000 mediaconch_23.10-1.debian.tar.xz
0000000000000000000000000000000000000000 000000 mediaconch_24.06.orig.tar.xz
0000000000000000000000000000000000000000 000000 mediaconch_24.06-1.debian.tar.xz
Checksums-Sha256:
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_23.10.orig.tar.xz
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_23.10-1.debian.tar.xz
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_24.06.orig.tar.xz
0000000000000000000000000000000000000000000000000000000000000000 000000 mediaconch_24.06-1.debian.tar.xz
Files:
00000000000000000000000000000000 000000 mediaconch_23.10.orig.tar.xz
00000000000000000000000000000000 000000 mediaconch_23.10-1.debian.tar.xz
00000000000000000000000000000000 000000 mediaconch_24.06.orig.tar.xz
00000000000000000000000000000000 000000 mediaconch_24.06-1.debian.tar.xz
4 changes: 2 additions & 2 deletions Project/GNU/mediaconch.spec
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
%global mediaconch_version 23.10
%global libmediainfo_version 23.10
%global mediaconch_version 24.06
%global libmediainfo_version 24.06
%global libzen_version 0.4.41

%if 0%{?fedora_version} || 0%{?rhel}
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2013/CLI/MediaConch_CLI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2013/GUI/MediaConch_GUI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2013/Server/MediaConch-Server.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2015/CLI/MediaConch_CLI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2015/GUI/MediaConch_GUI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2015/Server/MediaConch-Server.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2017/CLI/MediaConch_CLI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2017/GUI/MediaConch_GUI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2017/Server/MediaConch-Server.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
8 changes: 4 additions & 4 deletions Project/MSVC2019/CLI/MediaConch_CLI.rc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <winresrc.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 23,10,0,0
PRODUCTVERSION 23,10,0,0
FILEVERSION 24,06,0,0
PRODUCTVERSION 24,06,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -19,10 +19,10 @@ BEGIN
BEGIN
VALUE "CompanyName", "MediaArea.net"
VALUE "FileDescription", "Implementation checker, policy checker, reporter, and fixer"
VALUE "FileVersion", "23.10.0.0"
VALUE "FileVersion", "24.06.0.0"
VALUE "LegalCopyright", "Copyright (C) 2002-2015 MediaArea.net SARL"
VALUE "ProductName", "MediaConch"
VALUE "ProductVersion", "23.10.0.0"
VALUE "ProductVersion", "24.06.0.0"
END
END
BLOCK "VarFileInfo"
Expand Down
Loading

0 comments on commit b0b89e4

Please sign in to comment.