Uprev libmtp to 1.1.12

Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches. Note that some patches have been skipped.
- Moved skipped patches to ./skipped_patches

BUG=chrome-os-partner:47236
TEST=none
R=thestig@chromium.org

Committed: https://chromium.googlesource.com/chromium/deps/libmtp/+/4f0c550b9e148f1760eb6d9a44112940649d885c

[yawano, 2016-09-14 12:11:26]

Description was changed from

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- NOT yet: Apply patches in ./patches

BUG=chrome-os-partner:47236
TEST=none
==========

to

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- NOT yet: Apply patches in ./patches

BUG=chrome-os-partner:47236
TEST=none
==========

[yawano, 2016-09-20 08:36:54]

Description was changed from

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- NOT yet: Apply patches in ./patches

BUG=chrome-os-partner:47236
TEST=none
==========

to

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches

BUG=chrome-os-partner:47236
TEST=none
==========

[yawano, 2016-09-20 08:43:56]

yawano@chromium.org changed reviewers:
+ thestig@chromium.org

[yawano, 2016-09-20 08:43:59]

thestig@: PTAL. Thank you! Sorry for huge CL.

A few questions.

1. Are we using Makefiles? If not, is it okay to remove them in this CL with
adding new patch set? I've tried to apply patches to Makefile(.am|.in). But it
has caused a lot of conflicts since they are changed largely in the latest
version. I've tried to manually merge them, but I don't think they are merged
successfully.

2. I've skipped some patches (already upstreamed, etc) and moved them to
skipped-patches directory. Is it okay to remove them in this CL?

3. Do you remember why we have removed Nexus S in the patch 10? Note that I've
skipped the patch too in this CL.

Thanks.

[yawano, 2016-09-20 08:47:18]

Description was changed from

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches

BUG=chrome-os-partner:47236
TEST=none
==========

to

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches
- Moved skipped patches to ./skipped-patches

BUG=chrome-os-partner:47236
TEST=none
==========

[yawano, 2016-09-20 08:47:54]

Description was changed from

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches
- Moved skipped patches to ./skipped-patches

BUG=chrome-os-partner:47236
TEST=none
==========

to

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches. Note that some patches have been skipped.
- Moved skipped patches to ./skipped-patches

BUG=chrome-os-partner:47236
TEST=none
==========

[yawano, 2016-09-20 08:48:41]

Description was changed from

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches. Note that some patches have been skipped.
- Moved skipped patches to ./skipped-patches

BUG=chrome-os-partner:47236
TEST=none
==========

to

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches. Note that some patches have been skipped.
- Moved skipped patches to ./skipped_patches

BUG=chrome-os-partner:47236
TEST=none
==========

[yawano, 2016-09-20 08:49:22]

Correction: skipped-patches directory -> skipped_patches directory.

[Lei Zhang, 2016-09-20 08:58:05]

On 2016/09/20 08:43:59, yawano wrote:
> thestig@: PTAL. Thank you! Sorry for huge CL.
> 
> A few questions.
> 
> 1. Are we using Makefiles? If not, is it okay to remove them in this CL with
> adding new patch set? I've tried to apply patches to Makefile(.am|.in). But it
> has caused a lot of conflicts since they are changed largely in the latest
> version. I've tried to manually merge them, but I don't think they are merged
> successfully.

Probably. Since on ChromiumOS, the libmtp .ebuild file is the build config. I
think ebuilds work with make?

OTOH, 11_add_gyp_file_and_generated_headers.patch may no longer be needed, since
we stopped trying to build libmtp as part of Chromium on Linux. That and GYP is
deprecated.

> 2. I've skipped some patches (already upstreamed, etc) and moved them to
> skipped-patches directory. Is it okay to remove them in this CL?

Sure. Maybe keep README.chromium too? It's great to see some patches are
upstream.

> 3. Do you remember why we have removed Nexus S in the patch 10? Note that I've
> skipped the patch too in this CL.

A stock Nexus S is not a MTP device. I still have a working example that I use
from time to time. It shows up as a USB drive to the host. Someone contributed
bad data to libmtp, likely for a modified NS with some custom ROM.

[yawano, 2016-09-21 07:30:07]

On 2016/09/20 08:58:05, Lei Zhang wrote:
> On 2016/09/20 08:43:59, yawano wrote:
> > thestig@: PTAL. Thank you! Sorry for huge CL.
> > 
> > A few questions.
> > 
> > 1. Are we using Makefiles? If not, is it okay to remove them in this CL with
> > adding new patch set? I've tried to apply patches to Makefile(.am|.in). But
it
> > has caused a lot of conflicts since they are changed largely in the latest
> > version. I've tried to manually merge them, but I don't think they are
merged
> > successfully.
> 
> Probably. Since on ChromiumOS, the libmtp .ebuild file is the build config. I
> think ebuilds work with make?

Yes, it failed to compile if I removed those Makefiles.

> 
> OTOH, 11_add_gyp_file_and_generated_headers.patch may no longer be needed,
since
> we stopped trying to build libmtp as part of Chromium on Linux. That and GYP
is
> deprecated.

Reverted the patch 11, and remove it.

