[PATCH 1/4] gnu: orc: Update to 0.4.25.

[PATCH 1/4] gnu: orc: Update to 0.4.25.

[宋文武]

* gnu/packages/gstreamer.scm (orc): Update to 0.4.25.
---
 gnu/packages/gstreamer.scm | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 45dded1..5b348b1 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1,7 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2013, 2015 Andreas Enge <andreas@enge.fr>
 ;;; Copyright © 2014 John Darrington <jmd@gnu.org>
-;;; Copyright © 2015 Sou Bunnbu <iyzsong@gmail.com>
+;;; Copyright © 2015, 2016 Sou Bunnbu <iyzsong@gmail.com>
 ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org>
 ;;;
 ;;; This file is part of GNU Guix.
@@ -61,14 +61,14 @@
 (define-public orc
   (package
     (name "orc")
-    (version "0.4.24")
+    (version "0.4.25")
     (source (origin
               (method url-fetch)
               (uri (string-append "https://gstreamer.freedesktop.org/data/src/"
                                   "orc/orc-" version ".tar.xz"))
               (sha256
                (base32
-                "16ykgdrgxr6pfpy931p979cs68klvwmk3ii1k0a00wr4nn9x931k"))))
+                "1lak3hyvvb0w9avzmf0a8vayb7vqhj4m709q1czlhvgjb15dbcf1"))))
     (build-system gnu-build-system)
     (arguments `(#:phases
                  (alist-cons-before
-- 
2.6.3

[PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH.

[宋文武]

* gnu/packages/glib.scm (python-pygobject)[native-search-paths]: Use the
same search paths as gobject-introspection.
---
 gnu/packages/glib.scm | 1 +
 1 file changed, 1 insertion(+)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b925704..11e9348 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -548,6 +548,7 @@ useful for C++.")
      ;; test_callback_user_data_middle_single
      ;; test_callback_user_data_middle_tuple
      '(#:tests? #f))
+    (native-search-paths (package-native-search-paths gobject-introspection))
     (home-page "https://live.gnome.org/PyGObject")
     (synopsis "Python bindings for GObject")
     (description
-- 
2.6.3

[PATCH 3/4] gnu: python-pygobject: Propagate glib and libffi.

[宋文武]

* gnu/packages/glib.scm (python-pygobject): Move glib and libffi to propagated-inputs.
(python2-pygobject)[inputs]: Remove glib and libffi.
---
 gnu/packages/glib.scm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 11e9348..e69563b 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -534,9 +534,11 @@ useful for C++.")
        ("pkg-config" ,pkg-config)))
     (inputs
      `(("python" ,python)
-       ("glib"   ,glib)
        ("python-pycairo" ,python-pycairo)
-       ("gobject-introspection" ,gobject-introspection)
+       ("gobject-introspection" ,gobject-introspection)))
+    (propagated-inputs
+     ;; pygobject-3.0.pc refers to all these.
+     `(("glib" ,glib)
        ("libffi" ,libffi)))
     (arguments
      ;; TODO: failing tests: test_native_calls_async
@@ -561,10 +563,8 @@ useful for C++.")
     (name "python2-pygobject")
     (inputs
      `(("python" ,python-2)
-       ("glib" ,glib)
        ("python-pycairo" ,python2-pycairo)
-       ("gobject-introspection" ,gobject-introspection)
-       ("libffi" ,libffi)))))
+       ("gobject-introspection" ,gobject-introspection)))))
 
 (define telepathy-glib
   (package
-- 
2.6.3

[PATCH 4/4] gnu: Add gst-python.

[宋文武]

* gnu/packages/gstreamer.scm (python-gst, python2-gst): New variables.
---
 gnu/packages/gstreamer.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index 5b348b1..b19ea81 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -24,6 +24,7 @@
   #:use-module (guix packages)
   #:use-module (guix download)
   #:use-module (guix build-system gnu)
+  #:use-module (guix utils)
   #:use-module (gnu packages)
   #:use-module (gnu packages audio)
   #:use-module (gnu packages bison)
@@ -400,3 +401,60 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
      "This GStreamer plugin supports a large number of audio and video
 compression formats through the use of the libav library.")
     (license gpl2+)))
