Packman Build Service PMBS

makemkv.changes Changed

makemkv.spec Changed

makemkv-bin-1.14.4.tar.xz/bin/amd64/makemkvcon -> makemkv-bin-1.14.5.tar.xz/bin/amd64/makemkvcon Changed

makemkv-bin-1.14.4.tar.xz/bin/i386/makemkvcon -> makemkv-bin-1.14.5.tar.xz/bin/i386/makemkvcon Changed

makemkv-bin-1.14.4.tar.xz/src/share/appdata.tar -> makemkv-bin-1.14.5.tar.xz/src/share/appdata.tar Changed

makemkv-bin-1.14.4.tar.xz/src/share/blues.jar -> makemkv-bin-1.14.5.tar.xz/src/share/blues.jar Changed

makemkv-oss-1.14.4.tar.xz/libdriveio/src/drives Deleted

makemkv-oss-1.14.4.tar.xz/libdriveio/src/drives/drive.h Deleted

@@ -1,26 +0,0 @@
-/*
-    libDriveIo - MMC drive interrogation library
-
-    Copyright (C) 2007-2019 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 <stddef.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-#include <driveio/scsihlp.h>

makemkv-oss-1.14.4.tar.xz/libdriveio/src/drives/pioneer.cpp Deleted

@@ -1,262 +0,0 @@
-/*
-    libDriveIo - MMC drive interrogation library
-
-    Copyright (C) 2007-2019 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 "drive.h"
-
-static int ReadDriveMemory(ISimpleScsiTarget* ScsiTarget,uint32_t Address,uint32_t Size,void* Buffer,bool *Ok)
-{
-    int err;
-    ScsiCmd cmd;
-    ScsiCmdResponse res;
-
-    if ( (Size>0xffffff) || (Address>0xffffff) )
-    {
-        return EINVAL;
-    }
-
-    memset(&cmd,0,sizeof(cmd));
-    cmd.CdbLen=10;
-    cmd.Cdb[0]=0x3c;
-    cmd.Cdb[1]=1;
-    cmd.Cdb[2]=0x81;
-    cmd.Cdb[3]=(uint8_t)(Address>>(2*8));
-    cmd.Cdb[4]=(uint8_t)(Address>>(1*8));
-    cmd.Cdb[5]=(uint8_t)(Address>>(0*8));
-    cmd.Cdb[6]=(uint8_t)(Size>>(2*8));
-    cmd.Cdb[7]=(uint8_t)(Size>>(1*8));
-    cmd.Cdb[8]=(uint8_t)(Size>>(0*8));
-
-    cmd.OutputBuffer=Buffer;
-    cmd.OutputLen=Size;
-    cmd.Timeout=30;
-
-    if (0!=(err=ScsiTarget->Exec(&cmd,&res))) return err;
-
-    if ( (res.Status!=0) || (res.Transferred!=Size) )
-    {
-        *Ok = false;
-    } else {
-        *Ok = true;
-    }
-
-    return 0;
-}
-
-static void append_trimmed(char *str,const char *src,size_t len)
-{
-    char *dst = str+strlen(str);
-    for (size_t i=0;i<len;i++)
-    {
-        char c;
-        c = src[i];
-        if ( (c==0) || (c==' ') )
-        {
-            dst[i]=0;
-            return;
-        }
-        dst[i]=c;
-    }
-    dst[len]=0;
-}
-
-//
-// Drive info
-//
-static int QueryDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,const char *FwDate)
-{
-    int err;
-    DriveInfoItem item;
-    ScsiCmdResponse res;
-    uint8_t data_buf[0x40];
-    bool ok;
-
-    //
-    // Firmware date, emulate firmware information page
-    //
-    if (0!=DriveInfoList_GetItemById(List,diid_FeatureDescriptor_FirmwareInformation,&item))
-    {
-        uint8_t fwbuf[20];
-
-        memset(fwbuf,0,sizeof(fwbuf));
-
-        fwbuf[0]=0x01;
-        fwbuf[1]=0x0c;
-        fwbuf[3]=0x10;
-
-        memcpy(fwbuf+4,"20",2);
-        memcpy(fwbuf+6,FwDate+0,2);
-        memcpy(fwbuf+8,FwDate+3,2);
-        memcpy(fwbuf+10,FwDate+6,2);
-        memset(fwbuf+12,'0',6);
-
-        if (0!=DriveInfoList_AddItem(List,diid_FeatureDescriptor_FirmwareInformation,fwbuf,20)) return ENOMEM;
-    }
-
-    //
-    // Pioneer-specific info
-    //
-    static const uint8_t readinfo_cdb[10]={0x3c,2,0xf1,0,0,0,0,0,0x30,0};
-    if (0!=(err=ExecuteReadScsiCommand(ScsiTarget,readinfo_cdb,10,data_buf,0x30,&res))) return err;
-    if (res.Status!=0)
-    {
-        // Seems that this is not a PIONEER drive after all, bail
-        return 0;
-    }
-    if (0!=DriveInfoList_AddItem(List,diid_FirmwareVendorSpecificInfo,data_buf,0x30)) return ENOMEM;
-
-    //
-    // Firmware architecture
-    //
-    for (unsigned int i=0;i<3;i++)
-    {
-        memset(data_buf,0x55,sizeof(data_buf));
-        if (0!=(err=ReadDriveMemory(ScsiTarget,0x1000,0x40,data_buf,&ok))) return err;
-        if (ok)
-        {
-            if (0==memcmp(data_buf,"PIONEER ",8))
-            {
-                data_buf[0x40-1]=0;
-                if (0!=DriveInfoList_AddItem(List,diid_FirmwarePlatform,data_buf,strlen((char*)data_buf)+1)) return ENOMEM;
-                break;
-            }
-        }
-    }
-
-
-    //
-    // At last, firmware description string
-    //
-    if (0==DriveInfoList_GetItemById(List,diid_FirmwareVendorSpecificInfo,&item))
-    {
-        //
-        // Construct serial if missing
-        //
-        DriveInfoItem   serial_item;
-        if (0==DriveInfoList_GetItemById(List,diid_FeatureDescriptor_DriveSerialNumber,&serial_item))
-        {
-            uint8_t buf_serial[20];
-            buf_serial[0]=0x01;
-            buf_serial[1]=0x08;
-            buf_serial[2]=0x00;
-            buf_serial[3]=0x10;
-            memcpy(buf_serial+4,item.Data,16);
-            if (0!=DriveInfoList_AddItem(List,diid_FeatureDescriptor_DriveSerialNumber,buf_serial,20)) return ENOMEM;
-        }
-
-        char fw_str[128+0x40];
-        strcpy(fw_str,"intf=");
-        append_trimmed(fw_str,((const char*)item.Data)+0x10,4);
-        strcat(fw_str," gen=");
-        append_trimmed(fw_str,((const char*)item.Data)+0x14,4);
-        strcat(fw_str," krnl=");
-        append_trimmed(fw_str,((const char*)item.Data)+0x18,4);
-        strcat(fw_str," main=");
-        append_trimmed(fw_str,((const char*)item.Data)+0x20,4);
-        strcat(fw_str," ver=");
-        append_trimmed(fw_str,((const char*)item.Data)+0x28,8);
-
-        DriveInfoItem   platform_item;
-        if (0==DriveInfoList_GetItemById(List,diid_FirmwarePlatform,&platform_item))
-        {
-            strcat(fw_str," plat=");
-            strcat(fw_str,((const char*)platform_item.Data));
-        }
-        if (0!=DriveInfoList_AddItem(List,diid_FirmwareDetailsString,fw_str,strlen((char*)fw_str)+1)) return ENOMEM;
-    }
-
-    return 0;
-}
-
-//
-// Total drive info (may be big!)
-//
-static int QueryTotalDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List)
-{
-    int err;
-    DriveInfoItem pioneer_info_item;
-    uint32_t firmware_size;
-    uint8_t data_buf[0x40000];
-    bool ok;
-
-    if (0!=DriveInfoList_GetItemById(List,diid_FirmwareVendorSpecificInfo,&pioneer_info_item))
-    {
-        return 0;
-    }
-
-    //
-    // Firmware image
-    //
-    firmware_size = 0x20000;
-    // todo get size based on platform
-    if (firmware_size>sizeof(data_buf)) firmware_size=sizeof(data_buf);
-
-    ok=true;
-    static const uint32_t block_size=64;
-    for (uint32_t offset=0;offset!=firmware_size;offset+=block_size)
-    {
-        if (0!=(err=ReadDriveMemory(ScsiTarget,offset,block_size,data_buf+offset,&ok))) return err;
-        if (false==ok)
-        {
-            break;
-        }
-    }
-    if (ok)
-    {
-        if (0!=DriveInfoList_AddItem(List,diid_FirmwareFlashImage,data_buf,firmware_size)) return ENOMEM;
-    }
-
-    return 0;
-}
-
-
-
-
-int SpecInfo_PIONEER(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType)
-{
-    int err;
-    const uint8_t* vendor_info = DriveInfo->inq.VendorSpecificInfo;
-
-    if ( (0==memcmp(vendor_info+9,"  PIONEER  ",11)) &&
-         (vendor_info[0]==' ') &&
-         (vendor_info[3]=='/') &&
-         (vendor_info[6]=='/')
-       )
-    {
-        // pioneer drive indeed, continue
-    } else {
-        return 0;
-    }
-
-    switch(QueryType)
-    {
-    case diq_QueryDriveInfo:
-        err=QueryDriveInfo(ScsiTarget,List,(const char*)vendor_info+1);
-        break;
-    case diq_QueryTotalDriveInfo:
-        err=QueryTotalDriveInfo(ScsiTarget,List);
-        break;
-    default:
-        err = 0;
-        break;
-    }
-
-    return err;
-}
-

makemkv-oss-1.14.4.tar.xz/libdriveio/src/drives/xboxhddvd.cpp Deleted

@@ -1,108 +0,0 @@
-/*
-    libDriveIo - MMC drive interrogation library
-
-    Copyright (C) 2007-2019 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 "drive.h"
-
-static int cmd_df_enable(ISimpleScsiTarget* ScsiTarget)
-{
-    static const uint8_t cdb_switch_df[12]={0x1D, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
-    static const uint8_t subcmd_enable[8]={0x88, 0x00, 0x00, 0x04, 0x02, 0x6F, 0x01, 0x00};
-
-    return ExecuteWriteScsiCommand(ScsiTarget,cdb_switch_df,12,subcmd_enable,8);
-}
-
-static int cmd_df_write_word(ISimpleScsiTarget* ScsiTarget,uint32_t Address,uint16_t Value)
-{
-    ScsiCmd cmd;
-    ScsiCmdResponse res;
-    memset(&cmd,0,sizeof(cmd));
-
-    uint32_t end = Address+1;
-
-    cmd.Cdb[0]=0xdf;
-    cmd.Cdb[2]=0xe3;
-
-    cmd.Cdb[4]=(Address>>16)&0xff;
-    cmd.Cdb[5]=(Address>>8)&0xff;
-    cmd.Cdb[6]=(Address>>0)&0xff;
-
-    cmd.Cdb[7]=(end>>16)&0xff;
-    cmd.Cdb[8]=(end>>8)&0xff;
-    cmd.Cdb[9]=(end>>0)&0xff;
-
-    cmd.Cdb[10]=(Value>>8)&0xff;
-    cmd.Cdb[11]=(Value>>0)&0xff;
-
-    cmd.CdbLen = 12;
-    cmd.Timeout=10;
-
-    int err;
-
-    if (0!=(err=ScsiTarget->Exec(&cmd,&res))) return err;
-    if (res.Status!=0) return -1;
-
-    return 0;
-}
-
-static bool read_vid(ISimpleScsiTarget* ScsiTarget,uint8_t* vid)
-{
-    if (0!=cmd_df_enable(ScsiTarget)) return false;
-
-    static const uint32_t AGID_DATA_OFFSET=0x60C1C8;
-
-    if (0!=cmd_df_write_word(ScsiTarget,AGID_DATA_OFFSET+0,0x0000)) return false;
-    if (0!=cmd_df_write_word(ScsiTarget,AGID_DATA_OFFSET+2,0x0005)) return false;
-    if (0!=cmd_df_write_word(ScsiTarget,AGID_DATA_OFFSET+4,0x0000)) return false;
-    if (0!=cmd_df_write_word(ScsiTarget,AGID_DATA_OFFSET+6,0x0001)) return false;
-
-    // read structure
-    static const uint8_t cdb_read_vid[12]={0xAD, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x00, 0x24, 0x00, 0x00};
-    uint8_t vid_data[0x24];
-    unsigned int data_size=0x24;
-    if (0!=ExecuteReadScsiCommand(ScsiTarget,cdb_read_vid,12,vid_data,&data_size)) return false;
-    if (data_size!=0x24) return false;
-    if (vid_data[0]!=0x00) return false;
-    if (vid_data[1]!=0x22) return false;
-
-    memcpy(vid,vid_data+4,16);
-    return true;
-}
-
-
-
-int SpecInfo_XBOXHDDVD(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType)
-{
-    if (0!=strcmp(DriveInfo->inq.Vendor,"TOSHIBA")) return 0;
-    if (0!=strcmp(DriveInfo->inq.Product,"DVD/HD  X807616")) return 0;
-
-
-    if (QueryType==diq_QueryDiscInfo)
-    {
-        uint8_t vid[16];
-        if (true==read_vid(ScsiTarget,vid))
-        {
-            if (DriveInfoList_AddItem(List, diid_Aacs_VID,vid,16)) return ENOMEM;
-        }
-    }
-
-    return 0;
-}
-
-

makemkv-oss-1.14.4.tar.xz/libdriveio/inc/driveio/driveio.h -> makemkv-oss-1.14.5.tar.xz/libdriveio/inc/driveio/driveio.h Changed

@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include "scsicmd.h"
 
-#define LIBDRIVEIO_VERSION "1.03"
+#define LIBDRIVEIO_VERSION "2.01"
 
 //
 // All values in enums below are fixed, new values may be added
@@ -100,11 +100,7 @@
     diq_QueryAllInfo=0,
     diq_QueryDriveInfo=1,
     diq_QueryDiscInfo=2,
-    diq_QueryTotalDriveInfo=3,
-
-    // perform action
-    dia_UnlockMediaAccess=100,
-
+    diq_obsolette_3=3,
     diq_MaxValue
 } DriveIoQueryType_enum;
 
@@ -118,6 +114,27 @@
     size_t          Size;
 } DriveInfoItem;
 
+typedef struct _ScsiInquiryData
+{
+    uint8_t     DeviceType;
+    char        Vendor[9];
+    char        Product[17];
+    char        Revision[5];
+    uint8_t     VendorSpecificInfo[20];
+} ScsiInquiryData;
+
+typedef struct _ScsiDriveInfo
+{
+    ScsiInquiryData InquiryData;
+    char            FirmwareDate[15];
+    char            SerialNumber[33];
+} ScsiDriveInfo;
+
+typedef struct _ScsiDriveId
+{
+    char        IdString[128];
+} ScsiDriveId;
+
 //
 // Opaque types
 //
@@ -166,6 +183,12 @@
 //
 int             DIO_CDECL   DriveIoQuery(DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DriveIoQueryType QueryType,DIO_INFOLIST* InfoList);
 
+//
+// Utility
+//
+int             DIO_CDECL   DriveIoGetInquiryData(ScsiInquiryData *InquiryData,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DIO_INFOLIST InfoList);
+int             DIO_CDECL   DriveIoGetDriveInfo(ScsiDriveInfo *DriveInfo,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DIO_INFOLIST InfoList);
+int             DIO_CDECL   DriveIoGetDriveId(ScsiDriveId *DriveId,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DIO_INFOLIST InfoList);
 
 //
 // TIPS - Trivial IP SCSI tunneling.

makemkv-oss-1.14.4.tar.xz/libdriveio/inc/driveio/error.h -> makemkv-oss-1.14.5.tar.xz/libdriveio/inc/driveio/error.h Changed

makemkv-oss-1.14.4.tar.xz/libdriveio/inc/driveio/scsicmd.h -> makemkv-oss-1.14.5.tar.xz/libdriveio/inc/driveio/scsicmd.h Changed

makemkv-oss-1.14.4.tar.xz/libdriveio/inc/driveio/scsihlp.h -> makemkv-oss-1.14.5.tar.xz/libdriveio/inc/driveio/scsihlp.h Changed

@@ -21,17 +21,9 @@
 #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);
@@ -40,9 +32,7 @@
 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;
-
+void BuildDriveId(ScsiDriveId* DriveId,const ScsiDriveInfo *DriveInfo);
 
 static inline uint32_t uint32_get_be(const void *Buf)
 {
@@ -80,3 +70,5 @@
     ((uint8_t*)Buf)[1] = (uint8_t)(Value>>(0*8));
 }
 
+}
+using namespace LibDriveIo;

makemkv-oss-1.14.4.tar.xz/libdriveio/src/infolist.cpp -> makemkv-oss-1.14.5.tar.xz/libdriveio/src/infolist.cpp Changed

makemkv-oss-1.14.4.tar.xz/libdriveio/src/libdriveio.def -> makemkv-oss-1.14.5.tar.xz/libdriveio/src/libdriveio.def Changed

makemkv-oss-1.14.4.tar.xz/libdriveio/src/libdriveio.vers -> makemkv-oss-1.14.5.tar.xz/libdriveio/src/libdriveio.vers Changed

makemkv-oss-1.14.4.tar.xz/libdriveio/src/scsihlp.cpp -> makemkv-oss-1.14.5.tar.xz/libdriveio/src/scsihlp.cpp Changed

@@ -21,7 +21,7 @@
 #include <stddef.h>
 #include <stdint.h>
 #include <driveio/scsihlp.h>
-#include <errno.h>
+#include <driveio/error.h>
 #include <string.h>
 #include <unistd.h>
 
@@ -33,7 +33,7 @@
 
     if (CdbLen>16)
     {
-        return -EINVAL;
+        return DRIVEIO_ERROR_INVALID_ARG;
     }
 
     memset(&cmd,0,sizeof(cmd));
@@ -69,7 +69,7 @@
         cmd.Cdb[11] = 0;
         break;
     default:
-        return -EINVAL;
+        return DRIVEIO_ERROR_INVALID_ARG;
     }
 
     if (Read)
@@ -103,7 +103,7 @@
 
     if (res.Status!=0)
     {
-        return -EIO;
+        return DRIVEIO_ERR_SCSI_STATUS(res.Status);
     }
 
     *BufferSize = res.Transferred;
@@ -125,12 +125,12 @@
 
     if (res.Status!=0)
     {
-        return -EIO;
+        return DRIVEIO_ERR_SCSI_STATUS(res.Status);
     }
 
     if (res.Transferred!=BufferSize)
     {
-        return -EIO;
+        return DRIVEIO_ERROR_BAD_DATA;
     }
 
     return 0;
@@ -212,7 +212,6 @@
     dst[i]=0;
 }
 
-
 static void AddInquiryData(ScsiInquiryData *InquiryData,const uint8_t* Data)
 {
     InquiryData->DeviceType = Data[0] & 0x1f;
@@ -233,14 +232,14 @@
 
 static void AddFirmwareDate(ScsiDriveInfo *DriveInfo,const uint8_t* Data)
 {
-    CopyPaddedString(DriveInfo->firmware_date,14,Data+4);
+    CopyPaddedString(DriveInfo->FirmwareDate,14,Data+4);
 }
 
 static void AddSerialNumber(ScsiDriveInfo *DriveInfo,const uint8_t* Data)
 {
     unsigned int len = Data[3];
     if (len>32) len = 32;
-    CopyPaddedString(DriveInfo->serial_number,len,Data+4);
+    CopyPaddedString(DriveInfo->SerialNumber,len,Data+4);
 }
 
 static int ReadSingleFeatureDescriptor(ISimpleScsiTarget* ScsiTarget,uint16_t Id,uint8_t *Buffer,unsigned int BufferLen,bool* Have)
@@ -299,7 +298,7 @@
 
     if (Evpd==0)
     {
-        if (res.Status!=0) return EIO;
+        if (res.Status!=0) return DRIVEIO_ERR_SCSI_STATUS(res.Status);
         slen = ((unsigned int)Buffer[4])+5;
         if (slen>len)
         {
@@ -311,7 +310,7 @@
                 //
                 memset(Buffer+len,0,slen-len);
             } else {
-                return -ERANGE;
+                return DRIVEIO_ERROR_BAD_DATA;
             }
         }
     } else {
@@ -344,7 +343,7 @@
         if (0!=(err=QueryInquiryInfo(ScsiTarget,0,buf,&len))) return err;
         AddInquiryData(InquiryData,buf);
 
-        if ((buf[0]&0x1f)!=5) return -EBADF; // not a MMC drive
+        if ((buf[0]&0x1f)!=5) return DRIVEIO_ERROR_BAD_DATA; // not a MMC drive
     }
 
     return 0;
@@ -357,7 +356,7 @@
     DriveInfoItem   item;
     bool have;
 
-    err=BuildInquiryData(ScsiTarget,List,&DriveInfo->inq);
+    err=BuildInquiryData(ScsiTarget,List,&DriveInfo->InquiryData);
     if (err) return err;
 
     if (0==DriveInfoList_GetItemById(List,diid_FeatureDescriptor_FirmwareInformation,&item))
@@ -369,7 +368,7 @@
         {
             AddFirmwareDate(DriveInfo,buf+8);
         } else {
-            DriveInfo->firmware_date[0]=0;
+            DriveInfo->FirmwareDate[0]=0;
         }
     }
 
@@ -382,9 +381,52 @@
         {
             AddSerialNumber(DriveInfo,buf+8);
         } else {
-            DriveInfo->serial_number[0]=0;
+            DriveInfo->SerialNumber[0]=0;
         }
     }
 
     return 0;
 }
+
+static char* AppendStr(char* dst,const char* src)
+{
+    const uint8_t* p = (const uint8_t*)src;
+    while (*p!=0)
+    {
+        uint8_t c;
+
+        c = *p; p++;
+
+        if ((c>0x7e) || (c<0x20)) continue;
+
+        if (c==0x20) c='_';
+
+        *dst = c; dst++;
+    }
+
+    return dst;
+}
+
+void LibDriveIo::BuildDriveId(ScsiDriveId* DriveId,const ScsiDriveInfo *DriveInfo)
+{
+    char* dst = DriveId->IdString;
+
+    dst = AppendStr(dst,DriveInfo->InquiryData.Vendor);
+    *dst='_'; dst++;
+    dst = AppendStr(dst,DriveInfo->InquiryData.Product);
+    *dst='_'; dst++;
+    dst = AppendStr(dst,DriveInfo->InquiryData.Revision);
+    if (DriveInfo->FirmwareDate[0]!=0)
+    {
+        *dst='_'; dst++;
+        dst = AppendStr(dst,DriveInfo->FirmwareDate);
+    }
+    if (DriveInfo->SerialNumber[0]!=0)
+    {
+        *dst='_'; dst++;
+        dst = AppendStr(dst,DriveInfo->SerialNumber);
+    }
+
+    *dst = 0;
+}
+

makemkv-oss-1.14.4.tar.xz/libdriveio/src/stdquery.cpp -> makemkv-oss-1.14.5.tar.xz/libdriveio/src/stdquery.cpp Changed

@@ -23,46 +23,14 @@
 #include <driveio/scsicmd.h>
 #include <driveio/driveio.h>
 #include <driveio/scsihlp.h>
+#include <driveio/error.h>
 #include <errno.h>
 #include <string.h>
 
 //
-// This table lists all specific query routines
-//
-int SpecInfo_PIONEER(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType);
-int SpecInfo_XBOXHDDVD(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType);
-int SpecInfo_MOGUL1(const ScsiDriveInfo* DriveInfo,ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType);
-
-static const QuerySpecificDriveInfoProc AllDrivesQuery[]=
-{
-    SpecInfo_PIONEER,       // all Pioneer drives
-    SpecInfo_XBOXHDDVD,     // x-box hd-dvd drive
-#ifdef DRIVEIO_ENABLE_SPECIFIC_MOGUL1
-    SpecInfo_MOGUL1,         // our secret "mogul1" drive (can read VID, KCD and PMSN)
-#endif
-    NULL
-};
-
-static int QuerySpecificInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,DriveIoQueryType QueryType)
-{
-    ScsiDriveInfo   drive_info;
-    int err;
-
-    if (0!=(err=BuildDriveInfo(ScsiTarget,List,&drive_info))) return err;
-
-    for (unsigned int i=0;AllDrivesQuery[i]!=NULL;i++)
-    {
-        err = (AllDrivesQuery[i])(&drive_info,ScsiTarget,List,QueryType);
-        if (err) return err;
-    }
-
-    return 0;
-}
-
-//
 // Queries all standard drive info
 //
-static int QueryStandardDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,bool Total)
+static int QueryDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,bool Total)
 {
     int err;
     unsigned int len,slen;
@@ -73,8 +41,8 @@
     //
     err=QueryInquiryInfo(ScsiTarget,0,data_buffer,&slen);
     if (err) return err;
-    if (DriveInfoList_AddItem(List,diid_InquiryData,data_buffer,slen)) return ENOMEM;
-    if ((data_buffer[0]&0x1f)!=5) return EBADF; // not a MMC drive
+    if (DriveInfoList_AddItem(List,diid_InquiryData,data_buffer,slen)) return DRIVEIO_ERR_NO_MEMORY;
+    if ((data_buffer[0]&0x1f)!=5) return DRIVEIO_ERROR_BAD_DATA; // not a MMC drive
 
     if (Total)
     {
@@ -90,7 +58,7 @@
                 if (0==memcmp(inqdata,data_buffer,34)) slen=0;
             }
             if (slen==0) continue;
-            if (DriveInfoList_AddItem(List,(DriveInfoId)(diid_InquiryData+evpd),data_buffer,slen)) return ENOMEM;
+            if (DriveInfoList_AddItem(List,(DriveInfoId)(diid_InquiryData+evpd),data_buffer,slen)) return DRIVEIO_ERR_NO_MEMORY;
         }
     }
 
@@ -123,7 +91,7 @@
 
         if (slen==8) break; // empty feature header
 
-        if (slen < 12) return ERANGE;
+        if (slen < 12) return DRIVEIO_ERROR_BAD_DATA;
 
         first_feature = true;
 
@@ -164,7 +132,7 @@
                 }
             }
 
-            if (DriveInfoList_AddItem(List,(DriveInfoId)(diid_FeatureDescriptor + feature_code),dptr,feature_len)) return ENOMEM;
+            if (DriveInfoList_AddItem(List,(DriveInfoId)(diid_FeatureDescriptor + feature_code),dptr,feature_len)) return DRIVEIO_ERR_NO_MEMORY;
 
             first_feature = false;
             current_feature = feature_code+1;
@@ -278,8 +246,8 @@
             slen = uint32_get_be(data_buffer);
             slen +=4;
             if (slen > len) slen = len;
-            if (slen<8) return ERANGE;
-            if (DriveInfoList_AddItem(List,diid_CurrentProfile,data_buffer+6,2)) return ENOMEM;
+            if (slen<8) return DRIVEIO_ERROR_BAD_DATA;
+            if (DriveInfoList_AddItem(List,diid_CurrentProfile,data_buffer+6,2)) return DRIVEIO_ERR_NO_MEMORY;
         }
     }
 
@@ -328,7 +296,7 @@
 
         if (slen>maxlen) slen=maxlen;
 
-        if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_DiscStructure) + code),data_buffer,slen)) return ENOMEM;
+        if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_DiscStructure) + code),data_buffer,slen)) return DRIVEIO_ERR_NO_MEMORY;
     }
 
     //
@@ -350,7 +318,7 @@
             len = res.Transferred;
             slen = uint16_get_be(data_buffer)+2;
             if (slen>len) continue;
-            if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_TOC) + layer_id),data_buffer,slen)) return ENOMEM;
+            if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_TOC) + layer_id),data_buffer,slen)) return DRIVEIO_ERR_NO_MEMORY;
         }
     }
 
@@ -389,7 +357,7 @@
             }
 
             if (slen>len) continue;
-            if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_DiscInformation) + layer_id),data_buffer,slen)) return ENOMEM;
+            if (DriveInfoList_AddItem(List, (DriveInfoId) (((unsigned int)diid_DiscInformation) + layer_id),data_buffer,slen)) return DRIVEIO_ERR_NO_MEMORY;
         }
     }
 
@@ -418,23 +386,12 @@
         {
              return ERANGE;
         }
-        if (DriveInfoList_AddItem(List, diid_DiscCapacity,data_buffer,8)) return ENOMEM;
+        if (DriveInfoList_AddItem(List, diid_DiscCapacity,data_buffer,8)) return DRIVEIO_ERR_NO_MEMORY;
     }
 
     return 0;
 }
 
-static int QueryDriveInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,bool Total)
-{
-    int err;
-
-    if (0!=(err=QueryStandardDriveInfo(ScsiTarget,List,Total))) return err;
-
-    if (0!=(err=QuerySpecificInfo(ScsiTarget,List,diq_QueryDriveInfo))) return err;
-
-    return 0;
-}
-
 static int QueryDiscInfo(ISimpleScsiTarget* ScsiTarget,DIO_INFOLIST List,bool FailIfNotReady)
 {
     int err;
@@ -448,8 +405,6 @@
 
     if (0!=(err=QueryStandardDiscInfo(ScsiTarget,List))) return err;
 
-    if (0!=(err=QuerySpecificInfo(ScsiTarget,List,diq_QueryDiscInfo))) return err;
-
     return 0;
 }
 
@@ -464,7 +419,7 @@
     list = DriveInfoList_Create();
     if (NULL==list)
     {
-        return ENOMEM;
+        return DRIVEIO_ERR_NO_MEMORY;
     }
 
     switch(QueryType)
@@ -479,10 +434,6 @@
     case diq_QueryDiscInfo:
         err = QueryDiscInfo(ScsiTarget,list,true);
         break;
-    case diq_QueryTotalDriveInfo:
-        if (0!=(err = QueryDriveInfo(ScsiTarget,list,true))) break;
-        err = QuerySpecificInfo(ScsiTarget,list,diq_QueryTotalDriveInfo);
-        break;
     default:
         break;
     }
@@ -513,9 +464,12 @@
 
 int CFwdScsiTarget::Exec(const ScsiCmd* Cmd,ScsiCmdResponse *CmdResult)
 {
-    return m_Func(m_Context,Cmd,CmdResult);
+    if (NULL==m_Func) return -1;
+    return (*m_Func)(m_Context,Cmd,CmdResult);
 }
 
+}; // namespace LibDriveIo
+
 //
 // API
 //
@@ -526,4 +480,29 @@
     return LibDriveIo::DriveIoQuery(&t,QueryType,InfoList);
 }
 
-}; // namespace LibDriveIo
+extern "C" int DIO_CDECL DriveIoGetInquiryData(ScsiInquiryData *InquiryData,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DIO_INFOLIST InfoList)
+{
+    CFwdScsiTarget t(ScsiProc,ScsiContext);
+    return LibDriveIo::BuildInquiryData(&t,InfoList,InquiryData);
+}
+
+extern "C" int DIO_CDECL DriveIoGetDriveInfo(ScsiDriveInfo *DriveInfo,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DIO_INFOLIST InfoList)
+{
+    CFwdScsiTarget t(ScsiProc,ScsiContext);
+    return LibDriveIo::BuildDriveInfo(&t,InfoList,DriveInfo);
+}
+
+extern "C" int DIO_CDECL DriveIoGetDriveId(ScsiDriveId *DriveId,DriveIoExecScsiCmdFunc ScsiProc,void* ScsiContext,DIO_INFOLIST InfoList)
+{
+    int err;
+    ScsiDriveInfo info;
+    CFwdScsiTarget t(ScsiProc,ScsiContext);
+
+    err = LibDriveIo::BuildDriveInfo(&t,InfoList,&info);
+    if (0!=err) return err;
+
+    LibDriveIo::BuildDriveId(DriveId,&info);
+
+    return 0;
+}
+

makemkv-oss-1.14.4.tar.xz/libmakemkv/src/libmakemkv.def -> makemkv-oss-1.14.5.tar.xz/libmakemkv/src/libmakemkv.def Changed

makemkv-oss-1.14.4.tar.xz/libmmbd/src/bdplus.cpp -> makemkv-oss-1.14.5.tar.xz/libmmbd/src/bdplus.cpp Changed

makemkv-oss-1.14.4.tar.xz/libmmbd/src/bdplus.h -> makemkv-oss-1.14.5.tar.xz/libmmbd/src/bdplus.h Changed

makemkv-oss-1.14.4.tar.xz/libmmbd/src/libmmbd.def -> makemkv-oss-1.14.5.tar.xz/libmmbd/src/libmmbd.def Changed

makemkv-oss-1.14.4.tar.xz/libmmbd/src/libmmbd.vers -> makemkv-oss-1.14.5.tar.xz/libmmbd/src/libmmbd.vers Changed

makemkv-oss-1.14.4.tar.xz/makefile.common -> makemkv-oss-1.14.5.tar.xz/makefile.common Changed

makemkv-oss-1.14.4.tar.xz/makemkvgui/inc/ver_num.h -> makemkv-oss-1.14.5.tar.xz/makemkvgui/inc/ver_num.h Changed

makemkv-oss-1.14.4.tar.xz/makemkvgui/src/str/en_utf16.cpp -> makemkv-oss-1.14.5.tar.xz/makemkvgui/src/str/en_utf16.cpp Changed

@@ -13,7 +13,7 @@
 
 */
 
