From 56bd759df1d0c750a065b8c845e93d5dfa6b549d Mon Sep 17 00:00:00 2001 From: "Robin H. Johnson" Date: Sat, 8 Aug 2015 13:49:04 -0700 Subject: proj/gentoo: Initial commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson X-Thanks: Alec Warner - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring - wrote much python to improve cvs2svn X-Thanks: Rich Freeman - validation scripts X-Thanks: Patrick Lauer - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed --- media-libs/libjpeg-turbo/Manifest | 6 + .../files/libjpeg-turbo-1.2.0-x32.patch | 38 +++ ...ibjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch | 38 +++ .../files/libjpeg-turbo-1.3.1-jstdhuff.patch | 301 +++++++++++++++++++++ .../files/libjpeg-turbo-1.3.1-overrun.patch | 21 ++ .../libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild | 122 +++++++++ .../libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild | 118 ++++++++ .../libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild | 121 +++++++++ .../libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild | 116 ++++++++ .../libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild | 117 ++++++++ media-libs/libjpeg-turbo/metadata.xml | 16 ++ 11 files changed, 1014 insertions(+) create mode 100644 media-libs/libjpeg-turbo/Manifest create mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch create mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch create mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch create mode 100644 media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild create mode 100644 media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild create mode 100644 media-libs/libjpeg-turbo/metadata.xml (limited to 'media-libs/libjpeg-turbo') diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest new file mode 100644 index 000000000000..dd91fe8dd671 --- /dev/null +++ b/media-libs/libjpeg-turbo/Manifest @@ -0,0 +1,6 @@ +DIST libjpeg-turbo-1.3.0.tar.gz 1361603 SHA256 2657008cfc08aadbaca065bd9f8964b8a2c0abd03e73da5b5f09c1216be31234 SHA512 4d34c3c5f2cdd70b2a3d1b55eeb4ce59cb3d4b8d22bb6d43c2ec844b7eb5685b55a9b1b46ad2bc5f2756b5f5535ccad032791c3b932af9c1efc502aa5e701053 WHIRLPOOL 13c1366b9bef87cab42c88f75d1ff7eddb4ea745e0056154f1f3fb27deedee077d662395bada3bd5c18d6f8bf744d0b1f3d465967d33b453ea2acc327a6f166f +DIST libjpeg-turbo-1.3.1.tar.gz 1390282 SHA256 c132907417ddc40ed552fe53d6b91d5fecbb14a356a60ddc7ea50d6be9666fb9 SHA512 6b02dc617e291b357230ef3e8cfcd27f9acc8c3e9f1c869ab0a08e9e13711b87156c6cd1aaa1a6406a873fc6732f44c8a7d94a5d6688d24b14ac63a96ee52081 WHIRLPOOL f978b24d0a4e63a421822c2114c0cfc87cbc1dedd648ddc2e97e24ee19dc5584433b1da7d41a64f0ae37b50799a273165aaec6f1377ed35a7971dbe8a0b6a8d5 +DIST libjpeg-turbo-1.4.0.tar.gz 1524645 SHA256 d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee SHA512 60d038413acee43a23bb81d18309eed16e771d48b839b7aea52f582bbf9f99f04b3cc991e13cafc3d5df1441b726ea0792e7ad593ce4e52c96792c3b1df42c09 WHIRLPOOL 5f6c15bee87d9f9b82013801a8c6cd42c725ba4d65c0d60f990d4d0aec3c0b9334a5be832b34ae71d8606c801fc621de965c17b8b3067f7eef061f0155cbaa19 +DIST libjpeg-turbo-1.4.1.tar.gz 1529614 SHA256 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 SHA512 81197fdac40c55cb9820b832c55dab9dd5aa19427a22feb6027510a4dc9c45aeea6a37203447600481f5162a0a2ca972324997cc89fc7e51b51808260df0598d WHIRLPOOL b1c2a225720216b602dfda04a3ecf52d2251ea775c44d2cd872e9c33f43f4275ca2fbfaccba8d493c12ece4023f0c4e0c3c029837bdaff577bc401ee46a14433 +DIST libjpeg8_8d-1.debian.tar.gz 13676 SHA256 70ec6689b0ad85739802cf3ebbdcc12ea01e21edd8f931c614b25b44cf199057 SHA512 7def4f13524f0af3b9adf35a370027a18f43b9a635f56a17d5bb7883370db8b18b8a12737d0f0cb4b0287ccf8fb474eb5f754de6b398ffe7d522c54e5bf68040 WHIRLPOOL 94526c31d401eb14c9bf0f7115e13a27886ad58863e25d6653eba2b2f5ef260ec272368d2b9d9934bd75b1e5b5f1afc97230e540248efc24d6e85e5680399d27 +DIST libjpeg8_8d-2.debian.tar.gz 14764 SHA256 9b36468b2aba24d63d3c87625de89f31834ac429e6dec7d68d86a52b5110219c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675 WHIRLPOOL bda41c37f3f57733fcd86969126f6dbede2fbf633b0168265a7fe353fb7f3cd995a94e7987bac472957ec6fb0b2dc34d5dd646f0de79e06bc94e59d7cf440939 diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch new file mode 100644 index 000000000000..d85a4d7908f3 --- /dev/null +++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.2.0-x32.patch @@ -0,0 +1,38 @@ +https://bugs.gentoo.org/420239 + +https://sourceforge.net/tracker/?func=detail&aid=3533795&group_id=303195&atid=1278160 + +--- configure ++++ 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';; +--- simd/nasm_lt.sh ++++ 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/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch new file mode 100644 index 000000000000..46eefad1604f --- /dev/null +++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.0-CVE-2013-6629-and-6630.patch @@ -0,0 +1,38 @@ +http://bugzilla.redhat.com/show_bug.cgi?id=1031734 +http://bugzilla.redhat.com/show_bug.cgi?id=1031749 +http://sourceforge.net/p/libjpeg-turbo/code/1090/ + +--- jdmarker.c ++++ jdmarker.c +@@ -304,7 +304,7 @@ + /* Process a SOS marker */ + { + INT32 length; +- int i, ci, n, c, cc; ++ int i, ci, n, c, cc, pi; + jpeg_component_info * compptr; + INPUT_VARS(cinfo); + +@@ -348,6 +348,13 @@ + + TRACEMS3(cinfo, 1, JTRC_SOS_COMPONENT, cc, + compptr->dc_tbl_no, compptr->ac_tbl_no); ++ ++ /* This CSi (cc) should differ from the previous CSi */ ++ for (pi = 0; pi < i; pi++) { ++ if (cinfo->cur_comp_info[pi] == compptr) { ++ ERREXIT1(cinfo, JERR_BAD_COMPONENT_ID, cc); ++ } ++ } + } + + /* Collect the additional scan parameters Ss, Se, Ah/Al. */ +@@ -465,6 +472,8 @@ + for (i = 0; i < count; i++) + INPUT_BYTE(cinfo, huffval[i], return FALSE); + ++ MEMZERO(&huffval[count], (256 - count) * SIZEOF(UINT8)); ++ + length -= count; + + if (index & 0x10) { /* AC table definition */ diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch new file mode 100644 index 000000000000..764147dbcaf5 --- /dev/null +++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-jstdhuff.patch @@ -0,0 +1,301 @@ +Index: jcparam.c +=================================================================== +--- jcparam.c (revision 1103) ++++ jcparam.c (revision 1104) +@@ -16,6 +16,7 @@ + #define JPEG_INTERNALS + #include "jinclude.h" + #include "jpeglib.h" ++#include "jstdhuff.c" + + + /* +@@ -166,116 +167,6 @@ + + + /* +- * Huffman table setup routines +- */ +- +-LOCAL(void) +-add_huff_table (j_compress_ptr cinfo, +- JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) +-/* Define a Huffman table */ +-{ +- int nsymbols, len; +- +- if (*htblptr == NULL) +- *htblptr = jpeg_alloc_huff_table((j_common_ptr) cinfo); +- +- /* Copy the number-of-symbols-of-each-code-length counts */ +- MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits)); +- +- /* Validate the counts. We do this here mainly so we can copy the right +- * number of symbols from the val[] array, without risking marching off +- * the end of memory. jchuff.c will do a more thorough test later. +- */ +- nsymbols = 0; +- for (len = 1; len <= 16; len++) +- nsymbols += bits[len]; +- if (nsymbols < 1 || nsymbols > 256) +- ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); +- +- MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8)); +- +- /* Initialize sent_table FALSE so table will be written to JPEG file. */ +- (*htblptr)->sent_table = FALSE; +-} +- +- +-LOCAL(void) +-std_huff_tables (j_compress_ptr cinfo) +-/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ +-/* IMPORTANT: these are only valid for 8-bit data precision! */ +-{ +- static const UINT8 bits_dc_luminance[17] = +- { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; +- static const UINT8 val_dc_luminance[] = +- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; +- +- static const UINT8 bits_dc_chrominance[17] = +- { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; +- static const UINT8 val_dc_chrominance[] = +- { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; +- +- static const UINT8 bits_ac_luminance[17] = +- { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; +- static const UINT8 val_ac_luminance[] = +- { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, +- 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, +- 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, +- 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, +- 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, +- 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, +- 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, +- 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, +- 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, +- 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, +- 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, +- 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, +- 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, +- 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, +- 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, +- 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, +- 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, +- 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, +- 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, +- 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, +- 0xf9, 0xfa }; +- +- static const UINT8 bits_ac_chrominance[17] = +- { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; +- static const UINT8 val_ac_chrominance[] = +- { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, +- 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, +- 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, +- 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, +- 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, +- 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, +- 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, +- 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, +- 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, +- 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, +- 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, +- 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, +- 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, +- 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, +- 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, +- 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, +- 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, +- 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, +- 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, +- 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, +- 0xf9, 0xfa }; +- +- add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[0], +- bits_dc_luminance, val_dc_luminance); +- add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[0], +- bits_ac_luminance, val_ac_luminance); +- add_huff_table(cinfo, &cinfo->dc_huff_tbl_ptrs[1], +- bits_dc_chrominance, val_dc_chrominance); +- add_huff_table(cinfo, &cinfo->ac_huff_tbl_ptrs[1], +- bits_ac_chrominance, val_ac_chrominance); +-} +- +- +-/* + * Default parameter setup for compression. + * + * Applications that don't choose to use this routine must do their +@@ -313,7 +204,7 @@ + /* Set up two quantization tables using default quality of 75 */ + jpeg_set_quality(cinfo, 75, TRUE); + /* Set up two Huffman tables */ +- std_huff_tables(cinfo); ++ std_huff_tables((j_common_ptr) cinfo); + + /* Initialize default arithmetic coding conditioning */ + for (i = 0; i < NUM_ARITH_TBLS; i++) { +Index: jstdhuff.c +=================================================================== +--- jstdhuff.c (revision 0) ++++ jstdhuff.c (revision 1104) +@@ -0,0 +1,133 @@ ++/* ++* jstdhuff.c ++* ++* This file was part of the Independent JPEG Group's software: ++* Copyright (C) 1991-1998, Thomas G. Lane. ++* libjpeg-turbo Modifications: ++* Copyright (C) 2013, D. R. Commander. ++* For conditions of distribution and use, see the accompanying README file. ++* ++* This file contains routines to set the default Huffman tables, if they are ++* not already set. ++*/ ++ ++/* ++ * Huffman table setup routines ++ */ ++ ++LOCAL(void) ++add_huff_table (j_common_ptr cinfo, ++ JHUFF_TBL **htblptr, const UINT8 *bits, const UINT8 *val) ++/* Define a Huffman table */ ++{ ++ int nsymbols, len; ++ ++ if (*htblptr == NULL) ++ *htblptr = jpeg_alloc_huff_table(cinfo); ++ else ++ return; ++ ++ /* Copy the number-of-symbols-of-each-code-length counts */ ++ MEMCOPY((*htblptr)->bits, bits, SIZEOF((*htblptr)->bits)); ++ ++ /* Validate the counts. We do this here mainly so we can copy the right ++ * number of symbols from the val[] array, without risking marching off ++ * the end of memory. jchuff.c will do a more thorough test later. ++ */ ++ nsymbols = 0; ++ for (len = 1; len <= 16; len++) ++ nsymbols += bits[len]; ++ if (nsymbols < 1 || nsymbols > 256) ++ ERREXIT(cinfo, JERR_BAD_HUFF_TABLE); ++ ++ MEMCOPY((*htblptr)->huffval, val, nsymbols * SIZEOF(UINT8)); ++ ++ /* Initialize sent_table FALSE so table will be written to JPEG file. */ ++ (*htblptr)->sent_table = FALSE; ++} ++ ++ ++LOCAL(void) ++std_huff_tables (j_common_ptr cinfo) ++/* Set up the standard Huffman tables (cf. JPEG standard section K.3) */ ++/* IMPORTANT: these are only valid for 8-bit data precision! */ ++{ ++ JHUFF_TBL **dc_huff_tbl_ptrs, **ac_huff_tbl_ptrs; ++ ++ static const UINT8 bits_dc_luminance[17] = ++ { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 }; ++ static const UINT8 val_dc_luminance[] = ++ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; ++ ++ static const UINT8 bits_dc_chrominance[17] = ++ { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 }; ++ static const UINT8 val_dc_chrominance[] = ++ { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 }; ++ ++ static const UINT8 bits_ac_luminance[17] = ++ { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d }; ++ static const UINT8 val_ac_luminance[] = ++ { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12, ++ 0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07, ++ 0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08, ++ 0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0, ++ 0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16, ++ 0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28, ++ 0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39, ++ 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, ++ 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59, ++ 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69, ++ 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79, ++ 0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, ++ 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, ++ 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, ++ 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, ++ 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5, ++ 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4, ++ 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2, ++ 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, ++ 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, ++ 0xf9, 0xfa }; ++ ++ static const UINT8 bits_ac_chrominance[17] = ++ { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 }; ++ static const UINT8 val_ac_chrominance[] = ++ { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21, ++ 0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71, ++ 0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91, ++ 0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0, ++ 0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34, ++ 0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26, ++ 0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38, ++ 0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, ++ 0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, ++ 0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, ++ 0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, ++ 0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, ++ 0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, ++ 0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, ++ 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, ++ 0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, ++ 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, ++ 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, ++ 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, ++ 0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, ++ 0xf9, 0xfa }; ++ ++ if (cinfo->is_decompressor) { ++ dc_huff_tbl_ptrs = ((j_decompress_ptr)cinfo)->dc_huff_tbl_ptrs; ++ ac_huff_tbl_ptrs = ((j_decompress_ptr)cinfo)->ac_huff_tbl_ptrs; ++ } else { ++ dc_huff_tbl_ptrs = ((j_compress_ptr)cinfo)->dc_huff_tbl_ptrs; ++ ac_huff_tbl_ptrs = ((j_compress_ptr)cinfo)->ac_huff_tbl_ptrs; ++ } ++ ++ add_huff_table(cinfo, &dc_huff_tbl_ptrs[0], bits_dc_luminance, ++ val_dc_luminance); ++ add_huff_table(cinfo, &ac_huff_tbl_ptrs[0], bits_ac_luminance, ++ val_ac_luminance); ++ add_huff_table(cinfo, &dc_huff_tbl_ptrs[1], bits_dc_chrominance, ++ val_dc_chrominance); ++ add_huff_table(cinfo, &ac_huff_tbl_ptrs[1], bits_ac_chrominance, ++ val_ac_chrominance); ++} +Index: jdhuff.c +=================================================================== +--- jdhuff.c (revision 1103) ++++ jdhuff.c (revision 1104) +@@ -21,6 +21,7 @@ + #include "jpeglib.h" + #include "jdhuff.h" /* Declarations shared with jdphuff.c */ + #include "jpegcomp.h" ++#include "jstdhuff.c" + + + /* +@@ -795,6 +796,12 @@ + huff_entropy_ptr entropy; + int i; + ++ /* Motion JPEG frames typically do not include the Huffman tables if they ++ are the default tables. Thus, if the tables are not set by the time ++ the Huffman decoder is initialized (usually within the body of ++ jpeg_start_decompress()), we set them to default values. */ ++ std_huff_tables((j_common_ptr) cinfo); ++ + entropy = (huff_entropy_ptr) + (*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, + SIZEOF(huff_entropy_decoder)); diff --git a/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch new file mode 100644 index 000000000000..92f48c38adae --- /dev/null +++ b/media-libs/libjpeg-turbo/files/libjpeg-turbo-1.3.1-overrun.patch @@ -0,0 +1,21 @@ +diff -Naur old/jchuff.c new/jchuff.c +--- old/jchuff.c 2014-11-27 06:48:21.009442853 -1000 ++++ new/jchuff.c 2014-11-27 06:48:46.289700004 -1000 +@@ -391,7 +391,16 @@ + #endif + + +-#define BUFSIZE (DCTSIZE2 * 2) ++/* Although it is exceedingly rare, it is possible for a Huffman-encoded ++ * coefficient block to be larger than the 128-byte unencoded block. For each ++ * of the 64 coefficients, PUT_BITS is invoked twice, and each invocation can ++ * theoretically store 16 bits (for a maximum of 2048 bits or 256 bytes per ++ * encoded block.) If, for instance, one artificially sets the AC ++ * coefficients to alternating values of 32767 and -32768 (using the JPEG ++ * scanning order-- 1, 8, 16, etc.), then this will produce an encoded block ++ * larger than 200 bytes. ++ */ ++#define BUFSIZE (DCTSIZE2 * 4) + + #define LOAD_BUFFER() { \ + if (state->free_in_buffer < BUFSIZE) { \ diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild new file mode 100644 index 000000000000..d8cf7c7d1f4e --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.0-r3.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools 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/ http://sourceforge.net/projects/libjpeg-turbo/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz" + +LICENSE="BSD IJG" +SLOT="0" +KEYWORDS="alpha amd64 arm 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 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +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 ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 + epatch "${FILESDIR}"/${P}-CVE-2013-6629-and-6630.patch + + if [[ -x ./configure ]]; then + elibtoolize + else + eautoreconf + fi + + epunt_cxx #424689 + + 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 + + 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/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild new file mode 100644 index 000000000000..5c5d52aad793 --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild @@ -0,0 +1,118 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools 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/ http://sourceforge.net/projects/libjpeg-turbo/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://debian/pool/main/libj/libjpeg8/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 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +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 ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 + epatch "${FILESDIR}"/${PN}-1.3.1-jstdhuff.patch + epatch "${FILESDIR}"/${PN}-1.3.1-overrun.patch + + # generate a new ./configure compatible with non-bash shells, #533902 + eautoreconf + + 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 + + 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/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild new file mode 100644 index 000000000000..dc1e2bdd6b0b --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1.ebuild @@ -0,0 +1,121 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools 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/ http://sourceforge.net/projects/libjpeg-turbo/" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz + mirror://debian/pool/main/libj/libjpeg8/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 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +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 ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 + + if [[ -x ./configure ]]; then + elibtoolize + else + eautoreconf + fi + + epunt_cxx #424689 + + 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 + + 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/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild new file mode 100644 index 000000000000..537318b84738 --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit autotools 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/ http://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 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +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 ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 + + # generate a new ./configure compatible with non-bash shells, #533902 + eautoreconf + + 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 + + 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/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild new file mode 100644 index 000000000000..d473c175f8b9 --- /dev/null +++ b/media-libs/libjpeg-turbo/libjpeg-turbo-1.4.1.ebuild @@ -0,0 +1,117 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +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/ http://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 + abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 + !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )" +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 ) + +src_prepare() { + epatch "${FILESDIR}"/${PN}-1.2.0-x32.patch #420239 + + 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/media-libs/libjpeg-turbo/metadata.xml b/media-libs/libjpeg-turbo/metadata.xml new file mode 100644 index 000000000000..0ca0b0e3817c --- /dev/null +++ b/media-libs/libjpeg-turbo/metadata.xml @@ -0,0 +1,16 @@ + + + + graphics + + ssuominen@gentoo.org + Samuli Suominen + + + anarchy@gentoo.org + Jory A. Pratt + + + libjpeg-turbo + + -- cgit v1.2.3-65-gdbad