summary refs log tree commit diff
path: root/gnu/packages/gstreamer.scm
diff options
context:
space:
mode:
authorMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-10-27 22:44:58 -0400
committerMaxim Cournoyer <maxim.cournoyer@gmail.com>2021-11-11 12:18:24 -0500
commit222b461878179dbe3b5fdce8cb59cf6841579df7 (patch)
treef836d4f6c0db94acc6458ead435b41e962c9b12b /gnu/packages/gstreamer.scm
parent33b28e9553435a58f8e34c785ff3fd451165b634 (diff)
downloadguix-222b461878179dbe3b5fdce8cb59cf6841579df7.tar.gz
gnu: zxing-cpp: Update to 1.2.0-0.00783db.
* gnu/packages/aidc.scm (zxing-cpp): Update to 1.2.0-0.00783db.
[version]: Use git-version.
[source]: Adjust accordingly.
[native-inputs]: Replace googletest-source by the regular googletest package.
Add fmt.
[arguments]: Remove field.
(zxing-cpp-1.2): New variable.
* gnu/packages/gstreamer.scm (gst-plugins-bad): Skip failing test.
[inputs]: Use zxing-cpp-1.2.
Diffstat (limited to 'gnu/packages/gstreamer.scm')
-rw-r--r--gnu/packages/gstreamer.scm9
1 files changed, 7 insertions, 2 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 2ee9fdcea8..a4c7967c4c 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -775,7 +775,12 @@ model to base your own plug-in on, here it is.")
                  ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/932
                  ((".*elements/curlhttpsrc\\.c.*") "")
                  ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412
-                 ((".*elements/dtls\\.c.*") "")))))
+                 ((".*elements/dtls\\.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\".*")
+                  "")))))
          (add-before 'check 'pre-check
            (lambda _
              ;; Tests require a running X server.
@@ -898,7 +903,7 @@ model to base your own plug-in on, here it is.")
        ("wpebackend-fdo" ,wpebackend-fdo)
        ;; ("wpewebkit" ,wpewebkit)
        ("zbar" ,zbar)
-       ("zxing" ,zxing-cpp)))
+       ("zxing" ,zxing-cpp-1.2)))
     (home-page "https://gstreamer.freedesktop.org/")
     (synopsis "Plugins for the GStreamer multimedia library")
     (description