public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/xv/
Date: Wed, 28 Sep 2022 00:09:58 +0000 (UTC)	[thread overview]
Message-ID: <1664323781.c81b99f1d14ab1f640f3630f897a09a189d4c944.sam@gentoo> (raw)

commit:     c81b99f1d14ab1f640f3630f897a09a189d4c944
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Sun Sep 25 05:09:09 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Sep 28 00:09:41 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81b99f1

media-gfx/xv: Fix hardcoded /usr/lib

Bug: https://bugs.gentoo.org/731022
Closes: https://bugs.gentoo.org/731022
Closes: https://github.com/gentoo/gentoo/pull/27435
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/xv/xv-3.10a-r20.ebuild | 88 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

diff --git a/media-gfx/xv/xv-3.10a-r20.ebuild b/media-gfx/xv/xv-3.10a-r20.ebuild
new file mode 100644
index 000000000000..2121127b27e1
--- /dev/null
+++ b/media-gfx/xv/xv-3.10a-r20.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop flag-o-matic toolchain-funcs
+
+JUMBOV=20070520
+DESCRIPTION="Interactive image manipulation program supporting a wide variety of formats"
+HOMEPAGE="http://www.trilon.com/xv/index.html http://www.sonic.net/~roelofs/greg_xv.html"
+SRC_URI="mirror://sourceforge/png-mng/${P}-jumbo-patches-${JUMBOV}.tar.gz
+	ftp://ftp.cis.upenn.edu/pub/xv/${P}.tar.gz
+	mirror://gentoo/${P}.png.bz2"
+
+LICENSE="xv"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="jpeg tiff png"
+
+DEPEND="x11-libs/libXt
+	jpeg? ( virtual/jpeg:0 )
+	tiff? ( media-libs/tiff:0 )
+	png? ( >=media-libs/libpng-1.2:0= sys-libs/zlib )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${WORKDIR}/${P}-jumbo-fix-enh-patch-${JUMBOV}.txt"
+	"${FILESDIR}/${P}-osx-bsd-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-vdcomp-osx-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-disable-jp2k-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-fix-wait-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-add-ldflags-${JUMBOV}.patch"
+	"${FILESDIR}/${P}-libpng15-r1.patch"
+	"${FILESDIR}/${P}-wformat-security.patch"
+)
+
+src_prepare() {
+	default
+
+	append-cppflags -DUSE_GETCWD -DLINUX -DUSLEEP
+	use jpeg && append-cppflags -DDOJPEG
+	use png && append-cppflags -DDOPNG
+	use tiff && append-cppflags -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+
+	# Link with various image libraries depending on use flags
+	IMAGE_LIBS=""
+	use jpeg && IMAGE_LIBS="${IMAGE_LIBS} -ljpeg"
+	use png && IMAGE_LIBS="${IMAGE_LIBS} -lz -lpng"
+	use tiff && IMAGE_LIBS="${IMAGE_LIBS} -ltiff"
+
+	sed -i \
+		-e 's/\(^JPEG.*\)/#\1/g' \
+		-e 's/\(^PNG.*\)/#\1/g' \
+		-e 's/\(^TIFF.*\)/#\1/g' \
+		-e "s/\(^LIBS = .*\)/\1${IMAGE_LIBS}/g" Makefile || die
+
+	# 731022
+	sed -i -e "s#lib -lz#$(get_libdir) -lz#" Makefile || die
+
+	# /usr/bin/gzip => /bin/gzip
+	sed -i -e 's#/usr\(/bin/gzip\)#'"${EPREFIX}"'\1#g' config.h || die
+
+	# Fix installation of ps docs
+	sed -i -e 's#$(DESTDIR)$(LIBDIR)#$(LIBDIR)#g' Makefile || die
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" CCOPTS="${CPPFLAGS} ${CFLAGS}" LDFLAGS="${LDFLAGS}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}"
+}
+
+src_install() {
+	dodir /usr/bin
+	dodir /usr/share/man/man1
+
+	emake \
+		DESTDIR="${D}" \
+		PREFIX="${EPREFIX}"/usr \
+		DOCDIR="${EPREFIX}/usr/share/doc/${PF}" \
+		LIBDIR="${T}" install
+
+	dodoc CHANGELOG BUGS IDEAS
+	newicon "${WORKDIR}"/${P}.png ${PN}.png
+	make_desktop_entry xv "" "" "Graphics;Viewer"
+}


             reply	other threads:[~2022-09-28  0:10 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-28  0:09 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-10-16 11:44 [gentoo-commits] repo/gentoo:master commit in: media-gfx/xv/ Ben Kohler
2024-10-12 15:05 Sam James
2024-10-03 16:11 Arthur Zamarin
2024-10-02 20:11 Sam James
2024-10-02 20:11 Sam James
2024-10-02 20:11 Sam James
2024-09-03 11:17 Ben Kohler
2024-08-29 18:11 Ben Kohler
2024-08-29 15:08 Ben Kohler
2024-08-12  4:22 Eli Schwartz
2024-07-17 17:29 Ben Kohler
2024-07-17 17:29 Ben Kohler
2022-10-08 20:01 Sam James
2022-10-05  5:53 Arthur Zamarin
2022-10-04 18:41 Arthur Zamarin
2022-10-04 18:40 Arthur Zamarin
2022-10-04 17:30 Sam James
2022-10-04 17:30 Sam James
2022-09-28  0:10 Sam James
2019-02-10 17:33 Mikle Kolyada
2019-02-10 17:31 Mikle Kolyada
2019-02-09 18:36 Thomas Deutschmann
2019-02-02 21:17 Sergei Trofimovich
2019-02-02 19:18 Sergei Trofimovich
2019-02-02 19:09 Sergei Trofimovich
2019-02-01 14:55 Tobias Klausmann
2019-01-28 19:38 Sergei Trofimovich
2016-02-14 12:19 Ulrich Müller
2015-11-23  9:25 Agostino Sarubbo
2015-11-16 14:19 Agostino Sarubbo
2015-11-13  9:42 Agostino Sarubbo
2015-11-12  9:40 Agostino Sarubbo
2015-11-11  9:54 Agostino Sarubbo
2015-11-11  5:18 Jeroen Roovers
2015-11-09 10:31 Agostino Sarubbo
2015-11-08 11:04 Pacho Ramos
2015-11-08 11:04 Pacho Ramos

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1664323781.c81b99f1d14ab1f640f3630f897a09a189d4c944.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox