diff --git a/hardware/misc/libgpod/actions.py b/hardware/misc/libgpod/actions.py index a3c4bfb509..84b32f5232 100644 --- a/hardware/misc/libgpod/actions.py +++ b/hardware/misc/libgpod/actions.py @@ -10,6 +10,7 @@ from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools def setup(): + autotools.autoreconf("-fiv") autotools.configure("\ --with-html-dir=/usr/share/doc/%s/html \ --with-temp-mount-dir=/run/libgpod \ diff --git a/hardware/misc/libgpod/files/0001-configure.ac-Add-support-for-libplist-2.2.patch b/hardware/misc/libgpod/files/0001-configure.ac-Add-support-for-libplist-2.2.patch new file mode 100644 index 0000000000..9d2b28ecfb --- /dev/null +++ b/hardware/misc/libgpod/files/0001-configure.ac-Add-support-for-libplist-2.2.patch @@ -0,0 +1,27 @@ +From 46d147703337b5ab9e81266869e41c89e6481e08 Mon Sep 17 00:00:00 2001 +From: Bastien Nocera +Date: Wed, 17 Jun 2020 11:52:43 +0200 +Subject: [PATCH] configure.ac: Add support for libplist 2.2 + +--- + configure.ac | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c4ffeaf..c3a7a9d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,9 @@ AC_CHECK_FUNCS([localtime_r]) + AC_CHECK_MEMBERS([struct tm.tm_gmtoff],,,[#include ]) + dnl sqlite3 is needed for newer ipod models (nano5g), and libplist is needed + dnl by libgpod sqlite code +-PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0) ++LIBPLIST_DEP=libplist ++PKG_CHECK_EXISTS(libplist-2.0, LIBPLIST_DEP=libplist-2.0) ++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 $LIBPLIST_DEP >= 1.0 gmodule-2.0) + + dnl *************************************************** + dnl The following functions are only available starting +-- +2.26.2 + diff --git a/hardware/misc/libgpod/files/libgpod-udev.patch b/hardware/misc/libgpod/files/libgpod-udev.patch new file mode 100644 index 0000000000..819728ed80 --- /dev/null +++ b/hardware/misc/libgpod/files/libgpod-udev.patch @@ -0,0 +1,15 @@ +--- tools/90-libgpod.rules.in~ 2011-07-24 06:03:29.000000000 -0500 ++++ tools/90-libgpod.rules.in 2019-10-15 15:50:28.279770507 -0500 +@@ -16,10 +16,10 @@ + + + # "iPods" using the afc protocol (iPhone, iPod Touch, ...) +-ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}+="@udevdir@/iphone-set-info", GOTO="libgpod_end" ++ACTION=="add|change", ENV{USBMUX_SUPPORTED}=="1", IMPORT{program}=="@udevdir@/iphone-set-info", GOTO="libgpod_end" + # with a new enough usbmuxd, the rule below is not useful since it will + # take care of setting USBMUX_SUPPORTED for all supported devices. Keep + # this rule for now until distros ship a new enough usbmuxd +-ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}+="@udevdir@/iphone-set-info" ++ACTION=="add|change", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="129[0-9a]", IMPORT{program}=="@udevdir@/iphone-set-info" + + LABEL="libgpod_end" diff --git a/hardware/misc/libgpod/pspec.xml b/hardware/misc/libgpod/pspec.xml index 993eb21d6f..a7f056a4e0 100644 --- a/hardware/misc/libgpod/pspec.xml +++ b/hardware/misc/libgpod/pspec.xml @@ -15,6 +15,7 @@ mirrors://sourceforge/gtkpod/libgpod-0.8.3.tar.bz2 intltool + libusb-devel sqlite-devel python-devel gtk-doc @@ -32,6 +33,8 @@ 0001-323-Segmentation-fault-when-opening-ipod.patch libgpod-0.8.2-pkgconfig_overlinking.patch libgpod-fixswig.patch + libgpod-udev.patch + 0001-configure.ac-Add-support-for-libplist-2.2.patch @@ -41,6 +44,7 @@ zlib glib2 sqlite + libusb libxml2 libplist sg3_utils