-static const unsigned short en_po_str[22021]={
+static const unsigned short en_po_str[21555]={
 '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,
@@ -28,7 +28,6 @@
 '%','1',0,
 '%','1',' ','%','2',0,
 'F','i','l','e',' ','s','y','s','t','e','m',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',',',' ','d','i','s','c',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d',0,
-'S','c','s','i',' ','o','p',' ','w','i','t','h',' ','b','u','f','f','e','r',' ','s','i','z','e','=','%','1',' ','.',' ','T','h','i','s',' ','i','s',' ','a',' ','p','e','r','f',' ','w','a','r','n','i','n','g',',',' ','y','o','u',' ','s','h','o','u','l','d','n',0x27,'t',' ','s','e','e',' ','m','a','n','y',' ','o','f',' ','t','h','e','s','e',0,
 'E','r','r','o','r',' ',0x27,'%','1',0x27,' ','o','c','c','u','r','r','e','d',' ','w','h','i','l','e',' ','r','e','a','d','i','n','g',' ',0x27,'%','2',0x27,' ','a','t',' ','o','f','f','s','e','t',' ',0x27,'%','3',0x27,0,
 'E','r','r','o','r',' ',0x27,'%','1',0x27,' ','o','c','c','u','r','r','e','d',' ','w','h','i','l','e',' ','i','s','s','u','i','n','g',' ','S','C','S','I',' ','c','o','m','m','a','n','d',' ','%','4',' ','t','o',' ','d','e','v','i','c','e',' ',0x27,'%','2',':','%','3',0x27,0,
 'O','p','e','r','a','t','i','n','g',' ','s','y','s','t','e','m',' ','b','l','o','c','k','e','d',' ','a','c','c','e','s','s',' ','t','o',' ','o','p','t','i','c','a','l',' ','d','r','i','v','e',' ','"','%','1','"','.',' ','P','r','o','g','r','a','m',' ','n','e','e','d','s',' ','t','o',' ','b','e',' ','r','u','n',' ','a','s',' ','a','d','m','i','n','i','s','t','r','a','t','o','r',' ','t','o',' ','a','c','c','e','s','s',' ','t','h','e',' ','d','r','i','v','e','.',0,
@@ -131,7 +130,6 @@
 'L','o','a','d','i','n','g',' ','p','l','a','y','l','i','s','t','s',0,
 'D','e','c','r','y','p','t','i','n','g',0,
 'P','r','o','c','e','s','s','i','n','g',' ','t','i','t','l','e','s',0,
-'V','C','-','1',' ','v','i','d','e','o',' ','s','t','r','e','a','m',' ','w','i','t','h','o','u','t',' ','T','F','C','N','T','R',' ','i','n','f','o','r','m','a','t','i','o','n',' ','i','s',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d',',',' ','s','o','r','r','y','.',' ','F','e','w',' ','H','D','-','D','V','D','s',' ','u','s','e',' ','i','t',' ','a','n','y','w','a','y','.',0,
 'O','p','e','n','i','n','g',' ','M','K','V',' ','f','i','l','e',0,
 'T','r','a','c','k',' ','#','%','1',' ','o','f',' ','t','y','p','e',' ','%','2',' ','i','n',' ','%','3',' ','f','i','l','e',' ','i','s',' ','n','o','t',' ','r','e','c','o','g','n','i','z','e','d',' ','a','n','d',' ','w','a','s',' ','s','k','i','p','p','e','d','.',0,
 'M','K','V',' ','f','i','l','e',' ','h','a','s',' ','n','o',' ','v','i','d','e','o',' ','t','r','a','c','k','s',' ','a','n','d',' ','c','a','n',0x27,'t',' ','b','e',' ','o','p','e','n','e','d','.',0,
@@ -225,11 +223,6 @@
 'S','t','r','e','a','m','s',' ','w','i','t','h',' ','w','i','d','e',' ','l','e','f','t','/','r','i','g','h','t',' ','c','h','a','n','n','e','l','s',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','.',0,
 'S','t','r','e','a','m','s',' ','w','i','t','h',' ','s','i','d','e',' ','h','i','g','h',' ','l','e','f','t','/','r','i','g','h','t',' ','c','h','a','n','n','e','l','s',' ','a','r','e',' ','n','o','t',' ','s','u','p','p','o','r','t','e','d','.',0,
 'T','h','i','s',' ','s','t','r','e','a','m',' ','c','a','n',0x27,'t',' ','b','e',' ','p','r','o','p','e','r','l','y',' ','d','e','c','o','d','e','d',' ','b','y',' ','t','h','i','s',' ','D','L','L',',',' ','p','l','e','a','s','e',' ','u','s','e',' ','d','t','s','d','e','c','o','d','e','r','d','l','l',' ','v','1','.','1','.','0','.','5',' ','o','r',' ','l','a','t','e','r','.',0,
-'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','s','t','a','r','t','e','d',',',' ','w','e','b',' ','s','e','r','v','e','r',' ','a','d','d','r','e','s','s',' ','i','s',' ','h','t','t','p',':','/','/','%','1',' ','o','r',' ','h','t','t','p',':','/','/','l','o','c','a','l','h','o','s','t',':','%','2',0,
-'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','s','t','o','p','p','e','d',0,
-'S','t','r','e','a','m','i','n','g',' ','s','e','r','v','e','r',' ','f','a','i','l','e','d',' ','t','o',' ','s','t','a','r','t',0,
-'U','P','n','P',' ','s','e','r','v','e','r',' ','e','n','a','b','l','e','d',' ','o','n',' ','a','d','d','r','e','s','s',' ','%','1',0,
-'D','e','t','e','c','t','e','d',' ','N','M','T',' ','d','e','v','i','c','e',' ','"','%','1','"',',',' ','e','n','a','b','l','e','d',' ','m','y','i','B','o','x',' ','e','x','t','e','n','s','i','o','n','s',0,
 'O','u','t','p','u','t',' ','f','o','l','d','e','r',' ','i','s',' ','n','o','t',' ','s','e','t',0,
 'F','i','l','e',' ','%','1',' ','a','l','r','e','a','d','y',' ','e','x','i','s','t','.',' ','D','o',' ','y','o','u',' ','w','a','n','t',' ','t','o',' ','o','v','e','r','w','r','i','t','e',' ','i','t','?',0,
 'T','i','t','l','e',' ','%','1',' ','s','k','i','p','p','e','d',0,
@@ -507,9 +500,6 @@
 'N','o','n','e',0,
 'L','a','t','e','s','t',' ','a','v','a','i','l','a','b','l','e',' ','v','e','r','s','i','o','n',':',0,
 'W','e','b','s','i','t','e',' ','U','R','L',':',0,
-'E','n','a','b','l','e',' ','U','P','n','P',' ',':',0,
-'U','s','e',' ','s','p','e','c','i','f','i','c',' ','I','P',' ','a','d','d','r','e','s','s',' ',':',0,
-'W','e','b',' ','s','e','r','v','e','r',' ','p','o','r','t',' ',':',0,
 'I','O',0,
 'S','t','r','e','a','m','i','n','g',0,
 'P','r','o','t','e','c','t','i','o','n',0,
@@ -576,58 +566,57 @@
 'O','S',' ','d','e','v','i','c','e',' ','n','a','m','e',':',' ',0,
 0};
 
-static const unsigned int en_po_off[1121]={
+static const unsigned int en_po_off[1101]={
 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,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,7748,
-3333,7773,3334,7838,3335,8237,3336,8605,3337,8988,3338,9067,3339,9099,3340,9147,3341,9220,3342,9266,3343,9439,
-3344,9513,3345,9540,3346,9669,3400,9755,3401,9775,3402,9802,3403,9813,3404,9831,3405,9852,3406,9860,3407,9880,
-4001,9893,4002,9976,4003,10042,4004,10107,4007,10190,4008,10252,4009,10310,4020,10421,4021,10456,4022,10508,4023,10540,
-4024,10604,4025,10638,4026,10684,4027,10731,4028,10779,4040,10822,4041,10900,4042,10959,4043,11011,4044,11108,4045,11179,
-4046,11277,4047,11320,4048,11358,4049,11393,4050,11445,4051,11526,4052,11576,4053,11607,4054,11758,4055,11775,4060,11838,
-4061,11895,4062,11957,4500,12052,4501,12133,4502,12158,4503,12191,4504,12225,5000,12277,5001,12302,5002,12354,5003,12371,
-5004,12406,5005,12433,5006,12449,5007,12472,5008,12495,5009,12536,5010,12569,5011,12589,5012,12622,5013,12661,5014,12716,
-5015,12751,5016,12820,5017,12844,5018,12863,5019,12887,5020,12912,5021,13067,5022,13213,5024,13296,5025,13327,5026,13343,
-5027,13350,5028,13362,5029,13374,5030,13384,5031,13396,5033,13408,5036,13419,5037,13451,5038,13494,5039,13659,5040,13840,
-5041,14066,5042,14213,5043,14263,5044,14359,5045,14372,5046,14386,5047,14399,5048,14417,5049,14432,5050,14439,5051,14489,
-5052,14647,5053,14820,5054,15016,5055,15076,5056,15144,5057,15212,5058,15240,5060,15387,5061,15396,5062,15409,5063,15420,
-5064,15432,5065,15438,5066,15446,5067,15461,5068,15467,5069,15533,5070,15547,5071,15559,5072,15736,5073,15769,5074,15849,
-5075,15975,5076,16026,5077,16087,5078,16126,5079,16188,5080,16231,5081,16246,5082,16259,5083,16303,5084,16373,5085,16450,
-5086,16514,5087,16522,5088,16543,5089,16567,5090,16578,5091,16583,5092,16590,5093,16599,5094,16629,5100,16651,5101,16665,
-5201,16792,5202,16797,5203,16802,5204,16811,5207,16820,5208,16826,5209,16841,5210,16850,5214,16855,5215,16864,5216,16870,
-5217,16887,5218,16899,5219,16915,5220,16926,5221,16939,5222,16950,5223,16956,5224,16966,5225,16982,5226,16996,5227,17008,
-5228,17018,5233,17036,5234,17049,5235,17063,5238,17082,5239,17092,5240,17102,5248,17117,5249,17127,5250,17135,5301,17144,
-5302,17155,5303,17209,5304,17273,5305,17284,5306,17301,5307,17311,5308,17321,5380,17336,5381,17344,6000,17351,6001,17364,
-6002,17383,6003,17402,6005,17436,6006,17457,6007,17471,6008,17553,6010,17567,6011,17579,6012,17586,6013,17630,6014,17637,
-6015,17662,6016,17680,6017,17727,6018,17748,6019,17769,6020,17775,6021,17782,6022,17799,6023,17806,6024,17839,6026,17863,
-6030,17920,6031,17926,6032,17932,6034,17938,6035,17946,6036,17956,6037,17964,6038,17989,6039,18001,6040,18013,6041,18042,
-6042,18097,6043,18110,6044,18138,6045,18151,6046,18164,6047,18186,6048,18196,6050,18220,6051,18265,6052,18358,6053,18370,
-6054,18386,6055,18402,6056,18417,6057,18430,6058,18451,6059,18457,6060,18464,6061,18471,6062,18484,6063,18498,6064,18515,
-6065,18533,6066,18549,6067,18562,6068,18574,6069,18588,6070,18593,6071,18602,6072,18609,6073,18616,6074,18624,6075,18637,
-6076,18642,6077,18666,6078,18697,6079,18752,6080,18822,6081,18830,6082,18835,6083,18854,6084,18878,6085,18898,6086,18903,
-6087,18936,6088,18978,6089,18998,6090,19003,6091,19008,6092,19017,6093,19024,6094,19044,6095,19058,6096,19079,6097,19087,
-6098,19111,6099,19173,6100,19194,6101,19205,6102,19217,6103,19225,6104,19230,6105,19255,6106,19262,6107,19287,6108,19308,
-6109,19349,6110,19366,6111,19377,6112,19394,6119,19408,6120,19438,6121,19467,6122,19496,6123,19530,6124,19561,6125,19593,
-6126,19613,6127,19643,6128,19671,6129,19693,6130,19707,6131,19733,6132,19741,6133,19764,6134,19775,6135,19787,6136,19807,
-6137,19827,6138,19839,6139,20104,6142,20136,6143,20159,6144,20170,6145,20187,6146,20197,6147,20222,6148,20230,6149,20250,
-6150,20292,6151,20316,6152,20356,6153,20365,6154,20386,6156,20407,6157,20412,6158,20417,6159,20443,6161,20456,6162,20470,
-6163,20496,6164,20514,6165,20517,6166,20527,6167,20538,6168,20561,6169,20589,6170,20603,6171,20638,6172,20671,6173,20680,
-6174,20698,6175,20723,6177,20746,6178,20778,6180,20806,6181,20814,6200,20825,6201,20831,6202,20837,6203,20843,6204,20853,
-6205,20858,6206,20870,6207,20879,6209,20893,6210,20906,6211,20917,6212,20932,6213,20944,6214,20953,6215,20964,6216,20973,
-6220,20981,6221,21005,6222,21018,6223,21029,6224,21039,6225,21052,6226,21421,6227,21439,6228,21540,6229,21551,6300,21568,
-6301,21597,6302,21615,6303,21630,6304,21640,6305,21651,6306,21667,6307,21686,6308,21702,6309,21725,6320,21748,6321,21780,
-6322,21812,6323,21837,6324,21853,6325,21865,6326,21877,6327,21897,6329,21916,6330,21937,6331,21970,6332,22003,0};
+1011,320,1012,323,2001,329,2003,378,2004,432,2006,500,2007,617,2008,772,2009,895,2010,1023,2011,1068,
+2012,1212,2013,1296,2014,1382,2015,1430,2016,1512,2017,1675,2018,1790,2019,1852,2020,1892,2021,2059,2022,2182,
+2023,2316,2024,2360,2200,2382,2201,2400,2202,2424,2203,2453,2204,2483,2205,2512,2206,2535,2207,2552,2208,2572,
+2209,2593,2210,2616,2211,2641,2300,2664,2301,2678,2302,2695,2303,2711,2304,2730,2400,2755,2401,2766,2402,2781,
+2404,2797,3000,2813,3001,2835,3002,2926,3003,2994,3004,3027,3005,3075,3006,3101,3007,3134,3008,3164,3009,3222,
+3010,3270,3011,3323,3012,3358,3013,3398,3014,3444,3015,3485,3016,3536,3017,3558,3018,3585,3019,3625,3020,3695,
+3021,3771,3022,3832,3023,3866,3024,3940,3025,4080,3026,4195,3027,4277,3028,4333,3029,4370,3030,4430,3031,4493,
+3032,4643,3033,4752,3034,4798,3035,4843,3036,4933,3037,4992,3038,5033,3039,5073,3040,5131,3041,5165,3042,5203,
+3043,5311,3100,5394,3101,5411,3102,5444,3103,5466,3104,5484,3105,5500,3106,5507,3107,5520,3108,5529,3109,5542,
+3110,5555,3111,5567,3200,5587,3201,5616,3202,5634,3203,5645,3210,5663,3220,5680,3221,5747,3300,5797,3301,5853,
+3302,5905,3303,5952,3304,6019,3305,6040,3306,6094,3307,6193,3308,6224,3309,6266,3310,6312,3311,6404,3312,6471,
+3313,6548,3314,6616,3315,6665,3316,6688,3317,6711,3318,6733,3319,6786,3320,6848,3321,6908,3322,6986,3323,7038,
+3324,7097,3325,7143,3326,7196,3327,7269,3328,7333,3329,7382,3330,7475,3331,7532,3332,7565,3333,7590,3334,7655,
+3335,8054,3336,8422,3337,8805,3338,8884,3339,8916,3340,8964,3341,9037,3342,9083,3343,9256,3344,9330,3345,9357,
+3346,9486,3400,9572,3401,9592,3402,9619,3403,9630,3404,9648,3405,9669,3406,9677,3407,9697,4001,9710,4002,9793,
+4003,9859,4004,9924,4007,10007,4008,10069,4009,10127,4020,10238,4021,10273,4022,10325,4023,10357,4024,10421,4025,10455,
+4026,10501,4027,10548,4028,10596,4040,10639,4041,10717,4042,10776,4043,10828,4044,10925,4045,10996,4046,11094,4047,11137,
+4048,11175,4049,11210,4050,11262,4051,11343,4052,11393,4053,11424,4054,11575,4055,11592,4060,11655,4061,11712,4062,11774,
+5000,11869,5001,11894,5002,11946,5003,11963,5004,11998,5005,12025,5006,12041,5007,12064,5008,12087,5009,12128,5010,12161,
+5011,12181,5012,12214,5013,12253,5014,12308,5015,12343,5016,12412,5017,12436,5018,12455,5019,12479,5020,12504,5021,12659,
+5022,12805,5024,12888,5025,12919,5026,12935,5027,12942,5028,12954,5029,12966,5030,12976,5031,12988,5033,13000,5036,13011,
+5037,13043,5038,13086,5039,13251,5040,13432,5041,13658,5042,13805,5043,13855,5044,13951,5045,13964,5046,13978,5047,13991,
+5048,14009,5049,14024,5050,14031,5051,14081,5052,14239,5053,14412,5054,14608,5055,14668,5056,14736,5057,14804,5058,14832,
+5060,14979,5061,14988,5062,15001,5063,15012,5064,15024,5065,15030,5066,15038,5067,15053,5068,15059,5069,15125,5070,15139,
+5071,15151,5072,15328,5073,15361,5074,15441,5075,15567,5076,15618,5077,15679,5078,15718,5079,15780,5080,15823,5081,15838,
+5082,15851,5083,15895,5084,15965,5085,16042,5086,16106,5087,16114,5088,16135,5089,16159,5090,16170,5091,16175,5092,16182,
+5093,16191,5094,16221,5100,16243,5101,16257,5201,16384,5202,16389,5203,16394,5204,16403,5207,16412,5208,16418,5209,16433,
+5210,16442,5214,16447,5215,16456,5216,16462,5217,16479,5218,16491,5219,16507,5220,16518,5221,16531,5222,16542,5223,16548,
+5224,16558,5225,16574,5226,16588,5227,16600,5228,16610,5233,16628,5234,16641,5235,16655,5238,16674,5239,16684,5240,16694,
+5248,16709,5249,16719,5250,16727,5301,16736,5302,16747,5303,16801,5304,16865,5305,16876,5306,16893,5307,16903,5308,16913,
+5380,16928,5381,16936,6000,16943,6001,16956,6002,16975,6003,16994,6005,17028,6006,17049,6007,17063,6008,17145,6010,17159,
+6011,17171,6012,17178,6013,17222,6014,17229,6015,17254,6016,17272,6017,17319,6018,17340,6019,17361,6020,17367,6021,17374,
+6022,17391,6023,17398,6024,17431,6026,17455,6030,17512,6031,17518,6032,17524,6034,17530,6035,17538,6036,17548,6037,17556,
+6038,17581,6039,17593,6040,17605,6041,17634,6042,17689,6043,17702,6044,17730,6045,17743,6046,17756,6047,17778,6048,17788,
+6050,17812,6051,17857,6052,17950,6053,17962,6054,17978,6055,17994,6056,18009,6057,18022,6058,18043,6059,18049,6060,18056,
+6061,18063,6062,18076,6063,18090,6064,18107,6065,18125,6066,18141,6067,18154,6068,18166,6069,18180,6070,18185,6071,18194,
+6072,18201,6073,18208,6074,18216,6075,18229,6076,18234,6077,18258,6078,18289,6079,18344,6080,18414,6081,18422,6082,18427,
+6083,18446,6084,18470,6085,18490,6086,18495,6087,18528,6088,18570,6089,18590,6090,18595,6091,18600,6092,18609,6093,18616,
+6094,18636,6095,18650,6096,18671,6097,18679,6098,18703,6099,18765,6100,18786,6101,18797,6102,18809,6103,18817,6104,18822,
+6105,18847,6106,18854,6107,18879,6108,18900,6109,18941,6110,18958,6111,18969,6112,18986,6119,19000,6120,19030,6121,19059,
+6122,19088,6123,19122,6124,19153,6125,19185,6126,19205,6127,19235,6128,19263,6129,19285,6130,19299,6131,19325,6132,19333,
+6133,19356,6134,19367,6135,19379,6136,19399,6137,19419,6138,19431,6139,19696,6142,19728,6143,19751,6144,19762,6145,19779,
+6146,19789,6147,19814,6148,19822,6149,19842,6150,19884,6151,19908,6152,19948,6153,19957,6154,19978,6156,19999,6157,20004,
+6158,20009,6159,20035,6164,20048,6165,20051,6166,20061,6167,20072,6168,20095,6169,20123,6170,20137,6171,20172,6172,20205,
+6173,20214,6174,20232,6175,20257,6177,20280,6178,20312,6180,20340,6181,20348,6200,20359,6201,20365,6202,20371,6203,20377,
+6204,20387,6205,20392,6206,20404,6207,20413,6209,20427,6210,20440,6211,20451,6212,20466,6213,20478,6214,20487,6215,20498,
+6216,20507,6220,20515,6221,20539,6222,20552,6223,20563,6224,20573,6225,20586,6226,20955,6227,20973,6228,21074,6229,21085,
+6300,21102,6301,21131,6302,21149,6303,21164,6304,21174,6305,21185,6306,21201,6307,21220,6308,21236,6309,21259,6320,21282,
+6321,21314,6322,21346,6323,21371,6324,21387,6325,21399,6326,21411,6327,21431,6329,21450,6330,21471,6331,21504,6332,21537,0};
 
 extern "C" const unsigned short * en_po_getstr_utf16(unsigned int code)
 {

makemkv-oss-1.14.4.tar.xz/msvc/inc/lgpl/getopt.h -> makemkv-oss-1.14.5.tar.xz/msvc/inc/lgpl/getopt.h Changed

makemkv-oss-1.14.4.tar.xz/msvc/src/glibc/getopt_win32.c -> makemkv-oss-1.14.5.tar.xz/msvc/src/glibc/getopt_win32.c Changed

Changes of Revision 63