Hello community, here is the log from the commit of package vulkan for openSUSE:Factory checked in at 2018-02-10 17:55:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vulkan (Old) and /work/SRC/openSUSE:Factory/.vulkan.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vulkan" Sat Feb 10 17:55:13 2018 rev:9 rq:573926 version:1.0.68.0 Changes: -------- --- /work/SRC/openSUSE:Factory/vulkan/vulkan.changes 2018-01-13 21:34:57.557560932 +0100 +++ /work/SRC/openSUSE:Factory/.vulkan.new/vulkan.changes 2018-02-10 17:55:14.606482626 +0100 @@ -1,0 +2,11 @@ +Wed Feb 7 23:19:20 UTC 2018 - jeng...@inai.de + +- Update to new snapshot 1.0.68 + * layers: add image layout validation to vkCmdBlitImage() + * layers: Add VK_EXT_validation_cache implementation for shaders + * layers: Add layer metadata for EXT_validation_cache extension + * layers: Add descriptor limit checks to vkCreatePipelineLayout() + * layers: Create instance & device extension lists +- Add no-git.diff + +------------------------------------------------------------------- Old: ---- Vulkan-LoaderAndValidationLayers-1.0.65.0.tar.xz New: ---- Vulkan-LoaderAndValidationLayers-1.0.68.0.tar.xz no-git.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vulkan.spec ++++++ --- /var/tmp/diff_new_pack.MqxJVF/_old 2018-02-10 17:55:15.910435423 +0100 +++ /var/tmp/diff_new_pack.MqxJVF/_new 2018-02-10 17:55:15.914435278 +0100 @@ -16,11 +16,11 @@ # -%define version_unconverted 1.0.65.0 +%define version_unconverted 1.0.68.0 Name: vulkan %define lname libvulkan1 -Version: 1.0.65.0 +Version: 1.0.68.0 Release: 0 Summary: Vulkan loader and validation layers License: MIT @@ -29,6 +29,7 @@ Source: Vulkan-LoaderAndValidationLayers-%version.tar.xz Source9: baselibs.conf +Patch1: no-git.diff BuildRequires: bison BuildRequires: cmake >= 2.8.11 BuildRequires: gcc-c++ >= 4.8 @@ -81,6 +82,7 @@ %prep %setup -qn Vulkan-LoaderAndValidationLayers-%version +%patch -P 1 -p1 %build chmod a-x *.md *.txt @@ -119,8 +121,6 @@ %_bindir/* %dir %_sysconfdir/vulkan/ %config %_sysconfdir/vulkan/explicit_layer.d/ -%dir %_sysconfdir/vulkan/icd.d/ -%_sysconfdir/vulkan/icd.d/* %_datadir/vulkan/ %files -n libvulkan1 ++++++ Vulkan-LoaderAndValidationLayers-1.0.65.0.tar.xz -> Vulkan-LoaderAndValidationLayers-1.0.68.0.tar.xz ++++++ ++++ 47134 lines of diff (skipped) ++++++ _service ++++++ --- /var/tmp/diff_new_pack.MqxJVF/_old 2018-02-10 17:55:16.902399514 +0100 +++ /var/tmp/diff_new_pack.MqxJVF/_new 2018-02-10 17:55:16.906399369 +0100 @@ -2,10 +2,10 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers</param> - <param name="revision">sdk-1.0.65</param> + <param name="revision">sdk-1.0.68</param> <param name="revision">master</param> - <param name="parent-tag">4867820f5</param> - <param name="versionformat">1.0.65.0</param> + <param name="parent-tag">7cc9e754d</param> + <param name="versionformat">1.0.68.0</param> <param name="exclude">windowsRuntimeInstaller</param> </service> <service name="recompress" mode="disabled"> ++++++ no-git.diff ++++++ From: Jan Engelhardt <jeng...@inai.de> Date: 2018-02-07 23:47:38.565174864 +0100 throw out idiotic reliance on git and/or bundled spirv-tools. diff --git a/CMakeLists.txt b/CMakeLists.txt index 26808788c..d00609303 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -326,7 +326,7 @@ macro(run_external_revision_generate source_dir symbol_name output) # parsing from a Git repository), you probably also want to add the revision file to the list of DEPENDS on the # subsequent line (to ensure that the script is re-run when the revision file is modified). COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --git_dir ${source_dir} -s ${symbol_name} -o ${output} - DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/.git/HEAD ${source_dir}/.git/index + DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ) endmacro() diff --git a/scripts/external_revision_generator.py b/scripts/external_revision_generator.py index 9ba9156b0..159d44ebc 100644 --- a/scripts/external_revision_generator.py +++ b/scripts/external_revision_generator.py @@ -90,20 +90,7 @@ def main(): rev_method_group.add_argument("--git_dir", metavar="SOURCE_DIR", help="git working copy directory") rev_method_group.add_argument("--rev_file", metavar="REVISION_FILE", help="source revision file path (must contain a SHA1 hash") args = parser.parse_args() - - # We can either parse the latest Git commit ID out of the specified repository (preferred where possible), - # or computing the SHA1 hash of the contents of a file passed on the command line and (where necessary -- - # e.g. when building the layers outside of a Git environment). - if args.git_dir is not None: - # Extract commit ID from the specified source directory - try: - commit_id = get_commit_id_from_git('git', args.git_dir) - except WindowsError: - # Call git.bat on Windows for compatiblity. - commit_id = get_commit_id_from_git('git.bat', args.git_dir) - elif args.rev_file is not None: - # Read the commit ID from a file. - commit_id = get_commit_id_from_file(args.rev_file) + commit_id = "0000000000000000000000000000000000000000" if not is_sha1(commit_id): raise ValueError("commit ID for " + args.symbol_name + " must be a SHA1 hash.")