Packman Build Service PMBS

We truncated the diff of some files because they were too big. If you want to see the full diff for every file, click here.

Changes of Revision 38

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.10.4.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.10.5.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.10.4.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.10.5.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.10.4.tar.xz/bin/i386/mmdtsdec -> makemkv-bin-1.10.5.tar.xz/bin/i386/mmdtsdec Changed

makemkv-bin-1.10.4.tar.xz/src/share/blues.jar -> makemkv-bin-1.10.5.tar.xz/src/share/blues.jar Changed

makemkv-bin-1.10.4.tar.xz/src/share/makemkv_pol.mo.gz -> makemkv-bin-1.10.5.tar.xz/src/share/makemkv_pol.mo.gz Changed

makemkv-oss-1.10.4.tar.xz/libdriveio/src/scsihlp.h Deleted

@@ -1,70 +0,0 @@
-/*
-    libDriveIo - MMC drive interrogation library
-
-    Copyright (C) 2007-2016 GuinpinSoft inc <libdriveio@makemkv.com>
-
-    This library is free software; you can redistribute it and/or
-    modify it under the terms of the GNU Lesser General Public
-    License as published by the Free Software Foundation; either
-    version 2.1 of the License, or (at your option) any later version.
-
-    This library is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-    Lesser General Public License for more details.
-
-    You should have received a copy of the GNU Lesser General Public
-    License along with this library; if not, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
-
-*/
-#include <driveio/driveio.h>
-
-namespace LibDriveIo
-{
-
-typedef struct _ScsiDriveInfo
-{
-    ScsiInquiryData inq;
-    char            firmware_date[15];
-    char            serial_number[33];
-} ScsiDriveInfo;
-
-typedef int (*QuerySpecificDriveInfoProc)(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType);
-
-int ExecuteReadScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,void *Buffer,unsigned int BufferSize,ScsiCmdResponse* Response);
-int ExecuteReadScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,void *Buffer,unsigned int* BufferSize);
-int ExecuteWriteScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,const void *Buffer,unsigned int BufferSize,ScsiCmdResponse* Response);
-int ExecuteWriteScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,const void *Buffer,unsigned int BufferSize);
-int TestUnitReady(ISimpleScsiTarget* ScsiTarget, bool* Ready);
-int BuildDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiDriveInfo *DriveInfo);
-int QueryInquiryInfo(ISimpleScsiTarget* ScsiTarget,uint8_t Evpd,uint8_t *Buffer,unsigned int *BufferSize);
-
-
-static inline uint32_t uint32_get_be(const void *Buf)
-{
-    uint32_t v=0;
-
-    v |= (((uint32_t)(((uint8_t*)Buf)[0]))<<(3*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[1]))<<(2*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[2]))<<(1*8));
-    v |= (((uint32_t)(((uint8_t*)Buf)[3]))<<(0*8));
-
-    return v;
-}
-
-static inline uint16_t uint16_get_be(const void *Buf)
-{
-    uint16_t v=0;
-
-    v |= (((uint16_t)(((uint8_t*)Buf)[0]))<<(1*8));
-    v |= (((uint16_t)(((uint8_t*)Buf)[1]))<<(0*8));
-
-    return v;
-}
-
-
-};
-
-using namespace LibDriveIo;
-

makemkv-oss-1.10.4.tar.xz/Makefile.in -> makemkv-oss-1.10.5.tar.xz/Makefile.in Changed

@@ -1,28 +1,43 @@
-
 include makefile.common
 
 GCC=@CC@
+GXX=@CXX@
 MOC=@QT_MOC@
 
-CFLAGS=@CFLAGS_OPT@ -D_linux_ -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS
+CFLAGS=@CFLAGS@ -D_linux_
+LDFLAGS=@LDFLAGS@
 DESTDIR=@DESTDIR@
-PREFIX=@prefix@
-ENABLE_GUI=@ENABLE_GUI@
-LIBDIR=$(PREFIX)/lib
-BINDIR=$(PREFIX)/bin
-DATADIR=$(PREFIX)/share
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+datarootdir=@datarootdir@
+libdir=@libdir@
+bindir=@bindir@
+datadir=@datadir@
 FFMPEG_CFLAGS=@ffmpeg_CFLAGS@
-FFMPEG_LIBS=@ffmpeg_LIBS@
+FFMPEG_LIBS=@ffmpeg_LIBS@ -lrt
+ENABLE_GUI=@ENABLE_GUI@
+ENABLE_DEBUG=@ENABLE_DEBUG@
+NO_EC_DEF=@NO_EC_DEF@
+QT_INC=@QT_INC@
+QT_CFLAGS=@QT_CFLAGS@
+QT_LIB=@QT_LIB@
 INSTALL=@INSTALL@
 OBJCOPY=@OBJCOPY@
 LD=@LD@
 BUILDINFO_ARCH_NAME=$(shell $(GCC) -dumpmachine)
 BUILDINFO_BUILD_DATE=$(shell date)
 
+top_srcdir ?= .
+INCF=-I$(top_srcdir)/
+
 ifeq ($(ENABLE_GUI),yes)
 OUT_GUI=out/makemkv
 endif
 
+ifeq ($(ENABLE_DEBUG),no)
+STRIP_FLAGS=--strip-all --strip-debug --strip-unneeded --discard-all
+endif
+
 all: out/libdriveio.so.0 out/libmakemkv.so.1 $(OUT_GUI) out/libmmbd.so.0
 	@echo "type \"sudo make install\" to install"
 
@@ -30,36 +45,36 @@
 	-rm -rf out tmp
 
 install: out/libdriveio.so.0 out/libmakemkv.so.1 $(OUT_GUI) out/libmmbd.so.0
-	$(INSTALL) -D -m 644 out/libdriveio.so.0 $(DESTDIR)$(LIBDIR)/libdriveio.so.0
-	$(INSTALL) -D -m 644 out/libmakemkv.so.1 $(DESTDIR)$(LIBDIR)/libmakemkv.so.1
-	$(INSTALL) -D -m 644 out/libmmbd.so.0 $(DESTDIR)$(LIBDIR)/libmmbd.so.0
+	$(INSTALL) -D -m 644 out/libdriveio.so.0 $(DESTDIR)$(libdir)/libdriveio.so.0
+	$(INSTALL) -D -m 644 out/libmakemkv.so.1 $(DESTDIR)$(libdir)/libmakemkv.so.1
+	$(INSTALL) -D -m 644 out/libmmbd.so.0 $(DESTDIR)$(libdir)/libmmbd.so.0
 ifeq ($(DESTDIR),)
 	ldconfig
 endif
 ifeq ($(ENABLE_GUI),yes)
-	$(INSTALL) -D -m 755 out/makemkv $(DESTDIR)$(BINDIR)/makemkv
-	$(INSTALL) -D -m 644 makemkvgui/share/makemkv.desktop $(DESTDIR)$(DATADIR)/applications/makemkv.desktop
-	$(INSTALL) -D -m 644 makemkvgui/share/icons/16x16/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/16x16/apps/makemkv.png
-	$(INSTALL) -D -m 644 makemkvgui/share/icons/22x22/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/22x22/apps/makemkv.png
-	$(INSTALL) -D -m 644 makemkvgui/share/icons/32x32/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/32x32/apps/makemkv.png
-	$(INSTALL) -D -m 644 makemkvgui/share/icons/64x64/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/64x64/apps/makemkv.png
-	$(INSTALL) -D -m 644 makemkvgui/share/icons/128x128/makemkv.png $(DESTDIR)$(DATADIR)/icons/hicolor/128x128/apps/makemkv.png
+	$(INSTALL) -D -m 755 out/makemkv $(DESTDIR)$(bindir)/makemkv
+	$(INSTALL) -D -m 644 makemkvgui/share/makemkv.desktop $(DESTDIR)$(datadir)/applications/makemkv.desktop
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/16x16/makemkv.png $(DESTDIR)$(datadir)/icons/hicolor/16x16/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/22x22/makemkv.png $(DESTDIR)$(datadir)/icons/hicolor/22x22/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/32x32/makemkv.png $(DESTDIR)$(datadir)/icons/hicolor/32x32/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/64x64/makemkv.png $(DESTDIR)$(datadir)/icons/hicolor/64x64/apps/makemkv.png
+	$(INSTALL) -D -m 644 makemkvgui/share/icons/128x128/makemkv.png $(DESTDIR)$(datadir)/icons/hicolor/128x128/apps/makemkv.png
 endif
 
 out/%: out/%.full
