root
10 years ago
parent
87fa8e0748
commit
a5eac0c22a
@ -1,4 +1,4 @@
|
||||
DIST gnupg-1.4.18.tar.bz2 3649557 SHA256 b7b5fdda78849955e0cdbc5a085f3a08f8b7fba126c622085debb62def5d6388 SHA512 f9619ede8e0d2844774e07fb42359444c5ab8e15565a87f419f76cc3d781940c564f35f429131686fdd7559c5c2edb49506b3c0a1feecbd95438743075be3e63 WHIRLPOOL 780876be0603fd0605b192721e2bbb770ad67d98acba8ef0fd769ab3241467696da5f49a189d89600d076691bf2cedb1294ffade5c44f6d24512d6a93a6f8981
|
||||
DIST gnupg-2.0.25.tar.bz2 4301689 SHA256 b3abe97df096cf53d6a422ac922f3c48e688bc892b7ccf669b92f0b7fc6c5823 SHA512 8b80c86ec53ed3b82d15a8e316baf175691e06e1bcac28d66c61fd37d07e26196a7ee7855e6eb958c301cee764866cc3cf00e5ec0aef23abddf7427bb3d23fb1 WHIRLPOOL 786f3db3af0c96249e128ce3a30dee7e9fbec38d75ed29138f0dfdcbe4f4377c39d4152844087cec0147921eed73c1a01382b542c6a27e86e8bd9265f67e65e2
|
||||
DIST gnupg-2.0.26.tar.bz2 4303384 SHA256 7758e30dc382ae7a7167ed41b7f936aa50af5ea2d6fccdef663b5b750b65b8e0 SHA512 5dd23baaac764fd48abd235ed52a85a2c7fd68b98fcde45c0f294ddb3b5629e8b1bd894585fbed4e6a6cb2bc4a5552c098c3cf1a849fffa469424fd0a4fee726 WHIRLPOOL 8d9b30337957f6bfeddea29116d862ef0c0ddd06d59bc2799db236b91b2c6767aad6f37f2166fc431c5d9454eb41f49f3e261bc38d0e89361f0c467f4591cd5a
|
||||
DIST gnupg-2.1.0.tar.bz2 3111585 SHA256 16a8c3f50a15bf37d2dfb1c5e4bb3ec533e1d0b6a4043ff3680a376a3ad4058b SHA512 85693dd800a530ca1ae073d976c3ab103b16261680739b7fa331ff7d3856b2628edaa309cf08310f489863729256bbe0a0fe0a059901eceaaf46860feffb7624 WHIRLPOOL cb385fffe0bf7e09ab3073371ed5eb7fad385d2b3f9e3f06c4123fafef10429f04c49e23c4775afd78b3bef199045cc6321560c252c218d54d31d1577ce04d63
|
||||
DIST gnupg-2.1.1.tar.bz2 4801472 SHA256 70ecd01d2875db62624c911c2fd815742f50aef5492698eb3bfc09a08690ce49 SHA512 00aea535f18d66fa8053c25633f89acbdfc43c91db568d6b7de0db6b40331edafacd04bf2da0aeef3201642e63baf242504d58f05286cfab4014c062432d7885 WHIRLPOOL d49b164d52188f5a9b47a0892aa81918c21ee71bd85b2b1c27979edf1f303afa5bd94d77ff491d33d6f991057cce1faf347419a784cb64f25ebfe5c1fff78d16
|
||||
|
||||
@ -1,22 +0,0 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-AutoConf/Config-AutoConf-0.305.ebuild,v 1.1 2014/06/14 12:35:25 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
MODULE_AUTHOR="REHSACK"
|
||||
MODULE_VERSION=${PV%.0}
|
||||
|
||||
inherit perl-module
|
||||
|
||||
DESCRIPTION="A module to implement some of AutoConf macros in pure perl"
|
||||
|
||||
SLOT="0"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="test"
|
||||
|
||||
DEPEND="test? ( >=dev-perl/Test-Pod-1.14
|
||||
>=dev-perl/Test-Pod-Coverage-1.08 )"
|
||||
RDEPEND="dev-perl/Capture-Tiny"
|
||||
|
||||
SRC_TEST="do"
|
||||
@ -1,6 +1,6 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-AutoConf/Config-AutoConf-0.304.ebuild,v 1.1 2014/06/02 09:32:26 mrueg Exp $
|
||||
# $Header: /var/cvsroot/gentoo-x86/dev-perl/Config-AutoConf/Config-AutoConf-0.307.ebuild,v 1.1 2014/12/17 17:30:46 mrueg Exp $
|
||||
|
||||
EAPI=5
|
||||
|
||||
@ -1,2 +1 @@
|
||||
DIST Config-AutoConf-0.304.tar.gz 26426 SHA256 5ed41260069340b58ac511f901e86f8f9cc886ea044d20a53c543aa6315f72a7 SHA512 d8ee9b88120cf34585f96d70073bdb9756e31df3cf10d3a439d1e3f60e7b577a841cee02a7d6ac86c75e1c6db794ac611c82fad747f07b9143a94ffbd7fc7382 WHIRLPOOL 31af782dd57e7811c42eb754a81a30e604d6908b0bf9da8f1c325246c3b183387c49f13bb5a938f7530b57332944d0d10c22af3aaa276970d3cd101b06aa39a9
|
||||
DIST Config-AutoConf-0.305.tar.gz 27095 SHA256 7905d7752f0afedca0d6a0f008b8b489519c0b01dedc50de1fcce74520253cc0 SHA512 f9224cbb832b598a60f77eff4748cf237aca94e47412ea7c7a40485a15cf0f28398fda634224b1fb0f5790fe2f057b32c59e749351d875ea9527cc056143d297 WHIRLPOOL 15500fe67d523dbfd9231ccaf52c707ffe99957056bcbd415ba9f7e1ad264d91f9e2fbae0674daf788a9e6c85400603a39483d209169963389eb2ff88b87e5a2
|
||||
DIST Config-AutoConf-0.307.tar.gz 30838 SHA256 779a27bcd289b825a4143974350e18ebf317b9c14b67c7ce92798b670ca93157 SHA512 92a76c17ab12d39aea0916df22aafdc3b2d6d04e6e48530bea992b4cb52683a9ada0284123b1ef406f29fb03670dd131397935639131b4fadd8a03a49584f612 WHIRLPOOL e7f0f8549866194b0a1183e1e86eba33f64cca32fbbfbdbdb52280769b566814cfed7ec50d9d5451b0d6259d698b69faa1b347f6c604bb56de4a4f166e7ec2b0
|
||||
|
||||
@ -0,0 +1,13 @@
|
||||
--- source/blender/blenfont/intern/blf_glyph.c
|
||||
+++ source/blender/blenfont/intern/blf_glyph.c
|
||||
@@ -262,8 +262,8 @@
|
||||
g->xoff = -1;
|
||||
g->yoff = -1;
|
||||
bitmap = slot->bitmap;
|
||||
- g->width = bitmap.width;
|
||||
- g->height = bitmap.rows;
|
||||
+ g->width = (int)bitmap.width;
|
||||
+ g->height = (int)bitmap.rows;
|
||||
|
||||
if (g->width && g->height) {
|
||||
if (sharp) {
|
||||
@ -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));
|
||||
@ -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) { \
|
||||
@ -0,0 +1,123 @@
|
||||
# Copyright 1999-2014 Gentoo Foundation
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
# $Header: /var/cvsroot/gentoo-x86/media-libs/libjpeg-turbo/libjpeg-turbo-1.3.1-r1.ebuild,v 1.1 2014/12/17 14:47:55 kensington Exp $
|
||||
|
||||
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
|
||||
|
||||
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
|
||||
}
|
||||
@ -1 +1 @@
|
||||
Wed, 17 Dec 2014 14:07:01 +0000
|
||||
Wed, 17 Dec 2014 21:07:07 +0000
|
||||
|
||||
@ -1 +1 @@
|
||||
Wed, 17 Dec 2014 14:07:01 +0000
|
||||
Wed, 17 Dec 2014 21:07:08 +0000
|
||||
|
||||
@ -1,13 +1,13 @@
|
||||
DEFINED_PHASES=compile configure install prepare unpack
|
||||
DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4= virtual/pkgconfig doc? ( app-text/asciidoc )
|
||||
DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4 virtual/pkgconfig doc? ( app-text/asciidoc )
|
||||
DESCRIPTION=An open source dive log program
|
||||
EAPI=5
|
||||
HOMEPAGE=http://subsurface.hohndel.org
|
||||
IUSE=debug doc usb linguas_bg_BG linguas_da_DK linguas_de_CH linguas_de_DE linguas_el_GR linguas_en_GB linguas_es_ES linguas_et_EE linguas_fi_FI linguas_fr_FR linguas_he linguas_hu linguas_it_IT linguas_lv_LV linguas_nb_NO linguas_nl_NL linguas_pl_PL linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru_RU linguas_sk_SK linguas_sv_SE linguas_tr linguas_zh_TW
|
||||
KEYWORDS=~amd64 ~x86
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4=
|
||||
RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4
|
||||
SLOT=0
|
||||
SRC_URI=http://subsurface.hohndel.org/downloads/Subsurface-4.2.tgz https://bitbucket.org/bearsh/bearshlay/downloads/Subsurface-4.2.tgz
|
||||
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 6faef4c127028ccbba3a11400d24ae34 l10n 33bde4fb0cfd3a21a277b66bfd837e19 multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils 9e0174de733aecba0a7e66b2b01841d2 qt4-r2 7199e3db5b5908325487d379c6f67cf0 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=39652797e3d850948cc1ba2e978a2c8a
|
||||
_md5_=f871ec2f2e3839e2559c1d96b62660ef
|
||||
|
||||
@ -1,11 +1,11 @@
|
||||
DEFINED_PHASES=compile configure install prepare unpack
|
||||
DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4= virtual/pkgconfig doc? ( app-text/asciidoc ) dev-vcs/git
|
||||
DEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4 virtual/pkgconfig doc? ( app-text/asciidoc ) dev-vcs/git
|
||||
DESCRIPTION=An open source dive log program
|
||||
EAPI=5
|
||||
HOMEPAGE=http://subsurface.hohndel.org
|
||||
IUSE=debug doc usb linguas_bg_BG linguas_da_DK linguas_de_CH linguas_de_DE linguas_el_GR linguas_en_GB linguas_es_ES linguas_et_EE linguas_fi_FI linguas_fr_FR linguas_he linguas_hu linguas_it_IT linguas_lv_LV linguas_nb_NO linguas_nl_NL linguas_pl_PL linguas_pt_BR linguas_pt_PT linguas_ro_RO linguas_ru_RU linguas_sk_SK linguas_sv_SE linguas_tr linguas_zh_TW
|
||||
LICENSE=GPL-2
|
||||
RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4=
|
||||
RDEPEND=dev-db/sqlite:3 dev-libs/glib:2 >=dev-libs/libdivecomputer-0.4.2[usb?] dev-libs/libgit2:= dev-libs/libxml2 dev-libs/libxslt dev-libs/libzip dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 kde-base/marble:4
|
||||
SLOT=0
|
||||
_eclasses_=base 87f7447ccfc06fd0729ff4684e11e0d6 eutils 6faef4c127028ccbba3a11400d24ae34 git-2 e28f0d8a9b321431b1e699782851b827 l10n 33bde4fb0cfd3a21a277b66bfd837e19 multilib 3bf24e6abb9b76d9f6c20600f0b716bf qmake-utils 9e0174de733aecba0a7e66b2b01841d2 qt4-r2 7199e3db5b5908325487d379c6f67cf0 toolchain-funcs 0dfbfa13f57c6184f4728d12ac002aac
|
||||
_md5_=6a62876255eff7c4ec92c17c19c987b9
|
||||
_md5_=6375a227fb1cf2ec394dc5953dd89381
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue