diff options
author | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 17:18:14 +0000 |
---|---|---|
committer | kmadhusu@chromium.org <kmadhusu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 17:18:14 +0000 |
commit | 7adb691ede5f9cd213b0b341c8ba26a7a3ff0cb2 (patch) | |
tree | eb8fa0cdf28c7633733e0c30b910b80e094b296f | |
parent | bcfecfaaa0fd27d0efaac5eac5a1f43588145775 (diff) | |
download | chromium_src-7adb691ede5f9cd213b0b341c8ba26a7a3ff0cb2.zip chromium_src-7adb691ede5f9cd213b0b341c8ba26a7a3ff0cb2.tar.gz chromium_src-7adb691ede5f9cd213b0b341c8ba26a7a3ff0cb2.tar.bz2 |
Revert 142154 - Adds libexif gyp file to third_party to handle image metadata.
libexif source files are added to deps/third_party/libexif(r141967). This change doesn't make us use the library yet, that will be the next step. This is a no-op change from the point of view of the build.
BUG=none
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10391195
TBR=kmadhusu@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10539162
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142157 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | .gitignore | 1 | ||||
-rw-r--r-- | DEPS | 3 | ||||
-rw-r--r-- | third_party/libexif/LICENSE | 507 | ||||
-rw-r--r-- | third_party/libexif/README.chromium | 24 | ||||
-rw-r--r-- | third_party/libexif/chromium.patch | 558 | ||||
-rw-r--r-- | third_party/libexif/libexif.def | 145 | ||||
-rw-r--r-- | third_party/libexif/libexif.gyp | 129 |
7 files changed, 0 insertions, 1367 deletions
@@ -153,7 +153,6 @@ v8.log /third_party/jsoncpp/source /third_party/leveldatabase/src /third_party/leveldb -/third_party/libexif/sources /third_party/libjingle/source /third_party/libjpeg_turbo /third_party/libphonenumber/libphonenumber.xml @@ -101,9 +101,6 @@ deps = { "src/third_party/icu": "/trunk/deps/third_party/icu46@140144", - "src/third_party/libexif/sources": - "/trunk/deps/third_party/libexif/sources@141967", - "src/third_party/hunspell": "/trunk/deps/third_party/hunspell@132738", diff --git a/third_party/libexif/LICENSE b/third_party/libexif/LICENSE deleted file mode 100644 index 49ec5ef..0000000 --- a/third_party/libexif/LICENSE +++ /dev/null @@ -1,507 +0,0 @@ -(Copied from sources/COPYING) - ---------------------------------------------------------------------- - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -not price. Our General Public Licenses are designed to make sure that -you have the freedom to distribute copies of free software (and charge -for this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser General Public License from time to time. -Such new versions will be similar in spirit to the present version, -but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY -KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU -FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR -CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE -LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING -RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A -FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - <one line to give the library's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - <signature of Ty Coon>, 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! - - diff --git a/third_party/libexif/README.chromium b/third_party/libexif/README.chromium deleted file mode 100644 index 98f7cc0..0000000 --- a/third_party/libexif/README.chromium +++ /dev/null @@ -1,24 +0,0 @@ -Name: EXIF Library -Short Name: libexif -URL: http://libexif.sourceforge.net/ -Version: 0.6.20 -License: LGPL 2.1 -License File: LICENSE -Date: 2012-06-04 -Security Critical: yes (Security Audit is in progress. Do not build this with Chromium). - -Description: -libexif is a library for parsing, editing, and saving EXIF data. Many maker -notes from Canon, Casio, Epson, Fuji, Nikon, Olympus, Pentax and Sanyo cameras -are also supported. - -Local Modifications: -- Added license header to exif-mem.c. Please refer to chromium.patch. -- config.h and _stdint.h has been modified to build on all platforms. Please - refer to chromium.patch. -- Added BIND_TEXTDOMAIN macro to conditionally bind the text domain to locale - directory. Please refer to chromium.patch. -- Removed ABOUT-NLS, *.m4, *-m4, binary, ChangeLog, config*, contrib, depcomp, - INSTALL, install-sh, Makefile-files, *.sym, *.am, *.in, *.pc.in, *.spec, *.sh - and *.txt files. -- Removed "doc", "po", "NEWS", "mkinstalldirs", "missing", "nls" folders. diff --git a/third_party/libexif/chromium.patch b/third_party/libexif/chromium.patch deleted file mode 100644 index daa561f..0000000 --- a/third_party/libexif/chromium.patch +++ /dev/null @@ -1,558 +0,0 @@ -diff --git a/third_party/libexif/sources/config.h b/third_party/libexif/sources/config.h -index 1811177..7857662 100644 ---- a/third_party/libexif/sources/config.h -+++ b/third_party/libexif/sources/config.h -@@ -1,13 +1,24 @@ --/* config.h. Generated from config.h.in by configure. */ -+#if defined(_WIN32) -+/* config.h. Generated by configure. */ - /* config.h.in. Generated from configure.ac by autoheader. */ - - /* Define to 1 if translation of program messages to the user's native - language is requested. */ --#define ENABLE_NLS 1 -+/* #undef ENABLE_NLS 1 */ -+ -+/* The gettext domain we're using */ -+/* #undef GETTEXT_PACKAGE "libexif-12" */ -+ -+/* Define locale directory. */ -+/* #undef LOCALEDIR "UTF-8" */ -+ -+/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and -+ * LOCALE_DIR */ -+/* #undef BIND_TEXTDOMAIN 1 */ - - /* Define if the GNU dcgettext() function is already present or preinstalled. - */ --#define HAVE_DCGETTEXT 1 -+/* #undef HAVE_DCGETTEXT 1 */ - - /* Define to 1 if you have the <dlfcn.h> header file. */ - #define HAVE_DLFCN_H 1 -@@ -21,8 +32,93 @@ - /* Define to 1 if you have the <inttypes.h> header file. */ - #define HAVE_INTTYPES_H 1 - --/* Define to 1 if you have the `localtime_r' function. */ --#define HAVE_LOCALTIME_R 1 -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+/* #undef HAVE_STDINT_H 1 */ -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define as const if the declaration of iconv() needs const. */ -+#define ICONV_CONST -+ -+/* Name of package */ -+#define PACKAGE "libexif" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "EXIF library" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "EXIF library 0.6.20" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "libexif" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.6.20" -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Version number of package */ -+#define VERSION "0.6.20" -+ -+#elif !defined(__APPLE__) -+/* config.h. Generated by configure. */ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* #define __cplusplus 1 */ -+#define LOCALEDIR "UTF-8" -+ -+/* Define to 1 if translation of program messages to the user's native -+ language is requested. */ -+/* #undef ENABLE_NLS */ -+ -+/* The gettext domain we're using */ -+/* #undef GETTEXT_PACKAGE "libexif-12" */ -+ -+/* Define locale directory. */ -+/* #undef LOCALEDIR "UTF-8" */ -+ -+/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and -+ * LOCALE_DIR */ -+/* #undef BIND_TEXTDOMAIN 1 */ -+ -+/* Define if the GNU dcgettext() function is already present or preinstalled. -+ */ -+#define HAVE_DCGETTEXT 1 -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+#define HAVE_GETTEXT 1 -+ -+/* Define if you have the iconv() function. */ -+#define HAVE_ICONV 1 -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define HAVE_INTTYPES_H 1 - - /* Define to 1 if you have the <memory.h> header file. */ - #define HAVE_MEMORY_H 1 -@@ -49,11 +145,101 @@ - #define HAVE_UNISTD_H 1 - - /* Define as const if the declaration of iconv() needs const. */ --#define ICONV_CONST -+#define ICONV_CONST -+ -+/* Name of package */ -+#define PACKAGE "libexif" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "EXIF library" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "EXIF library 0.6.20" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "libexif" -+ -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.6.20" -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Version number of package */ -+#define VERSION "0.6.20" -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+#else // defined(__APPLE__) -+ -+// We need different definitions for the iPhone from desktop OS X, -+// we get the necessary #define from TargetConditionals.h -+#include <TargetConditionals.h> -+ -+#if TARGET_OS_IPHONE -+ -+/* config.h. Generated from config.h.in by configure. */ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if translation of program messages to the user's native -+ language is requested. */ -+/* #undef ENABLE_NLS */ -+ -+/* The gettext domain we're using */ -+/* #undef GETTEXT_PACKAGE "libexif-12" */ - --/* Define to the sub-directory in which libtool stores uninstalled libraries. -+/* Define locale directory. */ -+/* #undef LOCALEDIR "UTF-8" */ -+ -+/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and -+ * LOCALE_DIR */ -+/* #undef BIND_TEXTDOMAIN 1 */ -+ -+/* Define if the GNU dcgettext() function is already present or preinstalled. - */ --#define LT_OBJDIR ".libs/" -+/* #undef HAVE_DCGETTEXT */ -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+/* #undef HAVE_GETTEXT */ -+ -+/* Define if you have the iconv() function. */ -+/* #undef HAVE_ICONV */ -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define as const if the declaration of iconv() needs const. */ -+/* #undef ICONV_CONST */ - - /* Name of package */ - #define PACKAGE "libexif" -@@ -70,8 +256,93 @@ - /* Define to the one symbol short name of this package. */ - #define PACKAGE_TARNAME "libexif" - --/* Define to the home page for this package. */ --#define PACKAGE_URL "" -+/* Define to the version of this package. */ -+#define PACKAGE_VERSION "0.6.20" -+ -+/* Define to 1 if you have the ANSI C header files. */ -+#define STDC_HEADERS 1 -+ -+/* Version number of package */ -+#define VERSION "0.6.20" -+ -+/* Define to empty if `const' does not conform to ANSI C. */ -+/* #undef const */ -+#else // !TARGET_OS_IPHONE -+ -+/* config.h. Generated from config.h.in by configure. */ -+/* config.h.in. Generated from configure.ac by autoheader. */ -+ -+/* Define to 1 if translation of program messages to the user's native -+ language is requested. */ -+/* #undef ENABLE_NLS */ -+ -+/* The gettext domain we're using */ -+/* #undef GETTEXT_PACKAGE "libexif-12" */ -+ -+/* Define locale directory. */ -+/* #undef LOCALEDIR "UTF-8" */ -+ -+/* Define to 1 if we want to bind text domain and enable GETTEXT_PACKAGE and -+ * LOCALE_DIR */ -+/* #undef BIND_TEXTDOMAIN 1 */ -+ -+/* Define if the GNU dcgettext() function is already present or preinstalled. -+ */ -+/* #undef HAVE_DCGETTEXT */ -+ -+/* Define to 1 if you have the <dlfcn.h> header file. */ -+#define HAVE_DLFCN_H 1 -+ -+/* Define if the GNU gettext() function is already present or preinstalled. */ -+/* #undef HAVE_GETTEXT */ -+ -+/* Define if you have the iconv() function. */ -+#define HAVE_ICONV 1 -+ -+/* Define to 1 if you have the <inttypes.h> header file. */ -+#define HAVE_INTTYPES_H 1 -+ -+/* Define to 1 if you have the <memory.h> header file. */ -+#define HAVE_MEMORY_H 1 -+ -+/* Define to 1 if you have the <stdint.h> header file. */ -+#define HAVE_STDINT_H 1 -+ -+/* Define to 1 if you have the <stdlib.h> header file. */ -+#define HAVE_STDLIB_H 1 -+ -+/* Define to 1 if you have the <strings.h> header file. */ -+#define HAVE_STRINGS_H 1 -+ -+/* Define to 1 if you have the <string.h> header file. */ -+#define HAVE_STRING_H 1 -+ -+/* Define to 1 if you have the <sys/stat.h> header file. */ -+#define HAVE_SYS_STAT_H 1 -+ -+/* Define to 1 if you have the <sys/types.h> header file. */ -+#define HAVE_SYS_TYPES_H 1 -+ -+/* Define to 1 if you have the <unistd.h> header file. */ -+#define HAVE_UNISTD_H 1 -+ -+/* Define as const if the declaration of iconv() needs const. */ -+#define ICONV_CONST -+ -+/* Name of package */ -+#define PACKAGE "libexif" -+ -+/* Define to the address where bug reports for this package should be sent. */ -+#define PACKAGE_BUGREPORT "libexif-devel@lists.sourceforge.net" -+ -+/* Define to the full name of this package. */ -+#define PACKAGE_NAME "EXIF library" -+ -+/* Define to the full name and version of this package. */ -+#define PACKAGE_STRING "EXIF library 0.6.20" -+ -+/* Define to the one symbol short name of this package. */ -+#define PACKAGE_TARNAME "libexif" - - /* Define to the version of this package. */ - #define PACKAGE_VERSION "0.6.20" -@@ -84,9 +355,6 @@ - - /* Define to empty if `const' does not conform to ANSI C. */ - /* #undef const */ -+#endif // TARGET_OS_IPHONE - --/* Define to `__inline__' or `__inline' if that's what the C compiler -- calls it, or to nothing if 'inline' is not supported under any name. */ --#ifndef __cplusplus --/* #undef inline */ --#endif -+#endif // _WIN32 -diff --git a/third_party/libexif/sources/libexif/_stdint.h b/third_party/libexif/sources/libexif/_stdint.h -index 80ecf41..0ecf836 100644 ---- a/third_party/libexif/sources/libexif/_stdint.h -+++ b/third_party/libexif/sources/libexif/_stdint.h -@@ -1,2 +1,15 @@ - /* This file is generated automatically by configure */ -+#if defined(_WIN32) -+// Define C99 equivalent types. -+typedef signed char int8_t; -+typedef signed short int16_t; -+typedef signed int int32_t; -+typedef signed long long int64_t; -+typedef signed long long ssize_t; -+typedef unsigned char uint8_t; -+typedef unsigned short uint16_t; -+typedef unsigned int uint32_t; -+typedef unsigned long long uint64_t; -+#else - #include <stdint.h> -+#endif -diff --git a/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c b/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c -index 6ef73a4..6ced674 100644 ---- a/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c -+++ b/third_party/libexif/sources/libexif/canon/mnote-canon-tag.c -@@ -160,7 +160,9 @@ mnote_canon_tag_get_title (MnoteCanonTag t) - { - unsigned int i; - -- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#if defined(BIND_TEXTDOMAIN) -+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) - if (table[i].tag == t) return (_(table[i].title)); - return NULL; -@@ -194,7 +196,9 @@ mnote_canon_tag_get_description (MnoteCanonTag t) - if (table[i].tag == t) { - if (!*table[i].description) - return ""; -- bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#if defined(BIND_TEXTDOMAIN) -+ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - return _(table[i].description); - } - return NULL; -diff --git a/third_party/libexif/sources/libexif/exif-entry.c b/third_party/libexif/sources/libexif/exif-entry.c -index a7edf7a..7f3ae55 100644 ---- a/third_party/libexif/sources/libexif/exif-entry.c -+++ b/third_party/libexif/sources/libexif/exif-entry.c -@@ -840,7 +840,9 @@ exif_entry_get_value (ExifEntry *e, char *val, unsigned int maxlen) - * - * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - */ -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - - /* make sure the returned string is zero terminated */ - memset (val, 0, maxlen); -diff --git a/third_party/libexif/sources/libexif/exif-format.c b/third_party/libexif/sources/libexif/exif-format.c -index 2c63c33..08e4f0c 100644 ---- a/third_party/libexif/sources/libexif/exif-format.c -+++ b/third_party/libexif/sources/libexif/exif-format.c -@@ -61,8 +61,9 @@ exif_format_get_name (ExifFormat format) - * - * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - */ -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -- -+#endif - for (i = 0; ExifFormatTable[i].name; i++) - if (ExifFormatTable[i].format == format) - return _(ExifFormatTable[i].name); -diff --git a/third_party/libexif/sources/libexif/exif-mem.c b/third_party/libexif/sources/libexif/exif-mem.c -index b4d7ece..86f8fc9 100644 ---- a/third_party/libexif/sources/libexif/exif-mem.c -+++ b/third_party/libexif/sources/libexif/exif-mem.c -@@ -1,3 +1,23 @@ -+ /* exif-mem.c -+ * -+ * Copyright (c) 2003 Lutz Mueller <lutz@users.sourceforge.net> -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the -+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, -+ * Boston, MA 02110-1301 USA. -+ */ -+ - #include <libexif/exif-mem.h> - - #include <stdlib.h> -diff --git a/third_party/libexif/sources/libexif/exif-tag.c b/third_party/libexif/sources/libexif/exif-tag.c -index 9e38849..433d6cc 100644 ---- a/third_party/libexif/sources/libexif/exif-tag.c -+++ b/third_party/libexif/sources/libexif/exif-tag.c -@@ -990,7 +990,9 @@ exif_tag_get_title_in_ifd (ExifTag tag, ExifIfd ifd) - * - * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - */ -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - return _(ExifTagTable[i].title); - } - -@@ -1024,7 +1026,9 @@ exif_tag_get_description_in_ifd (ExifTag tag, ExifIfd ifd) - * - * bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); - */ -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - return _(ExifTagTable[i].description); - } - -diff --git a/third_party/libexif/sources/libexif/exif-utils.h b/third_party/libexif/sources/libexif/exif-utils.h -index 7861564..38d0f67 100644 ---- a/third_party/libexif/sources/libexif/exif-utils.h -+++ b/third_party/libexif/sources/libexif/exif-utils.h -@@ -30,11 +30,12 @@ extern "C" { - #include <libexif/exif-byte-order.h> - #include <libexif/exif-format.h> - #include <libexif/_stdint.h> -+#include "config.h" - - - /* If these definitions don't work for you, please let us fix the - * macro generating _stdint.h */ -- -+ - /*! EXIF Unsigned Byte data type */ - typedef unsigned char ExifByte; /* 1 byte */ - -diff --git a/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c b/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c -index 3200eb6..4078037 100644 ---- a/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c -+++ b/third_party/libexif/sources/libexif/fuji/mnote-fuji-tag.c -@@ -83,7 +83,9 @@ mnote_fuji_tag_get_title (MnoteFujiTag t) - { - unsigned int i; - -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) - if (table[i].tag == t) return (_(table[i].title)); - return NULL; -@@ -98,7 +100,9 @@ mnote_fuji_tag_get_description (MnoteFujiTag t) - if (table[i].tag == t) { - if (!*table[i].description) - return ""; -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - return _(table[i].description); - } - return NULL; -diff --git a/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c b/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c -index 3810352..af8ffef 100644 ---- a/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c -+++ b/third_party/libexif/sources/libexif/olympus/mnote-olympus-tag.c -@@ -208,7 +208,9 @@ mnote_olympus_tag_get_title (MnoteOlympusTag t) - { - unsigned int i; - -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) - if (table[i].tag == t) return (_(table[i].title)); - return NULL; -@@ -223,7 +225,9 @@ mnote_olympus_tag_get_description (MnoteOlympusTag t) - if (table[i].tag == t) { - if (!table[i].description || !*table[i].description) - return ""; -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - return _(table[i].description); - } - return NULL; -diff --git a/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c b/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c -index 740f135..b53390f 100644 ---- a/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c -+++ b/third_party/libexif/sources/libexif/pentax/mnote-pentax-tag.c -@@ -153,7 +153,9 @@ mnote_pentax_tag_get_title (MnotePentaxTag t) - { - unsigned int i; - -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - for (i = 0; i < sizeof (table) / sizeof (table[0]); i++) - if (table[i].tag == t) return (_(table[i].title)); - return NULL; -@@ -168,7 +170,9 @@ mnote_pentax_tag_get_description (MnotePentaxTag t) - if (table[i].tag == t) { - if (!table[i].description || !*table[i].description) - return ""; -+#if defined(BIND_TEXTDOMAIN) - bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); -+#endif - return _(table[i].description); - } - return NULL; diff --git a/third_party/libexif/libexif.def b/third_party/libexif/libexif.def deleted file mode 100644 index e0238a1..0000000 --- a/third_party/libexif/libexif.def +++ /dev/null @@ -1,145 +0,0 @@ -LIBRARY "libexif" -EXPORTS - -exif_array_set_byte_order @1 -exif_byte_order_get_name @2 -exif_content_add_entry @3 -exif_content_dump @4 -exif_content_fix @5 -exif_content_foreach_entry @6 -exif_content_free @7 -exif_content_get_entry @8 -exif_content_get_ifd @9 -exif_content_log @10 -exif_content_new @11 -exif_content_new_mem @12 -exif_content_ref @13 -exif_content_remove_entry @14 -exif_content_unref @15 -exif_convert_utf16_to_utf8 @16 -exif_data_dump @17 -exif_data_fix @18 -exif_data_foreach_content @19 -exif_data_free @20 -exif_data_get_byte_order @21 -exif_data_get_data_type @22 -exif_data_get_log @23 -exif_data_get_mnote_data @24 -exif_data_load_data @25 -exif_data_log @26 -exif_data_new @27 -exif_data_new_from_data @28 -exif_data_new_from_file @29 -exif_data_new_mem @30 -exif_data_option_get_description @31 -exif_data_option_get_name @32 -exif_data_ref @33 -exif_data_save_data @34 -exif_data_set_byte_order @35 -exif_data_set_data_type @36 -exif_data_set_option @37 -exif_data_unref @38 -exif_data_unset_option @39 -exif_entry_dump @40 -exif_entry_fix @41 -exif_entry_free @42 -exif_entry_get_value @43 -exif_entry_initialize @44 -exif_entry_new @45 -exif_entry_new_mem @46 -exif_entry_ref @47 -exif_entry_unref @48 -exif_format_get_name @49 -exif_format_get_size @50 -exif_get_long @51 -exif_get_rational @52 -exif_get_short @53 -exif_get_slong @54 -exif_get_srational @55 -exif_get_sshort @56 -exif_ifd_get_name @57 -exif_loader_get_buf @58 -exif_loader_get_data @59 -exif_loader_log @60 -exif_loader_new @61 -exif_loader_new_mem @62 -exif_loader_ref @63 -exif_loader_reset @64 -exif_loader_unref @65 -exif_loader_write @66 -exif_loader_write_file @67 -exif_log @68 -exif_log_code_get_message @69 -exif_log_code_get_title @70 -exif_log_free @71 -exif_log_new @72 -exif_log_new_mem @73 -exif_log_ref @74 -exif_log_set_func @75 -exif_log_unref @76 -exif_logv @77 -exif_mem_alloc @78 -exif_mem_free @79 -exif_mem_new @80 -exif_mem_new_default @81 -exif_mem_realloc @82 -exif_mem_ref @83 -exif_mem_unref @84 -exif_mnote_data_canon_identify @85 -exif_mnote_data_canon_new @86 -exif_mnote_data_construct @87 -exif_mnote_data_count @88 -exif_mnote_data_fuji_identify @89 -exif_mnote_data_fuji_new @90 -exif_mnote_data_get_description @91 -exif_mnote_data_get_id @92 -exif_mnote_data_get_name @93 -exif_mnote_data_get_title @94 -exif_mnote_data_get_value @95 -exif_mnote_data_load @96 -exif_mnote_data_log @97 -exif_mnote_data_olympus_identify @98 -exif_mnote_data_olympus_new @99 -exif_mnote_data_pentax_identify @100 -exif_mnote_data_pentax_new @101 -exif_mnote_data_ref @102 -exif_mnote_data_save @103 -exif_mnote_data_set_byte_order @104 -exif_mnote_data_set_offset @105 -exif_mnote_data_unref @106 -exif_set_long @107 -exif_set_rational @108 -exif_set_short @109 -exif_set_slong @110 -exif_set_srational @111 -exif_set_sshort @112 -exif_tag_from_name @113 -exif_tag_get_description @114 -exif_tag_get_description_in_ifd @115 -exif_tag_get_name @116 -exif_tag_get_name_in_ifd @117 -exif_tag_get_support_level_in_ifd @118 -exif_tag_get_title @119 -exif_tag_get_title_in_ifd @120 -exif_tag_table_count @121 -exif_tag_table_get_name @122 -exif_tag_table_get_tag @123 -mnote_canon_entry_count_values @124 -mnote_canon_entry_get_value @125 -mnote_canon_tag_get_description @126 -mnote_canon_tag_get_name @127 -mnote_canon_tag_get_name_sub @128 -mnote_canon_tag_get_title @129 -mnote_canon_tag_get_title_sub @130 -mnote_fuji_entry_get_value @131 -mnote_fuji_tag_get_description @132 -mnote_fuji_tag_get_name @133 -mnote_fuji_tag_get_title @134 -mnote_olympus_entry_get_value @135 -mnote_olympus_tag_get_description @136 -mnote_olympus_tag_get_name @137 -mnote_olympus_tag_get_title @138 -mnote_pentax_entry_get_value @139 -mnote_pentax_tag_get_description @140 -mnote_pentax_tag_get_name @141 -mnote_pentax_tag_get_title @142 diff --git a/third_party/libexif/libexif.gyp b/third_party/libexif/libexif.gyp deleted file mode 100644 index 20aa227..0000000 --- a/third_party/libexif/libexif.gyp +++ /dev/null @@ -1,129 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'variables': { - 'conditions': [ - # TODO(kmadhusu): We are not ready to build this library on Android. - # Resolve the issues and build on Android. - ['os_posix==1 and OS!="mac"', { - 'use_system_libexif%': 0, - }, { # os_posix != 1 or OS == "mac" - 'use_system_libexif%': 0, - }], - ], - }, - 'conditions': [ - ['use_system_libexif==0', { - 'targets': [ - { - 'target_name': 'libexif', - 'type': 'shared_library', - 'product_name': 'exif', - 'sources': [ - 'sources/libexif/exif-byte-order.c', - 'sources/libexif/exif-content.c', - 'sources/libexif/exif-data.c', - 'sources/libexif/exif-entry.c', - 'sources/libexif/exif-format.c', - 'sources/libexif/exif-ifd.c', - 'sources/libexif/exif-loader.c', - 'sources/libexif/exif-log.c', - 'sources/libexif/exif-mem.c', - 'sources/libexif/exif-mnote-data.c', - 'sources/libexif/exif-tag.c', - 'sources/libexif/exif-utils.c', - 'sources/libexif/canon/exif-mnote-data-canon.c', - 'sources/libexif/canon/mnote-canon-entry.c', - 'sources/libexif/canon/mnote-canon-tag.c', - 'sources/libexif/fuji/exif-mnote-data-fuji.c', - 'sources/libexif/fuji/mnote-fuji-entry.c', - 'sources/libexif/fuji/mnote-fuji-tag.c', - 'sources/libexif/olympus/exif-mnote-data-olympus.c', - 'sources/libexif/olympus/mnote-olympus-entry.c', - 'sources/libexif/olympus/mnote-olympus-tag.c', - 'sources/libexif/pentax/exif-mnote-data-pentax.c', - 'sources/libexif/pentax/mnote-pentax-entry.c', - 'sources/libexif/pentax/mnote-pentax-tag.c', - ], - 'include_dirs': [ - 'sources', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - 'sources', - ], - }, - 'conditions': [ - ['os_posix==1 and OS!="mac"', { - 'cflags!': ['-fvisibility=hidden'], - }], - ['OS=="mac"', { - 'conditions': [ - ['mac_breakpad==1', { - 'variables': { - 'mac_real_dsym': 1, - }, - }], - ], - 'xcode_settings': { - 'GCC_SYMBOLS_PRIVATE_EXTERN': 'NO', # no -fvisibility=hidden - # TODO(kmadhusu): Copy this dylib to Versions folder. - # (Do something similar to libplugin_carbon_interpose.dylib). - 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', - }, - }], - ['OS=="win"', { - 'product_name': 'libexif', - 'msvs_settings': { - 'VCLinkerTool': { - 'ModuleDefinitionFile': 'libexif.def', - }, - }, - 'defines': [ - # This seems like a hack, but this is what WebKit Win does. - 'snprintf=_snprintf', - 'inline=__inline', - ], - }], - ], - }, - ], - }, { # 'use_system_libexif==0 - 'conditions': [ - ['sysroot!=""', { - 'variables': { - 'pkg-config': '../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"', - }, - }, { - 'variables': { - 'pkg-config': 'pkg-config' - }, - }], - ], - 'targets': [ - { - 'target_name': 'libexif', - 'type': 'none', - 'direct_dependent_settings': { - 'cflags': [ - '<!@(<(pkg-config) --cflags libexif)', - ], - 'defines': [ - 'USE_SYSTEM_LIBEXIF', - ], - }, - 'link_settings': { - 'ldflags': [ - '<!@(<(pkg-config) --libs-only-L --libs-only-other libexif)', - ], - 'libraries': [ - '<!@(<(pkg-config) --libs-only-l libexif)', - ], - }, - } - ], - }], - ] -} |