Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(529)

Side by Side Diff: patches/11_add_gyp_file_and_generated_headers.patch

Issue 11358153: Update libmtp from pre 1.1.4 git to 1.1.5 release. (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libmtp/
Patch Set: disable mptz Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 Index: config.h 1 Index: config.h
2 =================================================================== 2 ===================================================================
3 --- config.h (revision 0) 3 --- config.h (revision 0)
4 +++ config.h (revision 0) 4 +++ config.h (revision 0)
5 @@ -0,0 +1,211 @@ 5 @@ -0,0 +1,211 @@
6 +/* config.h. Generated from config.h.in by configure. */ 6 +/* config.h. Generated from config.h.in by configure. */
7 +/* config.h.in. Generated from configure.ac by autoheader. */ 7 +/* config.h.in. Generated from configure.ac by autoheader. */
8 + 8 +
9 +/* Define if building universal (internal helper macro) */ 9 +/* Define if building universal (internal helper macro) */
10 +/* #undef AC_APPLE_UNIVERSAL_BUILD */ 10 +/* #undef AC_APPLE_UNIVERSAL_BUILD */
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 +/* Name of package */ 152 +/* Name of package */
153 +#define PACKAGE "libmtp" 153 +#define PACKAGE "libmtp"
154 + 154 +
155 +/* Define to the address where bug reports for this package should be sent. */ 155 +/* Define to the address where bug reports for this package should be sent. */
156 +#define PACKAGE_BUGREPORT "libmtp-discuss@lists.sourceforge.net" 156 +#define PACKAGE_BUGREPORT "libmtp-discuss@lists.sourceforge.net"
157 + 157 +
158 +/* Define to the full name of this package. */ 158 +/* Define to the full name of this package. */
159 +#define PACKAGE_NAME "libmtp" 159 +#define PACKAGE_NAME "libmtp"
160 + 160 +
161 +/* Define to the full name and version of this package. */ 161 +/* Define to the full name and version of this package. */
162 +#define PACKAGE_STRING "libmtp 1.1.4" 162 +#define PACKAGE_STRING "libmtp 1.1.5"
163 + 163 +
164 +/* Define to the one symbol short name of this package. */ 164 +/* Define to the one symbol short name of this package. */
165 +#define PACKAGE_TARNAME "libmtp" 165 +#define PACKAGE_TARNAME "libmtp"
166 + 166 +
167 +/* Define to the home page for this package. */ 167 +/* Define to the home page for this package. */
168 +#define PACKAGE_URL "" 168 +#define PACKAGE_URL ""
169 + 169 +
170 +/* Define to the version of this package. */ 170 +/* Define to the version of this package. */
171 +#define PACKAGE_VERSION "1.1.4" 171 +#define PACKAGE_VERSION "1.1.5"
172 + 172 +
173 +/* Define as the return type of signal handlers (`int' or `void'). */ 173 +/* Define as the return type of signal handlers (`int' or `void'). */
174 +#define RETSIGTYPE void 174 +#define RETSIGTYPE void
175 + 175 +
176 +/* Define to 1 if you have the ANSI C header files. */ 176 +/* Define to 1 if you have the ANSI C header files. */
177 +#define STDC_HEADERS 1 177 +#define STDC_HEADERS 1
178 + 178 +
179 +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */ 179 +/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
180 +#define TIME_WITH_SYS_TIME 1 180 +#define TIME_WITH_SYS_TIME 1
181 + 181 +
182 +/* Enable MTPZ functionality */ 182 +/* Enable MTPZ functionality */
183 +#define USE_MTPZ /**/ 183 +/* #undef USE_MTPZ */
184 + 184 +
185 +/* Version number of package */ 185 +/* Version number of package */
186 +#define VERSION "1.1.4" 186 +#define VERSION "1.1.5"
187 + 187 +
188 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most 188 +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
189 + significant byte first (like Motorola and SPARC, unlike Intel). */ 189 + significant byte first (like Motorola and SPARC, unlike Intel). */
190 +#if defined AC_APPLE_UNIVERSAL_BUILD 190 +#if defined AC_APPLE_UNIVERSAL_BUILD
191 +# if defined __BIG_ENDIAN__ 191 +# if defined __BIG_ENDIAN__
192 +# define WORDS_BIGENDIAN 1 192 +# define WORDS_BIGENDIAN 1
193 +# endif 193 +# endif
194 +#else 194 +#else
195 +# ifndef WORDS_BIGENDIAN 195 +# ifndef WORDS_BIGENDIAN
196 +/* # undef WORDS_BIGENDIAN */ 196 +/* # undef WORDS_BIGENDIAN */
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
434 434
435 Property changes on: src/gphoto2-endian.h 435 Property changes on: src/gphoto2-endian.h
436 ___________________________________________________________________ 436 ___________________________________________________________________
437 Added: svn:eol-style 437 Added: svn:eol-style
438 + LF 438 + LF
439 439
440 Index: src/libmtp.h 440 Index: src/libmtp.h
441 =================================================================== 441 ===================================================================
442 --- src/libmtp.h (revision 0) 442 --- src/libmtp.h (revision 0)
443 +++ src/libmtp.h (revision 0) 443 +++ src/libmtp.h (revision 0)
444 @@ -0,0 +1,1023 @@ 444 @@ -0,0 +1,1026 @@
445 +/** 445 +/**
446 + * \file libmtp.h 446 + * \file libmtp.h
447 + * Interface to the Media Transfer Protocol library. 447 + * Interface to the Media Transfer Protocol library.
448 + * 448 + *
449 + * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se> 449 + * Copyright (C) 2005-2012 Linus Walleij <triad@df.lth.se>
450 + * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com> 450 + * Copyright (C) 2005-2008 Richard A. Low <richard@wentnet.com>
451 + * Copyright (C) 2007 Ted Bullock <tbullock@canada.com> 451 + * Copyright (C) 2007 Ted Bullock <tbullock@canada.com>
452 + * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com> 452 + * Copyright (C) 2008 Florent Mertens <flomertens@gmail.com>
453 + * 453 + *
454 + * This library is free software; you can redistribute it and/or 454 + * This library is free software; you can redistribute it and/or
(...skipping 11 matching lines...) Expand all
466 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330, 466 + * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
467 + * Boston, MA 02111-1307, USA. 467 + * Boston, MA 02111-1307, USA.
468 + * 468 + *
469 + * <code> 469 + * <code>
470 + * #include <libmtp.h> 470 + * #include <libmtp.h>
471 + * </code> 471 + * </code>
472 + */ 472 + */
473 +#ifndef LIBMTP_H_INCLUSION_GUARD 473 +#ifndef LIBMTP_H_INCLUSION_GUARD
474 +#define LIBMTP_H_INCLUSION_GUARD 474 +#define LIBMTP_H_INCLUSION_GUARD
475 + 475 +
476 +#define LIBMTP_VERSION 1.1.4 476 +#define LIBMTP_VERSION 1.1.5
477 +#define LIBMTP_VERSION_STRING "1.1.4" 477 +#define LIBMTP_VERSION_STRING "1.1.5"
478 + 478 +
479 +/* This handles MSVC pecularities */ 479 +/* This handles MSVC pecularities */
480 +#ifdef _MSC_VER 480 +#ifdef _MSC_VER
481 +#include <windows.h> 481 +#include <windows.h>
482 +#define __WIN32__ 482 +#define __WIN32__
483 +#define snprintf _snprintf 483 +#define snprintf _snprintf
484 +#define ssize_t SSIZE_T 484 +#define ssize_t SSIZE_T
485 +/* 485 +/*
486 + * Types that do not exist in Windows 486 + * Types that do not exist in Windows
487 + * sys/types.h, but they exist in mingw32 487 + * sys/types.h, but they exist in mingw32
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
1207 + LIBMTP_devicestorage_t *next; /**< Next storage, follow this link until NULL */ 1207 + LIBMTP_devicestorage_t *next; /**< Next storage, follow this link until NULL */
1208 + LIBMTP_devicestorage_t *prev; /**< Previous storage */ 1208 + LIBMTP_devicestorage_t *prev; /**< Previous storage */
1209 +}; 1209 +};
1210 + 1210 +
1211 +/** 1211 +/**
1212 + * LIBMTP Event structure 1212 + * LIBMTP Event structure
1213 + * TODO: add all externally visible events here 1213 + * TODO: add all externally visible events here
1214 + */ 1214 + */
1215 +enum LIBMTP_event_enum { 1215 +enum LIBMTP_event_enum {
1216 + LIBMTP_EVENT_NONE, 1216 + LIBMTP_EVENT_NONE,
1217 + LIBMTP_EVENT_STORE_ADDED,
1217 +}; 1218 +};
1218 +typedef enum LIBMTP_event_enum LIBMTP_event_t; 1219 +typedef enum LIBMTP_event_enum LIBMTP_event_t;
1219 + 1220 +
1220 +/** @} */ 1221 +/** @} */
1221 + 1222 +
1222 +/* Make functions available for C++ */ 1223 +/* Make functions available for C++ */
1223 +#ifdef __cplusplus 1224 +#ifdef __cplusplus
1224 +extern "C" { 1225 +extern "C" {
1225 +#endif 1226 +#endif
1226 + 1227 +
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
1352 + const char *); 1353 + const char *);
1353 +LIBMTP_filesampledata_t *LIBMTP_new_filesampledata_t(void); 1354 +LIBMTP_filesampledata_t *LIBMTP_new_filesampledata_t(void);
1354 +void LIBMTP_destroy_filesampledata_t(LIBMTP_filesampledata_t *); 1355 +void LIBMTP_destroy_filesampledata_t(LIBMTP_filesampledata_t *);
1355 +int LIBMTP_Get_Representative_Sample_Format(LIBMTP_mtpdevice_t *, 1356 +int LIBMTP_Get_Representative_Sample_Format(LIBMTP_mtpdevice_t *,
1356 + LIBMTP_filetype_t const, 1357 + LIBMTP_filetype_t const,
1357 + LIBMTP_filesampledata_t **); 1358 + LIBMTP_filesampledata_t **);
1358 +int LIBMTP_Send_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, 1359 +int LIBMTP_Send_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const,
1359 + LIBMTP_filesampledata_t *); 1360 + LIBMTP_filesampledata_t *);
1360 +int LIBMTP_Get_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const, 1361 +int LIBMTP_Get_Representative_Sample(LIBMTP_mtpdevice_t *, uint32_t const,
1361 + LIBMTP_filesampledata_t *); 1362 + LIBMTP_filesampledata_t *);
1363 +int LIBMTP_Get_Thumbnail(LIBMTP_mtpdevice_t *, uint32_t const,
1364 + unsigned char **data, unsigned int *size);
1362 + 1365 +
1363 +/** 1366 +/**
1364 + * @} 1367 + * @}
1365 + * @defgroup tracks The track management API. 1368 + * @defgroup tracks The track management API.
1366 + * @{ 1369 + * @{
1367 + */ 1370 + */
1368 +LIBMTP_track_t *LIBMTP_new_track_t(void); 1371 +LIBMTP_track_t *LIBMTP_new_track_t(void);
1369 +void LIBMTP_destroy_track_t(LIBMTP_track_t*); 1372 +void LIBMTP_destroy_track_t(LIBMTP_track_t*);
1370 +LIBMTP_track_t *LIBMTP_Get_Tracklisting(LIBMTP_mtpdevice_t*); 1373 +LIBMTP_track_t *LIBMTP_Get_Tracklisting(LIBMTP_mtpdevice_t*);
1371 +LIBMTP_track_t *LIBMTP_Get_Tracklisting_With_Callback(LIBMTP_mtpdevice_t*, 1374 +LIBMTP_track_t *LIBMTP_Get_Tracklisting_With_Callback(LIBMTP_mtpdevice_t*,
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
1447 + * @{ 1450 + * @{
1448 + */ 1451 + */
1449 +int LIBMTP_Delete_Object(LIBMTP_mtpdevice_t *, uint32_t); 1452 +int LIBMTP_Delete_Object(LIBMTP_mtpdevice_t *, uint32_t);
1450 +int LIBMTP_Set_Object_Filename(LIBMTP_mtpdevice_t *, uint32_t , char *); 1453 +int LIBMTP_Set_Object_Filename(LIBMTP_mtpdevice_t *, uint32_t , char *);
1451 + 1454 +
1452 +/** 1455 +/**
1453 + * @} 1456 + * @}
1454 + * @defgroup files The events API. 1457 + * @defgroup files The events API.
1455 + * @{ 1458 + * @{
1456 + */ 1459 + */
1457 +int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *, LIBMTP_event_t *); 1460 +int LIBMTP_Read_Event(LIBMTP_mtpdevice_t *, LIBMTP_event_t *, uint32_t *);
1458 + 1461 +
1459 + 1462 +
1460 +/** @} */ 1463 +/** @} */
1461 + 1464 +
1462 +/* End of C++ exports */ 1465 +/* End of C++ exports */
1463 +#ifdef __cplusplus 1466 +#ifdef __cplusplus
1464 +} 1467 +}
1465 +#endif 1468 +#endif
1466 + 1469 +
1467 +#endif /* LIBMTP_H_INCLUSION_GUARD */ 1470 +#endif /* LIBMTP_H_INCLUSION_GUARD */
1468 1471
1469 Property changes on: src/libmtp.h 1472 Property changes on: src/libmtp.h
1470 ___________________________________________________________________ 1473 ___________________________________________________________________
1471 Added: svn:eol-style 1474 Added: svn:eol-style
1472 + LF 1475 + LF
1473 1476
1474 Index: src/_stdint.h 1477 Index: src/_stdint.h
1475 =================================================================== 1478 ===================================================================
1476 --- src/_stdint.h (revision 0) 1479 --- src/_stdint.h (revision 0)
1477 +++ src/_stdint.h (revision 0) 1480 +++ src/_stdint.h (revision 0)
1478 @@ -0,0 +1,2 @@ 1481 @@ -0,0 +1,2 @@
1479 +/* This file is generated automatically by configure */ 1482 +/* This file is generated automatically by configure */
1480 +#include <stdint.h> 1483 +#include <stdint.h>
1481 1484
1482 Property changes on: src/_stdint.h 1485 Property changes on: src/_stdint.h
1483 ___________________________________________________________________ 1486 ___________________________________________________________________
1484 Added: svn:eol-style 1487 Added: svn:eol-style
1485 + LF 1488 + LF
1486 1489
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698