+
+(define-public python-gst
+  (package
+    (name "python-gst")
+    (version "1.6.2")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append
+                    "https://gstreamer.freedesktop.org/src/gst-python/"
+                    "gst-python-" version ".tar.xz"))
+              (sha256
+               (base32
+                "09ci5zvr7lms7mvgbjgsjwaxcl4nq45n1g9pdwnqmx3rf0qkwxjf"))))
+    (build-system gnu-build-system)
+    (arguments
+     `(#:configure-flags
+       (let ((python-sitedir
+              ;; XXX: make this a package property?
+              ,(string-append "lib/python"
+                              (version-major+minor (package-version python))
+                              "/site-packages")))
+         (list (string-append
+                "--with-pygi-overrides-dir=" %output "/" python-sitedir
+                "/gi/overrides")))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("python" ,python)))
+    (propagated-inputs
+     `(("gst-plugins-base" ,gst-plugins-base)
+       ("python-pygobject" ,python-pygobject)))
+    (home-page "http://gstreamer.freedesktop.org/")
+    (synopsis "GStreamer GObject Introspection overrides for Python")
+    (description
+     "This package contains GObject Introspection overrides for Python that can
+be used by Python applications using GStreamer.")
+    (license lgpl2.1+)
+    (properties `((python2-variant . ,(delay python2-gst))))))
+
+(define-public python2-gst
+  (package (inherit python-gst)
+    (name "python2-gst")
+    (arguments
+     `(#:configure-flags
+       (let ((python-sitedir
+              ;; XXX: make this a package property?
+              ,(string-append "lib/python"
+                              (version-major+minor (package-version python-2))
+                              "/site-packages")))
+         (list (string-append
+                "--with-pygi-overrides-dir=" %output "/" python-sitedir
+                "/gi/overrides")))))
+    (native-inputs
+     `(("pkg-config" ,pkg-config)
+       ("python" ,python-2)))
+    (propagated-inputs
+     `(("gst-plugins-base" ,gst-plugins-base)
+       ("python-pygobject" ,python2-pygobject)))))
-- 
2.6.3

Re: [PATCH 4/4] gnu: Add gst-python.

[Efraim Flashner]

[-- Attachment #1: Type: text/plain, Size: 3686 bytes --]

On Sun,  6 Mar 2016 15:07:58 +0800
宋文武 <iyzsong@gmail.com> wrote:

> * gnu/packages/gstreamer.scm (python-gst, python2-gst): New variables.
> ---
>  gnu/packages/gstreamer.scm | 58 ++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 58 insertions(+)
> 
> diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
> index 5b348b1..b19ea81 100644
> --- a/gnu/packages/gstreamer.scm
> +++ b/gnu/packages/gstreamer.scm
> @@ -24,6 +24,7 @@
>    #:use-module (guix packages)
>    #:use-module (guix download)
>    #:use-module (guix build-system gnu)
> +  #:use-module (guix utils)
>    #:use-module (gnu packages)
>    #:use-module (gnu packages audio)
>    #:use-module (gnu packages bison)
> @@ -400,3 +401,60 @@ distribution problems in some jurisdictions, e.g. due to patent threats.")
>       "This GStreamer plugin supports a large number of audio and video
>  compression formats through the use of the libav library.")
>      (license gpl2+)))
> +
> +(define-public python-gst
> +  (package
> +    (name "python-gst")
> +    (version "1.6.2")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append
> +                    "https://gstreamer.freedesktop.org/src/gst-python/"
> +                    "gst-python-" version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "09ci5zvr7lms7mvgbjgsjwaxcl4nq45n1g9pdwnqmx3rf0qkwxjf"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     `(#:configure-flags
> +       (let ((python-sitedir
> +              ;; XXX: make this a package property?
> +              ,(string-append "lib/python"
> +                              (version-major+minor (package-version python))
> +                              "/site-packages")))
> +         (list (string-append
> +                "--with-pygi-overrides-dir=" %output "/" python-sitedir
> +                "/gi/overrides")))))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("python" ,python)))
> +    (propagated-inputs
> +     `(("gst-plugins-base" ,gst-plugins-base)
> +       ("python-pygobject" ,python-pygobject)))
> +    (home-page "http://gstreamer.freedesktop.org/")
> +    (synopsis "GStreamer GObject Introspection overrides for Python")
> +    (description
> +     "This package contains GObject Introspection overrides for Python that can
> +be used by Python applications using GStreamer.")
> +    (license lgpl2.1+)
> +    (properties `((python2-variant . ,(delay python2-gst))))))
> +
> +(define-public python2-gst
> +  (package (inherit python-gst)
> +    (name "python2-gst")
> +    (arguments
> +     `(#:configure-flags
> +       (let ((python-sitedir
> +              ;; XXX: make this a package property?
> +              ,(string-append "lib/python"
> +                              (version-major+minor (package-version python-2))
> +                              "/site-packages")))
> +         (list (string-append
> +                "--with-pygi-overrides-dir=" %output "/" python-sitedir
> +                "/gi/overrides")))))
> +    (native-inputs
> +     `(("pkg-config" ,pkg-config)
> +       ("python" ,python-2)))
> +    (propagated-inputs
> +     `(("gst-plugins-base" ,gst-plugins-base)
> +       ("python-pygobject" ,python2-pygobject)))))

