Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (46d08b146ba76908d15478673770b80538552111)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Pavel Vinogradov <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (46d08b146ba76908d15478673770b80538552111)
  • Date: Mon, 13 Mar 2023 17:42:53 +0000

GIT changes to master grimoire by Pavel Vinogradov <public AT sourcemage.org>:

video-libs/libplacebo/HISTORY
| 3
video-libs/libplacebo/PRE_BUILD
| 6

video-libs/libplacebo/patches/0001-vulkan-utils_gen-fix-build-on-vulkan-headers-1.3.241.patch
| 148 ----------
video-libs/libplacebo/patches/glslang.patch
| 17 -
4 files changed, 3 insertions(+), 171 deletions(-)

New commits:
commit 46d08b146ba76908d15478673770b80538552111
Author: Pavel Vinogradov <public AT sourcemage.org>
Commit: Pavel Vinogradov <public AT sourcemage.org>

video-libs/libplacebo: dropped the patches

diff --git a/video-libs/libplacebo/HISTORY b/video-libs/libplacebo/HISTORY
index 2c5fb45..3fe2a57 100644
--- a/video-libs/libplacebo/HISTORY
+++ b/video-libs/libplacebo/HISTORY
@@ -1,5 +1,8 @@
2023-03-13 Pavel Vinogradov <public AT sourcemage.org>
* DETAILS: version 5.264.0
+ * PRE_BUILD, patches/glslang.patch,
+
patches/0001-vulkan-utils_gen-fix-build-on-vulkan-headers-1.3.241.patch:
+ removed, not needed anymore

2023-03-01 Pavel Vinogradov <public AT sourcemage.org>
* DEPENDS: depends on git if scm branch
diff --git a/video-libs/libplacebo/PRE_BUILD b/video-libs/libplacebo/PRE_BUILD
deleted file mode 100755
index f2413a1..0000000
--- a/video-libs/libplacebo/PRE_BUILD
+++ /dev/null
@@ -1,6 +0,0 @@
-default_pre_build &&
-cd "${SOURCE_DIRECTORY}" &&
-
-if [[ "${LIBPLACEBO_BRANCH}" == "stable" ]]; then
- apply_patch_dir patches
-fi
diff --git
a/video-libs/libplacebo/patches/0001-vulkan-utils_gen-fix-build-on-vulkan-headers-1.3.241.patch

