[bug#70516] [PATCH] gnu: Add libgpod.

[bug#70516] [PATCH] gnu: Add libgpod.

[Sergey Trofimov]

* gnu/packages/music.scm (libgpod): New variable.
(clementine)[inputs]: Make use of it.
---
 gnu/packages/music.scm | 55 +++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 54 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index df3ff38b4a..94f4da95ab 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -182,6 +182,7 @@ (define-module (gnu packages music)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rsync)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages scsi)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
@@ -430,6 +431,58 @@ (define-public aria-maestosa
 score, keyboard, guitar, drum and controller views.")
     (license license:gpl3+)))
 
+(define-public libgpod
+  (package
+    (name "libgpod")
+    (version "0.8.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.code.sf.net/p/gtkpod/libgpod")
+             (commit "8dc5015ae036b219c4c9579a156886aa3a722aa5")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yzngb7h1mibz4x56w9fh02vx8xi4wyq4fjc3ad0jayv3hxjjkqv"))))
+    (arguments
+     (list
+      #:configure-flags
+      #~(list
+         "--without-hal"
+         "--enable-udev"
+         (string-append "--with-udev-dir=" #$output "/lib/udev")
+         (string-append "--prefix=" #$output))
+
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-autotools-version-requirement
+            (lambda _
+              (setenv "ACLOCAL_FLAGS"
+                      (string-join
+                       (map (lambda (s) (string-append "-I " s))
+                            (string-split (getenv "ACLOCAL_PATH") #\:))
+                       " "))
+              (substitute* "configure.ac"
+                (("libplist >= 1\\.0") "libplist-2.0 >= 2.2")
+                (("-Werror") ""))
+              ;; patch for plist-2.0
+              (substitute* "tools/ipod-lockdown.c"
+                (("plist_dict_insert_item") "plist_dict_set_item"))
+              ;; it expects version-suffixed binary
+              (substitute* "gnome-autogen.sh"
+                (("automake-1\\.13") "automake")))))))
+
+    (build-system gnu-build-system)
+    (native-inputs
+     (list automake libtool autoconf intltool pkg-config `(,glib "bin") gtk-doc))
+    (propagated-inputs (list libimobiledevice))
+    (inputs (list libxml2 sg3-utils sqlite taglib libplist gdk-pixbuf))
+    (home-page "https://sourceforge.net/projects/gtkpod")
+    (synopsis "Library to access iPod contents")
+    (description "Library to access iPod contents.  Enables iPod support in
+@code{Clementine}.")
+    (license license:lgpl2.1+)))
+
 (define-public clementine
   (package
     (name "clementine")
@@ -511,7 +564,7 @@ (define-public clementine
            gst-libav
            libcdio
            libmygpo-qt
-           ;; TODO: Package libgpod.
+           libgpod
            libmtp
            libxml2
            protobuf

base-commit: 02df0a8a7d4712398d90f8635d4004e76bbc9f51
prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3
prerequisite-patch-id: aba438a3c32ef44149bbc749c1e0b89d00006b3e
prerequisite-patch-id: 1bcd992c56c1b094479b842032fc9731315cbf83
prerequisite-patch-id: 500c43ab90039ca164d6b0864adb110bd9bd9afe
prerequisite-patch-id: f7629448294f448f1914d9bc50a4136a05b77c03
-- 
2.41.0

[bug#70516] [PATCH v1 1/2] gnu: Add libgpod.

[Sergey Trofimov]

* gnu/packages/music.scm (libgpod): New variable.
---
 gnu/packages/music.scm | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 798aad11f7..1ce0570c28 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -183,6 +183,7 @@ (define-module (gnu packages music)
   #:use-module (gnu packages readline)
   #:use-module (gnu packages rsync)
   #:use-module (gnu packages ruby)
+  #:use-module (gnu packages scsi)
   #:use-module (gnu packages sdl)
   #:use-module (gnu packages serialization)
   #:use-module (gnu packages sphinx)
@@ -431,6 +432,58 @@ (define-public aria-maestosa
 score, keyboard, guitar, drum and controller views.")
     (license license:gpl3+)))
 
+(define-public libgpod
+  (package
+    (name "libgpod")
+    (version "0.8.3")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+             (url "https://git.code.sf.net/p/gtkpod/libgpod")
+             (commit "8dc5015ae036b219c4c9579a156886aa3a722aa5")))
+       (file-name (git-file-name name version))
+       (sha256
+        (base32 "1yzngb7h1mibz4x56w9fh02vx8xi4wyq4fjc3ad0jayv3hxjjkqv"))))
+    (arguments
+     (list
+      #:configure-flags
+      #~(list
+         "--without-hal"
+         "--enable-udev"
+         (string-append "--with-udev-dir=" #$output "/lib/udev")
+         (string-append "--prefix=" #$output))
+
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'patch-autotools-version-requirement
+            (lambda _
+              (setenv "ACLOCAL_FLAGS"
+                      (string-join
+                       (map (lambda (s) (string-append "-I " s))
+                            (string-split (getenv "ACLOCAL_PATH") #\:))
+                       " "))
+              (substitute* "configure.ac"
+                (("libplist >= 1\\.0") "libplist-2.0 >= 2.2")
+                (("-Werror") ""))
+              ;; patch for plist-2.0
+              (substitute* "tools/ipod-lockdown.c"
+                (("plist_dict_insert_item") "plist_dict_set_item"))
+              ;; it expects version-suffixed binary
+              (substitute* "gnome-autogen.sh"
+                (("automake-1\\.13") "automake")))))))
+
+    (build-system gnu-build-system)
+    (native-inputs
+     (list automake libtool autoconf intltool pkg-config `(,glib "bin") gtk-doc))
+    (propagated-inputs (list libimobiledevice gdk-pixbuf))
+    (inputs (list libxml2 sg3-utils sqlite taglib libplist))
+    (home-page "https://sourceforge.net/projects/gtkpod")
+    (synopsis "Library to access iPod contents")
+    (description "Library to access iPod contents.  Enables iPod support in
+@code{Clementine}.")
+    (license license:lgpl2.1+)))
+
 (define-public clementine
   (package
     (name "clementine")

base-commit: 7d7fca19429cf9d38125610f46333eb02fc2d3fd
prerequisite-patch-id: f9cc903b8048c8c6fde576fbf38ab110263020e3
prerequisite-patch-id: 1bcd992c56c1b094479b842032fc9731315cbf83
prerequisite-patch-id: 500c43ab90039ca164d6b0864adb110bd9bd9afe
prerequisite-patch-id: f7629448294f448f1914d9bc50a4136a05b77c03
-- 
2.41.0

[bug#70516] [PATCH v1 2/2] gnu: clementine: Build with libgpod.

[Sergey Trofimov]

* gnu/packages/music.scm (clementine): Add libgpod to dependencies.
---
 gnu/packages/music.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 1ce0570c28..5ff1ca20f4 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -565,7 +565,7 @@ (define-public clementine
            gst-libav
            libcdio
            libmygpo-qt
-           ;; TODO: Package libgpod.
+           libgpod
            libmtp
            libxml2
            protobuf
-- 
2.41.0

[bug#70516] [PATCH v1 1/2] gnu: Add libgpod.

[Ludovic Courtès]

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

Sergey Trofimov <sarg@sarg.org.ru> skribis:

> * gnu/packages/music.scm (libgpod): New variable.

Applied with this change:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 674 bytes --]

diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index d2a2b28aeb9..4da7466e054 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -480,8 +480,8 @@ (define-public libgpod
     (inputs (list libxml2 sg3-utils sqlite taglib libplist))
     (home-page "https://sourceforge.net/projects/gtkpod")
     (synopsis "Library to access iPod contents")
-    (description "Library to access iPod contents.  Enables iPod support in
-@code{Clementine}.")
+    (description "This package provides a library to access iPod contents.  It
+enables iPod support in music players such as Clementine.")
     (license license:lgpl2.1+)))
 
 (define-public clementine

[-- Attachment #3: Type: text/plain, Size: 102 bytes --]


See
<https://guix.gnu.org/manual/devel/en/html_node/Synopses-and-Descriptions.html>.

Thanks,
Ludo'.

bug#70516: [PATCH v1 2/2] gnu: clementine: Build with libgpod.

[Ludovic Courtès]

Sergey Trofimov <sarg@sarg.org.ru> skribis:

> * gnu/packages/music.scm (clementine): Add libgpod to dependencies.

Applied, thanks!