upg vlc python-setuptools
This commit is contained in:
parent
7d2e5017a8
commit
a4aa3899b7
|
|
@ -6,7 +6,7 @@
|
|||
#-----------------------------------------| DESCRIPTION |---------------------------------------
|
||||
|
||||
pkgname=python-setuptools
|
||||
pkgver=61.3.0
|
||||
pkgver=61.3.1
|
||||
pkgrel=01
|
||||
epoch=1
|
||||
pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
|
|
@ -72,12 +72,16 @@ check() { (
|
|||
export PYTHONDONTWRITEBYTECODE=1
|
||||
|
||||
cd setuptools-$pkgver
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib python -m pytest \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
# 1-7: skipping all tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter)
|
||||
# 8-10: subtle difference introduced by devendoring
|
||||
PRE_BUILT_SETUPTOOLS_SDIST="$PWD"/build/lib python -m pytest \
|
||||
--deselect setuptools/tests/integration/test_pip_install_sdist.py \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
--deselect setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests \
|
||||
--deselect setuptools/tests/test_virtualenv.py \
|
||||
--deselect "setuptools/tests/test_editable_install.py::test_editable_with_pyproject[__import__('setuptools').setup()]" \
|
||||
--deselect setuptools/tests/test_editable_install.py::test_editable_with_pyproject \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
|
||||
--deselect setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example
|
||||
)}
|
||||
|
|
@ -91,6 +95,6 @@ package() {
|
|||
|
||||
license=('PSF')
|
||||
|
||||
sha256sums=(63bb2671c3a4dd67949e9c8ff46aa06939c91d960e562cba68498a7ffb992b0a # python-setuptools-61.3.0.tar.gz
|
||||
sha256sums=(dbc68c0f2fa637248424a122fe42b6591e91c9b0c1c3c8f46ef0323f99c9e68a # python-setuptools-61.3.1.tar.gz
|
||||
3fffbffa0d0116ab64cb1e0e9b33ea28c60147c8f4fdbcfe71fac2adcfedd14a) # system-validate-pyproject.patch
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
# Contributor: Eli Schwartz <eschwartz@archlinux.org>
|
||||
|
||||
pkgname=python-setuptools
|
||||
pkgver=61.3.0
|
||||
pkgver=61.3.1
|
||||
pkgrel=1
|
||||
epoch=1
|
||||
pkgdesc="Easily download, build, install, upgrade, and uninstall Python packages"
|
||||
|
|
@ -22,7 +22,7 @@ provides=('python-distribute')
|
|||
replaces=('python-distribute')
|
||||
source=("$pkgname-$pkgver.tar.gz::https://github.com/pypa/setuptools/archive/v$pkgver.tar.gz"
|
||||
system-validate-pyproject.patch)
|
||||
sha512sums=('35e2b848cf79e577b8c469562cb68a80b27d42d2d9c1c94f84fea9beb85e2db0796ed64d414add67a404d801c4f4e6cd489a72153de4dc8ed8b45fab24c28fd9'
|
||||
sha512sums=('33569c80465e6465871276e1923d165a1ca82599654f8375d5280f9b2ef48f227c79e457b9462ac575a82287c997b6078b496cb606134cc67a3e5e906cc2e5e0'
|
||||
'50495062093b1b6902484c384abe073896e4f45c5768741582e178014367f186831711a72a8a987e7bacafe96d871161fc07c686dd92c6886de19302f6a10b56')
|
||||
|
||||
export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=0
|
||||
|
|
@ -72,12 +72,16 @@ check() { (
|
|||
export PYTHONDONTWRITEBYTECODE=1
|
||||
|
||||
cd setuptools-$pkgver
|
||||
SETUPTOOLS_USE_DISTUTILS=stdlib python -m pytest \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
# 1-7: skipping all tests using "setuptools_sdist", "setuptools_wheel" (or "venv" which uses the latter)
|
||||
# 8-10: subtle difference introduced by devendoring
|
||||
PRE_BUILT_SETUPTOOLS_SDIST="$PWD"/build/lib python -m pytest \
|
||||
--deselect setuptools/tests/integration/test_pip_install_sdist.py \
|
||||
--deselect setuptools/tests/test_distutils_adoption.py \
|
||||
--deselect setuptools/tests/test_setuptools.py::test_its_own_wheel_does_not_contain_tests \
|
||||
--deselect setuptools/tests/test_virtualenv.py \
|
||||
--deselect "setuptools/tests/test_editable_install.py::test_editable_with_pyproject[__import__('setuptools').setup()]" \
|
||||
--deselect setuptools/tests/test_editable_install.py::test_editable_with_pyproject \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_in_sdist \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::TestMeta::test_example_file_not_in_wheel \
|
||||
--deselect setuptools/tests/config/test_apply_pyprojecttoml.py::test_apply_pyproject_equivalent_to_setupcfg \
|
||||
--deselect setuptools/tests/config/test_pyprojecttoml.py::test_invalid_example
|
||||
)}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,21 @@
|
|||
diff --git a/setuptools/config/pyprojecttoml.py b/setuptools/config/pyprojecttoml.py
|
||||
index bc76b111..886c9747 100644
|
||||
--- a/setuptools/config/pyprojecttoml.py
|
||||
+++ b/setuptools/config/pyprojecttoml.py
|
||||
@@ -26,10 +26,14 @@ def load_file(filepath: _Path) -> dict:
|
||||
|
||||
|
||||
def validate(config: dict, filepath: _Path):
|
||||
- from setuptools.extern._validate_pyproject import validate as _validate
|
||||
+ import validate_pyproject.api, validate_pyproject.cli, validate_pyproject.plugins
|
||||
+ plugins = validate_pyproject.plugins.list_from_entry_points()
|
||||
+ validator = validate_pyproject.api.Validator(
|
||||
+ validate_pyproject.cli.select_plugins(plugins, ('setuptools', 'distutils'), ())
|
||||
+ )
|
||||
|
||||
try:
|
||||
- return _validate(config)
|
||||
+ return validator(config)
|
||||
except Exception as ex:
|
||||
if ex.__class__.__name__ != "ValidationError":
|
||||
# Workaround for the fact that `extern` can duplicate imports
|
||||
|
|
@ -10,7 +10,7 @@ _vlcver=3.0.17.4
|
|||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=05
|
||||
pkgrel=06
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player - no systemd,avahi,dbus '
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -100,7 +100,7 @@ optdepends=('avahi: service discovery using bonjour protocol'
|
|||
conflicts=('vlc-plugin')
|
||||
replaces=('vlc-plugin')
|
||||
options=('!emptydirs')
|
||||
#options=(debug '!emptydirs') ## uncomment this and comment the above options to produce the debug pkg
|
||||
#options=('debug' '!emptydirs') ## uncomment this and comment the above options to produce the debug pkg
|
||||
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
|
||||
$pkgname-dav1d-1.0.patch::https://github.com/videolan/vlc/commit/2202c892c8dc.patch
|
||||
update-vlc-plugin-cache.hook
|
||||
|
|
@ -264,4 +264,5 @@ sha256sums=(8c5a62d88a4fb45c1b095cf10befef217dfa87aedcec5184b9e7d590b6dd4133 #
|
|||
b98043683dd90d3f5a3f501212dfc629839b661100de5ac79fd30cb7b4a06f13 # update-vlc-plugin-cache.hook
|
||||
a45340d4f4fc371c70ae96e13ee8ced28930e77b1598b2429ac84a4a31029b86 # caca-fix-to-newer-version.patch
|
||||
08f6a07a149039255d34ff04db08c3de477966118f62339a631b53ffa2dfd85a) # vlc-live-media-2021.patch
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ _vlcver=3.0.17.4
|
|||
# optional fixup version including hyphen
|
||||
_vlcfixupver=
|
||||
pkgver=${_vlcver}${_vlcfixupver//-/.r}
|
||||
pkgrel=5
|
||||
pkgrel=6
|
||||
pkgdesc='Multi-platform MPEG, VCD/DVD, and DivX player'
|
||||
url='https://www.videolan.org/vlc/'
|
||||
arch=('x86_64')
|
||||
|
|
@ -99,7 +99,7 @@ optdepends=('avahi: service discovery using bonjour protocol'
|
|||
'pcsclite: aribcam support')
|
||||
conflicts=('vlc-plugin')
|
||||
replaces=('vlc-plugin')
|
||||
options=(debug '!emptydirs')
|
||||
options=('debug' '!emptydirs')
|
||||
source=(https://download.videolan.org/${pkgname}/${_vlcver}/${pkgname}-${_vlcver}${_vlcfixupver}.tar.xz{,.asc}
|
||||
$pkgname-dav1d-1.0.patch::https://github.com/videolan/vlc/commit/2202c892c8dc.patch
|
||||
update-vlc-plugin-cache.hook
|
||||
|
|
|
|||
|
|
@ -0,0 +1,80 @@
|
|||
From 2202c892c8dc1381b596c53c2ebd3ca680061f95 Mon Sep 17 00:00:00 2001
|
||||
From: Steve Lhomme <robux4@ycbcr.xyz>
|
||||
Date: Fri, 18 Mar 2022 11:42:49 +0100
|
||||
Subject: [PATCH] dav1d: fix compilation with (upcoming) dav1d 1.0
|
||||
|
||||
(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited)
|
||||
edited:
|
||||
- 3.0 has the 128 pixels padding elsewhere
|
||||
- 3.0 has an extra parameter for add_integer_with_range()
|
||||
- 3.0 was setting i_extra_picture_buffers further down in the code
|
||||
- 3.0 uses 16 threads max
|
||||
|
||||
Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
|
||||
---
|
||||
modules/codec/dav1d.c | 22 +++++++++++++++++++++-
|
||||
1 file changed, 21 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/modules/codec/dav1d.c b/modules/codec/dav1d.c
|
||||
index 039165f52ec..cfabbc27cb3 100644
|
||||
--- a/modules/codec/dav1d.c
|
||||
+++ b/modules/codec/dav1d.c
|
||||
@@ -63,10 +63,16 @@ vlc_module_begin ()
|
||||
set_category(CAT_INPUT)
|
||||
set_subcategory(SUBCAT_INPUT_VCODEC)
|
||||
|
||||
+#if DAV1D_API_VERSION_MAJOR >= 6
|
||||
+ add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS,
|
||||
+ THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
|
||||
+ add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0
|
||||
+#else
|
||||
add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS,
|
||||
THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
|
||||
add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS,
|
||||
THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
|
||||
+#endif
|
||||
vlc_module_end ()
|
||||
|
||||
/*****************************************************************************
|
||||
@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this)
|
||||
return VLC_ENOMEM;
|
||||
|
||||
dav1d_default_settings(&p_sys->s);
|
||||
+#if DAV1D_API_VERSION_MAJOR >= 6
|
||||
+ p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
|
||||
+ if (p_sys->s.n_threads == 0)
|
||||
+ p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
|
||||
+#else
|
||||
p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
|
||||
if (p_sys->s.n_tile_threads == 0)
|
||||
p_sys->s.n_tile_threads =
|
||||
@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this)
|
||||
p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
|
||||
if (p_sys->s.n_frame_threads == 0)
|
||||
p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16;
|
||||
+#endif
|
||||
p_sys->s.allocator.cookie = dec;
|
||||
p_sys->s.allocator.alloc_picture_callback = NewPicture;
|
||||
p_sys->s.allocator.release_picture_callback = FreePicture;
|
||||
@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this)
|
||||
return VLC_EGENERIC;
|
||||
}
|
||||
|
||||
+#if DAV1D_API_VERSION_MAJOR >= 6
|
||||
+ msg_Dbg(p_this, "Using dav1d version %s with %d threads",
|
||||
+ dav1d_version(), p_sys->s.n_threads);
|
||||
+
|
||||
+ dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
|
||||
+#else
|
||||
msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
|
||||
dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
|
||||
|
||||
+ dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
|
||||
+#endif
|
||||
+
|
||||
dec->pf_decode = Decode;
|
||||
dec->pf_flush = FlushDecoder;
|
||||
- dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
|
||||
|
||||
dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
|
||||
dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;
|
||||
Loading…
Reference in New Issue