[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: a67ea57e40822e253dc734cad20e39559a39ff57
Author: Sam James gentoo org>
AuthorDate: Sun May 5 22:00:06 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun May 5 22:00:31 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a67ea57e
media-gfx/jhead: actually test the just-built binary
Oops. Pointed out by slyfox on the bug.
Bug: https://bugs.gentoo.org/931225
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild
b/media-gfx/jhead/jhead-3.08-r1.ebuild
index 181929ebdc85..3522816be291 100644
--- a/media-gfx/jhead/jhead-3.08-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.08-r1.ebuild
@@ -28,7 +28,7 @@ src_compile() {
src_test() {
# TODO: Add an example file we change & compare checksum?
# Trivial smoketest (which would've found bug #931225)
- jhead -V || die
+ ./jhead -V || die
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: d994e07488e48d462dff33a281ab8692415c35c5
Author: Sam James gentoo org>
AuthorDate: Sun May 5 16:44:21 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun May 5 16:44:21 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d994e074
media-gfx/jhead: add (very basic) smoketest to src_test
Left a TODO for someone else to improve.
Bug: https://bugs.gentoo.org/931225
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08-r1.ebuild | 6 ++
1 file changed, 6 insertions(+)
diff --git a/media-gfx/jhead/jhead-3.08-r1.ebuild
b/media-gfx/jhead/jhead-3.08-r1.ebuild
index 236107212ff2..181929ebdc85 100644
--- a/media-gfx/jhead/jhead-3.08-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.08-r1.ebuild
@@ -25,6 +25,12 @@ src_compile() {
emake CC="$(tc-getCC)"
}
+src_test() {
+ # TODO: Add an example file we change & compare checksum?
+ # Trivial smoketest (which would've found bug #931225)
+ jhead -V || die
+}
+
src_install() {
dobin ${PN}
dodoc *.txt
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/, media-gfx/jhead/files/
commit: 736ee1f27b0f84869cb6b99db0afffd833e69413
Author: Sam James gentoo org>
AuthorDate: Sun May 5 16:40:36 2024 +
Commit: Sam James gentoo org>
CommitDate: Sun May 5 16:41:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=736ee1f2
media-gfx/jhead: fix LDFLAGS patch
We don't want to build jhead itself with -shared, just libjhead.
Closes: https://bugs.gentoo.org/931225
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/files/jhead-3.08-fix-makefile.patch | 4 ++--
media-gfx/jhead/{jhead-3.08.ebuild => jhead-3.08-r1.ebuild} | 0
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
index 7f4e80be57ea..edf19da410dc 100644
--- a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
+++ b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
@@ -10,7 +10,7 @@
-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
-endif
+CFLAGS ?= -O2
-+LDFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
++LFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
+
+TARGET = libjhead.so.1.0.0
+TARGET0= libjhead.so
@@ -36,7 +36,7 @@
install -m 0644 jhead.1 $(MANDIR)
+
+$(TARGET): $(objs) jhead
-+ ${CC} $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
++ ${CC} $(CFLAGS) $(LDFLAGS) $(LFLAGS) -o $(TARGET) $(objs)
+ ln -s ${TARGET} ${TARGET0}
+ ln -s ${TARGET} ${TARGET1}
+ ln -s ${TARGET} ${TARGET2}
diff --git a/media-gfx/jhead/jhead-3.08.ebuild
b/media-gfx/jhead/jhead-3.08-r1.ebuild
similarity index 100%
rename from media-gfx/jhead/jhead-3.08.ebuild
rename to media-gfx/jhead/jhead-3.08-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/files/, media-gfx/jhead/
commit: e1a59a083d1232dcfaf429929cee44049efb9771
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed May 1 10:08:04 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed May 1 10:08:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1a59a08
media-gfx/jhead: drop 3.06.0.1-r1
Bug: https://bugs.gentoo.org/908519
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/jhead/Manifest | 1 -
.../files/jhead-3.06.0.1-CVE-2021-34055.patch | 108 -
.../jhead-3.06.0.1-mkstemp-fix-makefile.patch | 52 --
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 27 --
4 files changed, 188 deletions(-)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index d2f781c90eac..6a884cfb9bdd 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,2 +1 @@
-DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B
100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2
SHA512
7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9
DIST jhead-3.08.tgz 1146535 BLAKE2B
8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740
SHA512
eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5
diff --git a/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch
b/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch
deleted file mode 100644
index 1669eb6f089f..
--- a/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-From f4f57913fff5de97da347a22558bbb74a1166369 Mon Sep 17 00:00:00 2001
-From: matthias wandel
-Date: Wed, 1 Sep 2021 18:59:15 -0300
-Subject: [PATCH] If exif header is complete garbage, don't keep it. Fixes
- issue 36
-
-(cherry picked from commit c761620767ae72e5d61c697a73de262aebe0b591)
- exif.c| 12 +++-
- jhead.h | 2 +-
- jpgfile.c | 5 -
- 3 files changed, 12 insertions(+), 7 deletions(-)
-
-diff --git a/exif.c b/exif.c
-index ba066b5..d250a8d 100755
a/exif.c
-+++ b/exif.c
-@@ -1005,7 +1005,7 @@ void Clear_EXIF ()
- // Process a EXIF marker
- // Describes all the drivel that most digital cameras include...
- //--
--void process_EXIF (unsigned char * ExifSection, int length)
-+int process_EXIF (unsigned char * ExifSection, int length)
- {
- int FirstOffset;
-
-@@ -1020,7 +1020,7 @@ void process_EXIF (unsigned char * ExifSection, int
length)
- static uchar ExifHeader[] = "Exif\0\0";
- if (memcmp(ExifSection+2, ExifHeader,6)){
- ErrNonfatal("Incorrect Exif header",0,0);
--return;
-+return 0;
- }
- }
-
-@@ -1033,21 +1033,21 @@ void process_EXIF (unsigned char * ExifSection, int
length)
- MotorolaOrder = 1;
- }else{
- ErrNonfatal("Invalid Exif alignment marker.",0,0);
--return;
-+return 0;
- }
- }
-
- // Check the next value for correctness.
- if (Get16u(ExifSection+10) != 0x2a){
- ErrNonfatal("Invalid Exif start (1)",0,0);
--return;
-+return 0;
- }
-
- FirstOffset = (int)Get32u(ExifSection+12);
- if (FirstOffset < 8 || FirstOffset > 16){
- if (FirstOffset < 16 || FirstOffset > length-16 || length < 16){
- ErrNonfatal("invalid offset for first Exif IFD value",0,0);
--return;
-+return 0;
- }
- // Usually set to 8, but other values valid too.
- ErrNonfatal("Suspicious offset of first Exif IFD value",0,0);
-@@ -1086,6 +1086,7 @@ void process_EXIF (unsigned char * ExifSection, int
length)
- ImageInfo.FocalLength35mmEquiv =
(int)(ImageInfo.FocalLength/ImageInfo.CCDWidth*36 + 0.5);
- }
- }
-+ return 1;
- }
-
-
-@@ -1235,6 +1236,7 @@ void create_EXIF(void)
- const char * ClearOrientation(void)
- {
- int a;
-+
- if (NumOrientations == 0) return NULL;
-
- for (a=0;ahttp://www.sentex.net/~mwandel/jhead;
-SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
-> ${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-
-PATCHES=(
- "${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
- "${FILESDIR}/${P}-CVE-2021-34055.patch"
-)
-
-src_install() {
- dobin ${PN}
- dodoc *.txt
- docinto html
- dodoc *.html
- doman ${PN}.1
- doheader ${PN}.h
- dolib.so lib${PN}.so*
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: cfd7b8f81d198d587159fb2c769a259f740b555f
Author: Sam James gentoo org>
AuthorDate: Tue Apr 30 01:15:43 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 30 01:15:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfd7b8f8
media-gfx/jhead: Stabilize 3.08 sparc, #930948
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.08.ebuild
b/media-gfx/jhead/jhead-3.08.ebuild
index 79b35f73f039..6712f4b4f000 100644
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ b/media-gfx/jhead/jhead-3.08.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 sparc ~x86"
PATCHES=(
"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 63fcf18944c26fb1c03a2de50c07fdb6545786ff
Author: Sam James gentoo org>
AuthorDate: Tue Apr 30 01:15:42 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 30 01:15:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63fcf189
media-gfx/jhead: Stabilize 3.08 ppc64, #930948
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.08.ebuild
b/media-gfx/jhead/jhead-3.08.ebuild
index c933270e140a..79b35f73f039 100644
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ b/media-gfx/jhead/jhead-3.08.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
PATCHES=(
"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 99b9e5fc4d63c802586ae9c48df451cab326f848
Author: Sam James gentoo org>
AuthorDate: Tue Apr 30 01:15:46 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 30 01:15:46 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99b9e5fc
media-gfx/jhead: Stabilize 3.08 x86, #930948
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.08.ebuild
b/media-gfx/jhead/jhead-3.08.ebuild
index d4e0d3813695..da2bd7ac835a 100644
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ b/media-gfx/jhead/jhead-3.08.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc x86"
PATCHES=(
"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: d94ddec3a1e4bd33bf5246681c65f665a57a46f8
Author: Sam James gentoo org>
AuthorDate: Tue Apr 30 01:15:45 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 30 01:15:45 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d94ddec3
media-gfx/jhead: Stabilize 3.08 ppc, #930948
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.08.ebuild
b/media-gfx/jhead/jhead-3.08.ebuild
index 6712f4b4f000..d4e0d3813695 100644
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ b/media-gfx/jhead/jhead-3.08.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86"
PATCHES=(
"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 04172b2000c782af7e6208de453fa0fb9851bc39
Author: Sam James gentoo org>
AuthorDate: Tue Apr 30 01:15:47 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue Apr 30 01:15:47 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04172b20
media-gfx/jhead: Stabilize 3.08 amd64, #930948
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.08.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.08.ebuild
b/media-gfx/jhead/jhead-3.08.ebuild
index da2bd7ac835a..236107212ff2 100644
--- a/media-gfx/jhead/jhead-3.08.ebuild
+++ b/media-gfx/jhead/jhead-3.08.ebuild
@@ -11,7 +11,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
PATCHES=(
"${FILESDIR}"/${PN}-3.08-fix-makefile.patch
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/files/, media-gfx/jhead/
commit: d4bf8684d408ef7310a7915ca277707350d708d6
Author: Sam James gentoo org>
AuthorDate: Mon Mar 11 18:02:02 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 11 18:02:11 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4bf8684
media-gfx/jhead: add 3.08
Bug: https://bugs.gentoo.org/908519
Closes: https://bugs.gentoo.org/879543
Closes: https://bugs.gentoo.org/890252
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/Manifest | 1 +
.../jhead/files/jhead-3.08-fix-makefile.patch | 42 ++
media-gfx/jhead/jhead-3.08.ebuild | 36 +++
3 files changed, 79 insertions(+)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 088685d71f13..d2f781c90eac 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1 +1,2 @@
DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B
100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2
SHA512
7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9
+DIST jhead-3.08.tgz 1146535 BLAKE2B
8e53fed1988c12be40b804fd3c8aa51d71ddaa11d97ed11479ec100f26585cc4a19b3b29249642e1cdb5afbf612b6b4281c4f0ec3ad10ad1a6e6fdffc6729740
SHA512
eb50e487eaacf2b489ce5e76f09730c8bb0c50a0e2d7c854ebe8bd204ead8f6256e052c49c72af179dc46dd5372c1eff32ff549b947637b242dc7bbe8c7b20d5
diff --git a/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
new file mode 100644
index ..7f4e80be57ea
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-3.08-fix-makefile.patch
@@ -0,0 +1,42 @@
+--- a/makefile
b/makefile
+@@ -8,11 +8,15 @@ MANDIR=$(PREFIX)/share/man/man1
+ OBJ=obj
+ SRC=.
+
+-DPKG_BUILDFLAGS := $(shell command -v dpkg-buildflags 2> /dev/null)
+-ifdef DPKG_BUILDFLAGS
+-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
+-endif
++CFLAGS ?= -O2
++LDFLAGS += -fPIC -shared -Wl,-soname,libjhead.so.1
++
++TARGET = libjhead.so.1.0.0
++TARGET0= libjhead.so
++TARGET1= libjhead.so.1
++TARGET2 = libjhead.so.1.0
++
+++all: objdir jhead $(TARGET)
+
+ # To enable electric fence, set ELECTRIC_FENCE=1
+ ifeq ($(ELECTRIC_FENCE),1)
+@@ -31,7 +35,7 @@ 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 objdir
+- ${CC} $(CFLAGS) $(CPPFLAGS) -c $< -o $@
++ ${CC} -fPIC $(CFLAGS) $(CPPFLAGS) -c $< -o $@
+
+ jhead: $(objs) jhead.h
+ ${CC} $(LDFLAGS) -o jhead $(objs) -lm
+@@ -44,3 +48,9 @@ install: all
+ install -m 0755 jhead $(BINDIR)
+ install -m 0644 $(docs) $(DOCDIR)
+ install -m 0644 jhead.1 $(MANDIR)
++
++$(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-3.08.ebuild
b/media-gfx/jhead/jhead-3.08.ebuild
new file mode 100644
index ..c933270e140a
--- /dev/null
+++ b/media-gfx/jhead/jhead-3.08.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="EXIF JPEG camera setting parser and thumbnail remover"
+HOMEPAGE="http://www.sentex.net/~mwandel/jhead;
+SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
-> ${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-3.08-fix-makefile.patch
+)
+
+src_compile() {
+ # Older codebase with aliasing violations (bug #890252)
+ append-flags -fno-strict-aliasing
+ filter-lto
+
+ emake CC="$(tc-getCC)"
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc *.txt
+ docinto html
+ dodoc *.html
+ doman ${PN}.1
+ doheader ${PN}.h
+ dolib.so lib${PN}.so*
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 9a81351bea8eb7fe6943ee48bf4388d23402b769
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Jun 12 20:24:19 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Jun 12 20:24:42 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a81351b
media-gfx/jhead: drop 3.06.0.1
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/jhead/jhead-3.06.0.1.ebuild | 24
1 file changed, 24 deletions(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
deleted file mode 100644
index e691cde1cc18..
--- a/media-gfx/jhead/jhead-3.06.0.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
-HOMEPAGE="http://www.sentex.net/~mwandel/jhead;
-SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
-> ${P}.tgz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
-
-PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
-
-src_install() {
- dobin ${PN}
- dodoc *.txt
- docinto html
- dodoc *.html
- doman ${PN}.1
- doheader ${PN}.h
- dolib.so lib${PN}.so*
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: c3438730ec0f8d0575d566aa856b29ccff6e4a25
Author: Sam James gentoo org>
AuthorDate: Sun May 7 05:56:37 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 7 05:56:37 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3438730
media-gfx/jhead: Stabilize 3.06.0.1-r1 ppc64, #905846
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
index a61f9e2ce7f5..4a79de66ceee 100644
--- a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
PATCHES=(
"${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 9826534ba08a1e8b50e9a1778b73bb534ddc164a
Author: Sam James gentoo org>
AuthorDate: Sun May 7 05:12:08 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 7 05:12:08 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9826534b
media-gfx/jhead: Stabilize 3.06.0.1-r1 sparc, #905846
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
index 12cfeecf315c..5729187d23d6 100644
--- a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86"
PATCHES=(
"${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 11c07ab2a9b01bef850a814738a345ff6e3aa7b5
Author: Sam James gentoo org>
AuthorDate: Sun May 7 05:12:10 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 7 05:12:10 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11c07ab2
media-gfx/jhead: Stabilize 3.06.0.1-r1 ppc, #905846
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
index 5729187d23d6..a61f9e2ce7f5 100644
--- a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ~ppc64 sparc x86"
PATCHES=(
"${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 85969774dad625719deb09f67b6e9376ec8fd74f
Author: Sam James gentoo org>
AuthorDate: Sun May 7 05:00:01 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 7 05:00:01 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85969774
media-gfx/jhead: Stabilize 3.06.0.1-r1 x86, #905846
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
index 1100c87a7e25..12cfeecf315c 100644
--- a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
PATCHES=(
"${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: c3db345aff11fb45ac6cc6534eb321e4179b71cd
Author: Sam James gentoo org>
AuthorDate: Sun May 7 05:00:00 2023 +
Commit: Sam James gentoo org>
CommitDate: Sun May 7 05:00:00 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3db345a
media-gfx/jhead: Stabilize 3.06.0.1-r1 amd64, #905846
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
index b136a4af4247..1100c87a7e25 100644
--- a/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1-r1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
PATCHES=(
"${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/files/
commit: 227dea7a3673b42a6073fff1f607ea3212a795e2
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Sat Apr 8 17:15:34 2023 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Tue Apr 18 13:43:32 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=227dea7a
media-gfx/jhead: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/30519
Signed-off-by: Conrad Kostecki gentoo.org>
.../files/jhead-3.04-mkstemp-fix-makefile.patch| 53 --
1 file changed, 53 deletions(-)
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
deleted file mode 100644
index 0bb634b6f5b9..
--- a/media-gfx/jhead/files/jhead-3.04-mkstemp-fix-makefile.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/files/, media-gfx/jhead/
commit: ecf038d30f5cae49c82bed3af187d62387ed8c1e
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Apr 10 02:48:08 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Apr 10 02:48:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecf038d3
media-gfx/jhead: Add CVE-2021-34055 patch
Bug: https://bugs.gentoo.org/879801
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../files/jhead-3.06.0.1-CVE-2021-34055.patch | 108 +
media-gfx/jhead/jhead-3.06.0.1-r1.ebuild | 27 ++
2 files changed, 135 insertions(+)
diff --git a/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch
b/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch
new file mode 100644
index ..1669eb6f089f
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-3.06.0.1-CVE-2021-34055.patch
@@ -0,0 +1,108 @@
+From f4f57913fff5de97da347a22558bbb74a1166369 Mon Sep 17 00:00:00 2001
+From: matthias wandel
+Date: Wed, 1 Sep 2021 18:59:15 -0300
+Subject: [PATCH] If exif header is complete garbage, don't keep it. Fixes
+ issue 36
+
+(cherry picked from commit c761620767ae72e5d61c697a73de262aebe0b591)
+---
+ exif.c| 12 +++-
+ jhead.h | 2 +-
+ jpgfile.c | 5 -
+ 3 files changed, 12 insertions(+), 7 deletions(-)
+
+diff --git a/exif.c b/exif.c
+index ba066b5..d250a8d 100755
+--- a/exif.c
b/exif.c
+@@ -1005,7 +1005,7 @@ void Clear_EXIF ()
+ // Process a EXIF marker
+ // Describes all the drivel that most digital cameras include...
+ //--
+-void process_EXIF (unsigned char * ExifSection, int length)
++int process_EXIF (unsigned char * ExifSection, int length)
+ {
+ int FirstOffset;
+
+@@ -1020,7 +1020,7 @@ void process_EXIF (unsigned char * ExifSection, int
length)
+ static uchar ExifHeader[] = "Exif\0\0";
+ if (memcmp(ExifSection+2, ExifHeader,6)){
+ ErrNonfatal("Incorrect Exif header",0,0);
+-return;
++return 0;
+ }
+ }
+
+@@ -1033,21 +1033,21 @@ void process_EXIF (unsigned char * ExifSection, int
length)
+ MotorolaOrder = 1;
+ }else{
+ ErrNonfatal("Invalid Exif alignment marker.",0,0);
+-return;
++return 0;
+ }
+ }
+
+ // Check the next value for correctness.
+ if (Get16u(ExifSection+10) != 0x2a){
+ ErrNonfatal("Invalid Exif start (1)",0,0);
+-return;
++return 0;
+ }
+
+ FirstOffset = (int)Get32u(ExifSection+12);
+ if (FirstOffset < 8 || FirstOffset > 16){
+ if (FirstOffset < 16 || FirstOffset > length-16 || length < 16){
+ ErrNonfatal("invalid offset for first Exif IFD value",0,0);
+-return;
++return 0;
+ }
+ // Usually set to 8, but other values valid too.
+ ErrNonfatal("Suspicious offset of first Exif IFD value",0,0);
+@@ -1086,6 +1086,7 @@ void process_EXIF (unsigned char * ExifSection, int
length)
+ ImageInfo.FocalLength35mmEquiv =
(int)(ImageInfo.FocalLength/ImageInfo.CCDWidth*36 + 0.5);
+ }
+ }
++ return 1;
+ }
+
+
+@@ -1235,6 +1236,7 @@ void create_EXIF(void)
+ const char * ClearOrientation(void)
+ {
+ int a;
++
+ if (NumOrientations == 0) return NULL;
+
+ for (a=0;ahttp://www.sentex.net/~mwandel/jhead;
+SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
-> ${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=(
+ "${FILESDIR}/${P}-mkstemp-fix-makefile.patch"
+ "${FILESDIR}/${P}-CVE-2021-34055.patch"
+)
+
+src_install() {
+ dobin ${PN}
+ dodoc *.txt
+ docinto html
+ dodoc *.html
+ doman ${PN}.1
+ doheader ${PN}.h
+ dolib.so lib${PN}.so*
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 9fceaf2a9da27bc153a88c26a17ab13dd98e8d23
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Apr 7 12:36:28 2023 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Apr 7 12:36:28 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9fceaf2a
media-gfx/jhead: drop 3.04
Bug: https://bugs.gentoo.org/876247
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/jhead/Manifest | 1 -
media-gfx/jhead/jhead-3.04.ebuild | 24
2 files changed, 25 deletions(-)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 85a8dee9132a..088685d71f13 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,2 +1 @@
-DIST jhead-3.04.tar.gz 67754 BLAKE2B
4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152faf886bb28238ef74e73371d37902c3c13e6edb74a89347b2c6f698f18dd91b51797e1882cb1d3bf5461f
SHA512
d783b02059ebcb01845d346e7c48bdc9d9f12fb7b0fd47bf8aff0a85a03f3523fbc536ddab0912f1c56ddb315b6cf31f16d4c7a4f81112d9a4c76a4a57ec1aed
DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B
100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2
SHA512
7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9
diff --git a/media-gfx/jhead/jhead-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
deleted file mode 100644
index 4cddaa652eab..
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 ~ia64 ppc ppc64 sparc x86"
-
-PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
-
-src_install() {
- dobin ${PN}
- dodoc *.txt
- docinto html
- dodoc *.html
- doman ${PN}.1
- doheader ${PN}.h
- dolib.so lib${PN}.so*
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 7be623783e02c2d7feaac2813e9a8ab7804453fd Author: Arthur Zamarin gentoo org> AuthorDate: Tue Nov 1 15:53:45 2022 + Commit: Arthur Zamarin gentoo org> CommitDate: Tue Nov 1 15:53:45 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7be62378 media-gfx/jhead: add github upstream metadata Signed-off-by: Arthur Zamarin gentoo.org> media-gfx/jhead/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml index 71a5bee94e5a..f6fd981d91ac 100644 --- a/media-gfx/jhead/metadata.xml +++ b/media-gfx/jhead/metadata.xml @@ -5,4 +5,7 @@ dilfri...@gentoo.org Andreas K. Huettel + +Matthias-Wandel/jhead +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: e181a397c1fae85dd65589a72e33f8ddef8239ab
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 1 15:51:52 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 1 15:51:52 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e181a397
media-gfx/jhead: Stabilize 3.06.0.1 x86, #879015
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/jhead/jhead-3.06.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
index 46c86ae653e2..e691cde1cc18 100644
--- a/media-gfx/jhead/jhead-3.06.0.1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 82e84be48c5a50b151016b7855ffc8adbb15c2e7
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Nov 1 15:47:50 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Nov 1 15:50:35 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=82e84be4
media-gfx/jhead: stabilize 3.06.0.1 for amd64
Bug: https://bugs.gentoo.org/879015
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/jhead/jhead-3.06.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
index 637a64c4dda8..46c86ae653e2 100644
--- a/media-gfx/jhead/jhead-3.06.0.1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 30238ef818a5abc5cb4494e66fe6a8f738b52150
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 1 15:49:12 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 1 15:49:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30238ef8
media-gfx/jhead: Stabilize 3.06.0.1 sparc, #879015
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/jhead/jhead-3.06.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
index 7bd0e3ebb8b3..c7cbe65ad988 100644
--- a/media-gfx/jhead/jhead-3.06.0.1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 86e255ef69afe189c4d35ef12ff2e9b91abf0a0c
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 1 15:49:13 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 1 15:49:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86e255ef
media-gfx/jhead: Stabilize 3.06.0.1 ppc, #879015
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/jhead/jhead-3.06.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
index c7cbe65ad988..637a64c4dda8 100644
--- a/media-gfx/jhead/jhead-3.06.0.1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: c7491b8a88ede6987135bb0b82652c91be5ebafc
Author: Arthur Zamarin gentoo org>
AuthorDate: Tue Nov 1 15:47:45 2022 +
Commit: Arthur Zamarin gentoo org>
CommitDate: Tue Nov 1 15:47:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7491b8a
media-gfx/jhead: Stabilize 3.06.0.1 ppc64, #879015
Signed-off-by: Arthur Zamarin gentoo.org>
media-gfx/jhead/jhead-3.06.0.1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
index eb2c6cbb5bbd..7bd0e3ebb8b3 100644
--- a/media-gfx/jhead/jhead-3.06.0.1.ebuild
+++ b/media-gfx/jhead/jhead-3.06.0.1.ebuild
@@ -9,7 +9,7 @@
SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/files/, media-gfx/jhead/
commit: a47a1d8535d26adffaf93b0df37a623ed2e629c5
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 8 22:30:53 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Oct 8 22:35:44 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a47a1d85
media-gfx/jhead: add 3.06.0.1
Bug: https://bugs.gentoo.org/730746
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/jhead/Manifest | 1 +
.../jhead-3.06.0.1-mkstemp-fix-makefile.patch | 52 ++
media-gfx/jhead/jhead-3.06.0.1.ebuild | 24 ++
3 files changed, 77 insertions(+)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index c10ba22dd113..85a8dee9132a 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1 +1,2 @@
DIST jhead-3.04.tar.gz 67754 BLAKE2B
4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152faf886bb28238ef74e73371d37902c3c13e6edb74a89347b2c6f698f18dd91b51797e1882cb1d3bf5461f
SHA512
d783b02059ebcb01845d346e7c48bdc9d9f12fb7b0fd47bf8aff0a85a03f3523fbc536ddab0912f1c56ddb315b6cf31f16d4c7a4f81112d9a4c76a4a57ec1aed
+DIST jhead-3.06.0.1.tgz 1144608 BLAKE2B
100eaddd8585e8845e83c3eb24aefb0a0a2d477f0ee818c212cc39ad88f39cbac5532979dbe7ee8c4d7b9475fdf4cce4257679d996e4fae14ef1902ef2f8e5a2
SHA512
7804f4bab1b07eb08ed981364b3634b1c25e0657d57651871aede640254c33f9d2307ba7c9fb3bc81eb06b71ba5d27437275a3fe53859e9e9457e37e12545db9
diff --git a/media-gfx/jhead/files/jhead-3.06.0.1-mkstemp-fix-makefile.patch
b/media-gfx/jhead/files/jhead-3.06.0.1-mkstemp-fix-makefile.patch
new file mode 100644
index ..d25323d4ab38
--- /dev/null
+++ b/media-gfx/jhead/files/jhead-3.06.0.1-mkstemp-fix-makefile.patch
@@ -0,0 +1,52 @@
+diff -ruN jhead-3.06.0.1.orig/jhead.c jhead-3.06.0.1/jhead.c
+--- jhead-3.06.0.1.orig/jhead.c2021-04-14 14:02:45.0 +0200
jhead-3.06.0.1/jhead.c 2022-10-09 00:25:03.812585996 +0200
+@@ -377,7 +377,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 platforms support mkstemp.
+-mktemp(TempName);
++mkstemp(TempName);
+
+
+ if(!TempName[0]) {
+diff -ruN jhead-3.06.0.1.orig/makefile jhead-3.06.0.1/makefile
+--- jhead-3.06.0.1.orig/makefile 2021-04-14 14:02:45.0 +0200
jhead-3.06.0.1/makefile2022-10-09 00:27:28.659543801 +0200
+@@ -3,10 +3,14 @@
+ #
+ OBJ=obj
+ SRC=.
+-CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
+-LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++LFLAGS = -fPIC -shared -Wl,-soname,libjhead.so.1
+
+-all: objdir jhead
++TARGET= libjhead.so.1.0.0
++TARGET0 = libjhead.so
++TARGET1 = libjhead.so.1
++TARGET2 = libjhead.so.1.0
++
++all: objdir jhead $(TARGET)
+
+ objdir:
+ @mkdir -p obj
+@@ -15,7 +19,7 @@
+ $(OBJ)/exif.o $(OBJ)/iptc.o $(OBJ)/gpsinfo.o $(OBJ)/makernote.o
+
+ $(OBJ)/%.o:$(SRC)/%.c
+- ${CC} $(CFLAGS) -c $< -o $@
++ ${CC} -fPIC $(CFLAGS) -c $< -o $@
+
+ jhead: $(objs) jhead.h
+ ${CC} $(LDFLAGS) -o jhead $(objs) -lm
+@@ -26,3 +30,9 @@
+ install:
+ mkdir -p ${DESTDIR}/usr/bin/
+ 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-3.06.0.1.ebuild
b/media-gfx/jhead/jhead-3.06.0.1.ebuild
new file mode 100644
index ..eb2c6cbb5bbd
--- /dev/null
+++ b/media-gfx/jhead/jhead-3.06.0.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
+HOMEPAGE="http://www.sentex.net/~mwandel/jhead;
+SRC_URI="https://github.com/Matthias-Wandel/jhead/archive/refs/tags/${PV}.tar.gz
-> ${P}.tgz"
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
+
+src_install() {
+ dobin ${PN}
+ dodoc *.txt
+ docinto html
+ dodoc *.html
+ doman ${PN}.1
+ doheader ${PN}.h
+ dolib.so lib${PN}.so*
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/files/
commit: fa3833ddd2a83c8bc49f4d3409288b0186c37173
Author: Michael Mair-Keimberger gmail com>
AuthorDate: Tue Jul 28 13:29:01 2020 +
Commit: Aaron Bauman gentoo org>
CommitDate: Tue Jul 28 18:19:29 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa3833dd
media-gfx/jhead: remove unused patch
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Michael Mair-Keimberger gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/16873
Signed-off-by: Aaron Bauman gentoo.org>
media-gfx/jhead/files/Makefile | 44 --
1 file changed, 44 deletions(-)
diff --git a/media-gfx/jhead/files/Makefile b/media-gfx/jhead/files/Makefile
deleted file mode 100644
index 5f1d9799a42..000
--- 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}
-
-
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/, media-gfx/jhead/files/
commit: 40cb226be567e8f6b584268028b59b07812e8532
Author: Sam James gentoo org>
AuthorDate: Mon Jul 27 02:34:17 2020 +
Commit: Sam James gentoo org>
CommitDate: Mon Jul 27 03:15:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40cb226b
media-gfx/jhead: security cleanup
Closes: https://bugs.gentoo.org/711220
Package-Manager: Portage-3.0.0, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/Manifest | 2 --
.../files/jhead-2.90-mkstemp_respect_flags.patch | 26 --
media-gfx/jhead/jhead-2.97.ebuild | 31 -
media-gfx/jhead/jhead-3.00-r2.ebuild | 30
media-gfx/jhead/jhead-3.00.ebuild | 32 --
5 files changed, 121 deletions(-)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 9a2aa890a7e..c10ba22dd11 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,3 +1 @@
-DIST jhead-2.97.tar.gz 68361 BLAKE2B
ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667
SHA512
9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
-DIST jhead-3.00.tar.gz 69151 BLAKE2B
23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e
SHA512
daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
DIST jhead-3.04.tar.gz 67754 BLAKE2B
4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152faf886bb28238ef74e73371d37902c3c13e6edb74a89347b2c6f698f18dd91b51797e1882cb1d3bf5461f
SHA512
d783b02059ebcb01845d346e7c48bdc9d9f12fb7b0fd47bf8aff0a85a03f3523fbc536ddab0912f1c56ddb315b6cf31f16d4c7a4f81112d9a4c76a4a57ec1aed
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 f09214b9f3d..000
--- 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.c2011-02-12 14:36:47.0 -0200
-+++ jhead-2.90/jhead.c 2011-02-12 14:39:28.0 -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.0 -0200
-+++ jhead-2.90/makefile2011-02-12 14:40:50.0 -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/jhead-2.97.ebuild
b/media-gfx/jhead/jhead-2.97.ebuild
deleted file mode 100644
index 76ae79ab424..000
--- 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-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
deleted file mode 100644
index f5953484db7..000
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE=""
-
-src_prepare() {
- # bug 275200 - respect flags and use mktemp instead of mkstemp
- eapply
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: ee3d54c6b00b71068c3db7727fe95a9eb32b161d
Author: Sam James gentoo org>
AuthorDate: Sat Jul 18 18:36:24 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Jul 18 18:36:24 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3d54c6
media-gfx/jhead: sparc stable (bug #711220)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
index 327da10aa6b..4cddaa652ea 100644
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 33bd7e47a0da013af855c0228f70fdaa34aea563
Author: Sam James gentoo org>
AuthorDate: Fri Jul 17 23:10:56 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 17 23:25:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33bd7e47
media-gfx/jhead: x86 stable (bug #711220)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
index 85e79bccde4..327da10aa6b 100644
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 6781d9ebfe227f6c2943a8782d2634383bb13951
Author: Sam James gentoo org>
AuthorDate: Fri Jul 17 22:57:42 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 17 23:25:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6781d9eb
media-gfx/jhead: amd64 stable (bug #711220)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
index 054679e9429..85e79bccde4 100644
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 2798a0db443ea9254abd179e802d5d2885b139d8
Author: Sam James gentoo org>
AuthorDate: Fri Jul 17 03:29:35 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 17 03:29:35 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2798a0db
media-gfx/jhead: ppc stable (bug #711220)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
index c24ffacc211..054679e9429 100644
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ppc ppc64 ~sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 7f9a05d1bdf9ef0080f289314f584854e2b7e458
Author: Sam James gentoo org>
AuthorDate: Fri Jul 17 03:21:34 2020 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 17 03:21:34 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9a05d1
media-gfx/jhead: ppc64 stable (bug #711220)
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
media-gfx/jhead/jhead-3.04.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
index 52ccde1773d..c24ffacc211 100644
--- a/media-gfx/jhead/jhead-3.04.ebuild
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ppc64 ~sparc ~x86"
PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/, media-gfx/jhead/files/
commit: 67e090339cb570cde380194dbc8b68089d9de311
Author: John Helmert III posteo net>
AuthorDate: Wed Jun 24 20:39:38 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Jul 4 14:25:02 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=67e09033
media-gfx/jhead: Security bump to 3.04
EAPI bumped, src_prepare refactored away, added PATCHES array instead
with a patch that includes the effects of the previous patch. This patch
also includes adding Makefile functionality to create a shared library
that was removed upstream since the last version we have.
Bug: https://bugs.gentoo.org/701826
Bug: https://bugs.gentoo.org/711220
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: John Helmert III posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/16406
Signed-off-by: Andreas K. Hüttel gentoo.org>
media-gfx/jhead/Manifest | 1 +
.../files/jhead-3.04-mkstemp-fix-makefile.patch| 53 ++
media-gfx/jhead/jhead-3.04.ebuild | 24 ++
3 files changed, 78 insertions(+)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index 6cc468388b1..9a2aa890a7e 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,2 +1,3 @@
DIST jhead-2.97.tar.gz 68361 BLAKE2B
ed13d637dc491ad1c6ed7f9a5b0b526c80f69b8c521e3618289b16523ebb12690fa53a0a273f3f5793f970f390430d56c8504bed30fb45c5e9e2a9ac248f7667
SHA512
9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
DIST jhead-3.00.tar.gz 69151 BLAKE2B
23522718f07cd0b52b3d7fbd6d0f69ca5ecd5499174b06c6572be1319b275dc93eacd270f33cd7b3380ef85e6615aa79adf1fa9a1a86404876b35c31cdb0c95e
SHA512
daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
+DIST jhead-3.04.tar.gz 67754 BLAKE2B
4b81927fe3db58bf10b6e42c7e045a9d8a2f50df152faf886bb28238ef74e73371d37902c3c13e6edb74a89347b2c6f698f18dd91b51797e1882cb1d3bf5461f
SHA512
d783b02059ebcb01845d346e7c48bdc9d9f12fb7b0fd47bf8aff0a85a03f3523fbc536ddab0912f1c56ddb315b6cf31f16d4c7a4f81112d9a4c76a4a57ec1aed
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 000..0bb634b6f5b
--- /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-3.04.ebuild
b/media-gfx/jhead/jhead-3.04.ebuild
new file mode 100644
index 000..52ccde1773d
--- /dev/null
+++ b/media-gfx/jhead/jhead-3.04.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+PATCHES=( "${FILESDIR}/${P}-mkstemp-fix-makefile.patch" )
+
+src_install() {
+ dobin ${PN}
+ dodoc *.txt
+ docinto html
+ dodoc *.html
+ doman ${PN}.1
+ doheader ${PN}.h
+ dolib.so lib${PN}.so*
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 33ad7dc8bd31aa080b9ca57d021824914a36 Author: Andreas K. Hüttel gentoo org> AuthorDate: Sat Jun 6 23:15:17 2020 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Sat Jun 6 23:15:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33ad7dc8 media-gfx/jhead: Take package Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/jhead/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/media-gfx/jhead/metadata.xml b/media-gfx/jhead/metadata.xml index 6f49eba8f49..80a71f59785 100644 --- a/media-gfx/jhead/metadata.xml +++ b/media-gfx/jhead/metadata.xml @@ -1,5 +1,8 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + +dilfri...@gentoo.org +Andreas K. Huettel +
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 2cf6738e80921f381b35d34909c377f3daa63094
Author: Mikle Kolyada gentoo org>
AuthorDate: Thu May 2 21:42:15 2019 +
Commit: Mikle Kolyada gentoo org>
CommitDate: Thu May 2 21:42:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cf6738e
media-gfx/jhead: Add ~alpha keyword wrt bug #682322
Signed-off-by: Mikle Kolyada gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="~alpha"
media-gfx/jhead/jhead-3.00-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index c3e3a742dfc..09eacfbb60c 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 0e4660674ccb43ac7acb1b8aa80e081c03127c80
Author: Aaron Bauman gentoo org>
AuthorDate: Mon Apr 8 19:26:31 2019 +
Commit: Aaron Bauman gentoo org>
CommitDate: Mon Apr 8 19:26:31 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e466067
media-gfx/jhead: amd64 stable wrt bug #681512
Signed-off-by: Aaron Bauman gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
media-gfx/jhead/jhead-3.00-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index a7fe5adab25..c3e3a742dfc 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: b3dcbde014c67b3669a94b54d2946dba3ddf7d90
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Apr 7 21:17:35 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Apr 7 21:17:35 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3dcbde0
media-gfx/jhead: keyworded 3.00-r2 for ppc64, bug #682322
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-gfx/jhead/jhead-3.00-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index 06db6548a28..a7fe5adab25 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 60284bfc23a6cba30f4b7714858c18f1fd033928
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Apr 7 21:02:19 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Apr 7 21:02:19 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60284bfc
media-gfx/jhead: keyworded 3.00-r2 for ppc, bug #682322
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ppc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-gfx/jhead/jhead-3.00-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index a72b08962df..06db6548a28 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 3de8fc287f5c7bf4e8b5a3b9d4a945cd408a9e1e
Author: Sergei Trofimovich gentoo org>
AuthorDate: Sun Apr 7 20:53:36 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Sun Apr 7 20:53:36 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3de8fc28
media-gfx/jhead: keyworded 3.00-r2 for ia64, bug #682322
Package-Manager: Portage-2.3.62, Repoman-2.3.12
RepoMan-Options: --include-arches="ia64"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-gfx/jhead/jhead-3.00-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index a47820149d1..a72b08962df 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ia64 ~sparc ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 179de8968907b0ac0e70c7160f8efefb61714222
Author: Rolf Eike Beer sf-mail de>
AuthorDate: Fri Apr 5 08:55:44 2019 +
Commit: Sergei Trofimovich gentoo org>
CommitDate: Fri Apr 5 19:03:32 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=179de896
media-gfx/jhead: keyworded 3.00-r2 for sparc, bug #682322
Signed-off-by: Rolf Eike Beer sf-mail.de>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="sparc"
Signed-off-by: Sergei Trofimovich gentoo.org>
media-gfx/jhead/jhead-3.00-r2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index 4003550535b..a47820149d1 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~sparc ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: b4768c886c25f74bf60f3b7202177a468778d666
Author: Michał Górny gentoo org>
AuthorDate: Sat Nov 25 10:20:42 2017 +
Commit: Michał Górny gentoo org>
CommitDate: Sat Nov 25 10:21:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4768c88
media-gfx/jhead: Tested on ~x86, requested by Amynka
media-gfx/jhead/jhead-3.00-r2.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r2.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
index 6935d6e2757..4003550535b 100644
--- a/media-gfx/jhead/jhead-3.00-r2.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.sentex.net/~mwandel/${PN}/${P}.tar.gz;
LICENSE="public-domain"
SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~x86"
IUSE=""
src_prepare(){
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: e6a6511562637e6be2a67e6be7d7e1d62ade
Author: Sobhan Mohammadpour gmail com>
AuthorDate: Fri Nov 24 14:01:22 2017 +
Commit: Amy Liffey gentoo org>
CommitDate: Fri Nov 24 14:14:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a65115
media-gfx/jhead: add libjhead's header
add the missing header for libjhead
Closes:#6281
media-gfx/jhead/{jhead-3.00-r1.ebuild => jhead-3.00-r2.ebuild} | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/media-gfx/jhead/jhead-3.00-r1.ebuild
b/media-gfx/jhead/jhead-3.00-r2.ebuild
similarity index 93%
rename from media-gfx/jhead/jhead-3.00-r1.ebuild
rename to media-gfx/jhead/jhead-3.00-r2.ebuild
index 096b172d1e7..6935d6e2757 100644
--- a/media-gfx/jhead/jhead-3.00-r1.ebuild
+++ b/media-gfx/jhead/jhead-3.00-r2.ebuild
@@ -25,5 +25,6 @@ src_install() {
docinto html
dodoc *.html
doman ${PN}.1
- dolib.so libjhead.so*
+ doheader ${PN}.h
+ dolib.so lib${PN}.so*
}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/, media-gfx/jhead/files/
commit: 8edb9f9afb4ce6789ee0b3ad6c11093358d44d2f
Author: Sobhan Mohammadpour gmail com>
AuthorDate: Mon Nov 20 16:31:29 2017 +
Commit: Amy Liffey gentoo org>
CommitDate: Wed Nov 22 15:50:53 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8edb9f9a
media-gfx/jhead: add libjhead
compile jhead as a library and a binary for media-gfx/meshlab-2016.12 also
remove
unnecessary src_compile function
Acked-by: Luca Barbato gentoo.org>
Closes:#6249
media-gfx/jhead/files/Makefile | 44
media-gfx/jhead/jhead-3.00-r1.ebuild | 29
2 files changed, 73 insertions(+)
diff --git a/media-gfx/jhead/files/Makefile b/media-gfx/jhead/files/Makefile
new file mode 100644
index 000..5f1d9799a42
--- /dev/null
+++ b/media-gfx/jhead/files/Makefile
@@ -0,0 +1,44 @@
+#
+# 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/jhead-3.00-r1.ebuild
b/media-gfx/jhead/jhead-3.00-r1.ebuild
new file mode 100644
index 000..096b172d1e7
--- /dev/null
+++ b/media-gfx/jhead/jhead-3.00-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="~amd64"
+IUSE=""
+
+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
+}
+
+src_install() {
+ dobin ${PN}
+ dodoc *.txt
+ docinto html
+ dodoc *.html
+ doman ${PN}.1
+ dolib.so libjhead.so*
+}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 1223a801451f4cc8449f41e4335d4ed8210b1f51
Author: Tim Harder gentoo org>
AuthorDate: Thu Aug 31 11:40:48 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Aug 31 11:40:48 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1223a801
media-gfx/jhead: remove old
media-gfx/jhead/Manifest | 1 -
media-gfx/jhead/jhead-2.96.ebuild | 31 ---
2 files changed, 32 deletions(-)
diff --git a/media-gfx/jhead/Manifest b/media-gfx/jhead/Manifest
index cccaf8ec004..5270acd4d79 100644
--- a/media-gfx/jhead/Manifest
+++ b/media-gfx/jhead/Manifest
@@ -1,3 +1,2 @@
-DIST jhead-2.96.tar.gz 66235 SHA256
9fadfe6ad285cac29f328eaa7bc646d7f713eef22a7e9a9fb5b098da0b7b37c4 SHA512
819d78d15b9024a3b03af07ac282ff050c0e817d9f3d79afb0c8ecb1a2003045ad01397e8e84ce84139bd470619d28d66293a395f80bb929a9e6863f2f7d4f25
WHIRLPOOL
e9dfc8dc2401199c83b17f0aed0ed13ccdbf4feae7341553623bf714898758e6633c541d2fa2216dcbfcb26a7aad02dfaf7246f5013a015cae08c1c8d76fa5f6
DIST jhead-2.97.tar.gz 68361 SHA256
04b55c5cd27882f631c2b25316803d8ac81c6d2408e6129ca47019c018324f17 SHA512
9b33451546e5ad3b82fe6001515fd572925a1e2c11af763ae32d71ad2cb056ffa8d97abe14bd48ae5f6144da9d8322965387537d61e22d22b02624ebf351c230
WHIRLPOOL
094f6ef96332c0b207f270295a2ef5595644a1dd305dc940920c868719d73f10efdf08a34a141838f61bb70cb7bed94b5d5e0ab302dee2546e2252aefffa8b85
DIST jhead-3.00.tar.gz 69151 SHA256
88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e SHA512
daedfe7ea6be051f769e9a1e0946ea0fa741f387bbc5ba55eec394fb3f37b18a66aa8826190c790eb50a5b9d445ee0d5a28a08d181db3be469686b0675540fbe
WHIRLPOOL
7c17ab30dc379a9642f55f1b05e0ad83b77ac967cc8c1f0994e204e5701d56c803ee7dd154866cb8398106bf514c87ed351f97cd01914015bbc6e1e21a4ad975
diff --git a/media-gfx/jhead/jhead-2.96.ebuild
b/media-gfx/jhead/jhead-2.96.ebuild
deleted file mode 100644
index 0eeb2e94d41..000
--- a/media-gfx/jhead/jhead-2.96.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-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
-}
[gentoo-commits] repo/gentoo:master commit in: media-gfx/jhead/
commit: 9cb9e3a9ad016989a1d8f020769819e4542ac28c
Author: Tim Harder gentoo org>
AuthorDate: Thu Aug 31 11:40:03 2017 +
Commit: Tim Harder gentoo org>
CommitDate: Thu Aug 31 11:40:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb9e3a9
media-gfx/jhead: update 3.00 to EAPI 6
media-gfx/jhead/jhead-3.00.ebuild | 15 ---
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/media-gfx/jhead/jhead-3.00.ebuild
b/media-gfx/jhead/jhead-3.00.ebuild
index abefd9b35e6..a2d8d93f35b 100644
--- a/media-gfx/jhead/jhead-3.00.ebuild
+++ b/media-gfx/jhead/jhead-3.00.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI=5
+EAPI=6
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
DESCRIPTION="Exif Jpeg camera setting parser and thumbnail remover"
HOMEPAGE="http://www.sentex.net/~mwandel/jhead;
@@ -14,10 +14,10 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
~x86-linux ~ppc-macos ~x86-macos"
IUSE=""
-src_prepare() {
+PATCHES=(
# bug 275200 - respect flags and use mktemp instead of mkstemp
- epatch "${FILESDIR}"/${PN}-2.90-mkstemp_respect_flags.patch
-}
+ "${FILESDIR}"/${PN}-2.90-mkstemp_respect_flags.patch
+)
src_compile() {
emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
@@ -26,6 +26,7 @@ src_compile() {
src_install() {
dobin ${PN}
dodoc *.txt
- dohtml *.html
+ docinto html
+ dodoc *.html
doman ${PN}.1
}
