unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#28357] [PATCH] gnu: qtmultimedia: Build gstreamer backend.
@ 2017-09-05 13:46 Ricardo Wurmus
  2017-09-08 16:08 ` Ludovic Courtès
  0 siblings, 1 reply; 3+ messages in thread
From: Ricardo Wurmus @ 2017-09-05 13:46 UTC (permalink / raw)
  To: 28357; +Cc: Ricardo Wurmus

* gnu/packages/qt.scm (qtmultimedia)[inputs]: Add gstreamer and
gst-plugins-base.
[arguments]: Replace configure phase to pass extra arguments to qmake.
---
 gnu/packages/qt.scm | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/qt.scm b/gnu/packages/qt.scm
index 3e3588a50..bc275ebb0 100644
--- a/gnu/packages/qt.scm
+++ b/gnu/packages/qt.scm
@@ -46,6 +46,7 @@
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gnuzilla)
   #:use-module (gnu packages gperf)
+  #:use-module (gnu packages gstreamer)
   #:use-module (gnu packages gtk)
   #:use-module (gnu packages icu4c)
   #:use-module (gnu packages image)
@@ -776,7 +777,15 @@ developers using C++ or QML, a CSS & JavaScript like language.")
                    (("spectrum") "#"))))))
     (arguments
      (substitute-keyword-arguments (package-arguments qtsvg)
-       ((#:tests? _ #f) #f))) ; TODO: Enable the tests
+       ((#:phases phases)
+        `(modify-phases ,phases
+           (replace 'configure
+             (lambda* (#:key outputs #:allow-other-keys)
+               (let ((out (assoc-ref outputs "out")))
+                 (zero? (system* "qmake" "QT_BUILD_PARTS = libs tools tests"
+                                 (string-append "QMAKE_LFLAGS_RPATH=-Wl,-rpath," out "/lib -Wl,-rpath,")
+                                 (string-append "PREFIX=" out))))))))
+       ((#:tests? _ #f) #f)))           ; TODO: Enable the tests
     (native-inputs
      `(("perl" ,perl)
        ("pkg-config" ,pkg-config)
@@ -786,7 +795,10 @@ developers using C++ or QML, a CSS & JavaScript like language.")
      `(("alsa-lib" ,alsa-lib)
        ("mesa" ,mesa)
        ("pulseaudio" ,pulseaudio)
-       ("qtbase" ,qtbase)))))
+       ("qtbase" ,qtbase)
+       ;; Gstreamer is needed for the mediaplayer plugin
+       ("gstreamer" ,gstreamer)
+       ("gst-plugins-base" ,gst-plugins-base)))))
 
 (define-public qtwayland
   (package (inherit qtsvg)
-- 
2.14.1

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [bug#28357] [PATCH] gnu: qtmultimedia: Build gstreamer backend.
  2017-09-05 13:46 [bug#28357] [PATCH] gnu: qtmultimedia: Build gstreamer backend Ricardo Wurmus
@ 2017-09-08 16:08 ` Ludovic Courtès
  2017-09-28 11:29   ` bug#28357: " Ricardo Wurmus
  0 siblings, 1 reply; 3+ messages in thread
From: Ludovic Courtès @ 2017-09-08 16:08 UTC (permalink / raw)
  To: Ricardo Wurmus; +Cc: 28357

Ricardo Wurmus <rekado@elephly.net> skribis:

> * gnu/packages/qt.scm (qtmultimedia)[inputs]: Add gstreamer and
> gst-plugins-base.
> [arguments]: Replace configure phase to pass extra arguments to qmake.

LGTM, thanks!

Ludo'.

^ permalink raw reply	[flat|nested] 3+ messages in thread

* bug#28357: [PATCH] gnu: qtmultimedia: Build gstreamer backend.
  2017-09-08 16:08 ` Ludovic Courtès
@ 2017-09-28 11:29   ` Ricardo Wurmus
  0 siblings, 0 replies; 3+ messages in thread
From: Ricardo Wurmus @ 2017-09-28 11:29 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 28357-done


Ludovic Courtès <ludo@gnu.org> writes:

> Ricardo Wurmus <rekado@elephly.net> skribis:
>
>> * gnu/packages/qt.scm (qtmultimedia)[inputs]: Add gstreamer and
>> gst-plugins-base.
>> [arguments]: Replace configure phase to pass extra arguments to qmake.
>
> LGTM, thanks!

Pushed with 0423131156c9ff4a242e59db3f4dde912d8e400a.

-- 
Ricardo

GPG: BCA6 89B6 3655 3801 C3C6  2150 197A 5888 235F ACAC
https://elephly.net

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-09-28 11:31 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-05 13:46 [bug#28357] [PATCH] gnu: qtmultimedia: Build gstreamer backend Ricardo Wurmus
2017-09-08 16:08 ` Ludovic Courtès
2017-09-28 11:29   ` bug#28357: " Ricardo Wurmus

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).