are you sure this should use the gnu-build-system and not the
python-build-system?

-- 
Efraim Flashner   <efraim@flashner.co.il>   אפרים פלשנר
GPG key = A28B F40C 3E55 1372 662D  14F7 41AA E7DC CA3D 8351
Confidentiality cannot be guaranteed on emails sent or received unencrypted

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]

Re: [PATCH 4/4] gnu: Add gst-python.

[宋文武]

Efraim Flashner <efraim@flashner.co.il> writes:

> On Sun,  6 Mar 2016 15:07:58 +0800
> [...]
>
> are you sure this should use the gnu-build-system and not the
> python-build-system?
Yes, it use autotools, and don’t have setup.py.

Re: [PATCH 1/4] gnu: orc: Update to 0.4.25.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/gstreamer.scm (orc): Update to 0.4.25.

OK!

Ludo'.

Re: [PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/glib.scm (python-pygobject)[native-search-paths]: Use the
> same search paths as gobject-introspection.

[...]

> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -548,6 +548,7 @@ useful for C++.")
>       ;; test_callback_user_data_middle_single
>       ;; test_callback_user_data_middle_tuple
>       '(#:tests? #f))
> +    (native-search-paths (package-native-search-paths gobject-introspection))

Could you add a comment briefly explaining why this is necessary?  It’s
not entirely clear to me if this is a workaround or the “obvious” thing.

Thanks,
Ludo’.

Re: [PATCH 3/4] gnu: python-pygobject: Propagate glib and libffi.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/glib.scm (python-pygobject): Move glib and libffi to propagated-inputs.
> (python2-pygobject)[inputs]: Remove glib and libffi.

OK.  (Propagating these things is evil, but no better idea…)

Ludo'.

Re: [PATCH 4/4] gnu: Add gst-python.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/gstreamer.scm (python-gst, python2-gst): New variables.

[...]

> +    (arguments
> +     `(#:configure-flags
> +       (let ((python-sitedir
> +              ;; XXX: make this a package property?
> +              ,(string-append "lib/python"
> +                              (version-major+minor (package-version python))
> +                              "/site-packages")))

I think the directory name should be computed on the “build side”,
possibly using ‘get-python-version’ from (guix build
python-build-system) or something equivalent.

That way, ‘python2-gst’ wouldn’t have to duplicate this snippet.

WDYT?

Ludo’.

Re: [PATCH 4/4] gnu: Add gst-python.

[宋文武]

ludo@gnu.org (Ludovic Courtès) writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/gstreamer.scm (python-gst, python2-gst): New variables.
>
> [...]
>
>> +    (arguments
>> +     `(#:configure-flags
>> +       (let ((python-sitedir
>> +              ;; XXX: make this a package property?
>> +              ,(string-append "lib/python"
>> +                              (version-major+minor (package-version python))
>> +                              "/site-packages")))
>
> I think the directory name should be computed on the “build side”,
> possibly using ‘get-python-version’ from (guix build
> python-build-system) or something equivalent.
>
> That way, ‘python2-gst’ wouldn’t have to duplicate this snippet.
Cool, I did that and pushed, with comment that ‘get-python-version’ is a
private function, hope someone will factorize it later.


Thanks for the reviews!