> 
> > 2. I've skipped some patches (already upstreamed, etc) and moved them to
> > skipped-patches directory. Is it okay to remove them in this CL?
> 
> Sure. Maybe keep README.chromium too? It's great to see some patches are
> upstream.

Removed patches in skipped_patches.
Brought README.chromium back.

> > 3. Do you remember why we have removed Nexus S in the patch 10? Note that
I've
> > skipped the patch too in this CL.
> 
> A stock Nexus S is not a MTP device. I still have a working example that I use
> from time to time. It shows up as a USB drive to the host. Someone contributed
> bad data to libmtp, likely for a modified NS with some custom ROM.

Thank you. I get the reason. Applied the patch 11 which removes Nexus S.

PTAL again. Thank you!

[Lei Zhang, 2016-09-21 18:48:37]

On 2016/09/21 07:30:07, yawano wrote:
> On 2016/09/20 08:58:05, Lei Zhang wrote:
> > On 2016/09/20 08:43:59, yawano wrote:
> > > 3. Do you remember why we have removed Nexus S in the patch 10? Note that
> I've
> > > skipped the patch too in this CL.
> > 
> > A stock Nexus S is not a MTP device. I still have a working example that I
use
> > from time to time. It shows up as a USB drive to the host. Someone
contributed
> > bad data to libmtp, likely for a modified NS with some custom ROM.
> 
> Thank you. I get the reason. Applied the patch 11 which removes Nexus S.

Actually, I looked at 10_remove_nexus_s_from_device_list.patch again and I see
there's comments about device ID 0x4e21 vs 0x4e25 vs 0x4e26. I don't have my NS
on hand this very moment. Will check its device id when I get my hands on it to
verify. If 0x4e25/0x4e26 are IDs for custom ROMS, then maybe we can drop the
patch. Also, it's not obvious how many people are still using NS these days.

[Lei Zhang, 2016-09-22 06:29:46]

On 2016/09/21 18:48:37, Lei Zhang wrote:
> Actually, I looked at 10_remove_nexus_s_from_device_list.patch again and I see
> there's comments about device ID 0x4e21 vs 0x4e25 vs 0x4e26. I don't have my
NS
> on hand this very moment. Will check its device id when I get my hands on it
to
> verify. If 0x4e25/0x4e26 are IDs for custom ROMS, then maybe we can drop the
> patch. Also, it's not obvious how many people are still using NS these days.

My NS shows up as 18d1:4e21, so I guess the other two IDs are for custom ROMs?
In which case, we can drop 10_remove_nexus_s_from_device_list.patch.

lgtm

[yawano, 2016-09-22 23:59:37]

On 2016/09/22 06:29:46, Lei Zhang wrote:
> On 2016/09/21 18:48:37, Lei Zhang wrote:
> > Actually, I looked at 10_remove_nexus_s_from_device_list.patch again and I
see
> > there's comments about device ID 0x4e21 vs 0x4e25 vs 0x4e26. I don't have my
> NS
> > on hand this very moment. Will check its device id when I get my hands on it
> to
> > verify. If 0x4e25/0x4e26 are IDs for custom ROMS, then maybe we can drop the
> > patch. Also, it's not obvious how many people are still using NS these days.
> 
> My NS shows up as 18d1:4e21, so I guess the other two IDs are for custom ROMs?
> In which case, we can drop 10_remove_nexus_s_from_device_list.patch.
> 
> lgtm

Thank you!

[yawano, 2016-09-23 02:03:12]

Description was changed from

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches. Note that some patches have been skipped.
- Moved skipped patches to ./skipped_patches

BUG=chrome-os-partner:47236
TEST=none
==========

to

==========
Uprev libmtp to 1.1.12

- Downloaded libmtp 1.1.12 from
  https://sourceforge.net/projects/libmtp/files/libmtp/1.1.12/
- Apply patches in ./patches. Note that some patches have been skipped.
- Moved skipped patches to ./skipped_patches

BUG=chrome-os-partner:47236
TEST=none
R=thestig@chromium.org

Committed:
https://chromium.googlesource.com/chromium/deps/libmtp/+/4f0c550b9e148f1760eb...
==========

[yawano, 2016-09-23 02:03:14]

Committed patchset #39 (id:370001) manually as
4f0c550b9e148f1760eb6d9a44112940649d885c (presubmit successful).

[briannorris1, 2016-09-23 05:24:17]

On 2016/09/23 02:03:14, yawano wrote:
> Committed patchset #39 (id:370001) manually as
> 4f0c550b9e148f1760eb6d9a44112940649d885c (presubmit successful).

Yo, this is breaking the ChromeOS commit queue. You're requiring automake-1.15
now, which isn't in the chromiumos chroot.

[yawano, 2016-09-23 05:44:24]

On 2016/09/23 05:24:17, briannorris1 wrote:
> On 2016/09/23 02:03:14, yawano wrote:
> > Committed patchset #39 (id:370001) manually as
> > 4f0c550b9e148f1760eb6d9a44112940649d885c (presubmit successful).
> 
> Yo, this is breaking the ChromeOS commit queue. You're requiring automake-1.15
> now, which isn't in the chromiumos chroot.

This CL has been reverted at https://crrev.com/2364793002