* [PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH.
2016-03-06 7:07 [PATCH 1/4] gnu: orc: Update to 0.4.25 宋文武
@ 2016-03-06 7:07 ` 宋文武
2016-03-06 23:15 ` Ludovic Courtès
2016-03-06 7:07 ` [PATCH 3/4] gnu: python-pygobject: Propagate glib and libffi 宋文武
` (2 subsequent siblings)
3 siblings, 1 reply; 11+ messages in thread
From: 宋文武 @ 2016-03-06 7:07 UTC (permalink / raw)
To: guix-devel; +Cc: 宋文武
* 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
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH.
2016-03-06 7:07 ` [PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH 宋文武
@ 2016-03-06 23:15 ` Ludovic Courtès
0 siblings, 0 replies; 11+ messages in thread
From: Ludovic Courtès @ 2016-03-06 23:15 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <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’.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/4] gnu: python-pygobject: Propagate glib and libffi.
2016-03-06 7:07 [PATCH 1/4] gnu: orc: Update to 0.4.25 宋文武
2016-03-06 7:07 ` [PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH 宋文武
@ 2016-03-06 7:07 ` 宋文武
2016-03-06 23:17 ` Ludovic Courtès
2016-03-06 7:07 ` [PATCH 4/4] gnu: Add gst-python 宋文武
2016-03-06 23:14 ` [PATCH 1/4] gnu: orc: Update to 0.4.25 Ludovic Courtès
3 siblings, 1 reply; 11+ messages in thread
From: 宋文武 @ 2016-03-06 7:07 UTC (permalink / raw)
To: guix-devel; +Cc: 宋文武
* 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
^ permalink raw reply related [flat|nested] 11+ messages in thread* [PATCH 4/4] gnu: Add gst-python.
2016-03-06 7:07 [PATCH 1/4] gnu: orc: Update to 0.4.25 宋文武
2016-03-06 7:07 ` [PATCH 2/4] gnu: python-pygobject: Add search path for GI_TYPELIB_PATH 宋文武
2016-03-06 7:07 ` [PATCH 3/4] gnu: python-pygobject: Propagate glib and libffi 宋文武
@ 2016-03-06 7:07 ` 宋文武
2016-03-06 7:15 ` Efraim Flashner
2016-03-06 23:20 ` Ludovic Courtès
2016-03-06 23:14 ` [PATCH 1/4] gnu: orc: Update to 0.4.25 Ludovic Courtès
3 siblings, 2 replies; 11+ messages in thread
From: 宋文武 @ 2016-03-06 7:07 UTC (permalink / raw)
To: guix-devel; +Cc: 宋文武
* 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
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [PATCH 4/4] gnu: Add gst-python.
2016-03-06 7:07 ` [PATCH 4/4] gnu: Add gst-python 宋文武
@ 2016-03-06 7:15 ` Efraim Flashner
2016-03-06 7:25 ` 宋文武
2016-03-06 23:20 ` Ludovic Courtès
1 sibling, 1 reply; 11+ messages in thread
From: Efraim Flashner @ 2016-03-06 7:15 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
[-- 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 --]
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [PATCH 4/4] gnu: Add gst-python.
2016-03-06 7:07 ` [PATCH 4/4] gnu: Add gst-python 宋文武
2016-03-06 7:15 ` Efraim Flashner
@ 2016-03-06 23:20 ` Ludovic Courtès
2016-03-07 1:59 ` 宋文武
1 sibling, 1 reply; 11+ messages in thread
From: Ludovic Courtès @ 2016-03-06 23:20 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <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’.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 4/4] gnu: Add gst-python.
2016-03-06 23:20 ` Ludovic Courtès
@ 2016-03-07 1:59 ` 宋文武
0 siblings, 0 replies; 11+ messages in thread
From: 宋文武 @ 2016-03-07 1:59 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: guix-devel
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!
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/4] gnu: orc: Update to 0.4.25.
2016-03-06 7:07 [PATCH 1/4] gnu: orc: Update to 0.4.25 宋文武
` (2 preceding siblings ...)
2016-03-06 7:07 ` [PATCH 4/4] gnu: Add gst-python 宋文武
@ 2016-03-06 23:14 ` Ludovic Courtès
3 siblings, 0 replies; 11+ messages in thread
From: Ludovic Courtès @ 2016-03-06 23:14 UTC (permalink / raw)
To: 宋文武; +Cc: guix-devel
宋文武 <iyzsong@gmail.com> skribis:
> * gnu/packages/gstreamer.scm (orc): Update to 0.4.25.
OK!
Ludo'.
^ permalink raw reply [flat|nested] 11+ messages in thread