From 1578eccafe75cc419e89b5e5dab25376555db738 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Thu, 3 Sep 2015 19:37:46 +0000 Subject: sysutils/fusefs-simple-mtpfs: update to 0.2.24 (20150903 snapshot) Switch to |git describe --tags| versioning scheme. Tag offsets better show the amount of changes happenning between snapshots. Changes: https://github.com/phatina/simple-mtpfs/compare/76be403...a7ab64c --- .../files/patch-src__simple-mtpfs-fuse.cpp | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) (limited to 'sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp') diff --git a/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp b/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp index 8d2a846a7f90..d1dbca44fbe2 100644 --- a/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp +++ b/sysutils/fusefs-simple-mtpfs/files/patch-src__simple-mtpfs-fuse.cpp @@ -1,26 +1,32 @@ ---- src/simple-mtpfs-fuse.cpp~ +# Allow fake device file to use with fstab(5) + +--- src/simple-mtpfs-fuse.cpp.orig 2015-08-24 11:34:39 UTC +++ src/simple-mtpfs-fuse.cpp -@@ -314,7 +314,7 @@ bool SMTPFileSystem::parseOptions(int ar +@@ -309,12 +309,6 @@ bool SMTPFileSystem::parseOptions(int ar --m_options.m_device_no; --#ifdef HAVE_LIBUSB1 -+#if 0 //def HAVE_LIBUSB1 - // device file and -- device are mutually exclusive, fail if both set - if (m_options.m_device_no && m_options.m_device_file) { - m_options.m_good = false; -@@ -383,11 +383,9 @@ bool SMTPFileSystem::exec() +- // device file and -- device are mutually exclusive, fail if both set +- if (m_options.m_device_no && m_options.m_device_file) { +- m_options.m_good = false; +- return false; +- } +- + m_options.m_good = true; + return true; + } +@@ -379,11 +373,9 @@ bool SMTPFileSystem::exec() + return false; } - #ifdef HAVE_LIBUSB1 - if (m_options.m_device_file) { - // Try to use device file first, if provided - if (!m_device.connect(m_options.m_device_file)) - return false; -- } else +- } else { + // Try to use device file first, ignore otherwise + if (!m_options.m_device_file || -+ !m_device.connect(m_options.m_device_file)) - #endif // HAVE_LIBUSB1 - { ++ !m_device.connect(m_options.m_device_file)) { // Connect to MTP device by order number, if no device file supplied + if (!m_device.connect(m_options.m_device_no)) + return false; -- cgit v1.2.3