1 |
commit: 1e5e10f6661db0998bac55d76c1078e2d1bc6314 |
2 |
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 18 23:08:17 2016 +0000 |
4 |
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 18 23:10:10 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e5e10f6 |
7 |
|
8 |
dev-java/metadata-extractor: Version bump and java-pkg-simple rewrite |
9 |
|
10 |
Patching build.xml was annoying. This version isn't limited to Java |
11 |
6. Nothing currently requires it but it's well-maintained and looks |
12 |
useful. |
13 |
|
14 |
Package-Manager: portage-2.2.27 |
15 |
|
16 |
dev-java/metadata-extractor/Manifest | 1 + |
17 |
.../files/metadata-extractor-2.2.2-buildfix.patch | 46 ------------------- |
18 |
.../metadata-extractor-2.2.2-r4.ebuild | 45 ------------------- |
19 |
.../metadata-extractor-2.8.1.ebuild | 52 ++++++++++++++++++++++ |
20 |
dev-java/metadata-extractor/metadata.xml | 13 ++++-- |
21 |
5 files changed, 63 insertions(+), 94 deletions(-) |
22 |
|
23 |
diff --git a/dev-java/metadata-extractor/Manifest b/dev-java/metadata-extractor/Manifest |
24 |
index 6e18d8c..52d94f8 100644 |
25 |
--- a/dev-java/metadata-extractor/Manifest |
26 |
+++ b/dev-java/metadata-extractor/Manifest |
27 |
@@ -1 +1,2 @@ |
28 |
DIST metadata-extractor-2.2.2-src.jar 3936358 SHA256 38f8b12418afde99286b9b7c86158eb4fd2c47a23ed4af025af77bae301e1783 SHA512 5004ecef28e9fc1f24a4b13b4596c801e9b20fcb9c20165e79b2543837187b8cb019aa32c301e2850939a95a23224444d6eb7e23c45d8bf54cf267899052b2f7 WHIRLPOOL ff35285df14741babe45b2b1906b0d5ceacbc76a12684d0e676cb7ad784eeafaa9bee4016489ce5643d5bcf85d1140d69667f8f9a646c9720ae4eb2602bbf031 |
29 |
+DIST metadata-extractor-2.8.1.tar.gz 3132397 SHA256 0d734971e9896709fb9e11406cefbeaa0cf11d57fa7dca6b02acaf92a2a686fd SHA512 4e9fe88be4112fbf9ce481e7fd3b3a7c9544d1d5b1ebd646d2c6e2a2a1fe2d53a4b80ab859fe5e277c3e72f5e035aa46d7af7a953a182f5b8215edf9cde99974 WHIRLPOOL bc296ebe64b82ec9485f364e287139369bb1da5f98eab47db5014d0f1d263378d0341383da95bda3efa5fba6c81c3ebb9c30a3586aa7277ec893d2ad6ac5e52f |
30 |
|
31 |
diff --git a/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch b/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch |
32 |
deleted file mode 100644 |
33 |
index fb455f4..0000000 |
34 |
--- a/dev-java/metadata-extractor/files/metadata-extractor-2.2.2-buildfix.patch |
35 |
+++ /dev/null |
36 |
@@ -1,46 +0,0 @@ |
37 |
---- metadata-extractor.build 2009-01-31 15:22:58.000000000 +0200 |
38 |
-+++ metadata-extractor.build.fixed 2009-01-31 15:37:02.000000000 +0200 |
39 |
-@@ -24,25 +24,38 @@ |
40 |
- srcdir="${src}" |
41 |
- destdir="${build}" |
42 |
- debug="${debug}" |
43 |
-- verbose="${verbose}"/> |
44 |
-+ verbose="${verbose}"> |
45 |
-+ <exclude name="**/test/*.java"/> |
46 |
-+ </javac> |
47 |
-+ </target> |
48 |
-+ |
49 |
-+ <target name="compile-test" description="compile the source"> |
50 |
-+ <javac classpath="${classpath}" |
51 |
-+ srcdir="${src}" |
52 |
-+ destdir="${build}" |
53 |
-+ debug="${debug}" |
54 |
-+ verbose="${verbose}"> |
55 |
-+ <include name="**/test/*.java"/> |
56 |
-+ </javac> |
57 |
- </target> |
58 |
- |
59 |
-- <target name="dist-binaries" depends="clean, compile, test" description="generate binary distribution"> |
60 |
-+ <target name="dist-binaries" depends="clean, compile" description="generate binary distribution"> |
61 |
- <jar destfile="${dist}/metadata-extractor-${version}.jar" update="false" basedir="${build}"> |
62 |
- <manifest> |
63 |
- <attribute name="Main-Class" value="com.drew.imaging.jpeg.JpegMetadataReader"/> |
64 |
-- </manifest> |
65 |
-+ </manifest> |
66 |
-+ <exclude name="**/test/*.class"/> |
67 |
- </jar> |
68 |
- </target> |
69 |
- |
70 |
-- <target name="dist-source" depends="clean, compile, test" description="generate source distribution"> |
71 |
-+ <target name="dist-source" depends="clean, compile" description="generate source distribution"> |
72 |
- <jar destfile="${dist}/metadata-extractor-${version}-src.jar" update="false"> |
73 |
- <fileset dir="." |
74 |
- includes="${src}/**/*.java, ${src}/**/*.jpg, ${lib}/junit.jar, metadata-extractor.build, ReleaseNotes.txt"/> |
75 |
- </jar> |
76 |
- </target> |
77 |
- |
78 |
-- <target name="test" depends="compile" description="run all junit tests"> |
79 |
-+ <target name="test" depends="compile-test" description="run all junit tests"> |
80 |
- <junit printsummary="yes" fork="yes" haltonfailure="yes"> |
81 |
- <classpath> |
82 |
- <pathelement location="${build}"/> |
83 |
|
84 |
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild |
85 |
deleted file mode 100644 |
86 |
index 76b0290..0000000 |
87 |
--- a/dev-java/metadata-extractor/metadata-extractor-2.2.2-r4.ebuild |
88 |
+++ /dev/null |
89 |
@@ -1,45 +0,0 @@ |
90 |
-# Copyright 1999-2016 Gentoo Foundation |
91 |
-# Distributed under the terms of the GNU General Public License v2 |
92 |
-# $Id$ |
93 |
- |
94 |
-EAPI="5" |
95 |
- |
96 |
-inherit java-pkg-2 java-ant-2 eutils |
97 |
- |
98 |
-DESCRIPTION="Metadata extraction framework for Exif and IPTC metadata segments, extraction support for JPEG files" |
99 |
-HOMEPAGE="http://www.drewnoakes.com/code/exif/" |
100 |
-SRC_URI="http://www.drewnoakes.com/code/exif/metadata-extractor-${PV}-src.jar" |
101 |
- |
102 |
-LICENSE="GPL-2" |
103 |
-SLOT="0" |
104 |
-KEYWORDS="~amd64 ~x86" |
105 |
- |
106 |
-IUSE="test" |
107 |
- |
108 |
-DEPEND="|| ( =virtual/jdk-1.6* =virtual/jdk-1.5* =virtual/jdk-1.4* ) |
109 |
- test? ( dev-java/junit:0 ) |
110 |
- app-arch/unzip:0" |
111 |
- |
112 |
-RDEPEND=">=virtual/jre-1.4" |
113 |
-S=${WORKDIR} |
114 |
- |
115 |
-java_prepare() { |
116 |
- epatch "${FILESDIR}"/${P}-buildfix.patch |
117 |
- |
118 |
- mv metadata-extractor.build build.xml || die |
119 |
- |
120 |
- use test && java-pkg_jar-from --build-only --into lib/ junit junit.jar |
121 |
-} |
122 |
- |
123 |
-EANT_DOC_TARGET="" |
124 |
-EANT_BUILD_TARGET="dist-binaries" |
125 |
- |
126 |
-src_install() { |
127 |
- java-pkg_newjar dist/*.jar ${PN}.jar |
128 |
- |
129 |
- dodoc ReleaseNotes.txt |
130 |
-} |
131 |
- |
132 |
-src_test() { |
133 |
- ANT_TASKS="ant-junit" eant test |
134 |
-} |
135 |
|
136 |
diff --git a/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild |
137 |
new file mode 100644 |
138 |
index 0000000..039db5e |
139 |
--- /dev/null |
140 |
+++ b/dev-java/metadata-extractor/metadata-extractor-2.8.1.ebuild |
141 |
@@ -0,0 +1,52 @@ |
142 |
+# Copyright 1999-2016 Gentoo Foundation |
143 |
+# Distributed under the terms of the GNU General Public License v2 |
144 |
+# $Id$ |
145 |
+ |
146 |
+EAPI=5 |
147 |
+ |
148 |
+JAVA_PKG_IUSE="doc source" |
149 |
+ |
150 |
+inherit java-pkg-2 java-pkg-simple |
151 |
+ |
152 |
+DESCRIPTION="Access the metadata in digital images and video via a simple Java API" |
153 |
+HOMEPAGE="http://www.drewnoakes.com/code/exif/" |
154 |
+SRC_URI="https://github.com/drewnoakes/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" |
155 |
+LICENSE="GPL-2" |
156 |
+SLOT="0" |
157 |
+KEYWORDS="~amd64 ~x86" |
158 |
+IUSE="examples test" |
159 |
+ |
160 |
+CDEPEND="dev-java/xmpcore:0" |
161 |
+ |
162 |
+DEPEND="${CDEPEND} |
163 |
+ >=virtual/jdk-1.6 |
164 |
+ test? ( dev-java/junit:4 )" |
165 |
+ |
166 |
+RDEPEND="${CDEPEND} |
167 |
+ >=virtual/jre-1.6" |
168 |
+ |
169 |
+S="${WORKDIR}/${P}" |
170 |
+JAVA_SRC_DIR="Source" |
171 |
+JAVA_GENTOO_CLASSPATH="xmpcore" |
172 |
+ |
173 |
+java_prepare() { |
174 |
+ java-pkg_clean |
175 |
+} |
176 |
+ |
177 |
+src_install() { |
178 |
+ java-pkg-simple_src_install |
179 |
+ dodoc {CONTRIBUTING,README}.md |
180 |
+ use examples && java-pkg_doexamples Samples |
181 |
+} |
182 |
+ |
183 |
+src_test() { |
184 |
+ local DIR=Tests |
185 |
+ local CP="${DIR}:${S}/${PN}.jar:$(java-pkg_getjars junit-4,${JAVA_GENTOO_CLASSPATH})" |
186 |
+ local TESTS=$(find ${DIR} -name "*Test.java") |
187 |
+ TESTS="${TESTS//Tests\/}" |
188 |
+ TESTS="${TESTS//.java}" |
189 |
+ TESTS="${TESTS//\//.}" |
190 |
+ |
191 |
+ ejavac -cp "${CP}" -d ${DIR} $(find ${DIR} -name "*.java") |
192 |
+ ejunit4 -classpath "${CP}" ${TESTS} |
193 |
+} |
194 |
|
195 |
diff --git a/dev-java/metadata-extractor/metadata.xml b/dev-java/metadata-extractor/metadata.xml |
196 |
index a00c882..3d82341 100644 |
197 |
--- a/dev-java/metadata-extractor/metadata.xml |
198 |
+++ b/dev-java/metadata-extractor/metadata.xml |
199 |
@@ -6,8 +6,15 @@ |
200 |
<name>Java</name> |
201 |
</maintainer> |
202 |
<longdescription> |
203 |
- A general metadata extraction framework. Support currently exists for |
204 |
- Exif and Iptc metadata segments. Extraction of these segments is |
205 |
- provided for Jpeg files. |
206 |
+ metadata-extractor is a straightforward Java library for reading metadata from image files. |
207 |
+ |
208 |
+ Metadata metadata = ImageMetadataReader.readMetadata(imagePath); |
209 |
+ |
210 |
+ With that metadata object, you can iterate or query the various tag values that were read from the image. |
211 |
+ |
212 |
+ The library understands several formats of metadata, many of which may be present in a single image. |
213 |
</longdescription> |
214 |
+ <upstream> |
215 |
+ <remote-id type="github">drewnoakes/metadata-extractor</remote-id> |
216 |
+ </upstream> |
217 |
</pkgmetadata> |