summaryrefslogtreecommitdiff
path: root/media-gfx/jhead
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx/jhead')
-rw-r--r--media-gfx/jhead/Manifest10
-rw-r--r--media-gfx/jhead/files/Makefile44
-rw-r--r--media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch26
-rw-r--r--media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch53
-rw-r--r--media-gfx/jhead/jhead-2.97.ebuild31
-rw-r--r--media-gfx/jhead/jhead-3.00.ebuild32
-rw-r--r--media-gfx/jhead/jhead-3.04.ebuild (renamed from media-gfx/jhead/jhead-3.00-r2.ebuild)12
7 files changed, 59 insertions, 149 deletions
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index ca7479ad5a14..1d76b1456a64 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,8 +1,4 @@
-AUX Makefile 1095 BLAKE2B 59829280499ade024a4b96852b3a6dac3c25bca26e3131eeb819d46e4c8071b14fc5fd2a98704ae2aa212f1037719e58254fc592709da1ac8b99500c78cc942e SHA512 d2bdf49c30c1878d2d07e3a3168d7caf484d493a00ae6032ea870f130cd7b9f5d69bfd301cd0392dbe2f601d79dc9156a9b43ce5b09781e25e858d8eaf3840f1
-AUX jhead-2.90-mkstemp_respect_flags.patch 892 BLAKE2B 3a0c4ae7bf32391b32a405541bcd70525e8aa1c6064118b94f08ec8864fc712d50500066f10b2fc417ece0a3d4ec95919eb4751b2bf994ad3461d72b4de7d12a SHA512 14051d7088685dd957d0bdaace752167ebcdac7eb3b01b033918897e8c349e417e662688d7737f916f59d4f1dd7ad9752172791699da0565dd2d5b4f908a4ed8
-DIST jhead-2.97.tar.gz 68361 BLAKE2B ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667 SHA512 9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
-DIST jhead-3.00.tar.gz 69151 BLAKE2B 23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e SHA512 daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
-EBUILD jhead-2.97.ebuild 744 BLAKE2B 9ccad5df68d98ad6003a3b69a18661fb600de10f7326199ab7784cfb9bfc16b554bef37c5e555083503e09bcfbcc053cf8b018059b3995995ee2fe8d19c3bfd7 SHA512 39f2a2b352dfbdbe74bc4c188a688aa12623e33132a9afe487271e060c0e4eba7063ef28216796f026092449f1e87702becdadc07a7729108f97df6a725e96cf
-EBUILD jhead-3.00-r2.ebuild 712 BLAKE2B 5ab22c7fb0d1137d7a18f4020737dd30934eea11c00509288255205ee574e255af1b0de1092f8f3822d0dd7b86e3a9dc8b5b50fb327df7fccb5b83add9353464 SHA512 1c44c47e0a404a8a0aff91f4e0e97e0d0edbc1e120361fb068bdfa2d9a74e31ed3420d82f006d4d86cdc1bf218904d40a13f45d5ddb46ac66f91694a098728df
-EBUILD jhead-3.00.ebuild 746 BLAKE2B 576096a432b63a988861a85e05ebb92f1a4346bd012f74269629a2b868254a372699a4ed3be74ae78cb90df792ee61e77842da6da46ec98ae6a570faedf3fb89 SHA512 2f711c62175a02cc968fc698fffff784743a8befe3c315d294e78978357de5df3ee0c665ae70baf64091db4c3744f1c2aa3853fcae87754eb8a67d0a08ebe4a5
+AUX jhead-3.04-mkstemp-fix-makefile.patch 1496 BLAKE2B 99266c5b86f94e6b173ae48e72990503fdb9d6d55e10f509e94d08fa0e821f25075868c8c6587b69c0299caac738b4872f46473236cf714eb5ed7ff0cacbf1f4 SHA512 f1f682a7b24e5e6e31125f80cae48e6c9e1af1e9f21b347784da0724a73e10082ff45b5bd36210883e8163048e3174efe927db95ceb660de821338ff77b05575
+DIST jhead-3.04.tar.gz 67754 BLAKE2B 4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152faf886bb28238ef74e73371d37902c3c13e6edb74a89347b2c6f698f18dd91b51797e1882cb1d3bf5461f SHA512 d783b02059ebcb01845d346e7c48bdc9d9f12fb7b0fd47bf8aff0a85a03f3523fbc536ddab0912f1c56ddb315b6cf31f16d4c7a4f81112d9a4c76a4a57ec1aed
+EBUILD jhead-3.04.ebuild 560 BLAKE2B a086e6fcb77bfba28f39db47362883a63fd5d84e15dc0b53623653b23ddb349d31c3b1015628a9b6cede80fd214295cceca8ea74f41b6e517744ec6bec89d242 SHA512 3684a173be604da4f4494553e0580a0f30754d424fea04bc7be4f321a3bc3810a89136b466b917408dea6be7f8eff61de98bde3062a455190f4fd96b00052b54
MISC metadata.xml 260 BLAKE2B 5eb8d87919aaab2f101cfc899ccb00b8efb723b67cb102ce580e0e69781639708cb8523b8967f9fb169e00455c548cff19d2827ce711c3f36d5ae58a1d3777ee SHA512 b6369aad1615446c9a4e1740a51a49d843868e114e49bc526e7b00cefdc795a601b9c508d866b065cc4ed750b85f48f136ee5925b9511a80f4056d7ef832eab2
diff --git a/media-gfx/jhead/files/Makefile b/media-gfx/jhead/files/Makefile
deleted file mode 100644
index 5f1d9799a42b..000000000000
--- a/media-gfx/jhead/files/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-#--------------------------------
-# jhead makefile for Unix
-# this make file also creates libjhead for meshlab
-#--------------------------------
-OBJ=.
-SRC=.
-AR = ar cqs
-LFLAGS = -shared -Wl,-soname,libjhead.so.1
-
-objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \
- $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o
-
-TARGET = libjhead.so.1.0.0
-TARGET0 = libjhead.so
-TARGET1 = libjhead.so.1
-TARGET2 = libjhead.so.1.0
-
-all: jhead $(TARGET)
-
-$(OBJ)/%.o:$(SRC)/%.c
- ${CC} -fPIC $(CFLAGS) -c $< -o $@
-
-jhead: $(objs) jhead.h
- ${CC} ${LDFLAGS} -o jhead $(objs) -lm
-
-clean:
- rm -f $(objs) jhead ${TARGET} ${TARGETA} ${TARGET0} ${TARGETD} \
- ${TARGET1} ${TARGET2}
-
-install:
- cp jhead ${DESTDIR}/usr/bin/
- cp ${TARGET} ${DESTDIR}/usr/lib/
- cp jhead ${DESTDIR}/usr/bin/
- cp ${TARGET0} ${DESTDIR}/usr/lib/
- cp ${TARGET1} ${DESTDIR}/usr/lib/
- cp ${TARGET2} ${DESTDIR}/usr/lib/
-
-$(TARGET): $(objs) jhead
- ${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
- ln -s ${TARGET} ${TARGET0}
- ln -s ${TARGET} ${TARGET1}
- ln -s ${TARGET} ${TARGET2}
-
-
diff --git a/media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch b/media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch
deleted file mode 100644
index f09214b9f3d6..000000000000
--- a/media-gfx/jhead/files/jhead-2.90-mkstemp_respect_flags.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --exclude='*~' -Naur -Naur jhead-2.90.orig/jhead.c jhead-2.90/jhead.c
---- jhead-2.90.orig/jhead.c 2011-02-12 14:36:47.000000000 -0200
-+++ jhead-2.90/jhead.c 2011-02-12 14:39:28.000000000 -0200
-@@ -358,7 +358,7 @@
- // as mktemp - that is, that between getting the random name, and making the file
- // some other program could snatch that exact same name!
- // also, not all pltforms support mkstemp.
-- mktemp(TempName);
-+ mkstemp(TempName);
-
-
- if(!TempName[0]) {
-diff --exclude='*~' -Naur -Naur jhead-2.90.orig/makefile jhead-2.90/makefile
---- jhead-2.90.orig/makefile 2011-02-12 14:36:47.000000000 -0200
-+++ jhead-2.90/makefile 2011-02-12 14:40:50.000000000 -0200
-@@ -13,8 +13,9 @@
- $(OBJ)/%.o:$(SRC)/%.c
- ${CC} $(CFLAGS) -c $< -o $@
-
-+
- jhead: $(objs) jhead.h
-- ${CC} -o jhead $(objs) -lm
-+ ${CC} ${LDFLAGS} -o jhead $(objs) -lm
-
- clean:
- rm -f $(objs) jhead
diff --git a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
new file mode 100644
index 000000000000..0bb634b6f5b9
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
@@ -0,0 +1,53 @@
+diff --git a/jhead.c b/jhead.c
+index f78127a..d8d1472 100644
+--- a/jhead.c
++++ b/jhead.c
+@@ -376,7 +376,7 @@ static void DoCommand(const char * FileName, int ShowIt)
+ // as mktemp - that is, that between getting the random name, and making the file
+ // some other program could snatch that exact same name!
+ // also, not all platforms support mkstemp.
+- mktemp(TempName);
++ mkstemp(TempName);
+
+
+ if(!TempName[0]) {
+diff --git a/makefile b/makefile
+index f8f195e..c36d34f 100644
+--- a/makefile
++++ b/makefile
+@@ -3,17 +3,20 @@
+ #--------------------------------
+ OBJ=.
+ SRC=.
+-CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
+-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++LFLAGS = -fPIC -shared -Wl,-soname,libjhead.so.1
+
+-all: jhead
++TARGET = libjhead.so.1.0.0
++TARGET0 = libjhead.so
++TARGET1 = libjhead.so.1
++TARGET2 = libjhead.so.1.0
++
++all: jhead $(TARGET)
+
+ objs = $(OBJ)/jhead.o $(OBJ)/jpgfile.o $(OBJ)/jpgqguess.o $(OBJ)/paths.o \
+ $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o
+
+ $(OBJ)/%.o:$(SRC)/%.c
+- ${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++ ${CC} -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+ jhead: $(objs) jhead.h
+ ${CC} $(LDFLAGS) -o jhead $(objs) -lm
+@@ -23,3 +26,9 @@ clean:
+
+ install:
+ cp jhead ${DESTDIR}/usr/bin/
++
++$(TARGET): $(objs) jhead
++ ${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
++ ln -s ${TARGET} ${TARGET0}
++ ln -s ${TARGET} ${TARGET1}
++ ln -s ${TARGET} ${TARGET2}
diff --git a/media-gfx/jhead/jhead-2.97.ebuild b/media-gfx/jhead/jhead-2.97.ebuild
deleted file mode 100644
index 76ae79ab4249..000000000000
--- a/media-gfx/jhead/jhead-2.97.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-src_prepare() {
- # bug 275200 - respect flags and use mktemp instead of mkstemp
- epatch "${FILESDIR}"/${PN}-2.90-mkstemp_respect_flags.patch
-}
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin ${PN}
- dodoc *.txt
- dohtml *.html
- doman ${PN}.1
-}
diff --git a/media-gfx/jhead/jhead-3.00.ebuild b/media-gfx/jhead/jhead-3.00.ebuild
deleted file mode 100644
index a2d8d93f35bf..000000000000
--- a/media-gfx/jhead/jhead-3.00.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
-SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE=""
-
-PATCHES=(
- # bug 275200 - respect flags and use mktemp instead of mkstemp
- "${FILESDIR}"/${PN}-2.90-mkstemp_respect_flags.patch
-)
-
-src_compile() {
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
-}
-
-src_install() {
- dobin ${PN}
- dodoc *.txt
- docinto html
- dodoc *.html
- doman ${PN}.1
-}
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild b/media-gfx/jhead/jhead-3.04.ebuild
index f5953484db7e..4cddaa652eab 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
HOMEPAGE="http://www.sentex.net/~mwandel/jhead"
@@ -9,15 +9,9 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz"
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-src_prepare() {
- # bug 275200 - respect flags and use mktemp instead of mkstemp
- eapply "${FILESDIR}/${PN}-2.90-mkstemp_respect_flags.patch"
- cp "${FILESDIR}/Makefile" makefile || die
- eapply_user
-}
+PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
src_install() {
dobin ${PN}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-06 01:42:54 +0000