-	$(OBJCOPY) --strip-all --strip-debug --strip-unneeded --discard-all $< $@ 
+	$(OBJCOPY) $(STRIP_FLAGS) $< $@
 
 out/libdriveio.so.0.full:
 	mkdir -p out
-	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
+	$(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(INCF)$(LIBDRIVEIO_INC) $(LIBDRIVEIO_SRC) \
 	-fPIC -Xlinker -dy -Xlinker --version-script=libdriveio/src/libdriveio.vers \
 	-Xlinker -soname=libdriveio.so.0 -lc -lstdc++
 
 out/libmakemkv.so.1.full: tmp/gen_buildinfo.h
 	mkdir -p out
-	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(LIBEBML_INC) $(LIBEBML_DEF) $(LIBMATROSKA_INC) \
-	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(MAKEMKVGUI_INC) $(LIBABI_INC) $(LIBFFABI_INC) $(LIBDCADEC_DEF) \
-	$(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
+	$(GCC) $(CFLAGS) $(LDFLAGS) $(NO_EC_DEF) -D_GNU_SOURCE -D_REENTRANT -shared -Wl,-z,defs -o$@ $(INCF)$(LIBEBML_INC) $(LIBEBML_DEF) \
+	$(INCF)$(LIBMATROSKA_INC) $(INCF)$(LIBMAKEMKV_INC) $(INCF)$(SSTRING_INC) $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBABI_INC) \
+	$(INCF)$(LIBFFABI_INC) $(LIBDCADEC_DEF) $(LIBEBML_SRC) $(LIBMATROSKA_SRC) $(LIBMAKEMKV_SRC) $(GLIBC_SRC) $(SSTRING_SRC) \
 	$(LIBABI_SRC) $(LIBABI_SRC_LINUX) $(LIBFFABI_SRC) $(LIBDCADEC_SRC) \
 	-DHAVE_BUILDINFO_H -Itmp $(FFMPEG_CFLAGS) \
 	-fPIC -Xlinker -dy -Xlinker --version-script=libmakemkv/src/libmakemkv.vers \
@@ -67,18 +82,19 @@
 
 out/libmmbd.so.0.full:
 	mkdir -p out
-	$(GCC) $(CFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(MAKEMKVGUI_INC) $(LIBMMBD_INC) \
-	$(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
+	$(GCC) $(CFLAGS) $(LDFLAGS) -D_REENTRANT -shared -Wl,-z,defs -o$@ $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMMBD_INC) \
+	$(INCF)$(LIBMAKEMKV_INC) $(INCF)$(SSTRING_INC) $(INCF)$(LIBABI_INC) $(LIBMMBD_SRC) $(LIBMMBD_SRC_LINUX) $(SSTRING_SRC) \
 	-fPIC -Xlinker -dy -Xlinker --version-script=libmmbd/src/libmmbd.vers \
 	-Xlinker -soname=libmmbd.so.0 -lc -lstdc++ -lrt -lpthread -lcrypto
 
 out/makemkv.full: $(MAKEMKVGUI_GEN) $(MAKEMKVGUI_SRC_LINUX) tmp/gen_buildinfo.h
 	mkdir -p out
-	$(GCC) $(CFLAGS) -o$@ $(MAKEMKVGUI_INC) $(LIBMAKEMKV_INC) $(SSTRING_INC) $(LIBDRIVEIO_INC) $(LIBABI_INC) \
-	$(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) $(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
+	$(GXX) -std=c++11 $(CFLAGS) $(QT_CFLAGS) $(LDFLAGS) -o$@ $(INCF)$(MAKEMKVGUI_INC) $(INCF)$(LIBMAKEMKV_INC) $(INCF)$(SSTRING_INC) \
+	$(INCF)$(LIBDRIVEIO_INC) $(INCF)$(LIBABI_INC) $(MAKEMKVGUI_SRC) $(MAKEMKVGUI_SRC_LINUX) $(MAKEMKVGUI_GEN) \
+	$(SSTRING_SRC) $(LIBDRIVEIO_SRC_PUB) \
 	-DHAVE_BUILDINFO_H -Itmp \
-	@QT_INC@ -lc -lstdc++ \
-	@QT_LIB@ -lpthread -lz -lrt
+	$(QT_INC) -lc -lstdc++ \
+	$(QT_LIB) -lpthread -lz -lrt
 
 tmp/gen_buildinfo.h:
 	mkdir -p tmp
@@ -91,5 +107,5 @@
 
 tmp/image_data.o : makemkvgui/bin/image_data.bin
 	mkdir -p tmp
-	$(LD) -r -b binary -o $@ $<
+	$(LD) -r -b binary -z noexecstack -o $@ $<

makemkv-oss-1.10.4.tar.xz/autoxxx/config.guess -> makemkv-oss-1.10.5.tar.xz/autoxxx/config.guess Changed

@@ -1,14 +1,12 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
-#   2011, 2012 Free Software Foundation, Inc.
+#   Copyright 1992-2013 Free Software Foundation, Inc.
 
-timestamp='2012-02-10'
+timestamp='2013-06-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
+# the Free Software Foundation; either version 3 of the License, or
 # (at your option) any later version.
 #
 # This program is distributed in the hope that it will be useful, but
@@ -22,19 +20,17 @@
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
 # configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner.  Please send patches (context
-# diff format) to <config-patches@gnu.org> and include a ChangeLog
-# entry.
+# the same distribution terms that you use for the rest of that
+# program.  This Exception is an additional permission under section 7
+# of the GNU General Public License, version 3 ("GPLv3").
 #
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
+# Originally written by Per Bothner.
 #
 # You can get the latest version of this script from:
 # http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
+#
+# Please send patches with a ChangeLog entry to config-patches@gnu.org.
+
 
 me=`echo "$0" | sed -e 's,.*/,,'`
 
@@ -54,9 +50,7 @@
 GNU config.guess ($timestamp)
 
 Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
-Free Software Foundation, Inc.
+Copyright 1992-2013 Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -138,6 +132,27 @@
 UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
 UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
 
+case "${UNAME_SYSTEM}" in
+Linux|GNU|GNU/*)
+	# If the system lacks a compiler, then just pick glibc.
+	# We could probably try harder.
+	LIBC=gnu
+
+	eval $set_cc_for_build
+	cat <<-EOF > $dummy.c
+	#include <features.h>
+	#if defined(__UCLIBC__)
+	LIBC=uclibc
+	#elif defined(__dietlibc__)
+	LIBC=dietlibc
+	#else
+	LIBC=gnu
+	#endif
+	EOF
+	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`
+	;;
+esac
+
 # Note: order is significant - the case branches are not exclusive.
 
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
@@ -200,6 +215,10 @@
 	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
 	echo "${machine}-${os}${release}"
 	exit ;;
+    *:Bitrig:*:*)
+	UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'`
+	echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE}
+	exit ;;
     *:OpenBSD:*:*)
 	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
 	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
@@ -302,7 +321,7 @@
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
 	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
+    arm*:riscos:*:*|arm*:RISCOS:*:*)
 	echo arm-unknown-riscos
 	exit ;;
     SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
@@ -801,6 +820,9 @@
     i*:CYGWIN*:*)
 	echo ${UNAME_MACHINE}-pc-cygwin
 	exit ;;
+    *:MINGW64*:*)
+	echo ${UNAME_MACHINE}-pc-mingw64
+	exit ;;
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
@@ -852,21 +874,21 @@
 	exit ;;
     *:GNU:*:*)
 	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
+	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-${LIBC}`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
 	exit ;;
     *:GNU/*:*:*)
 	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
+	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-${LIBC}
 	exit ;;
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
     aarch64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     aarch64_be:Linux:*:*)
 	UNAME_MACHINE=aarch64_be
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: $.*$/\1/p' < /proc/cpuinfo` in
@@ -879,59 +901,54 @@
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
 	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
+	if test "$?" = 0 ; then LIBC="gnulibc1" ; fi
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
+	exit ;;
+    arc:Linux:*:* | arceb:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     arm*:Linux:*:*)
 	eval $set_cc_for_build
 	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
 	    | grep -q __ARM_EABI__
 	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
+	    echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	else
 	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
 		| grep -q __ARM_PCS_VFP
 	    then
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabi
 	    else
-		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+		echo ${UNAME_MACHINE}-unknown-linux-${LIBC}eabihf
 	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     cris:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     crisv32:Linux:*:*)
-	echo ${UNAME_MACHINE}-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-${LIBC}
 	exit ;;
     frv:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     hexagon:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-${LIBC}
 	exit ;;
     i*86:Linux:*:*)
-	LIBC=gnu
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'`

makemkv-oss-1.10.4.tar.xz/autoxxx/config.sub -> makemkv-oss-1.10.5.tar.xz/autoxxx/config.sub Changed

makemkv-oss-1.10.4.tar.xz/autoxxx/install-sh -> makemkv-oss-1.10.5.tar.xz/autoxxx/install-sh Changed

@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2011-01-19.21; # UTC
+scriptversion=2011-11-20.07; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -35,7 +35,7 @@
 # FSF changes to this file are in the public domain.
 #
 # Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
+# 'make' implicit rules from creating a file called install from it
 # when there is no Makefile.
 #
 # This script is compatible with the BSD install script, but was written
@@ -156,7 +156,7 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
-	# Protect names problematic for `test' and other utilities.
+	# Protect names problematic for 'test' and other utilities.
 	case $dst_arg in
 	  -* | [=!]) dst_arg=./$dst_arg;;
 	esac
@@ -190,7 +190,7 @@
     fi
     shift # arg
     dst_arg=$arg
-    # Protect names problematic for `test' and other utilities.
+    # Protect names problematic for 'test' and other utilities.
     case $dst_arg in
       -* | [=!]) dst_arg=./$dst_arg;;
     esac
@@ -202,7 +202,7 @@
     echo "$0: no input file specified." >&2
     exit 1
   fi
-  # It's OK to call `install-sh -d' without argument.
+  # It's OK to call 'install-sh -d' without argument.
   # This can happen when creating conditional directories.
   exit 0
 fi
@@ -240,7 +240,7 @@
 
 for src
 do
-  # Protect names problematic for `test' and other utilities.
+  # Protect names problematic for 'test' and other utilities.
   case $src in
     -* | [=!]) src=./$src;;
   esac
@@ -354,7 +354,7 @@
 	      if test -z "$dir_arg" || {
 		   # Check for POSIX incompatibilities with -m.
 		   # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
-		   # other-writeable bit of parent directory when it shouldn't.
+		   # other-writable bit of parent directory when it shouldn't.
 		   # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
 		   ls_ld_tmpdir=`ls -ld "$tmpdir"`
 		   case $ls_ld_tmpdir in

makemkv-oss-1.10.5.tar.xz/autoxxx/ltmain.sh Added

@@ -0,0 +1,9661 @@
+
+# libtool (GNU libtool) 2.4.2
+# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
+
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.  There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# As a special exception to the GNU General Public License,
+# if you distribute this file as part of a program or library that
+# is built using GNU Libtool, you may include this file under the
+# same distribution terms that you use for the rest of that program.
+#
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with GNU Libtool; see the file COPYING.  If not, a copy
+# can be downloaded from http://www.gnu.org/licenses/gpl.html,
+# or obtained by writing to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
+# Usage: $progname [OPTION]... [MODE-ARG]...
+#
+# Provide generalized library-building support services.
+#
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
+#
+# MODE must be one of the following:
+#
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
+#
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
+# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
+#
+# When reporting a bug, please describe a test case to reproduce it and
+# include the following information:
+#
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.7ubuntu1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
+#
+# Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
+
+PROGRAM=libtool
+PACKAGE=libtool
+VERSION="2.4.2 Debian-2.4.2-1.7ubuntu1"
+TIMESTAMP=""
+package_revision=1.3337
+
+# Be Bourne compatible
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+  emulate sh
+  NULLCMD=:
+  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+fi
+BIN_SH=xpg4; export BIN_SH # for Tru64
+DUALCASE=1; export DUALCASE # for MKS sh
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# NLS nuisances: We save the old values to restore during execute mode.
+lt_user_locale=
+lt_safe_locale=
+for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+do
+  eval "if test \"\${$lt_var+set}\" = set; then
+          save_$lt_var=\$$lt_var
+          $lt_var=C
+	  export $lt_var
+	  lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
+	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+	fi"
+done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
+
+$lt_unset CDPATH
+
+
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
+
+
+
+: ${CP="cp -f"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${MAKE="make"}
+: ${MKDIR="mkdir"}
+: ${MV="mv -f"}
+: ${RM="rm -f"}
+: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
+: ${Xsed="$SED -e 1s/^X//"}
+
+# Global variables:
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63  # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77	  # $? = 77 is used to indicate a skipped test to automake.
+
+exit_status=$EXIT_SUCCESS
+
+# Make sure IFS has a sensible default
+lt_nl='
+'
+IFS=" 	$lt_nl"
+
+dirname="s,/[^/]*$,,"
+basename="s,^.*/,,"
+
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
+# func_dirname_and_basename file append nondir_replacement
+# perform func_basename and func_dirname in a single function
+# call:
+#   dirname:  Compute the dirname of FILE.  If nonempty,
+#             add APPEND to the result, otherwise set result
+#             to NONDIR_REPLACEMENT.
+#             value returned in "$func_dirname_result"
+#   basename: Compute filename of FILE.
+#             value retuned in "$func_basename_result"
+# Implementation must be kept synchronized with func_dirname
+# and func_basename. For efficiency, we do not delegate to
+# those functions but instead duplicate the functionality here.
+func_dirname_and_basename ()
+{
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`

makemkv-oss-1.10.4.tar.xz/configure -> makemkv-oss-1.10.5.tar.xz/configure Changed

@@ -196,6 +196,14 @@
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
@@ -553,6 +561,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
+SHELL=${CONFIG_SHELL-/bin/sh}
+
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -623,6 +633,7 @@
 LIBOBJS
 QT_MOC
 QT_LIB
+QT_CFLAGS
 QT_INC
 qt4_LIBS
 qt4_CFLAGS
@@ -633,18 +644,40 @@
 PKG_CONFIG_LIBDIR
 PKG_CONFIG_PATH
 PKG_CONFIG
-EGREP
-GREP
-CPP
+NO_EC_DEF
 INSTALL_DATA
 INSTALL_SCRIPT
 INSTALL_PROGRAM
-CFLAGS_OPT
-LD
 OBJCOPY
+CXXCPP
 ac_ct_CXX
 CXXFLAGS
 CXX
+ENABLE_DEBUG
+ENABLE_GUI
+CPP
+OTOOL64
+OTOOL
+LIPO
+NMEDIT
+DSYMUTIL
+MANIFEST_TOOL
+AWK
+RANLIB
+STRIP
+ac_ct_AR
+AR
+DLLTOOL
+OBJDUMP
+LN_S
+NM
+ac_ct_DUMPBIN
+DUMPBIN
+LD
+FGREP
+EGREP
+GREP
+SED
 OBJEXT
 EXEEXT
 ac_ct_CC
@@ -652,7 +685,7 @@
 LDFLAGS
 CFLAGS
 CC
-ENABLE_GUI
+LIBTOOL
 DESTDIR
 target_os
 target_vendor
@@ -707,8 +740,18 @@
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
+enable_static
+enable_shared
+with_pic
+enable_fast_install
+with_gnu_ld
+with_sysroot
+enable_libtool_lock
 enable_gui
+enable_qt5
+enable_qt4
 enable_noec
+enable_debug
 '
       ac_precious_vars='build_alias
 host_alias
@@ -719,10 +762,11 @@
 LDFLAGS
 LIBS
 CPPFLAGS
+CPP
 CXX
 CXXFLAGS
 CCC
-CPP
+CXXCPP
 PKG_CONFIG
 PKG_CONFIG_PATH
 PKG_CONFIG_LIBDIR
@@ -1346,9 +1390,27 @@
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --enable-static[=PKGS]  build static libraries [default=no]
+  --enable-shared[=PKGS]  build shared libraries [default=yes]
+  --enable-fast-install[=PKGS]
+                          optimize for fast installation [default=yes]
+  --disable-libtool-lock  avoid locking (might break parallel builds)
   --disable-gui           do not build GUI (default is build GUI)
+  --disable-qt5           do not use Qt5
+  --disable-qt4           do not use Qt4
   --enable-noec           use private ECDSA code (default - use openssl ECDSA
                           if available)
+  --enable-debug          keep debug symbols in binarfies (default - strip
+                          debug symbols)
+
+Optional Packages:
+  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
+  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
+                          both]
+  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
 
 Some influential environment variables:
   DESTDIR     Installation root for maintainer mode
@@ -1359,9 +1421,10 @@
   LIBS        libraries to pass to the linker, e.g. -l<library>
   CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
               you have headers in a nonstandard directory <include dir>
+  CPP         C preprocessor
   CXX         C++ compiler command
   CXXFLAGS    C++ compiler flags
-  CPP         C preprocessor
+  CXXCPP      C++ preprocessor
   PKG_CONFIG  path to pkg-config utility
   PKG_CONFIG_PATH
               directories to add to pkg-config's search path
@@ -1493,21 +1556,21 @@
 
 } # ac_fn_c_try_compile
 
-# ac_fn_cxx_try_compile LINENO
-# ----------------------------
-# Try to compile conftest.$ac_ext, and return whether this succeeded.
-ac_fn_cxx_try_compile ()
+# ac_fn_c_try_link LINENO
+# -----------------------
+# Try to link conftest.$ac_ext, and return whether this succeeded.
+ac_fn_c_try_link ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  rm -f conftest.$ac_objext
-  if { { ac_try="$ac_compile"
+  rm -f conftest.$ac_objext conftest$ac_exeext
+  if { { ac_try="$ac_link"
 case "(($ac_try" in
   *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
   *) ac_try_echo=$ac_try;;
 esac
 eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
 $as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compile") 2>conftest.err
+  (eval "$ac_link") 2>conftest.err
   ac_status=$?
   if test -s conftest.err; then
     grep -v '^ *+' conftest.err >conftest.er1
@@ -1516,9 +1579,12 @@
   fi
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && {
-	 test -z "$ac_cxx_werror_flag" ||
+	 test -z "$ac_c_werror_flag" ||
 	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then :
+       } && test -s conftest$ac_exeext && {
+	 test "$cross_compiling" = yes ||
+	 test -x conftest$ac_exeext
+       }; then :

makemkv-oss-1.10.4.tar.xz/libabi/src/sys_linux.c -> makemkv-oss-1.10.5.tar.xz/libabi/src/sys_linux.c Changed

makemkv-oss-1.10.5.tar.xz/libdriveio/inc/driveio/scsihlp.h Added

@@ -0,0 +1,68 @@
+/*
+    libDriveIo - MMC drive interrogation library
+
+    Copyright (C) 2007-2016 GuinpinSoft inc <libdriveio@makemkv.com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+*/
+#include <driveio/scsicmd.h>
+#include <driveio/driveio.h>
+
+typedef struct _ScsiDriveInfo
+{
+    ScsiInquiryData inq;
+    char            firmware_date[15];
+    char            serial_number[33];
+} ScsiDriveInfo;
+
+typedef int (*QuerySpecificDriveInfoProc)(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType);
+
+namespace LibDriveIo
+{
+int ExecuteReadScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,void *Buffer,unsigned int BufferSize,ScsiCmdResponse* Response);
+int ExecuteReadScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,void *Buffer,unsigned int* BufferSize);
+int ExecuteWriteScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,const void *Buffer,unsigned int BufferSize,ScsiCmdResponse* Response);
+int ExecuteWriteScsiCommand(ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,const void *Buffer,unsigned int BufferSize);
+int TestUnitReady(ISimpleScsiTarget* ScsiTarget, bool* Ready);
+int BuildInquiryData(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiInquiryData *InquiryData);
+int BuildDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiDriveInfo *DriveInfo);
+int QueryInquiryInfo(ISimpleScsiTarget* ScsiTarget,uint8_t Evpd,uint8_t *Buffer,unsigned int *BufferSize);
+}
+using namespace LibDriveIo;
+
+
+static inline uint32_t uint32_get_be(const void *Buf)
+{
+    uint32_t v=0;
+
+    v |= (((uint32_t)(((uint8_t*)Buf)[0]))<<(3*8));
+    v |= (((uint32_t)(((uint8_t*)Buf)[1]))<<(2*8));
+    v |= (((uint32_t)(((uint8_t*)Buf)[2]))<<(1*8));
+    v |= (((uint32_t)(((uint8_t*)Buf)[3]))<<(0*8));
+
+    return v;
+}
+
+static inline uint16_t uint16_get_be(const void *Buf)
+{
+    uint16_t v=0;
+
+    v |= (((uint16_t)(((uint8_t*)Buf)[0]))<<(1*8));
+    v |= (((uint16_t)(((uint8_t*)Buf)[1]))<<(0*8));
+
+    return v;
+}
+

makemkv-oss-1.10.4.tar.xz/libdriveio/src/drives/drive.h -> makemkv-oss-1.10.5.tar.xz/libdriveio/src/drives/drive.h Changed

makemkv-oss-1.10.4.tar.xz/libdriveio/src/infolist.cpp -> makemkv-oss-1.10.5.tar.xz/libdriveio/src/infolist.cpp Changed

makemkv-oss-1.10.4.tar.xz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.10.5.tar.xz/libdriveio/src/scsihlp.cpp Changed

@@ -20,10 +20,9 @@
 */
 #include <stddef.h>
 #include <stdint.h>
-#include <driveio/scsicmd.h>
+#include <driveio/scsihlp.h>
 #include <errno.h>
 #include <string.h>
-#include "scsihlp.h"
 #include <unistd.h>
 
 static int ExecuteReadWriteScsiCommand(bool Read,ISimpleScsiTarget* ScsiTarget,const uint8_t* Cdb,unsigned int CdbLen,void *Buffer,unsigned int BufferSize,ScsiCmdResponse* Response)
@@ -34,7 +33,7 @@
 
     if (CdbLen>16)
     {
-        return EINVAL;
+        return -EINVAL;
     }
 
     memset(&cmd,0,sizeof(cmd));
@@ -70,7 +69,7 @@
         cmd.Cdb[11] = 0;
         break;
     default:
-        return EINVAL;
+        return -EINVAL;
     }
 
     if (Read)
@@ -104,7 +103,7 @@
 
     if (res.Status!=0)
     {
-        return EIO;
+        return -EIO;
     }
 
     *BufferSize = res.Transferred;
@@ -126,12 +125,12 @@
 
     if (res.Status!=0)
     {
-        return EIO;
+        return -EIO;
     }
 
     if (res.Transferred!=BufferSize)
     {
-        return EIO;
+        return -EIO;
     }
 
     return 0;
@@ -185,7 +184,6 @@
             return 0;
         }
 
-
         if ( (res.Status==2) &&
              (res.SenseData[0]==0x70) &&
              (res.SenseData[2]==2) &&
@@ -215,21 +213,21 @@
 }
 
 
-static void AddInquiryData(ScsiDriveInfo *DriveInfo,const uint8_t* Data)
+static void AddInquiryData(ScsiInquiryData *InquiryData,const uint8_t* Data)
 {
-    DriveInfo->inq.DeviceType = Data[0] & 0x1f;
+    InquiryData->DeviceType = Data[0] & 0x1f;
 
-    CopyPaddedString(DriveInfo->inq.Vendor,8,Data+8);
-    CopyPaddedString(DriveInfo->inq.Product,16,Data+16);
-    CopyPaddedString(DriveInfo->inq.Revision,4,Data+32);
+    CopyPaddedString(InquiryData->Vendor,8,Data+8);
+    CopyPaddedString(InquiryData->Product,16,Data+16);
+    CopyPaddedString(InquiryData->Revision,4,Data+32);
 
-    memset(DriveInfo->inq.VendorSpecificInfo,0,20);
+    memset(InquiryData->VendorSpecificInfo,0,20);
     unsigned int len = ((unsigned int)Data[4])+5;
     if (len>36)
     {
         len -= 36;
         if (len>20) len=20;
-        memcpy(DriveInfo->inq.VendorSpecificInfo,Data+36,len);
+        memcpy(InquiryData->VendorSpecificInfo,Data+36,len);
     }
 }
 
@@ -257,7 +255,7 @@
     cdb_rf[3]=(uint8_t)(Id>>0);
 
     len = BufferLen;
-    err=ExecuteReadScsiCommand(ScsiTarget,cdb_rf,10,Buffer,&len);
+    err=LibDriveIo::ExecuteReadScsiCommand(ScsiTarget,cdb_rf,10,Buffer,&len);
     if (err) return err;
 
     slen = uint32_get_be(Buffer) + 4;
@@ -313,7 +311,7 @@
                 //
                 memset(Buffer+len,0,slen-len);
             } else {
-                return ERANGE;
+                return -ERANGE;
             }
         }
     } else {
@@ -330,43 +328,42 @@
     return 0;
 }
 
-int LibDriveIo::BuildDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiDriveInfo *DriveInfo)
+int LibDriveIo::BuildInquiryData(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiInquiryData *InquiryData)
 {
     int err;
     uint8_t buf[256];
     unsigned int len;
     DriveInfoItem   item;
-    bool have;
 
     if (0==DriveInfoList_GetItemById(List,diid_InquiryData,&item))
     {
         // have drive info
-
-        AddInquiryData(DriveInfo,(const uint8_t*)item.Data);
-
-        if (0==DriveInfoList_GetItemById(List,diid_FeatureDescriptor_FirmwareInformation,&item))
-        {
-            AddFirmwareDate(DriveInfo,(const uint8_t*)item.Data);
-        } else {
-            DriveInfo->firmware_date[0]=0;
-        }
-
-        if (0==DriveInfoList_GetItemById(List,diid_FeatureDescriptor_DriveSerialNumber,&item))
-        {
-            AddSerialNumber(DriveInfo,(const uint8_t*)item.Data);
-        } else {
-            DriveInfo->serial_number[0]=0;
-        }
-
+        AddInquiryData(InquiryData,(const uint8_t*)item.Data);
     } else {
-
         // no drive info, query all data manually
-
         if (0!=(err=QueryInquiryInfo(ScsiTarget,0,buf,&len))) return err;
-        AddInquiryData(DriveInfo,buf);
+        AddInquiryData(InquiryData,buf);
 
-        if ((buf[0]&0x1f)!=5) return EBADF; // not a MMC drive
+        if ((buf[0]&0x1f)!=5) return -EBADF; // not a MMC drive
+    }
 
+    return 0;
+}
+
+int LibDriveIo::BuildDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,ScsiDriveInfo *DriveInfo)
+{
+    int err;
+    uint8_t buf[256];
+    DriveInfoItem   item;
+    bool have;
+
+    err=BuildInquiryData(ScsiTarget,List,&DriveInfo->inq);
+    if (err) return err;
+
+    if (0==DriveInfoList_GetItemById(List,diid_FeatureDescriptor_FirmwareInformation,&item))
+    {
+        AddFirmwareDate(DriveInfo,(const uint8_t*)item.Data);
+    } else {
         if (0!=(err=ReadSingleFeatureDescriptor(ScsiTarget,0x10c,buf,sizeof(buf),&have))) return err;
         if (have)
         {
@@ -374,7 +371,12 @@
         } else {
             DriveInfo->firmware_date[0]=0;
         }
+    }
 
+    if (0==DriveInfoList_GetItemById(List,diid_FeatureDescriptor_DriveSerialNumber,&item))
+    {
+        AddSerialNumber(DriveInfo,(const uint8_t*)item.Data);
+    } else {
         if (0!=(err=ReadSingleFeatureDescriptor(ScsiTarget,0x108,buf,sizeof(buf),&have))) return err;
         if (have)
         {
@@ -382,9 +384,7 @@
         } else {
             DriveInfo->serial_number[0]=0;
         }
-
     }
 
     return 0;
 }
-

makemkv-oss-1.10.4.tar.xz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.10.5.tar.xz/libdriveio/src/stdquery.cpp Changed

makemkv-oss-1.10.4.tar.xz/libmakemkv/src/libmkv.cpp -> makemkv-oss-1.10.5.tar.xz/libmakemkv/src/libmkv.cpp Changed

@@ -1016,16 +1016,10 @@
             fetch_frames = 1;
         }
 
-        if (false==stream->FetchFrames(fetch_frames,true))
-        {
-            throw mkv_error_exception("Error while reading input");
-        }
-
-        frames_count = stream->GetAvailableFramesCount();
-
+        frames_count = fetch_frames;
         if (frames_count>lacing_frames) frames_count=lacing_frames;
 
-        MKV_ASSERT(frames_count>0);
+        MKV_ASSERT(stream->GetAvailableFramesCount()>0);
 
         if (frames_count>1)
         {
@@ -1039,6 +1033,20 @@
         for (unsigned int i=1;i<frames_count;i++)
         {
             prev_frame = frame;
+
+            if (stream->GetAvailableFramesCount()<(i+1))
+            {
+                if (false==stream->FetchFrames(i+1,true))
+                {
+                    throw mkv_error_exception("Error while reading input");
+                }
+                if (stream->GetAvailableFramesCount()<(i+1))
+                {
+                    frames_count=i;
+                    break;
+                }
+            }
+
             frame=stream->PeekFrame(i);
             if ( (frame->keyframe()!=frame_keyframe) || frame->cluster_start() )
             {

makemkv-oss-1.10.4.tar.xz/makefile.common -> makemkv-oss-1.10.5.tar.xz/makefile.common Changed

@@ -1,5 +1,5 @@
 
-LIBDRIVEIO_INC=-Ilibdriveio/inc
+LIBDRIVEIO_INC=libdriveio/inc
 
 LIBDRIVEIO_SRC=libdriveio/src/infolist.cpp libdriveio/src/scsihlp.cpp libdriveio/src/srlist.cpp \
   libdriveio/src/stdquery.cpp libdriveio/src/tipclient.cpp libdriveio/src/tipcommon.cpp libdriveio/src/tipserver.cpp \
@@ -7,7 +7,7 @@
 
 LIBDRIVEIO_SRC_PUB=libdriveio/src/srlist.cpp
 
-LIBEBML_INC=-Ilibebml/inc
+LIBEBML_INC=libebml/inc
 
 LIBEBML_DEF=-DEBML_NO_READ -DEBML_STRICT_API -DEBML_DEBUG
 
@@ -17,7 +17,7 @@
   libebml/src/EbmlString.cpp libebml/src/EbmlSubHead.cpp libebml/src/EbmlUInteger.cpp libebml/src/EbmlUnicodeString.cpp \
   libebml/src/EbmlVersion.cpp libebml/src/EbmlVoid.cpp libebml/src/IOCallback.cpp libebml/src/MemIOCallback.cpp 
 
-LIBMATROSKA_INC=-Ilibmatroska/inc
+LIBMATROSKA_INC=libmatroska/inc
 
 LIBMATROSKA_SRC=libmatroska/src/FileKax.cpp libmatroska/src/KaxAttached.cpp libmatroska/src/KaxAttachments.cpp \
   libmatroska/src/KaxBlock.cpp libmatroska/src/KaxBlockData.cpp libmatroska/src/KaxCluster.cpp libmatroska/src/KaxContexts.cpp \
@@ -25,17 +25,17 @@
   libmatroska/src/KaxInfoData.cpp libmatroska/src/KaxSeekHead.cpp libmatroska/src/KaxSegment.cpp \
   libmatroska/src/KaxTracks.cpp libmatroska/src/KaxVersion.cpp libmatroska/src/KaxSemantic.cpp
 
-SSTRING_INC=-Isstring/inc
+SSTRING_INC=sstring/inc
 
 SSTRING_SRC=sstring/src/sstring.cpp
 
-LIBABI_INC=-Ilibabi/inc
+LIBABI_INC=libabi/inc
 
 LIBABI_SRC=libabi/src/ossl_aes.c libabi/src/ossl_sha.c libabi/src/ossl_ec.c libabi/src/zlib.c libabi/src/xpat.c libabi/src/libm.c
 
 LIBABI_SRC_LINUX=libabi/src/httplinux.cpp makemkvgui/src/api_linux.cpp libabi/src/sys_linux.c makemkvgui/src/spawn_posix.cpp
 
-LIBFFABI_INC=-Ilibffabi/inc
+LIBFFABI_INC=libffabi/inc
 
 LIBFFABI_SRC=libffabi/src/ffabi.c libffabi/src/mlp.c libffabi/src/log.c libffabi/src/audio_convert.c \
     libffabi/src/audio_mix.c libffabi/src/audio_mix_matrix.c
@@ -43,16 +43,16 @@
 LIBDCADEC_SRC=libffabi/src/dcadec/bitstream.cpp libffabi/src/dcadec/core_decoder.cpp libffabi/src/dcadec/dca_context.cpp \
     libffabi/src/dcadec/dmix_tables.cpp libffabi/src/dcadec/exss_parser.cpp libffabi/src/dcadec/idct_fixed.cpp \
     libffabi/src/dcadec/interpolator.cpp libffabi/src/dcadec/interpolator_fixed.cpp libffabi/src/dcadec/interpolator_float.cpp \
-    libffabi/src/dcadec/ta.cpp libffabi/src/dcadec/xll_decoder.cpp libffabi/src/dcadec/idct_float.cpp \
+    libffabi/src/dcadec/ta.cpp libffabi/src/dcadec/xll_decoder.cpp libffabi/src/dcadec/idct_float.cpp
 
 LIBDCADEC_DEF=-DDCA_LOG -DDCA_FFMALLOC
 
-LIBMAKEMKV_INC=-Ilibmakemkv/inc
+LIBMAKEMKV_INC=libmakemkv/inc
 
 LIBMAKEMKV_SRC=libmakemkv/src/ebmlwrite.cpp libmakemkv/src/libmkv.cpp libmakemkv/src/version.cpp libmakemkv/src/world.cpp \
     libmakemkv/src/stdstring.cpp
 
-MAKEMKVGUI_INC=-Imakemkvgui/inc
+MAKEMKVGUI_INC=makemkvgui/inc
 
 MAKEMKVGUI_SRC=makemkvgui/src/aboutbox.cpp makemkvgui/src/client.cpp makemkvgui/src/dirselectbox.cpp \
   makemkvgui/src/logic.cpp makemkvgui/src/logtext.cpp makemkvgui/src/main.cpp makemkvgui/src/nativefiledialog.cpp \
@@ -71,7 +71,7 @@
   makemkvgui/src/notify_linux.cpp makemkvgui/src/image_linux.cpp \
   tmp/image_data.o
 
-LIBMMBD_INC=-Ilibmmbd/inc
+LIBMMBD_INC=libmmbd/inc
 
 LIBMMBD_SRC=makemkvgui/src/client.cpp makemkvgui/src/marshall.cpp libmmbd/src/marmmbd.cpp libmmbd/src/nstring.cpp \
   libmmbd/src/mmbd.cpp libmmbd/src/mmconn.cpp libmmbd/src/mmbdipc.cpp libmmbd/src/utf8.cpp libmmbd/src/aacs.cpp \

makemkv-oss-1.10.4.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.10.5.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.10.4.tar.xz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.10.5.tar.xz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[21770]={
+static const unsigned short en_po_str[21792]={
 'e','n','g',':','E','n','g','l','i','s','h',0,
 'D','B','G',' ','A','S','S','E','R','T',':',' ','%','1',' ','a','t',' ','%','2',':','%','3',0,
 'L','I','B','M','K','V','_','T','R','A','C','E',':',' ','%','1',0,
@@ -49,6 +49,7 @@
 'U','n','a','b','l','e',' ','t','o',' ','o','p','e','n',' ','f','i','l','e',' ',0x27,'%','1',0x27,' ','i','n',' ','O','S',' ','m','o','d','e',' ','d','u','e',' ','t','o',' ','a',' ','b','u','g',' ','i','n',' ','O','S',' ','K','e','r','n','e','l','.',' ','T','h','i','s',' ','c','a','n',' ','b','e',' ','w','o','r','k','e','d',' ','a','r','o','u','n','d',',',' ','b','u','t',' ','r','e','a','d',' ','s','p','e','e','d',' ','m','a','y',' ','b','e',' ','v','e','r','y',' ','s','l','o','w','.',0,
 'F','a','i','l','e','d',' ','t','o',' ','a','l','l','o','c','a','t','e',' ','m','e','m','o','r','y',' ','f','o','r',' ','w','r','i','t','e',' ','c','a','c','h','e',',',' ','c','a','n',0x27,'t',' ','c','o','n','t','i','n','u','e','.',' ','P','l','e','a','s','e',' ','c','h','a','n','g','e',' ','r','e','a','d',' ','b','u','f','f','e','r',' ','s','i','z','e',' ','i','n',' ','p','r','e','f','e','r','e','n','c','e','s',' ','o','r',' ','c','l','o','s','e',' ','o','t','h','e','r',' ','a','p','p','l','i','c','a','t','i','o','n','s','.',0,
 'E','n','c','o','u','n','t','e','r','e','d',' ','%','1',' ','e','r','r','o','r','s',' ','o','f',' ','t','y','p','e',' ',0x27,'%','2',0x27,' ','-',' ','s','e','e',' ','%','3',0,
+'U','n','k','n','o','w','n',' ','d','e','v','i','c','e',' ','-',' ',0x27,'%','1',0x27,0,
 'U','n','s','p','e','c','i','f','i','e','d',' ','e','r','r','o','r',0,
 'O','p','e','r','a','t','i','o','n',' ','w','a','s',' ','c','a','n','c','e','l','l','e','d',0,
 'I','n','p','u','t',' ','p','a','r','a','m','e','t','e','r',' ','i','s',' ','i','n','c','o','r','r','e','c','t',0,
@@ -572,58 +573,58 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1113]={
+static const unsigned int en_po_off[1115]={
 1000,0,1001,12,1002,36,1003,53,1004,77,1005,124,1006,135,1007,136,1008,226,1009,275,1010,301,
 1011,320,1012,323,2001,329,2002,378,2003,464,2004,518,2006,586,2007,703,2008,858,2009,981,2010,1109,
 2011,1154,2012,1298,2013,1382,2014,1468,2015,1516,2016,1598,2017,1761,2018,1876,2019,1938,2020,1978,2021,2145,
-2022,2268,2023,2402,2200,2446,2201,2464,2202,2488,2203,2517,2204,2547,2205,2576,2206,2599,2207,2616,2208,2636,
-2209,2657,2210,2680,2211,2705,2300,2728,2301,2742,2302,2759,2303,2775,2304,2794,2400,2819,2401,2830,2402,2845,
-2404,2861,3000,2877,3001,2899,3002,2990,3003,3058,3004,3091,3005,3139,3006,3165,3007,3198,3008,3228,3009,3286,
-3010,3334,3011,3387,3012,3422,3013,3462,3014,3508,3015,3549,3016,3600,3017,3622,3018,3649,3019,3689,3020,3759,
-3021,3835,3022,3896,3023,3930,3024,4004,3025,4144,3026,4259,3027,4341,3028,4397,3029,4434,3030,4494,3031,4557,
-3032,4707,3033,4816,3034,4862,3035,4907,3036,4997,3037,5056,3038,5097,3039,5137,3040,5195,3041,5229,3042,5267,
-3043,5375,3100,5458,3101,5475,3102,5508,3103,5530,3104,5548,3105,5564,3106,5571,3107,5584,3108,5593,3109,5606,
-3110,5619,3111,5631,3200,5651,3201,5680,3202,5698,3203,5709,3204,5727,3210,5824,3220,5841,3221,5908,3300,5958,
-3301,6014,3302,6066,3303,6113,3304,6180,3305,6201,3306,6255,3307,6354,3308,6385,3309,6427,3310,6473,3311,6565,
-3312,6632,3313,6709,3314,6777,3315,6826,3316,6849,3317,6872,3318,6894,3319,6947,3320,7009,3321,7069,3322,7147,
-3323,7199,3324,7258,3325,7304,3326,7357,3327,7430,3328,7494,3329,7543,3330,7636,3331,7693,3332,7727,3333,7753,
-3334,7818,3335,8217,3336,8585,3337,8968,3338,9047,3339,9083,3340,9132,3341,9205,3342,9251,3343,9424,3344,9498,
-3345,9525,3400,9654,3401,9674,3402,9701,3403,9712,3404,9730,3405,9751,3406,9759,3407,9779,4001,9792,4002,9875,
-4003,9941,4004,10006,4007,10089,4008,10151,4009,10209,4020,10320,4021,10355,4022,10407,4023,10439,4024,10503,4025,10537,
-4026,10583,4027,10630,4028,10678,4040,10721,4041,10799,4042,10858,4043,10910,4044,11007,4045,11078,4046,11176,4047,11219,
-4048,11257,4049,11292,4050,11344,4051,11425,4052,11475,4053,11506,4054,11657,4055,11674,4060,11737,4061,11794,4062,11856,
-4500,11951,4501,12032,4502,12057,4503,12090,4504,12124,5000,12176,5001,12201,5002,12253,5003,12270,5004,12305,5005,12332,
-5006,12348,5007,12371,5008,12394,5009,12435,5010,12468,5011,12488,5012,12521,5013,12560,5014,12615,5015,12650,5016,12719,
-5017,12743,5018,12762,5019,12786,5020,12811,5021,12966,5022,13112,5024,13195,5025,13226,5026,13242,5027,13249,5028,13261,
-5029,13273,5030,13283,5031,13295,5033,13307,5036,13318,5037,13350,5038,13393,5039,13558,5040,13739,5041,13965,5042,14112,
-5043,14162,5044,14258,5045,14271,5046,14285,5047,14298,5048,14316,5049,14331,5050,14338,5051,14388,5052,14546,5053,14719,
-5054,14915,5055,14975,5056,15043,5057,15111,5058,15139,5060,15286,5061,15295,5062,15308,5063,15319,5064,15331,5065,15337,
-5066,15345,5067,15360,5068,15366,5069,15432,5070,15446,5071,15458,5072,15635,5073,15668,5074,15748,5075,15874,5076,15925,
-5077,15986,5078,16025,5079,16087,5080,16130,5081,16145,5082,16158,5083,16202,5084,16272,5085,16349,5086,16413,5087,16421,
-5088,16442,5089,16466,5090,16477,5091,16482,5092,16489,5093,16498,5094,16528,5100,16550,5201,16564,5202,16569,5203,16574,
-5204,16583,5207,16592,5208,16598,5209,16613,5210,16622,5214,16627,5215,16636,5216,16642,5217,16659,5218,16671,5219,16687,
-5220,16698,5221,16711,5222,16722,5223,16728,5224,16738,5225,16754,5226,16768,5227,16780,5228,16790,5233,16808,5234,16821,
-5235,16835,5238,16854,5239,16864,5240,16874,5248,16889,5249,16899,5250,16907,5301,16916,5302,16927,5303,16981,5304,17045,
-5305,17056,5306,17073,5307,17083,5380,17093,5381,17101,6000,17108,6001,17121,6002,17140,6003,17159,6005,17193,6006,17214,
-6007,17228,6008,17310,6010,17324,6011,17336,6012,17343,6013,17387,6014,17394,6015,17419,6016,17437,6017,17484,6018,17505,
-6019,17526,6020,17532,6021,17539,6022,17556,6023,17563,6024,17596,6026,17620,6030,17677,6031,17683,6032,17689,6034,17695,
-6035,17703,6036,17713,6037,17721,6038,17746,6039,17758,6040,17770,6041,17799,6042,17854,6043,17867,6044,17895,6045,17908,
-6046,17921,6047,17943,6048,17953,6050,17977,6051,18022,6052,18115,6053,18127,6054,18143,6055,18159,6056,18174,6057,18187,
-6058,18208,6059,18214,6060,18221,6061,18228,6062,18241,6063,18255,6064,18272,6065,18290,6066,18306,6067,18319,6068,18331,
-6069,18345,6070,18350,6071,18359,6072,18366,6073,18373,6074,18381,6075,18394,6076,18399,6077,18423,6078,18454,6079,18509,
-6080,18579,6081,18587,6082,18592,6083,18611,6084,18635,6085,18655,6086,18660,6087,18693,6088,18735,6089,18755,6090,18760,
-6091,18765,6092,18774,6093,18781,6094,18801,6095,18815,6096,18836,6097,18844,6098,18868,6099,18930,6100,18951,6101,18962,
-6102,18974,6103,18982,6104,18987,6105,19012,6106,19019,6107,19044,6108,19065,6109,19106,6110,19123,6111,19134,6112,19151,
-6119,19165,6120,19195,6121,19224,6122,19253,6123,19287,6124,19318,6125,19350,6126,19370,6127,19400,6128,19428,6129,19450,
-6130,19464,6131,19490,6132,19498,6133,19521,6134,19532,6135,19544,6136,19564,6137,19584,6138,19596,6139,19861,6142,19893,
-6143,19916,6144,19927,6145,19944,6146,19954,6147,19979,6148,19987,6149,20007,6150,20049,6151,20073,6152,20113,6153,20122,
-6154,20143,6156,20164,6157,20169,6158,20174,6159,20200,6161,20213,6162,20227,6163,20253,6164,20271,6165,20274,6166,20284,
-6167,20295,6168,20318,6169,20346,6170,20360,6171,20395,6172,20428,6173,20437,6174,20455,6175,20480,6176,20496,6177,20523,
-6180,20555,6181,20563,6200,20574,6201,20580,6202,20586,6203,20592,6204,20602,6205,20607,6206,20619,6207,20628,6209,20642,
-6210,20655,6211,20666,6212,20681,6213,20693,6214,20702,6215,20713,6216,20722,6220,20730,6221,20754,6222,20767,6223,20778,
-6224,20788,6225,20801,6226,21170,6227,21188,6228,21289,6229,21300,6300,21317,6301,21346,6302,21364,6303,21379,6304,21389,
-6305,21400,6306,21416,6307,21435,6308,21451,6309,21474,6320,21497,6321,21529,6322,21561,6323,21586,6324,21602,6325,21614,
-6326,21626,6327,21646,6329,21665,6330,21686,6331,21719,6332,21752,0};
+2022,2268,2023,2402,2024,2446,2200,2468,2201,2486,2202,2510,2203,2539,2204,2569,2205,2598,2206,2621,2207,2638,
+2208,2658,2209,2679,2210,2702,2211,2727,2300,2750,2301,2764,2302,2781,2303,2797,2304,2816,2400,2841,2401,2852,
+2402,2867,2404,2883,3000,2899,3001,2921,3002,3012,3003,3080,3004,3113,3005,3161,3006,3187,3007,3220,3008,3250,
+3009,3308,3010,3356,3011,3409,3012,3444,3013,3484,3014,3530,3015,3571,3016,3622,3017,3644,3018,3671,3019,3711,
+3020,3781,3021,3857,3022,3918,3023,3952,3024,4026,3025,4166,3026,4281,3027,4363,3028,4419,3029,4456,3030,4516,
+3031,4579,3032,4729,3033,4838,3034,4884,3035,4929,3036,5019,3037,5078,3038,5119,3039,5159,3040,5217,3041,5251,
+3042,5289,3043,5397,3100,5480,3101,5497,3102,5530,3103,5552,3104,5570,3105,5586,3106,5593,3107,5606,3108,5615,
+3109,5628,3110,5641,3111,5653,3200,5673,3201,5702,3202,5720,3203,5731,3204,5749,3210,5846,3220,5863,3221,5930,
+3300,5980,3301,6036,3302,6088,3303,6135,3304,6202,3305,6223,3306,6277,3307,6376,3308,6407,3309,6449,3310,6495,
+3311,6587,3312,6654,3313,6731,3314,6799,3315,6848,3316,6871,3317,6894,3318,6916,3319,6969,3320,7031,3321,7091,
+3322,7169,3323,7221,3324,7280,3325,7326,3326,7379,3327,7452,3328,7516,3329,7565,3330,7658,3331,7715,3332,7749,
+3333,7775,3334,7840,3335,8239,3336,8607,3337,8990,3338,9069,3339,9105,3340,9154,3341,9227,3342,9273,3343,9446,
+3344,9520,3345,9547,3400,9676,3401,9696,3402,9723,3403,9734,3404,9752,3405,9773,3406,9781,3407,9801,4001,9814,
+4002,9897,4003,9963,4004,10028,4007,10111,4008,10173,4009,10231,4020,10342,4021,10377,4022,10429,4023,10461,4024,10525,
+4025,10559,4026,10605,4027,10652,4028,10700,4040,10743,4041,10821,4042,10880,4043,10932,4044,11029,4045,11100,4046,11198,
+4047,11241,4048,11279,4049,11314,4050,11366,4051,11447,4052,11497,4053,11528,4054,11679,4055,11696,4060,11759,4061,11816,
+4062,11878,4500,11973,4501,12054,4502,12079,4503,12112,4504,12146,5000,12198,5001,12223,5002,12275,5003,12292,5004,12327,
+5005,12354,5006,12370,5007,12393,5008,12416,5009,12457,5010,12490,5011,12510,5012,12543,5013,12582,5014,12637,5015,12672,
+5016,12741,5017,12765,5018,12784,5019,12808,5020,12833,5021,12988,5022,13134,5024,13217,5025,13248,5026,13264,5027,13271,
+5028,13283,5029,13295,5030,13305,5031,13317,5033,13329,5036,13340,5037,13372,5038,13415,5039,13580,5040,13761,5041,13987,
+5042,14134,5043,14184,5044,14280,5045,14293,5046,14307,5047,14320,5048,14338,5049,14353,5050,14360,5051,14410,5052,14568,
+5053,14741,5054,14937,5055,14997,5056,15065,5057,15133,5058,15161,5060,15308,5061,15317,5062,15330,5063,15341,5064,15353,
+5065,15359,5066,15367,5067,15382,5068,15388,5069,15454,5070,15468,5071,15480,5072,15657,5073,15690,5074,15770,5075,15896,
+5076,15947,5077,16008,5078,16047,5079,16109,5080,16152,5081,16167,5082,16180,5083,16224,5084,16294,5085,16371,5086,16435,
+5087,16443,5088,16464,5089,16488,5090,16499,5091,16504,5092,16511,5093,16520,5094,16550,5100,16572,5201,16586,5202,16591,
+5203,16596,5204,16605,5207,16614,5208,16620,5209,16635,5210,16644,5214,16649,5215,16658,5216,16664,5217,16681,5218,16693,
+5219,16709,5220,16720,5221,16733,5222,16744,5223,16750,5224,16760,5225,16776,5226,16790,5227,16802,5228,16812,5233,16830,
+5234,16843,5235,16857,5238,16876,5239,16886,5240,16896,5248,16911,5249,16921,5250,16929,5301,16938,5302,16949,5303,17003,
+5304,17067,5305,17078,5306,17095,5307,17105,5380,17115,5381,17123,6000,17130,6001,17143,6002,17162,6003,17181,6005,17215,
+6006,17236,6007,17250,6008,17332,6010,17346,6011,17358,6012,17365,6013,17409,6014,17416,6015,17441,6016,17459,6017,17506,
+6018,17527,6019,17548,6020,17554,6021,17561,6022,17578,6023,17585,6024,17618,6026,17642,6030,17699,6031,17705,6032,17711,
+6034,17717,6035,17725,6036,17735,6037,17743,6038,17768,6039,17780,6040,17792,6041,17821,6042,17876,6043,17889,6044,17917,
+6045,17930,6046,17943,6047,17965,6048,17975,6050,17999,6051,18044,6052,18137,6053,18149,6054,18165,6055,18181,6056,18196,
+6057,18209,6058,18230,6059,18236,6060,18243,6061,18250,6062,18263,6063,18277,6064,18294,6065,18312,6066,18328,6067,18341,
+6068,18353,6069,18367,6070,18372,6071,18381,6072,18388,6073,18395,6074,18403,6075,18416,6076,18421,6077,18445,6078,18476,
+6079,18531,6080,18601,6081,18609,6082,18614,6083,18633,6084,18657,6085,18677,6086,18682,6087,18715,6088,18757,6089,18777,
+6090,18782,6091,18787,6092,18796,6093,18803,6094,18823,6095,18837,6096,18858,6097,18866,6098,18890,6099,18952,6100,18973,
+6101,18984,6102,18996,6103,19004,6104,19009,6105,19034,6106,19041,6107,19066,6108,19087,6109,19128,6110,19145,6111,19156,
+6112,19173,6119,19187,6120,19217,6121,19246,6122,19275,6123,19309,6124,19340,6125,19372,6126,19392,6127,19422,6128,19450,
+6129,19472,6130,19486,6131,19512,6132,19520,6133,19543,6134,19554,6135,19566,6136,19586,6137,19606,6138,19618,6139,19883,
+6142,19915,6143,19938,6144,19949,6145,19966,6146,19976,6147,20001,6148,20009,6149,20029,6150,20071,6151,20095,6152,20135,
+6153,20144,6154,20165,6156,20186,6157,20191,6158,20196,6159,20222,6161,20235,6162,20249,6163,20275,6164,20293,6165,20296,
+6166,20306,6167,20317,6168,20340,6169,20368,6170,20382,6171,20417,6172,20450,6173,20459,6174,20477,6175,20502,6176,20518,
+6177,20545,6180,20577,6181,20585,6200,20596,6201,20602,6202,20608,6203,20614,6204,20624,6205,20629,6206,20641,6207,20650,
+6209,20664,6210,20677,6211,20688,6212,20703,6213,20715,6214,20724,6215,20735,6216,20744,6220,20752,6221,20776,6222,20789,
+6223,20800,6224,20810,6225,20823,6226,21192,6227,21210,6228,21311,6229,21322,6300,21339,6301,21368,6302,21386,6303,21401,
+6304,21411,6305,21422,6306,21438,6307,21457,6308,21473,6309,21496,6320,21519,6321,21551,6322,21583,6323,21608,6324,21624,
+6325,21636,6326,21648,6327,21668,6329,21687,6330,21708,6331,21741,6332,21774,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {