pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/audio/libgpod Call mount() only on Linux -- it has dif...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/5f4e8e9d89d7
branches:  trunk
changeset: 610214:5f4e8e9d89d7
user:      shattered <shattered%pkgsrc.org@localhost>
date:      Sun Oct 21 11:04:40 2012 +0000

description:
Call mount() only on Linux -- it has different call signature elsewhere.

diffstat:

 audio/libgpod/Makefile         |   4 ++--
 audio/libgpod/distinfo         |   3 ++-
 audio/libgpod/patches/patch-aa |  17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)

diffs (45 lines):

diff -r 2906891d4763 -r 5f4e8e9d89d7 audio/libgpod/Makefile
--- a/audio/libgpod/Makefile    Sun Oct 21 10:27:14 2012 +0000
+++ b/audio/libgpod/Makefile    Sun Oct 21 11:04:40 2012 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2012/10/08 23:00:47 adam Exp $
+# $NetBSD: Makefile,v 1.31 2012/10/21 11:04:40 shattered Exp $
 
 DISTNAME=      libgpod-0.8.2
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=gtkpod/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 2906891d4763 -r 5f4e8e9d89d7 audio/libgpod/distinfo
--- a/audio/libgpod/distinfo    Sun Oct 21 10:27:14 2012 +0000
+++ b/audio/libgpod/distinfo    Sun Oct 21 11:04:40 2012 +0000
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2012/04/13 20:58:54 adam Exp $
+$NetBSD: distinfo,v 1.10 2012/10/21 11:04:41 shattered Exp $
 
 SHA1 (libgpod-0.8.2.tar.bz2) = f9ba70cd6f00ae59cdc6a43cc72c409a4d27606e
 RMD160 (libgpod-0.8.2.tar.bz2) = 63e60211cf0e52a60eade6d39e12b6fab023fccb
 Size (libgpod-0.8.2.tar.bz2) = 777945 bytes
+SHA1 (patch-aa) = 9b90cf13b94259b50fcab19f1041a4aa41eab8c5
diff -r 2906891d4763 -r 5f4e8e9d89d7 audio/libgpod/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/audio/libgpod/patches/patch-aa    Sun Oct 21 11:04:40 2012 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-aa,v 1.5 2012/10/21 11:04:42 shattered Exp $
+
+--- tools/generic-callout.c.orig       2011-07-24 11:03:29.000000000 +0000
++++ tools/generic-callout.c
+@@ -601,7 +601,12 @@ static char *mount_ipod (const char *dev
+                 return NULL;
+         }
+         g_assert (tmpname == filename);
++#if !defined(__linux__)
++        result = -1;
++#else
+         result = mount (dev_path, tmpname, fstype, 0, NULL);
++#endif
++
+         if (result != 0) {
+                 g_debug("failed to mount device %s at %s: %s",
+                         dev_path, tmpname, strerror(errno));



Home | Main Index | Thread Index | Old Index