diff --git a/.github/workflows/all.yml b/.github/workflows/all.yml index 6bf444eeb..533b92dee 100644 --- a/.github/workflows/all.yml +++ b/.github/workflows/all.yml @@ -902,9 +902,8 @@ jobs: cd libgpod-0.8.3 wget https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/libgpod/files/autogen.sh wget https://raw.githubusercontent.com/macports/macports-ports/master/multimedia/libgpod/files/patch-tools-generic-callout.c.diff - wget http://files.strawberrymusicplayer.org/patches/libgpod-libplist.patch patch -p0 < patch-tools-generic-callout.c.diff - patch -p1 < libgpod-libplist.patch + patch -p1 < $GITHUB_WORKSPACE/3rdparty/libgpod/patches/0001-Look-for-libplist-2.0.patch chmod u+x autogen.sh ./autogen.sh ./configure --disable-more-warnings \ diff --git a/3rdparty/libgpod/patches/0001-Look-for-libplist-2.0.patch b/3rdparty/libgpod/patches/0001-Look-for-libplist-2.0.patch new file mode 100644 index 000000000..36e6fb5de --- /dev/null +++ b/3rdparty/libgpod/patches/0001-Look-for-libplist-2.0.patch @@ -0,0 +1,25 @@ +From 27955cc4415c39f520f3674c9d1989d28e9b8670 Mon Sep 17 00:00:00 2001 +From: Jonas Kvinge +Date: Wed, 5 May 2021 20:10:28 +0200 +Subject: [PATCH 1/2] Look for libplist-2.0 + +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c4ffeaf..8052fa2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -42,7 +42,7 @@ 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) ++PKG_CHECK_MODULES(LIBGPOD, glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 gmodule-2.0) + + dnl *************************************************** + dnl The following functions are only available starting +-- +2.31.1 +