From 1a7e2f51b15c4be6167c401affa9e1c32265319b Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 4 Dec 2020 15:35:38 +0100 Subject: [PATCH 1/2] media-libs/libjpeg-turbo: delete unnecessary package Since qemu in Flatcar SDK does not need to pull in libjpeg-turbo, we can delete it completely. --- .../media-libs/libjpeg-turbo/Manifest | 9 -- .../files/libjpeg-turbo-1.2.0-x32.patch | 38 ------ .../libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild | 118 ----------------- .../libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild | 119 ------------------ .../media-libs/libjpeg-turbo/metadata.xml | 15 --- 5 files changed, 299 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest delete mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch delete mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest deleted file mode 100644 index d69b5ceb49..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX libjpeg-turbo-1.2.0-x32.patch 1248 SHA256 55190a460e44b1799e30ad31e5cf74db184ad4345d9836882779bb847c74ae19 SHA512 9ffc28a89db43eba9545bca2d4c1f5a11953f36a46e294b697bda190058dcaa59982f83552ce54f37ef83970d4b0fefd1e14497854c7991db38ab7f7c1c6afae WHIRLPOOL fa115376c2e0ab6769c1499c6249f90fd091f94f50f2d649ed27d553b93c043872f1198c261e28b825c496f905b1f5f7fb5cdabb2ca9c1bfa524df6928c5c90a -DIST libjpeg-turbo-1.5.0.tar.gz 1654276 SHA256 9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f SHA512 3b7249a5f5c7b1f1fa99924ac6bc9bff3bf811815ef38505af5359d1f0edb0bfb771f0fa54308743a2d9305cb19a997453fdb00d0aade3f2f17ea917a45fde22 WHIRLPOOL 5aee1cda739fb70fe15efd0cdb2cdecd7d99e4bea3d0b05d757420dd781749bc9c4a91ba4f5c1ad68584113323acc0d2784ac18c9daed678d4057a410a289610 -DIST libjpeg-turbo-1.5.1.tar.gz 1650647 SHA256 41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c SHA512 a03823cf4b3d1aada24e502fea0a979b1f656c01e55ffddc06013b9c79509c2da1e3bcf0b85282289451d77d4cb5f56dd8cbf6e492744836ddda1f7136534852 WHIRLPOOL 20540f3fa1518a3eab1f5e29cb0e84c7718bebbff5de960cbce5349cc58d3e4d14cd5883754ca9dfd60ea991d1097f7c3a8376f1112c15ac8be663139d0a400c -DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939 -EBUILD libjpeg-turbo-1.5.0.ebuild 2870 SHA256 701f0829e38764936da030e1e6277587d40816d5315433bae790d8032eca0375 SHA512 0507ab5d612610cee96f04670409ed8fc4255e40879c09f6d27773763ba1e49d8f09cff56cad4ce1188dbe09d67e3bec308bb6111b891384417d526b6ef16d75 WHIRLPOOL 7f6ef8dffc89b31746a062494bdff23010e6430470a7daff365da5c5ba40abd3df0b6c0029785d1a294d4063203c7dc6e737125ef18255b0a9ffbe1cd4ff131f -EBUILD libjpeg-turbo-1.5.1.ebuild 2932 SHA256 46d13f566f0929adfb3236179be25d26ca17e7ee6eb804ed52fdacfeed717076 SHA512 bf8a19521d8d2ae1659d20f9797efa44c5a7670fa0627828f030cb77c6c4552e85d5573dea54ce18caee20b70af17efac2de466fc18dbbc43ceafcdc07eb0836 WHIRLPOOL efc2434b58fb2a069eae9fdbc43d9321d1fe0bc5fb708ab3c18f39bf600bdf0daa311c93d7ad09474dbb5a6aaac35db1ca7be1d90ed586aa8c28a35a21345ea7 -MISC ChangeLog 8393 SHA256 7e611fd09a9127b517fdc9bc781ae30fed0f0ae14d08692acfe6f27fd5f143b5 SHA512 6fe0cf4d932d4de023bbeeca52ae098d1477a6a4df5dfcd4343e922ce52cfc3cbd1406f8014e270a66a4e99c5f1b1272b2e4a201ffb18614dd50701ab1171491 WHIRLPOOL 9d7330d2a056b268dfe9659a027877e4024d3ee4dddb3a181783cc9f99ca26c522da14353cdf32ae1220523e50f391ce7b8c1e83c3fcdea0abd47645dc5ad924 -MISC ChangeLog-2015 15563 SHA256 4b26f85d95e968cbe633ce71e86e29d285251f700ea1dcaa0f7a61dc37039438 SHA512 6755d1cdef54a317378dd091d1e9bb815044d54e81da64e78a826932ebf7fa70e627f31b395949ec4b5d30424f1529346488cfe16e0a8493cbaf3d10b8acda44 WHIRLPOOL 798e89f559d7f4482b773399e9e0806affc523b49d77683457ae860ba61d109427d0284ab63cdbfe1744770ebb3cc289ac995ce7735e9eb32fbfdb983a4574bc -MISC metadata.xml 466 SHA256 f986d515faf7af7706c2eab814891b6e00f3a2b2a9c2534fef22efaafee8b872 SHA512 2b8725c3493aa2294b43f3328f3506458254f57b8ac2914b96a7bbf987caa4c6a011e7afe72099bd0d33ff605c018853efde3e77faf2bcb012d7e49d229f17ea WHIRLPOOL 3081bed0e33685d63c2f60c33bd41016968ea72ee9a5b16a00b484d1f876382f20bab648db283c5e7c4703172ee19e78b74a06384edd0254c607c072347bd4d3 diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch deleted file mode 100644 index 523eed7557..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch +++ /dev/null @@ -1,38 +0,0 @@ -https://bugs.gentoo.org/420239 - -https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160 - ---- a/configure -+++ b/configure -@@ -33,7 +33,11 @@ case "$host_os" in - linux*) - case "$host_cpu" in - x86_64) -- objfmt='ELF64' -+ if echo __ILP32__ | $CC $CFLAGS -E - | grep __ILP32__ > /dev/null; then -+ objfmt='ELF64' -+ else -+ objfmt='ELFX32' -+ fi - ;; - *) - objfmt='ELF' -@@ -94,6 +98,7 @@ case "$objfmt" in - a.out) NAFLAGS='-faout -DAOUT';; - BSD-a.out) NAFLAGS='-faoutb -DAOUT';; - ELF) NAFLAGS='-felf -DELF';; -+ ELFX32) NAFLAGS='-felfx32 -DELF -D__x86_64__';; - ELF64) NAFLAGS='-felf64 -DELF -D__x86_64__';; - RDF) NAFLAGS='-frdf -DRDF';; - Mach-O) NAFLAGS='-fmacho -DMACHO';; ---- a/simd/nasm_lt.sh -+++ b/simd/nasm_lt.sh -@@ -11,7 +11,7 @@ while [ $# -gt 0 ]; do - pic=yes - fi - ;; -- -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-fas86| \ -+ -f|-fbin|-faout|-faoutb|-fcoff|-felf|-felf64|-felfx32|-fas86| \ - -fobj|-fwin32|-fwin64|-frdf|-fieee|-fmacho|-fmacho64) - # it's a file format specifier for nasm. - command="$command $1" diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild deleted file mode 100644 index b3ab9e76fa..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.0.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal - -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ https://sourceforge.net/projects/libjpeg-turbo/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/libjpeg8_8d-2.debian.tar.gz" - -LICENSE="BSD IJG" -SLOT="0" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - amd64? ( ${ASM_DEPEND} ) - x86? ( ${ASM_DEPEND} ) - amd64-fbsd? ( ${ASM_DEPEND} ) - x86-fbsd? ( ${ASM_DEPEND} ) - amd64-linux? ( ${ASM_DEPEND} ) - x86-linux? ( ${ASM_DEPEND} ) - x64-macos? ( ${ASM_DEPEND} ) - java? ( >=virtual/jdk-1.5 )" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 -) - -src_prepare() { - default - - elibtoolize - - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - local myconf=() - if multilib_is_native_abi; then - myconf+=( $(use_with java) ) - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - else - myconf+=( --without-java ) - fi - [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239 - - # Force /bin/bash until upstream generates a new version. #533902 - CONFIG_SHELL=/bin/bash \ - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - --with-mem-srcdst \ - "${myconf[@]}" -} - -multilib_src_compile() { - local _java_makeopts - use java && _java_makeopts="-j1" - emake ${_java_makeopts} - - if multilib_is_native_abi; then - pushd ../debian/extra >/dev/null - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - popd >/dev/null - fi -} - -multilib_src_test() { - emake test -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}"/usr/share/doc/${PF} \ - exampledir="${EPREFIX}"/usr/share/doc/${PF} \ - install - - if multilib_is_native_abi; then - pushd "${WORKDIR}"/debian/extra >/dev/null - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - popd >/dev/null - - if use java; then - rm -rf "${ED}"/usr/classes - java-pkg_dojar java/turbojpeg.jar - fi - fi -} - -multilib_src_install_all() { - prune_libtool_files - - insinto /usr/share/doc/${PF}/html - doins -r "${S}"/doc/html/* - newdoc "${WORKDIR}"/debian/changelog changelog.debian - if use java; then - insinto /usr/share/doc/${PF}/html/java - doins -r "${S}"/java/doc/* - newdoc "${S}"/java/README README.java - fi -} diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild deleted file mode 100644 index c12f011e80..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/libjpeg-turbo-1.5.1.ebuild +++ /dev/null @@ -1,119 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit libtool eutils java-pkg-opt-2 libtool toolchain-funcs multilib-minimal - -DESCRIPTION="MMX, SSE, and SSE2 SIMD accelerated JPEG library" -HOMEPAGE="http://libjpeg-turbo.virtualgl.org/ https://sourceforge.net/projects/libjpeg-turbo/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz - mirror://gentoo/libjpeg8_8d-2.debian.tar.gz" - -LICENSE="BSD IJG" -SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos" -IUSE="java static-libs" - -ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )" -COMMON_DEPEND="!media-libs/jpeg:0 - !media-libs/jpeg:62" -RDEPEND="${COMMON_DEPEND} - java? ( >=virtual/jre-1.5 )" -DEPEND="${COMMON_DEPEND} - amd64? ( ${ASM_DEPEND} ) - x86? ( ${ASM_DEPEND} ) - amd64-fbsd? ( ${ASM_DEPEND} ) - x86-fbsd? ( ${ASM_DEPEND} ) - amd64-linux? ( ${ASM_DEPEND} ) - x86-linux? ( ${ASM_DEPEND} ) - x64-macos? ( ${ASM_DEPEND} ) - x64-cygwin? ( ${ASM_DEPEND} ) - java? ( >=virtual/jdk-1.5 )" - -MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h ) - -PATCHES=( - "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 -) - -src_prepare() { - default - - elibtoolize - - java-pkg-opt-2_src_prepare -} - -multilib_src_configure() { - local myconf=() - if multilib_is_native_abi; then - myconf+=( $(use_with java) ) - if use java; then - export JAVACFLAGS="$(java-pkg_javac-args)" - export JNI_CFLAGS="$(java-pkg_get-jni-cflags)" - fi - else - myconf+=( --without-java ) - fi - [[ ${ABI} == "x32" ]] && myconf+=( --without-simd ) #420239 - - # Force /bin/bash until upstream generates a new version. #533902 - CONFIG_SHELL="${EPREFIX}"/bin/bash \ - ECONF_SOURCE=${S} \ - econf \ - $(use_enable static-libs static) \ - --with-mem-srcdst \ - "${myconf[@]}" -} - -multilib_src_compile() { - local _java_makeopts - use java && _java_makeopts="-j1" - emake ${_java_makeopts} - - if multilib_is_native_abi; then - pushd ../debian/extra >/dev/null - emake CC="$(tc-getCC)" CFLAGS="${LDFLAGS} ${CFLAGS}" - popd >/dev/null - fi -} - -multilib_src_test() { - emake test -} - -multilib_src_install() { - emake \ - DESTDIR="${D}" \ - docdir="${EPREFIX}"/usr/share/doc/${PF} \ - exampledir="${EPREFIX}"/usr/share/doc/${PF} \ - install - - if multilib_is_native_abi; then - pushd "${WORKDIR}"/debian/extra >/dev/null - emake \ - DESTDIR="${D}" prefix="${EPREFIX}"/usr \ - INSTALL="install -m755" INSTALLDIR="install -d -m755" \ - install - popd >/dev/null - - if use java; then - rm -rf "${ED}"/usr/classes - java-pkg_dojar java/turbojpeg.jar - fi - fi -} - -multilib_src_install_all() { - prune_libtool_files - - insinto /usr/share/doc/${PF}/html - doins -r "${S}"/doc/html/* - newdoc "${WORKDIR}"/debian/changelog changelog.debian - if use java; then - insinto /usr/share/doc/${PF}/html/java - doins -r "${S}"/java/doc/* - newdoc "${S}"/java/README README.java - fi -} diff --git a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/metadata.xml b/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/metadata.xml deleted file mode 100644 index c5936bf8ef..0000000000 --- a/sdk_container/src/third_party/portage-stable/media-libs/libjpeg-turbo/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - anarchy@gentoo.org - Jory A. Pratt - - - graphics@gentoo.org - Gentoo Graphics Project - - - libjpeg-turbo - - From 978f39f90dba228f11d58813451498d9e0bc642c Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 4 Dec 2020 15:36:05 +0100 Subject: [PATCH 2/2] virtual/jpeg: delete unnecessary package Now that libjpeg-turbo was deleted, we can now delete virtual/jpeg. --- .../portage-stable/virtual/jpeg/jpeg-0-r2.ebuild | 16 ---------------- .../portage-stable/virtual/jpeg/jpeg-62.ebuild | 15 --------------- .../portage-stable/virtual/jpeg/metadata.xml | 14 -------------- 3 files changed, 45 deletions(-) delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-0-r2.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-62.ebuild delete mode 100644 sdk_container/src/third_party/portage-stable/virtual/jpeg/metadata.xml diff --git a/sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-0-r2.ebuild b/sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-0-r2.ebuild deleted file mode 100644 index b8d1dba447..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-0-r2.ebuild +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib-build - -DESCRIPTION="Virtual to select between libjpeg-turbo and IJG jpeg for source-based packages" -SLOT="0" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND="|| ( - >=media-libs/libjpeg-turbo-1.3.0-r3:0[static-libs?,${MULTILIB_USEDEP}] - >=media-libs/jpeg-8d-r1:0[static-libs?,${MULTILIB_USEDEP}] - )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-62.ebuild b/sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-62.ebuild deleted file mode 100644 index 0f597765fb..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/jpeg/jpeg-62.ebuild +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit multilib-build - -DESCRIPTION="A virtual for the libjpeg.so.62 ABI for binary-only programs" -SLOT="62" -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - -RDEPEND="|| ( - >=media-libs/libjpeg-turbo-1.3.0-r3:0[${MULTILIB_USEDEP}] - >=media-libs/jpeg-6b-r12:62[${MULTILIB_USEDEP}] - )" diff --git a/sdk_container/src/third_party/portage-stable/virtual/jpeg/metadata.xml b/sdk_container/src/third_party/portage-stable/virtual/jpeg/metadata.xml deleted file mode 100644 index d5a42ca38b..0000000000 --- a/sdk_container/src/third_party/portage-stable/virtual/jpeg/metadata.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - graphics@gentoo.org - Gentoo Graphics Project - - - For building against. This is the only slot - that provides headers and command line tools. - For binary compatibility, provides - libjpeg.so.62 only. - -