CVS commit: pkgsrc/audio/libgpod

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Jul  6 12:27:40 UTC 2022

Modified Files:
        pkgsrc/audio/libgpod: distinfo
Added Files:
        pkgsrc/audio/libgpod/patches: patch-configure

Log Message:
libgpod: fix libplist detection


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/audio/libgpod/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/audio/libgpod/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/libgpod/distinfo
diff -u pkgsrc/audio/libgpod/distinfo:1.14 pkgsrc/audio/libgpod/distinfo:1.15
--- pkgsrc/audio/libgpod/distinfo:1.14  Tue Oct 26 09:59:05 2021
+++ pkgsrc/audio/libgpod/distinfo       Wed Jul  6 12:27:40 2022
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 09:59:05 nia Exp $
+$NetBSD: distinfo,v 1.15 2022/07/06 12:27:40 wiz Exp $
 
 BLAKE2s (libgpod-0.8.3.tar.bz2) = e09dfe859abed20dee090c587e39995b9ede34a0268c6e59c19c292c73967bf8
 SHA512 (libgpod-0.8.3.tar.bz2) = e39f22054c2d2bdf5fc764aa1f692de17a1a06c7c7e9c60883d126b216dacca7840bf818e7e7e039218fe2a64c0920ba96d8cbbe310e11c1c4e68b82e7cbbd8e
 Size (libgpod-0.8.3.tar.bz2) = 801903 bytes
 SHA1 (patch-aa) = 9b90cf13b94259b50fcab19f1041a4aa41eab8c5
+SHA1 (patch-configure) = c607fadc30d89abb96c89575fa9fe2ca134d8558

Added files:

Index: pkgsrc/audio/libgpod/patches/patch-configure
diff -u /dev/null pkgsrc/audio/libgpod/patches/patch-configure:1.1
--- /dev/null   Wed Jul  6 12:27:40 2022
+++ pkgsrc/audio/libgpod/patches/patch-configure        Wed Jul  6 12:27:40 2022
@@ -0,0 +1,54 @@
+$NetBSD: patch-configure,v 1.1 2022/07/06 12:27:40 wiz Exp $
+
+--- configure.orig     2013-09-02 10:58:17.000000000 +0000
++++ configure
+@@ -17348,12 +17348,12 @@ if test -n "$LIBGPOD_CFLAGS"; then
+     pkg_cv_LIBGPOD_CFLAGS="$LIBGPOD_CFLAGS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0" 2>/dev/null`
++  pkg_cv_LIBGPOD_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -17365,12 +17365,12 @@ if test -n "$LIBGPOD_LIBS"; then
+     pkg_cv_LIBGPOD_LIBS="$LIBGPOD_LIBS"
+  elif test -n "$PKG_CONFIG"; then
+     if test -n "$PKG_CONFIG" && \
+-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0\""; } >&5
+-  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0") 2>&5
++    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0\""; } >&5
++  ($PKG_CONFIG --exists --print-errors "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0") 2>&5
+   ac_status=$?
+   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+   test $ac_status = 0; }; then
+-  pkg_cv_LIBGPOD_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0" 2>/dev/null`
++  pkg_cv_LIBGPOD_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0" 2>/dev/null`
+                     test "x$?" != "x0" && pkg_failed=yes
+ else
+   pkg_failed=yes
+@@ -17391,14 +17391,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-              LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0" 2>&1`
++              LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0" 2>&1`
+         else
+-              LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0" 2>&1`
++              LIBGPOD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0" 2>&1`
+         fi
+       # Put the nasty error message in config.log where it belongs
+       echo "$LIBGPOD_PKG_ERRORS" >&5
+ 
+-      as_fn_error $? "Package requirements (glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist >= 1.0 gmodule-2.0) were not met:
++      as_fn_error $? "Package requirements (glib-2.0 >= 2.16.0 gobject-2.0 sqlite3 libplist-2.0 >= 1.0 gmodule-2.0) were not met:
+ 
+ $LIBGPOD_PKG_ERRORS
+