mirror of
https://codeberg.org/guix/guix.git
synced 2026-04-28 06:34:05 +00:00
Compare commits
25 Commits
haskell-te
...
gnome-team
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
6d1b402dba | ||
|
|
a0a174d18a | ||
|
|
e8fab5a808 | ||
|
|
fd378e37fd | ||
|
|
20820a525d | ||
|
|
55be2410d1 | ||
|
|
929e16ca91 | ||
|
|
cfb19502fc | ||
|
|
d54e297b2b | ||
|
|
624f00570b | ||
|
|
86267d4610 | ||
|
|
54a708e69f | ||
|
|
11b99e079d | ||
|
|
eeaf837217 | ||
|
|
11250db478 | ||
|
|
51c2fa607c | ||
|
|
3ae5c06b72 | ||
|
|
b9836afe69 | ||
|
|
ec246d10fd | ||
|
|
b1dbd3588a | ||
|
|
c16c355dbd | ||
|
|
4f75a4e7fc | ||
|
|
3ddd4e7d47 | ||
|
|
655867eed6 | ||
|
|
f1e8ac3787 |
@@ -1578,7 +1578,9 @@ dist_patch_DATA = \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_PATH.patch \
|
||||
%D%/packages/patches/gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch \
|
||||
%D%/packages/patches/gtk-doc-respect-xml-catalog.patch \
|
||||
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
|
||||
%D%/packages/patches/gtk-doc-mkhtml-test-fix.patch \
|
||||
%D%/packages/patches/gtk4-demo-reproducible.patch \
|
||||
%D%/packages/patches/gtk4-needs-udmabuf.patch \
|
||||
%D%/packages/patches/gtk4-respect-GUIX_GTK4_PATH.patch \
|
||||
%D%/packages/patches/gtkglext-disable-disable-deprecated.patch \
|
||||
%D%/packages/patches/gtksourceview-2-add-default-directory.patch \
|
||||
|
||||
@@ -43,6 +43,7 @@
|
||||
#:use-module (guix build-system cmake)
|
||||
#:use-module (guix build-system gnu)
|
||||
#:use-module (guix build-system glib-or-gtk)
|
||||
#:use-module (guix build-system meson)
|
||||
#:use-module (guix gexp)
|
||||
#:use-module (guix utils)
|
||||
#:use-module (gnu packages)
|
||||
@@ -995,18 +996,17 @@ Supported extensions to ISO 9660 are Rock Ridge, Joliet, AAIP, zisofs.")
|
||||
(define-public libudfread
|
||||
(package
|
||||
(name "libudfread")
|
||||
(version "1.1.2")
|
||||
(version "1.2.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
"https://download.videolan.org/pub/videolan/libudfread/"
|
||||
name "-" version ".tar.bz2"))
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"05c943ymw94nzjxf7v102916frqk7icgw4gb244wx23jn8cnz56m"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list automake autoconf libtool pkg-config))
|
||||
"03q5b1wm90vygx4rf4mzzrf0yhvhbvp72nyhv63pgz7v9jypqixv"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
(home-page "https://code.videolan.org/videolan/libudfread")
|
||||
(synopsis "C library to read UDF file systems")
|
||||
(description "@code{libudfread} is a C library for reading
|
||||
|
||||
@@ -578,7 +578,10 @@ This package provides the core library and elements.")
|
||||
(substitute* "tests/check/meson.build"
|
||||
;; This test causes nondeterministic failures (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/895>).
|
||||
((".*'elements/appsrc.c'.*") ""))
|
||||
((".*'elements/appsrc.c'.*") "")
|
||||
;; This one is flaky (see:
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/work_items/5016>).
|
||||
((".*'elements/inputselector.c'.*") ""))
|
||||
;; Some other tests fail on other architectures.
|
||||
#$@(cond
|
||||
((target-x86-32?)
|
||||
@@ -766,7 +769,8 @@ model to base your own plug-in on, here it is.")
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags #~(list "-Dsctp-internal-usrsctp=disabled"
|
||||
#:configure-flags #~(list "-Dgpl=enabled"
|
||||
"-Dsctp-internal-usrsctp=disabled"
|
||||
;; TODO: Figure out why audiovisualizer test
|
||||
;; fails on riscv64-linux.
|
||||
#$@(if (target-riscv64?)
|
||||
@@ -776,6 +780,15 @@ model to base your own plug-in on, here it is.")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/resindvd/resindvdsrc.c"
|
||||
;; `g_module_open' is a wrapper above dlopen; pass it the
|
||||
;; absolute file name of the library to ensure it is always
|
||||
;; found.
|
||||
(("\"libdvdcss\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "lib/libdvdcss.so"))))))
|
||||
(add-after 'unpack 'adjust-tests
|
||||
(lambda* (#:key native-inputs inputs #:allow-other-keys)
|
||||
(let ((gst-plugins-good (assoc-ref (or native-inputs inputs)
|
||||
@@ -789,18 +802,18 @@ model to base your own plug-in on, here it is.")
|
||||
|
||||
;; The 'elements_shm.test_shm_live' test sometimes times out
|
||||
;; (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790).
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/790>).
|
||||
((".*'elements/shm\\.c'.*") "")
|
||||
|
||||
;; The 'elements_curlhttpsrc' test sometimes times out.
|
||||
((".*'elements/curlhttpsrc\\.c'.*") "")
|
||||
|
||||
;; The 'mxfdemux' test fails for unknown reasons (see:
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921).
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921>).
|
||||
((".*'elements/mxfdemux.c'.*") "")
|
||||
|
||||
;; Unexpected critical/warning, see
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3000>
|
||||
;; <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/792>
|
||||
((".*'elements/netsim\\.c'.*") "")
|
||||
|
||||
;; TODO: Figure out why this test fails on riscv64-linux.
|
||||
@@ -809,30 +822,19 @@ model to base your own plug-in on, here it is.")
|
||||
"'elements/viewfinderbin.c'], true, ],"))
|
||||
'())
|
||||
|
||||
;; This test is flaky on at least some architectures.
|
||||
;; This test is flaky.
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/1244
|
||||
#$@(if (member (%current-system)
|
||||
'("aarch64-linux" "riscv64-linux"))
|
||||
`((("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],"))
|
||||
'())
|
||||
(("'elements/camerabin\\.c'\\].*],")
|
||||
"'elements/camerabin.c'], true, ],")
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
|
||||
((".*elements/dtls\\.c.*") "")
|
||||
|
||||
;; https://gitlab.freedesktop.org/gstreamer/gstreamer/-/issues/3921
|
||||
((".*elements/mxfdemux\\.c.*") "")
|
||||
|
||||
;; Unable to create pipeline 'bin.
|
||||
;; ( vulkanupload ! vulkancolorconvert ! vulkandownload )':
|
||||
;; no element "vulkanupload"
|
||||
((".*elements/vkcolorconvert\\.c.*") "")
|
||||
((".*elements/vkupload\\.c.*") ""))
|
||||
(substitute* "tests/check/elements/zxing.c"
|
||||
;; zxing 1.2.0 seemingly changed the type representation of
|
||||
;; the EAN_13 structure; disable it.
|
||||
((".*\"EAN_13\".*")
|
||||
"")))))
|
||||
((".*elements/vkupload\\.c.*") "")))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
@@ -1162,9 +1164,19 @@ after their category.")
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
|
||||
#:configure-flags #~(list "-Dgpl=enabled")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
#$@%common-gstreamer-phases
|
||||
(add-after 'unpack 'patch-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(substitute* "ext/dvdread/dvdreadsrc.c"
|
||||
;; `g_module_open' is a wrapper above dlopen; pass it the
|
||||
;; absolute file name of the library to ensure it is always
|
||||
;; found.
|
||||
(("\"libdvdcss\"")
|
||||
(format #f "~s"
|
||||
(search-input-file inputs "lib/libdvdcss.so"))))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda _
|
||||
;; Tests require a running X server.
|
||||
|
||||
@@ -1123,7 +1123,7 @@ application suites.")
|
||||
(define-public gtk
|
||||
(package
|
||||
(name "gtk")
|
||||
(version "4.20.3")
|
||||
(version "4.22.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
@@ -1131,9 +1131,11 @@ application suites.")
|
||||
(version-major+minor version) "/"
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32 "0ly1gqc6ybxv5f2a9hvjp5k6l9mfzy2yv8iy2xqnr9l8628g4wr8"))
|
||||
(base32 "1z2mkmazc2d51jbg3qwwdycycqiwswm88nhw6bxscz8j86f5lyyd"))
|
||||
(patches
|
||||
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
|
||||
(search-patches "gtk4-demo-reproducible.patch"
|
||||
"gtk4-needs-udmabuf.patch"
|
||||
"gtk4-respect-GUIX_GTK4_PATH.patch"))
|
||||
(modules '((guix build utils)))))
|
||||
(build-system meson-build-system)
|
||||
(outputs '("out" "bin" "doc"))
|
||||
@@ -1201,6 +1203,9 @@ application suites.")
|
||||
(("[ \t]*'empty-text.node',") "")
|
||||
(("[ \t]*'testswitch.node',") "")
|
||||
(("[ \t]*'widgetfactory.node',") "")
|
||||
;; The gtklistitemmanager test is flaky (see:
|
||||
;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6547>).
|
||||
((".*'gtklistitemmanager.c',.*") "")
|
||||
;; XXX: Figure out why this fails and report upstream.
|
||||
((".*'memorytexture',.*") "")
|
||||
((".*'yuv-matrix-dmabuf',.*") ""))
|
||||
@@ -1257,8 +1262,10 @@ application suites.")
|
||||
(setenv "XDG_CACHE_HOME" (getcwd))))
|
||||
(add-before 'check 'pre-check
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
;; Tests require a running X server.
|
||||
(system "Xvfb :1 +extension GLX &")
|
||||
;; Tests require a running X server. The '-noreset' option is
|
||||
;; necessary to avoid spurious "Failed to open display" test
|
||||
;; errors.
|
||||
(system "Xvfb :1 +extension GLX -screen 0 1024x768x24 -noreset &")
|
||||
(setenv "DISPLAY" ":1")
|
||||
;; Tests write to $HOME.
|
||||
(setenv "HOME" (getcwd))
|
||||
@@ -1301,6 +1308,7 @@ application suites.")
|
||||
docbook-xsl
|
||||
gettext-minimal
|
||||
`(,glib "bin")
|
||||
glibc-utf8-locales ;some tests require en_US.UTF-8
|
||||
gobject-introspection ;for building introspection data
|
||||
graphene
|
||||
gtk-doc/stable ;for building documentation
|
||||
@@ -1324,7 +1332,6 @@ application suites.")
|
||||
(inputs
|
||||
(list colord ;for color printing support
|
||||
cups ;for CUPS print-backend
|
||||
ffmpeg ;for ffmpeg media-backend
|
||||
fribidi
|
||||
gi-docgen
|
||||
gstreamer ;for gstreamer media-backend
|
||||
@@ -1368,8 +1375,8 @@ application suites.")
|
||||
(native-search-paths
|
||||
(list
|
||||
(search-path-specification
|
||||
(variable "GUIX_GTK4_PATH")
|
||||
(files '("lib/gtk-4.0")))))
|
||||
(variable "GUIX_GTK4_PATH")
|
||||
(files '("lib/gtk-4.0")))))
|
||||
(search-paths native-search-paths)
|
||||
(home-page "https://www.gtk.org/")
|
||||
(synopsis "Cross-platform widget toolkit")
|
||||
|
||||
@@ -11580,7 +11580,7 @@ of Linux application development.")
|
||||
(define-public wireplumber
|
||||
(package
|
||||
(name "wireplumber")
|
||||
(version "0.5.12")
|
||||
(version "0.5.14")
|
||||
(source
|
||||
(origin
|
||||
(method git-fetch)
|
||||
@@ -11590,7 +11590,7 @@ of Linux application development.")
|
||||
(commit version)))
|
||||
(file-name (git-file-name name version))
|
||||
(sha256
|
||||
(base32 "1dljz669ywy1lvvn0jh14ymynmbii45q5vay71zajpcg31249dyw"))))
|
||||
(base32 "0rr2vlbwjjhgsk6lk2iwaww21gks2v63f0cs01rh2mdi8jpfz7h2"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("-Dsystemd=disabled"
|
||||
|
||||
@@ -614,6 +614,9 @@ Android, and ChromeOS.")
|
||||
(add-after 'unpack 'disable-failing-tests
|
||||
(lambda _
|
||||
(substitute* "tests/meson.build"
|
||||
;; This test is flaky (see:
|
||||
;; <https://gitlab.freedesktop.org/libnice/libnice/-/work_items/210>).
|
||||
((".*'test-send-recv',.*") "")
|
||||
;; ‘test-set-port-range.c:66:main: assertion failed:
|
||||
;; (nice_agent_gather_candidates (agent, stream1))’
|
||||
(("'test-set-port-range'" all)
|
||||
|
||||
35
gnu/packages/patches/gtk-needs-udmabuf.patch
Normal file
35
gnu/packages/patches/gtk-needs-udmabuf.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
|
||||
|
||||
Upstream-status: Patch prepared by upstream, not yet committed.
|
||||
|
||||
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
|
||||
index 0118304bf8..6bf4d4bb93 100644
|
||||
--- a/testsuite/gsk/meson.build
|
||||
+++ b/testsuite/gsk/meson.build
|
||||
@@ -275,6 +275,16 @@ compare_render_tests = [
|
||||
'zero-length-path-stroke',
|
||||
]
|
||||
|
||||
+# These tests use dmabufs and fail in testrunners that have
|
||||
+# dmabuf support but no access to /dev/udmabuf.
|
||||
+# For that purpose we add them to the 'needs-udmabuf' suite
|
||||
+# with this list
|
||||
+needs_udmabuf = [
|
||||
+ 'yuv-matrix-dmabuf-nv12',
|
||||
+ 'yuv-matrix-dmabuf-rgba',
|
||||
+ 'yuv-matrix-dmabuf-yuyv',
|
||||
+]
|
||||
+
|
||||
# These tests are either slow or need lots of memory.
|
||||
# So we don't run them in parallel with other such tests to not
|
||||
# cause CI failures
|
||||
@@ -386,6 +396,9 @@ foreach renderer : renderers
|
||||
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
|
||||
extra_suites += ['failing']
|
||||
endif
|
||||
+ if needs_udmabuf.contains(testname)
|
||||
+ extra_suites += ['needs-udmabuf']
|
||||
+ endif
|
||||
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
|
||||
protocol: 'tap',
|
||||
args: [
|
||||
79
gnu/packages/patches/gtk4-demo-reproducible.patch
Normal file
79
gnu/packages/patches/gtk4-demo-reproducible.patch
Normal file
@@ -0,0 +1,79 @@
|
||||
Upstream-status: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/9675
|
||||
|
||||
diff --git a/demos/gtk-demo/geninclude.py b/demos/gtk-demo/geninclude.py
|
||||
index 2ebfaeb625..5864a608f5 100755
|
||||
--- a/demos/gtk-demo/geninclude.py
|
||||
+++ b/demos/gtk-demo/geninclude.py
|
||||
@@ -2,19 +2,20 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import sys
|
||||
-import re
|
||||
-import os
|
||||
from collections import *
|
||||
|
||||
+
|
||||
def add_quotes(s):
|
||||
return "\"" + s.lower() + "\""
|
||||
|
||||
+
|
||||
def wordify(s):
|
||||
return s.strip().rstrip(".,;:")
|
||||
|
||||
+
|
||||
def is_keyword(s):
|
||||
if s == "GTK":
|
||||
- return False
|
||||
+ return False
|
||||
elif s.startswith(("Gtk", "Gdk", "Pango")):
|
||||
return True
|
||||
elif s.startswith("G") and s[1].isupper():
|
||||
@@ -22,6 +23,7 @@ def is_keyword(s):
|
||||
else:
|
||||
return False
|
||||
|
||||
+
|
||||
out_file = sys.argv[1]
|
||||
in_files = sys.argv[2:]
|
||||
|
||||
@@ -82,6 +84,10 @@ for demo in demos:
|
||||
parent_index = parent_index + 1
|
||||
|
||||
|
||||
+# Sort demos by title
|
||||
+demos = sorted(demos, key=lambda x: x[1])
|
||||
+
|
||||
+
|
||||
# For every child with a parent, generate a list of child demos
|
||||
i = 0
|
||||
for parent in parents:
|
||||
@@ -91,15 +97,12 @@ for parent in parents:
|
||||
for child in demos:
|
||||
if child[1].startswith(parent + "/"):
|
||||
title = child[1][child[1].rfind('/') + 1:]
|
||||
- file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, child[2])) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
|
||||
+ file_output += " { \"" + child[0] + "\", \"" + title + "\", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(child[2]))) + ["NULL"]) + " }, \"" + child[3] + "\", " + child[4] + ", NULL },\n"
|
||||
|
||||
file_output += " { NULL }\n};\n"
|
||||
i = i + 1
|
||||
|
||||
|
||||
-# Sort demos by title
|
||||
-demos = sorted(demos, key=lambda x: x[1])
|
||||
-
|
||||
file_output += "\nDemoData gtk_demos[] = {\n"
|
||||
for demo in demos:
|
||||
# Do not generate one of these for demos with a parent demo
|
||||
@@ -118,10 +121,10 @@ for demo in demos:
|
||||
|
||||
if demo[5] != -1:
|
||||
child_array = "child" + str(demo[5])
|
||||
- file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, keywords)) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
|
||||
+ file_output += " { " + name + ", " + title + ", " + "(const char*[]) {" + ", ".join(list(map(add_quotes, sorted(keywords))) + ["NULL"]) + " }, " + file + ", " + demo[4] + ", " + child_array + " },\n"
|
||||
|
||||
-file_output += " { NULL }\n};\n"
|
||||
|
||||
+file_output += " { NULL }\n};\n"
|
||||
ofile = open(out_file, "w")
|
||||
ofile.write(file_output)
|
||||
ofile.close()
|
||||
35
gnu/packages/patches/gtk4-needs-udmabuf.patch
Normal file
35
gnu/packages/patches/gtk4-needs-udmabuf.patch
Normal file
@@ -0,0 +1,35 @@
|
||||
Some udmapbuf relying tests were still selected despite using --no-suite=needs-udmabuf.
|
||||
|
||||
Upstream-status: Patch prepared by upstream, not yet committed.
|
||||
|
||||
diff --git a/testsuite/gsk/meson.build b/testsuite/gsk/meson.build
|
||||
index 0118304bf8..6bf4d4bb93 100644
|
||||
--- a/testsuite/gsk/meson.build
|
||||
+++ b/testsuite/gsk/meson.build
|
||||
@@ -275,6 +275,16 @@ compare_render_tests = [
|
||||
'zero-length-path-stroke',
|
||||
]
|
||||
|
||||
+# These tests use dmabufs and fail in testrunners that have
|
||||
+# dmabuf support but no access to /dev/udmabuf.
|
||||
+# For that purpose we add them to the 'needs-udmabuf' suite
|
||||
+# with this list
|
||||
+needs_udmabuf = [
|
||||
+ 'yuv-matrix-dmabuf-nv12',
|
||||
+ 'yuv-matrix-dmabuf-rgba',
|
||||
+ 'yuv-matrix-dmabuf-yuyv',
|
||||
+]
|
||||
+
|
||||
# These tests are either slow or need lots of memory.
|
||||
# So we don't run them in parallel with other such tests to not
|
||||
# cause CI failures
|
||||
@@ -386,6 +396,9 @@ foreach renderer : renderers
|
||||
if test_xfails.contains(variant) or (renderer_name == 'cairo' and variant == 'clip')
|
||||
extra_suites += ['failing']
|
||||
endif
|
||||
+ if needs_udmabuf.contains(testname)
|
||||
+ extra_suites += ['needs-udmabuf']
|
||||
+ endif
|
||||
test('compare ' + renderer_name + ' ' + testname + ' ' + variant, compare_render,
|
||||
protocol: 'tap',
|
||||
args: [
|
||||
@@ -173,7 +173,7 @@ rates.")
|
||||
(define-public pulseaudio
|
||||
(package
|
||||
(name "pulseaudio")
|
||||
(version "16.1")
|
||||
(version "17.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append
|
||||
@@ -181,7 +181,7 @@ rates.")
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"1r2aa0g7al9jhrrbrnih6i3bfznd73kkbafrbzwpjyflj7735vwf"))
|
||||
"1dc7xdfbn5rknwsvv5m2ijfwnqrap208liwyhiykjghsczb98dq5"))
|
||||
(modules '((guix build utils)))
|
||||
(snippet
|
||||
;; Disable console-kit support by default since it's deprecated
|
||||
|
||||
@@ -16898,12 +16898,11 @@ the @code{sendfile(2)} system call.")
|
||||
(arguments
|
||||
(list
|
||||
#:test-flags
|
||||
#~(list "-k" "not TestCommandLineParser"
|
||||
#$@(if (target-aarch64?)
|
||||
;; TimeoutError: timed out
|
||||
'((string-append "--deselect=pyftpdlib/test/test_functional.py"
|
||||
"::TestTimeouts::test_idle_data_timeout2"))
|
||||
'()))))
|
||||
#~(list
|
||||
"-k" "not TestCommandLineParser"
|
||||
;; These contains flaky tests.
|
||||
"--deselect=pyftpdlib/test/test_functional.py"
|
||||
"--deselect=pyftpdlib/test/test_functional_ssl.py")))
|
||||
(native-inputs
|
||||
(list python-psutil
|
||||
python-pytest
|
||||
@@ -20956,7 +20955,8 @@ into 22 character URL-safe base64 slug representation.")
|
||||
(sha256
|
||||
(base32 "0zwjry4ylqncqvxrywp0km96jng4f288dgz8kz5vymk7nr2z21m1"))))
|
||||
(build-system pyproject-build-system)
|
||||
;; tests: 856 passed, 24 skipped
|
||||
;; The test_brokenpipeerror is flaky.
|
||||
(arguments (list #:test-flags #~(list "-k" "not test_brokenpipeerror")))
|
||||
(native-inputs
|
||||
(list python-poetry-core
|
||||
python-pytest
|
||||
|
||||
@@ -1090,11 +1090,16 @@ tst_qt_cmake_create.cpp"
|
||||
|
||||
;; See https://bugreports.qt.io/browse/QTBUG-113371
|
||||
;; Adding glibc-utf8-locales to native-inpus is no help.
|
||||
;; TODO: when core-updates is merged, check again.
|
||||
"tst_selftests"
|
||||
|
||||
;; The 'tst_qsqlthread' test sometimes fails.
|
||||
"tst_qsqlthread"
|
||||
;; The qsqldatabase test is flaky (see:
|
||||
;; <https://qt-project.atlassian.net/browse/QTBUG-145385>).
|
||||
"tst_qsqldatabase"
|
||||
|
||||
;; The 'tst_qtimer' test has a propensity to hang and
|
||||
;; fail (see:
|
||||
;; <https://qt-project.atlassian.net/browse/QTBUG-145261>).
|
||||
"tst_qtimer_no_glib"
|
||||
|
||||
;; The 'tst_qthread' test is also flaky, despite the
|
||||
;; patch applied that promised to fix it.
|
||||
@@ -1193,7 +1198,11 @@ tst_qt_cmake_create.cpp"
|
||||
;; This test may fail non-deterministically as reported
|
||||
;; in Guix bug#73233 and upstream at
|
||||
;; https://bugreports.qt.io/browse/QTBUG-119321.
|
||||
"tst_qsharedmemory")
|
||||
"tst_qsharedmemory"
|
||||
|
||||
;; This test fails deterministically on a non-privileged
|
||||
;; daemon.
|
||||
"tst_qstandardpaths")
|
||||
#$@(cond
|
||||
((target-ppc64le?)
|
||||
#~((list
|
||||
|
||||
@@ -50,7 +50,7 @@
|
||||
;;; Copyright © 2021 Alexey Abramov <levenson@mmer.org>
|
||||
;;; Copyright © 2021, 2022, 2023 Andrew Tropin <andrew@trop.in>
|
||||
;;; Copyright © 2021 David Wilson <david@daviwil.com>
|
||||
;;; Copyright © 2021-2025 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2021-2026 Maxim Cournoyer <maxim@guixotic.coop>
|
||||
;;; Copyright © 2020 Hartmut Goebel <h.goebel@crazy-compilers.com>
|
||||
;;; Copyright © 2021 Raghav Gururajan <rg@raghavgururajan.name>
|
||||
;;; Copyright © 2021 Thiago Jung Bauermann <bauermann@kolabnow.com>
|
||||
@@ -3573,38 +3573,21 @@ soon as it starts.")
|
||||
(define-public libbluray
|
||||
(package
|
||||
(name "libbluray")
|
||||
(version "1.3.4")
|
||||
(version "1.4.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
name "/" version "/"
|
||||
name "-" version ".tar.bz2"))
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0aszpsz3pc7p7z6yahlib4na585m6pqbg2d9dkpyipgml1lgv3s7"))))
|
||||
(build-system gnu-build-system)
|
||||
"0jglp44wsjpp5k3mrxskfj9b488ksn7cj2dhxfjdqa3z150drdbn"))))
|
||||
(build-system meson-build-system)
|
||||
(arguments
|
||||
(list
|
||||
#:configure-flags #~(list "--disable-bdjava-jar" "--disable-static")
|
||||
#:phases
|
||||
#~(modify-phases %standard-phases
|
||||
(add-after 'unpack 'move-packages-to-libs
|
||||
;; Avoid the need to propagate libxml2 et al. by referring to them
|
||||
;; directly.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (search-input-vicinity lib)
|
||||
(dirname
|
||||
(search-input-file inputs
|
||||
(string-append "lib/lib" lib ".so"))))
|
||||
(substitute* "src/libbluray.pc.in"
|
||||
(("@PACKAGES@") "")
|
||||
(("^Libs.private:" field)
|
||||
(string-append field
|
||||
" -L" (search-input-vicinity "xml2")
|
||||
" -L" (search-input-vicinity "freetype")
|
||||
" -L" (search-input-vicinity "fontconfig")
|
||||
" -lxml2 -lfreetype -lfontconfig")))))
|
||||
(add-before 'build 'fix-dlopen-paths
|
||||
(add-after 'unpack 'fix-dlopen-paths
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (lib/no.so library)
|
||||
(let ((found (search-input-file inputs library)))
|
||||
@@ -3612,11 +3595,29 @@ soon as it starts.")
|
||||
(string-length ".so")))))
|
||||
(substitute* "src/libbluray/disc/aacs.c"
|
||||
(("\"libaacs\"")
|
||||
(string-append "\"" (lib/no.so "lib/libaacs.so") "\""))
|
||||
(string-append "\"" (lib/no.so "lib/libaacs.so") "\"")))
|
||||
(substitute* "src/libbluray/disc/bdplus.c"
|
||||
(("\"libbdplus\"")
|
||||
(string-append "\"" (lib/no.so "lib/libbdplus.so") "\""))))))))
|
||||
(string-append "\"" (lib/no.so "lib/libbdplus.so") "\"")))))
|
||||
(add-after 'install 'move-packages-to-libs
|
||||
;; Avoid the need to propagate libxml2 et al. by referring to them
|
||||
;; directly.
|
||||
(lambda* (#:key inputs #:allow-other-keys)
|
||||
(define (search-input-vicinity lib)
|
||||
(dirname
|
||||
(search-input-file inputs
|
||||
(string-append "lib/lib" lib ".so"))))
|
||||
(substitute* (string-append #$output
|
||||
"/lib/pkgconfig/libbluray.pc")
|
||||
(("^Requires.private.*") "")
|
||||
(("^Libs.private:" field)
|
||||
(string-append field
|
||||
" -L" (search-input-vicinity "xml2")
|
||||
" -L" (search-input-vicinity "freetype")
|
||||
" -L" (search-input-vicinity "fontconfig")
|
||||
" -lxml2 -lfreetype -lfontconfig"))))))))
|
||||
(native-inputs (list pkg-config))
|
||||
(inputs (list fontconfig freetype libaacs libbdplus libxml2))
|
||||
(inputs (list fontconfig freetype libaacs libbdplus libudfread libxml2))
|
||||
(home-page "https://www.videolan.org/developers/libbluray.html")
|
||||
(synopsis "Blu-Ray Disc playback library")
|
||||
(description
|
||||
@@ -3627,22 +3628,18 @@ players, like VLC or MPlayer.")
|
||||
(define-public libdvdread
|
||||
(package
|
||||
(name "libdvdread")
|
||||
(version "6.1.3")
|
||||
(version "7.0.1")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
"libdvdread/" version "/"
|
||||
"libdvdread-" version ".tar.bz2"))
|
||||
"libdvdread-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0sakl4c8y2kkp09km0b5353w66pvfc72y8wi1vjwn252jx4ladff"))))
|
||||
(build-system gnu-build-system)
|
||||
(arguments
|
||||
`(#:configure-flags '("--with-libdvdcss=yes")))
|
||||
(native-inputs
|
||||
(list pkg-config))
|
||||
(propagated-inputs
|
||||
(list libdvdcss))
|
||||
"01ylalrr9lw6x7fz7z030243kln1hfd1pbh3m9ikjp610nih8gif"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
(propagated-inputs (list libdvdcss))
|
||||
(home-page "http://dvdnav.mplayerhq.hu/")
|
||||
(synopsis "Library for reading video DVDs")
|
||||
(description
|
||||
@@ -3706,16 +3703,16 @@ MPEG-2 stream containing VOB packets.")
|
||||
(define-public libdvdnav
|
||||
(package
|
||||
(name "libdvdnav")
|
||||
(version "6.1.1")
|
||||
(version "7.0.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/videolan/"
|
||||
"libdvdnav/" version "/"
|
||||
"libdvdnav-" version ".tar.bz2"))
|
||||
"libdvdnav-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0j4ds6c4xl34dijkfpw805vj7s0vzg095kw0fvzj7ls7b53sg4f1"))))
|
||||
(build-system gnu-build-system)
|
||||
"07i2gdj4nfah4lwlc6hl14xjbyh6b12bc1lipxs3q4vdsdd8z8d2"))))
|
||||
(build-system meson-build-system)
|
||||
(native-inputs (list pkg-config))
|
||||
(propagated-inputs (list libdvdread)) ;in 'Requires.private' of dvdnav.pc
|
||||
(home-page "http://dvdnav.mplayerhq.hu/")
|
||||
@@ -3736,16 +3733,16 @@ encapsulated.")
|
||||
(define-public libdvdcss
|
||||
(package
|
||||
(name "libdvdcss")
|
||||
(version "1.4.3")
|
||||
(version "1.5.0")
|
||||
(source (origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://download.videolan.org/pub/"
|
||||
name "/" version "/"
|
||||
name "-" version ".tar.bz2"))
|
||||
name "-" version ".tar.xz"))
|
||||
(sha256
|
||||
(base32
|
||||
"0y800y33spblb20s1lsjbaiybknmwwmmiczmjqx5s760blpwjg13"))))
|
||||
(build-system gnu-build-system)
|
||||
"16f3lnwcldy0ssq2yah97qsb0b8scsvhsivfbhpgizmys7j6752j"))))
|
||||
(build-system meson-build-system)
|
||||
(home-page "https://www.videolan.org/developers/libdvdcss.html")
|
||||
(synopsis "Library for accessing DVDs as block devices")
|
||||
(description
|
||||
@@ -5201,19 +5198,18 @@ specifications.")
|
||||
(define-public libaacs
|
||||
(package
|
||||
(name "libaacs")
|
||||
(version "0.11.0")
|
||||
(version "0.11.1")
|
||||
(source
|
||||
(origin
|
||||
(method url-fetch)
|
||||
(uri (string-append "https://ftp.videolan.org/pub/videolan/libaacs/"
|
||||
version "/libaacs-" version ".tar.bz2"))
|
||||
(sha256
|
||||
(base32 "11skjqjlldmbjkyxdcz4fmcn6y4p95r1xagbcnjy4ndnzf0l723d"))))
|
||||
(inputs
|
||||
(list libgcrypt))
|
||||
(native-inputs
|
||||
(list bison flex))
|
||||
(base32 "0f8ax9dp49mrm1484bl2df659b34xyrjmngzmvvpg2n9wkms12m8"))))
|
||||
(inputs (list libgcrypt))
|
||||
(native-inputs (list bison flex))
|
||||
(build-system gnu-build-system)
|
||||
(arguments (list #:configure-flags #~(list "--disable-static")))
|
||||
(home-page "https://www.videolan.org/developers/libaacs.html")
|
||||
(synopsis "Library for decrypting certain Blu-Ray discs")
|
||||
(description "libaacs is a library which implements the Advanced Access
|
||||
|
||||
Reference in New Issue
Block a user