Attachment #130480 for bug #174408

View | Details | Raw Unified | Return to bug 174408
Collapse All | Expand All

Lines 2-11 Link Here

(-)mtpfs/Makefile (-3 / +3 lines)
2	# $FreeBSD: ports/sysutils/mtpfs/Makefile,v 1.13 2012/11/17 06:01:39 svnexp Exp $	2	# $FreeBSD: ports/sysutils/mtpfs/Makefile,v 1.13 2012/11/17 06:01:39 svnexp Exp $
3		3
4	PORTNAME= mtpfs	4	PORTNAME= mtpfs
5	PORTVERSION= 0.9	5	PORTVERSION= 1.1
6	PORTREVISION= 2	6	PORTREVISION= 1
7	CATEGORIES= sysutils	7	CATEGORIES= sysutils
8	MASTER_SITES= http://www.adebenham.com/mtpfs/	8	MASTER_SITES= http://www.adebenham.com/files/mtp/
9		9
10	MAINTAINER= john@pcbsd.org	10	MAINTAINER= john@pcbsd.org
11	COMMENT= MTP device filesystem	11	COMMENT= MTP device filesystem

Lines 1-2 Link Here

(-)mtpfs/distinfo (-2 / +2 lines)
1	SHA256 (mtpfs-0.9.tar.gz) = 828e82955232155380b243348eb16cb5f6acfe02ddbf97222308b2fc2dcb1d09	1	SHA256 (mtpfs-1.1.tar.gz) = 1baf357de16995a5f0b5bc1b6833517a77456481d861cdba70f1ce1316ce4c1d
2	SIZE (mtpfs-0.9.tar.gz) = 95038	2	SIZE (mtpfs-1.1.tar.gz) = 108329




--- Makefile.in	2012-02-26 17:02:28.000000000 -0800
+++ Makefile.in	2012-12-12 19:11:25.155523995 -0800
@@ -181,7 +181,7 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 mtpfs_SOURCES = mtpfs.c mtpfs.h $(am__append_1)
-mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
+mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=26 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
 	$(MTP_CFLAGS) $(am__append_2)
 mtpfs_LDADD = $(FUSE_LIBS) $(GLIB_LIBS) $(MTP_LIBS) $(am__append_3)
 all: all-am
 




--- mtpfs.c	2012-02-26 16:59:39.000000000 -0800
+++ mtpfs.c	2012-12-12 19:11:46.955525173 -0800
@@ -1270,7 +1270,7 @@
         }
     }
     close (fi->fh);
-    return_unlock();
+    return_unlock(0);
 }
 
 void
@@ -1143,7 +1143,7 @@
 }
 
 static int

 {
     DBG("mtpfs_statfs");
     stbuf->f_bsize=1024;
@@ -1282,7 +1282,7 @@
 }
 
 void *
-mtpfs_init ()
+mtpfs_init (struct fuse_conn_info *conn)
 {
     LIBMTP_devicestorage_t *storage;
     DBG("mtpfs_init");
@@ -1298,8 +1298,14 @@
     // Do nothing
 }
 
+int
+mtpfs_blank_chmod(const char *path, mode_t mode)
+{
+	return (0);
+}
+
 static struct fuse_operations mtpfs_oper = {
-    .chmod   = mtpfs_blank,
+    .chmod   = mtpfs_blank_chmod,
     .release = mtpfs_release,
     .readdir = mtpfs_readdir,
     .getattr = mtpfs_getattr,
@@ -1428,7 +1434,7 @@
 
     DBG("Start fuse");
 
-    fuse_stat=fuse_main (argc, argv, &mtpfs_oper);
+    fuse_stat=fuse_main (argc, argv, &mtpfs_oper, NULL);
     DBG("fuse_main returned %d\n", fuse_stat);
     return fuse_stat;
 }




--- mtpfs.h	2012-02-23 20:37:14.000000000 -0800
+++ mtpfs.h	2012-12-12 19:10:01.055523958 -0800
@@ -18,7 +18,9 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-#include <sys/statfs.h>
-
+#include <sys/param.h>
+#include <sys/mount.h>
+#include <sys/statvfs.h>
 
 #include <libmtp.h>
 #include <glib.h>
@@ -49,7 +51,7 @@
 
 
     /* fuse functions */
-static void * mtpfs_init (void);
+static void * mtpfs_init (struct fuse_conn_info *);
 static int mtpfs_blank ();
 static int mtpfs_release (const char *path, struct fuse_file_info *fi);
 void mtpfs_destroy ();
@@ -62,7 +64,7 @@
 static int mtpfs_unlink (const gchar * path);
 static int mtpfs_mkdir (const char *path, mode_t mode);
 static int mtpfs_rmdir (const char *path);

+static int mtpfs_statfs (const char *path, struct statvfs *stbuf);
 int calc_length(int f);
 
 static LIBMTP_mtpdevice_t *device;

Return to bug 174408

Lines 1-11 Link Here

