diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-08-11 03:49:24 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-08-11 03:49:24 -0400 |
| commit | 3785e42e5219a86d9d8a5208ff18e97e0cbcbe78 (patch) | |
| tree | b4204645ec27c08735604b5043be44550f4d704e /gnu/packages/gstreamer.scm | |
| parent | d156c999d0e7413696064992bb4a001d2d95317d (diff) | |
| parent | d373c16f33fe0735a7a7d24899530c1af255b5f6 (diff) | |
| download | patches-3785e42e5219a86d9d8a5208ff18e97e0cbcbe78.tar patches-3785e42e5219a86d9d8a5208ff18e97e0cbcbe78.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/gstreamer.scm')
| -rw-r--r-- | gnu/packages/gstreamer.scm | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 69b8ffabee..97fd52e160 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -275,7 +275,16 @@ developers consider to have good quality code and correct functionality.") #:configure-flags (list (string-append "--with-html-dir=" (assoc-ref %outputs "doc") - "/share/gtk-doc/html")))) + "/share/gtk-doc/html")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-openjpeg-reference + (lambda _ + ;; Remove hard-coded openjpeg-2.1 path. 2.2 is API- and + ;; ABI-compatible. + (substitute* "ext/openjpeg/gstopenjpeg.h" + (("<openjpeg-2\\.1/") "<openjpeg-2.2/")) + #t))))) (propagated-inputs `(("gst-plugins-base" ,gst-plugins-base))) (native-inputs |