b/video-libs/libplacebo/patches/0001-vulkan-utils_gen-fix-build-on-vulkan-headers-1.3.241.patch
deleted file mode 100644
index 9b6bb8e..0000000
---
a/video-libs/libplacebo/patches/0001-vulkan-utils_gen-fix-build-on-vulkan-headers-1.3.241.patch
+++ /dev/null
@@ -1,148 +0,0 @@
-From baec0e53c9591a005d2fd6ee1dadcd10b8ce8770 Mon Sep 17 00:00:00 2001
-From: Niklas Haas <git AT haasn.dev>
-Date: Sun, 19 Feb 2023 19:57:06 +0100
-Subject: [PATCH] vulkan/utils_gen: fix build on vulkan-headers 1.3.241
-
-This version of the headers adds support for the vulkansc API, which
-pulls in a bunch of definitions that we don't care about.
-
-To properly exclude these, we need to start blacklisting all types not
-defined in the vulkan environment. Also leverage this to start
-blacklisting platform-specific crap in a more principled way.
-
-This is probably still not the correct way to do it, but it works for
-now.
-
-Fixes: https://code.videolan.org/videolan/libplacebo/-/issues/249
-Fixes: https://github.com/haasn/libplacebo/issues/155
----
- src/vulkan/utils_gen.py | 86 ++++++++++++++++++++++++++---------------
- 1 file changed, 55 insertions(+), 31 deletions(-)
-
-diff --git a/src/vulkan/utils_gen.py b/src/vulkan/utils_gen.py
-index 74cd13c..32b2f52 100644
---- a/src/vulkan/utils_gen.py
-+++ b/src/vulkan/utils_gen.py
-@@ -129,56 +129,80 @@ class Obj(object):
- def __init__(self, **kwargs):
- self.__dict__.update(kwargs)
-
--def findall_enum(registry, name):
-- for e in registry.iterfind('enums[@name="{0}"]/enum'.format(name)):
-- if not 'alias' in e.attrib:
-- yield e
-- for e in registry.iterfind('.//enum[@extends="{0}"]'.format(name)):
-- # ext 289 is a non-existing extension that defines some names for
-- # proprietary downstream consumers, causes problems unless excluded
-- if e.attrib.get('extnumber', '0') == '289':
-- continue
-- # some other extensions contain reserved identifiers that generally
-- # translate to compile failures
-- if 'RESERVED' in e.attrib['name']:
-- continue
-- if not 'alias' in e.attrib:
-- yield e
-+class VkXML(ET.ElementTree):
-+ def blacklist_block(self, req):
-+ for t in req.iterfind('type'):
-+ self.blacklist_types.add(t.attrib['name'])
-+ for e in req.iterfind('enum'):
-+ self.blacklist_enums.add(e.attrib['name'])
-+
-+ def __init__(self, *args, **kwargs):
-+
-+ super().__init__(*args, **kwargs)
-+ self.blacklist_types = set()
-+ self.blacklist_enums = set()
-+
-+ for f in self.iterfind('feature'):
-+ # Feature block for non-Vulkan API
-+ if not 'vulkan' in f.attrib['api'].split(','):
-+ for r in f.iterfind('require'):
-+ self.blacklist_block(r)
-+
-+ for e in self.iterfind('extensions/extension'):
-+ # Entire extension is unsupported on vulkan or platform-specifid
-+ if not 'vulkan' in e.attrib['supported'].split(',') or
'platform' in e.attrib:
-+ for r in e.iterfind('require'):
-+ self.blacklist_block(r)
-+ continue
-+
-+ # Only individual <require> blocks are API-specific
-+ for r in e.iterfind('require[@api]'):
-+ if not 'vulkan' in r.attrib['api'].split(','):
-+ self.blacklist_block(r)
-+
-+ def findall_enum(self, name):
-+ for e in self.iterfind('enums[@name="{0}"]/enum'.format(name)):
-+ if not 'alias' in e.attrib:
-+ if not e.attrib['name'] in self.blacklist_enums:
-+ yield e
-+ for e in self.iterfind('.//enum[@extends="{0}"]'.format(name)):
-+ if not 'alias' in e.attrib:
-+ if not e.attrib['name'] in self.blacklist_enums:
-+ yield e
-+
-+ def findall_type(self, category):
-+ for t in
self.iterfind('types/type[@category="{0}"]'.format(category)):
-+ name = t.attrib.get('name') or t.find('name').text
-+ if name in self.blacklist_types:
-+ continue
-+ yield t
-+
-
- def get_vkenum(registry, enum):
-- for e in findall_enum(registry, enum):
-+ for e in registry.findall_enum(enum):
- yield e.attrib['name']
-
- def get_vkobjects(registry):
-- for t in registry.iterfind('types/type[@category="handle"]'):
-+ for t in registry.findall_type('handle'):
- if 'objtypeenum' in t.attrib:
- yield Obj(enum = t.attrib['objtypeenum'],
- name = t.find('name').text)
-
- def get_vkstructs(registry):
-- for e in registry.iterfind('types/type[@category="struct"]'):
-- # Strings for platform-specific crap we want to blacklist as they
will
-- # most likely cause build failures
-- blacklist_strs = [
-- 'ANDROID', 'Surface', 'Win32', 'D3D12', 'GGP', 'FUCHSIA',
'Metal',
-- ]
--
-- if any([ str in e.attrib['name'] for str in blacklist_strs ]):
-- continue
--
-+ for t in registry.findall_type('struct'):
- stype = None
-- for m in e.iterfind('member'):
-+ for m in t.iterfind('member'):
- if m.find('name').text == 'sType':
- stype = m
- break
-
- if stype and 'values' in stype.attrib:
- yield Obj(stype = stype.attrib['values'],
-- name = e.attrib['name'])
-+ name = t.attrib['name'])
-
- def get_vkaccess(registry):
- access = Obj(read = 0, write = 0)
-- for e in findall_enum(registry, 'VkAccessFlagBits'):
-+ for e in registry.findall_enum('VkAccessFlagBits'):
- if '_READ_' in e.attrib['name']:
- access.read |= 1 << int(e.attrib['bitpos'])
- if '_WRITE_' in e.attrib['name']:
-@@ -214,7 +238,7 @@ if __name__ == '__main__':
- if not xmlfile or xmlfile == '':
- xmlfile = find_registry_xml(datadir)
-
-- registry = ET.parse(xmlfile)
-+ registry = VkXML(ET.parse(xmlfile))
- with open(outfile, 'w') as f:
- f.write(TEMPLATE.render(
- vkresults = get_vkenum(registry, 'VkResult'),
---
-2.39.2
-
diff --git a/video-libs/libplacebo/patches/glslang.patch
b/video-libs/libplacebo/patches/glslang.patch
deleted file mode 100644
index 4356b1e..0000000
--- a/video-libs/libplacebo/patches/glslang.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/src/glsl/meson.build b/src/glsl/meson.build
-index 19b4bc6..65f33f6 100644
---- a/src/glsl/meson.build
-+++ b/src/glsl/meson.build
-@@ -18,12 +18,6 @@ else
-
- glslang_deps = [
- cxx.find_library('glslang', required: glslang_req),
-- cxx.find_library('MachineIndependent', required: false),
-- cxx.find_library('OSDependent', required: glslang_req),
-- cxx.find_library('HLSL', required: glslang_req),
-- cxx.find_library('OGLCompiler', required: glslang_req),
-- cxx.find_library('GenericCodeGen', required: false),
-- cxx.find_library('SPVRemapper', required: glslang_req),
- cxx.find_library('SPIRV', required: glslang_req),
- cxx.find_library('SPIRV-Tools-opt', required: false),
- cxx.find_library('SPIRV-Tools', required: false),



  • [SM-Commit] GIT changes to master grimoire by Pavel Vinogradov (46d08b146ba76908d15478673770b80538552111), Pavel Vinogradov, 03/13/2023

Archive powered by MHonArc 2.6.24.

Top of Page