commit: eccf67987755ca8fc13c3357fdc79af11fd44f43 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jan 30 11:59:59 2021 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jan 30 12:01:05 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eccf6798
media-libs/jpeg: Remove last-rited pkg Closes: https://bugs.gentoo.org/762634 Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> media-libs/jpeg/Manifest | 2 - media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch | 49 ---------------- media-libs/jpeg/jpeg-9d.ebuild | 71 ----------------------- media-libs/jpeg/metadata.xml | 5 -- profiles/package.mask | 8 --- 5 files changed, 135 deletions(-) diff --git a/media-libs/jpeg/Manifest b/media-libs/jpeg/Manifest deleted file mode 100644 index d1334310aa3..00000000000 --- a/media-libs/jpeg/Manifest +++ /dev/null @@ -1,2 +0,0 @@ -DIST jpegsrc.v9d.tar.gz 1070160 BLAKE2B a905a15c0eadc8ebd797fe009685a2c300dc39600ed7416d58adf1ed326a26ca45146387fe73a87a589f4bed95e652f5385b4df5e7544a4e348bda27356295c2 SHA512 c425cf413e679e4112b428592e6facc813cadf92e42a6b850c5d348b3dd47b0599e2f4a119d7ff543b762cdcadd42a77ed1429a08874e73f64a54fb869714357 -DIST libjpeg8_8d-1.debian.tar.gz 13676 BLAKE2B ac6fab3e52f91c9ece95ed809fc972afc92c55754a59358f7dacb056917b1878f6f9be85a20ccb34eb13489a9963a00659fe25c27e8b18b44961c6ba5f3214cd SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 diff --git a/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch b/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch deleted file mode 100644 index 9ea87d4fa39..00000000000 --- a/media-libs/jpeg/files/jpeg-7-maxmem_sysconf.patch +++ /dev/null @@ -1,49 +0,0 @@ -# Make a reasonable guess about memory limits using sysconf(). -# includes 5% slop factor as suggested in documentation. - ---- jpeg-7/jmemansi.c -+++ jpeg-7/jmemansi.c -@@ -12,6 +12,15 @@ - * is shoved onto the user. - */ - -+#include <unistd.h> -+ -+#ifdef __FreeBSD__ -+# include <sys/types.h> -+# include <sys/sysctl.h> -+# include <sys/vmmeter.h> -+# include <vm/vm_param.h> -+#endif -+ - #define JPEG_INTERNALS - #include "jinclude.h" - #include "jpeglib.h" -@@ -157,7 +166,26 @@ - GLOBAL(long) - jpeg_mem_init (j_common_ptr cinfo) - { -- return DEFAULT_MAX_MEM; /* default for max_memory_to_use */ -+#ifdef _SC_AVPHYS_PAGES -+ long phys_size; -+ -+ if ((phys_size = sysconf(_SC_AVPHYS_PAGES)) == -1) -+ return DEFAULT_MAX_MEM; /* default for max_memory_to_use */ -+ if ((phys_size *= sysconf(_SC_PAGESIZE)) < 0) -+ return DEFAULT_MAX_MEM; -+ return (long) (phys_size * 0.95); -+#elif defined(HAVE_SYSCTL) && defined(HW_PHYSMEM) -+ /* This works on *bsd and darwin. */ -+ unsigned int physmem; -+ size_t len = sizeof physmem; -+ static int mib[2] = { CTL_HW, HW_PHYSMEM }; -+ -+ if (sysctl (mib, ARRAY_SIZE (mib), &physmem, &len, NULL, 0) == 0 -+ && len == sizeof (physmem)) -+ return (long) (physmem * 0.95); -+#endif -+ -+ return DEFAULT_MAX_MEM; - } - - GLOBAL(void) diff --git a/media-libs/jpeg/jpeg-9d.ebuild b/media-libs/jpeg/jpeg-9d.ebuild deleted file mode 100644 index a9830591cae..00000000000 --- a/media-libs/jpeg/jpeg-9d.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool toolchain-funcs multilib-minimal - -DESCRIPTION="Library to load, handle and manipulate images in the JPEG format" -HOMEPAGE="http://jpegclub.org/ http://www.ijg.org/"; -SRC_URI="http://www.ijg.org/files/${PN}src.v${PV}.tar.gz - mirror://debian/pool/main/libj/lib${PN}8/lib${PN}8_8d-1.debian.tar.gz" - -LICENSE="IJG" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -DEPEND="" -RDEPEND="!media-libs/libjpeg-turbo:0" - -DOCS=( change.log example.c README {coderules,filelist,install,jconfig,libjpeg,structure,usage,wizard}.txt ) - -PATCHES=( "${FILESDIR}"/${PN}-7-maxmem_sysconf.patch ) - -src_prepare() { - default - elibtoolize -} - -multilib_src_configure() { - # Fix building against this library on eg. Solaris and DragonFly BSD, see: - # http://mail-index.netbsd.org/pkgsrc-bugs/2010/01/18/msg035644.html - local ldverscript= - [[ ${CHOST} == *-solaris* ]] && ldverscript="--disable-ld-version-script" - - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - --enable-maxmem=64 \ - ${ldverscript} -} - -multilib_src_compile() { - emake - - if multilib_is_native_abi; then - # Build exifautotran and jpegexiforient - cd ../debian/extra - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - fi -} - -multilib_src_install() { - emake DESTDIR="${D}" install -} - -multilib_src_install_all() { - find "${D}" -name '*.la' -delete || die - - einstalldocs - - # Install exifautotran and jpegexiforient - newdoc ../debian/changelog changelog.debian - cd ../debian/extra - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - # Remove +x bits from man pages. - find "${ED}"/usr/share/man/ -type f -perm /1 -exec chmod a-x {} + || die -} diff --git a/media-libs/jpeg/metadata.xml b/media-libs/jpeg/metadata.xml deleted file mode 100644 index 6f49eba8f49..00000000000 --- a/media-libs/jpeg/metadata.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> -<!-- maintainer-needed --> -</pkgmetadata> diff --git a/profiles/package.mask b/profiles/package.mask index 7913e9178af..80c2ddb1758 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -253,14 +253,6 @@ games-rpg/asphyxia games-rpg/sakura-spirit games-rpg/the-royal-trap -# Michał Górny <[email protected]> (2020-12-30) -# Unmaintained. Entirely replaced by media-libs/libjpeg-turbo, -# to the point that reverse dependencies no longer build with -# media-libs/jpeg. The two libraries are binary-incompatible, -# and the current method of switching between them is incorrect. -# Removal in 30 days. Bug #762634. -media-libs/jpeg - # Jonas Stein <[email protected]> (2020-12-29) # Unusable without alsa. # Masked for removal after 2021-02-01