(-)mtpfs/files/patch-Makefile.in (-8 / +8 lines)
1	--- Makefile.in.orig Sun Jul 1 11:45:44 2007	1	--- Makefile.in 2012-02-26 17:02:28.000000000 -0800
2	+++ Makefile.in Sun Jul 1 11:46:00 2007	2	+++ Makefile.in 2012-12-12 19:11:25.155523995 -0800
3	@@ -157,7 +157,7 @@	3	@@ -181,7 +181,7 @@
4	top_builddir = @top_builddir@	4	top_builddir = @top_builddir@
5	top_srcdir = @top_srcdir@	5	top_srcdir = @top_srcdir@
6	mtpfs_SOURCES = id3read.c mtpfs.c mtpfs.h id3read.h	6	mtpfs_SOURCES = mtpfs.c mtpfs.h $(am__append_1)
7	-mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS)	7	-mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=22 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
8	+mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=25 $(FUSE_CFLAGS)	8	+mtpfs_CPPFLAGS = -DFUSE_USE_VERSION=26 $(FUSE_CFLAGS) $(GLIB_CFLAGS) \
9	mtpfs_LDADD = $(FUSE_LIBS)	9	$(MTP_CFLAGS) $(am__append_2)
		10	mtpfs_LDADD = $(FUSE_LIBS) $(GLIB_LIBS) $(MTP_LIBS) $(am__append_3)
10	all: all-am	11	all: all-am
11

Lines 1-15 Link Here

(-)mtpfs/files/patch-mtpfs.c (-12 / +37 lines)
1	--- mtpfs.c.orig 2008-08-05 07:29:29.000000000 +0200	1	--- mtpfs.c 2012-02-26 16:59:39.000000000 -0800
2	+++ mtpfs.c 2012-10-30 00:47:13.487478272 +0100	2	+++ mtpfs.c 2012-12-12 19:11:46.955525173 -0800
3	@@ -534,7 +534,7 @@	3	@@ -1270,7 +1270,7 @@
4	}
5	}
6	close (fi->fh);
7	- return_unlock();
8	+ return_unlock(0);
9	}
10
11	void
12	@@ -1143,7 +1143,7 @@
13	}	4	}
14		5
15	static int	6	static int
Lines 18-20 Link Here
18	{	9	{
19	DBG("mtpfs_statfs");	10	DBG("mtpfs_statfs");
20	stbuf->f_bsize=1024;	11	stbuf->f_bsize=1024;
		12	@@ -1282,7 +1282,7 @@
		13	}
		14
		15	void *
		16	-mtpfs_init ()
		17	+mtpfs_init (struct fuse_conn_info *conn)
		18	{
		19	LIBMTP_devicestorage_t *storage;
		20	DBG("mtpfs_init");
		21	@@ -1298,8 +1298,14 @@
		22	// Do nothing
		23	}
		24
		25	+int
		26	+mtpfs_blank_chmod(const char *path, mode_t mode)
		27	+{
		28	+ return (0);
		29	+}
		30	+
		31	static struct fuse_operations mtpfs_oper = {
		32	- .chmod = mtpfs_blank,
		33	+ .chmod = mtpfs_blank_chmod,
		34	.release = mtpfs_release,
		35	.readdir = mtpfs_readdir,
		36	.getattr = mtpfs_getattr,
		37	@@ -1428,7 +1434,7 @@
		38
		39	DBG("Start fuse");
		40
		41	- fuse_stat=fuse_main (argc, argv, &mtpfs_oper);
		42	+ fuse_stat=fuse_main (argc, argv, &mtpfs_oper, NULL);
		43	DBG("fuse_main returned %d\n", fuse_stat);
		44	return fuse_stat;
		45	}

Lines 1-18 Link Here

(-)mtpfs/files/patch-mtpfs.h (-7 / +15 lines)
1	--- mtpfs.h.orig 2009-01-04 03:03:56.000000000 +0800	1	--- mtpfs.h 2012-02-23 20:37:14.000000000 -0800
2	+++ mtpfs.h 2009-01-04 03:05:16.000000000 +0800	2	+++ mtpfs.h 2012-12-12 19:10:01.055523958 -0800
3	@@ -18,8 +18,9 @@	3	@@ -18,7 +18,9 @@
4	#include <fcntl.h>	4	#include <fcntl.h>
5	#include <dirent.h>	5	#include <dirent.h>
6	#include <errno.h>	6	#include <errno.h>
7	-#include <sys/statfs.h>	7	-#include <sys/statfs.h>
8	-
9	+#include <sys/param.h>	8	+#include <sys/param.h>
10	+#include <sys/mount.h>	9	+#include <sys/mount.h>
11	+#include <sys/statvfs.h>	10	+#include <sys/statvfs.h>
		11
12	#include <libmtp.h>	12	#include <libmtp.h>
13	#include <glib.h>	13	#include <glib.h>
14	#include <id3tag.h>	14	@@ -49,7 +51,7 @@
15	@@ -49,7 +50,7 @@	15
		16
		17	/* fuse functions */
		18	-static void * mtpfs_init (void);
		19	+static void * mtpfs_init (struct fuse_conn_info *);
		20	static int mtpfs_blank ();
		21	static int mtpfs_release (const char path, struct fuse_file_info fi);
		22	void mtpfs_destroy ();
		23	@@ -62,7 +64,7 @@
16	static int mtpfs_unlink (const gchar * path);	24	static int mtpfs_unlink (const gchar * path);
17	static int mtpfs_mkdir (const char *path, mode_t mode);	25	static int mtpfs_mkdir (const char *path, mode_t mode);
18	static int mtpfs_rmdir (const char *path);	26	static int mtpfs_rmdir (const char *path);
Lines 20-23 Link Here
20	+static int mtpfs_statfs (const char path, struct statvfs stbuf);	28	+static int mtpfs_statfs (const char path, struct statvfs stbuf);
21	int calc_length(int f);	29	int calc_length(int f);
22		30
23		31	static LIBMTP_mtpdevice_t *device;