msg7086 / x265-Yuuki-Asuna

A fork of x265. A modded version.
GNU General Public License v2.0
174 stars 35 forks source link

MSYS2/MinGW64: Version issues in Yuuki branch #16

Closed LigH-de closed 3 years ago

LigH-de commented 3 years ago

The file x265.rc contains confusing values; windres.exe stops with syntax error in line 7 (FILEVERSION => PRODUCTVERSION):

#include <winresrc.h>

1 RT_MANIFEST "x265res.manifest"

VS_VERSION_INFO VERSIONINFO
  FILEVERSION    3,4,0,
  PRODUCTVERSION 3,4,0,
  FILEFLAGSMASK  VS_FFI_FILEFLAGSMASK
  FILEOS         VOS_NT_WINDOWS32
#ifdef OPENOBEX_EXPORTS
  FILETYPE       VFT_DLL
#else
  FILETYPE       VFT_STATIC_LIB
#endif
  FILESUBTYPE    VFT2_UNKNOWN
  BEGIN
    BLOCK "StringFileInfo"
    BEGIN
      BLOCK "04090000"
      BEGIN
        VALUE "FileDescription",  "HEVC video encoder"
        VALUE "FileVersion",      "2.3M+850-g2b25c9ba0+47"
        VALUE "InternalName",     "x265"
        VALUE "LegalCopyright",   "Multicoreware: GPLv2 or commercial"
        VALUE "OriginalFilename", "265.exe"
        VALUE "ProductName",      "x265"
        VALUE "ProductVersion",   "2.3M+850-g2b25c9ba0+47"
      END
    END
    BLOCK "VarFileInfo"
    BEGIN
      VALUE "Translation", 0x409, 1200
    END
END
msg7086 commented 3 years ago

Should do.

LigH-de commented 3 years ago

Version looks good now. FindFF still needs to be patched for "not MSVC" instead of "not any Windows compiler"...

msg7086 commented 3 years ago

Slipstreamed into Yuuki, please check.

LigH-de commented 3 years ago

Not yet.

-- Checking for module 'libavformat'
--   Found libavformat, version 58.77.100
-- avformat: include F:/MABS/local64/opt/lightffmpeg/include lib F:/MABS/local64/lib/libavformat.a
-- Checking for module 'libavcodec'
--   Package 'libavcodec', required by 'virtual:world', not found
-- Can't find includes for avcodec...
-- Checking for module 'libavutil'
--   Package 'libavutil', required by 'virtual:world', not found
-- Can't find includes for avutil...
-- Checking for module 'libswresample'
--   Package 'libswresample', required by 'virtual:world', not found
-- Can't find includes for swresample...
-- Could not find FFMPEG

This file contains two parts depending on WIN32 (or MSVC). See this previous attempt.

If I change line 35 as well, it builds as desired.

-- Checking for module 'libavformat'
--   Found libavformat, version 58.77.100
-- avformat: include F:/MABS/local64/opt/lightffmpeg/include lib F:/MABS/local64/lib/libavformat.a
-- Checking for module 'libavcodec'
--   Found libavcodec, version 58.135.100
-- avcodec: include F:/MABS/local64/opt/lightffmpeg/include lib F:/MABS/local64/lib/libavcodec.a
-- Checking for module 'libavutil'
--   Found libavutil, version 56.72.100
-- avutil: include F:/MABS/local64/opt/lightffmpeg/include lib F:/MABS/local64/lib/libavutil.a
-- Checking for module 'libswresample'
--   Found libswresample, version 3.10.100
-- swresample: include F:/MABS/local64/opt/lightffmpeg/include lib F:/MABS/local64/lib/libswresample.a

Creating a PR.