- crux-commits - lists.crux.nu

r1019 - crux-2.2/ports/opt/libsdl
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:51:53 +0200 (Sun, 26 Mar 2006) New Revision: 1019 Added: crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch Modified: crux-2.2/ports/opt/libsdl/.md5sum crux-2.2/ports/opt/libsdl/Pkgfile Log: libsdl: added gcc4 patch Modified: crux-2.2/ports/opt/libsdl/.md5sum =================================================================== --- crux-2.2/ports/opt/libsdl/.md5sum 2006-03-26 01:30:40 UTC (rev 1018) +++ crux-2.2/ports/opt/libsdl/.md5sum 2006-03-26 01:51:53 UTC (rev 1019) @@ -1 +1,2 @@ 80919ef556425ff82a8555ff40a579a0 SDL-1.2.9.tar.gz +ba148e589d8577925883564356a25bbc libsdl-1.2.9-gcc4.patch Modified: crux-2.2/ports/opt/libsdl/Pkgfile =================================================================== --- crux-2.2/ports/opt/libsdl/Pkgfile 2006-03-26 01:30:40 UTC (rev 1018) +++ crux-2.2/ports/opt/libsdl/Pkgfile 2006-03-26 01:51:53 UTC (rev 1019) @@ -1,18 +1,20 @@ # Description: SDL, Simple DirectMedia Layer +# Description: a multimedia library which provides fast access to both graphics framebuffers and audio devices # URL: http://www.libsdl.org -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Daniel Mueller, daniel at danm dot de +# Maintainer: Simone Rota, sip at crux dot nu +# Packager: sten, nick dot steeves at shaw dot ca # Depends on: alsa-lib name=libsdl version=1.2.9 -release=1 -source=(http://www.libsdl.org/release/SDL-$version.tar.gz) +release=2 +source=(http://www.libsdl.org/release/SDL-$version.tar.gz $name-$version-gcc4.patch) build () { cd SDL-$version + patch -p1 -i $SRC/$name-$version-gcc4.patch ./configure --prefix=/usr \ - --enable-alsa + --enable-alsa make make DESTDIR=$PKG install } Added: crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch =================================================================== --- crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch (rev 0) +++ crux-2.2/ports/opt/libsdl/libsdl-1.2.9-gcc4.patch 2006-03-26 01:51:53 UTC (rev 1019) @@ -0,0 +1,467 @@ +# The origins of this patch are the following two URLs +# http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/SDL/FC-5/SDL-1.2.9-yuv… +# http://cvs.fedora.redhat.com/viewcvs/*checkout*/rpms/SDL/FC-5/SDL-1.2.8-gcc… + +diff -ru SDL-1.2.9.orig/src/hermes/HeadMMX.h SDL-1.2.9/src/hermes/HeadMMX.h +--- SDL-1.2.9.orig/src/hermes/HeadMMX.h 2006-03-21 16:34:57.000000000 -0700 ++++ SDL-1.2.9/src/hermes/HeadMMX.h 2006-03-21 16:36:07.000000000 -0700 +@@ -50,21 +50,19 @@ + extern "C" { + #endif + +- void ConvertMMX(HermesConverterInterface *) __attribute__ ((alias ("_ConvertMMX"))); +-#if 0 +- void ClearMMX_32(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_32"))); +- void ClearMMX_24(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_24"))); +- void ClearMMX_16(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_16"))); +- void ClearMMX_8(HermesClearInterface *) __attribute__ ((alias ("_ClearMMX_8"))); +- +- void ConvertMMXp32_16RGB555() __attribute__ ((alias ("_ConvertMMXp32_16RGB555"))); +-#endif +- +- void ConvertMMXpII32_24RGB888() __attribute__ ((alias ("_ConvertMMXpII32_24RGB888"))); +- void ConvertMMXpII32_16RGB565() __attribute__ ((alias ("_ConvertMMXpII32_16RGB565"))); +- void ConvertMMXpII32_16BGR565() __attribute__ ((alias ("_ConvertMMXpII32_16BGR565"))); +- void ConvertMMXpII32_16RGB555() __attribute__ ((alias ("_ConvertMMXpII32_16RGB555"))); +- void ConvertMMXpII32_16BGR555() __attribute__ ((alias ("_ConvertMMXpII32_16BGR555"))); ++ extern void _ConvertMMX(HermesConverterInterface *); ++ extern void _ConvertMMXpII32_24RGB888(); ++ extern void _ConvertMMXpII32_16RGB565(); ++ extern void _ConvertMMXpII32_16BGR565(); ++ extern void _ConvertMMXpII32_16RGB555(); ++ extern void _ConvertMMXpII32_16BGR555(); ++ ++ #define ConvertMMX _ConvertMMX ++ #define ConvertMMXpII32_24RGB888 _ConvertMMXpII32_24RGB888 ++ #define ConvertMMXpII32_16RGB565 _ConvertMMXpII32_16RGB565 ++ #define ConvertMMXpII32_16BGR565 _ConvertMMXpII32_16BGR565 ++ #define ConvertMMXpII32_16RGB555 _ConvertMMXpII32_16RGB555 ++ #define ConvertMMXpII32_16BGR555 _ConvertMMXpII32_16BGR555 + + #ifdef __cplusplus + } +diff -ru SDL-1.2.9.orig/src/hermes/HeadX86.h SDL-1.2.9/src/hermes/HeadX86.h +--- SDL-1.2.9.orig/src/hermes/HeadX86.h 2006-03-21 16:34:57.000000000 -0700 ++++ SDL-1.2.9/src/hermes/HeadX86.h 2006-03-21 16:36:07.000000000 -0700 +@@ -79,56 +79,47 @@ + extern "C" { + #endif + +- int Hermes_X86_CPU() __attribute__ ((alias ("_Hermes_X86_CPU"))); ++ extern int _Hermes_X86_CPU(); + +- void ConvertX86(HermesConverterInterface *) __attribute__ ((alias ("_ConvertX86"))); ++ extern void _ConvertX86(HermesConverterInterface *); ++ ++ extern void _ConvertX86p32_32BGR888(); ++ extern void _ConvertX86p32_32RGBA888(); ++ extern void _ConvertX86p32_32BGRA888(); ++ extern void _ConvertX86p32_24RGB888(); ++ extern void _ConvertX86p32_24BGR888(); ++ extern void _ConvertX86p32_16RGB565(); ++ extern void _ConvertX86p32_16BGR565(); ++ extern void _ConvertX86p32_16RGB555(); ++ extern void _ConvertX86p32_16BGR555(); ++ extern void _ConvertX86p32_8RGB332(); ++ ++ extern void _ConvertX86p16_16BGR565(); ++ extern void _ConvertX86p16_16RGB555(); ++ extern void _ConvertX86p16_16BGR555(); ++ extern void _ConvertX86p16_8RGB332(); ++ ++ ++ #define Hermes_X86_CPU _Hermes_X86_CPU ++ ++ #define ConvertX86 _ConvertX86 ++ ++ #define ConvertX86p32_32BGR888 _ConvertX86p32_32BGR888 ++ #define ConvertX86p32_32RGBA888 _ConvertX86p32_32RGBA888 ++ #define ConvertX86p32_32BGRA888 _ConvertX86p32_32BGRA888 ++ #define ConvertX86p32_24RGB888 _ConvertX86p32_24RGB888 ++ #define ConvertX86p32_24BGR888 _ConvertX86p32_24BGR888 ++ #define ConvertX86p32_16RGB565 _ConvertX86p32_16RGB565 ++ #define ConvertX86p32_16BGR565 _ConvertX86p32_16BGR565 ++ #define ConvertX86p32_16RGB555 _ConvertX86p32_16RGB555 ++ #define ConvertX86p32_16BGR555 _ConvertX86p32_16BGR555 ++ #define ConvertX86p32_8RGB332 _ConvertX86p32_8RGB332 ++ ++ #define ConvertX86p16_16BGR565 _ConvertX86p16_16BGR565 ++ #define ConvertX86p16_16RGB555 _ConvertX86p16_16RGB555 ++ #define ConvertX86p16_16BGR555 _ConvertX86p16_16BGR555 ++ #define ConvertX86p16_8RGB332 _ConvertX86p16_8RGB332 + +-#if 0 +- void ClearX86_32(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_32"))); +- void ClearX86_24(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_24"))); +- void ClearX86_16(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_16"))); +- void ClearX86_8(HermesClearInterface *) __attribute__ ((alias ("_ClearX86_8"))); +-#endif +- +- void ConvertX86p32_32BGR888() __attribute__ ((alias ("_ConvertX86p32_32BGR888"))); +- void ConvertX86p32_32RGBA888() __attribute__ ((alias ("_ConvertX86p32_32RGBA888"))); +- void ConvertX86p32_32BGRA888() __attribute__ ((alias ("_ConvertX86p32_32BGRA888"))); +- void ConvertX86p32_24RGB888() __attribute__ ((alias ("_ConvertX86p32_24RGB888"))); +- void ConvertX86p32_24BGR888() __attribute__ ((alias ("_ConvertX86p32_24BGR888"))); +- void ConvertX86p32_16RGB565() __attribute__ ((alias ("_ConvertX86p32_16RGB565"))); +- void ConvertX86p32_16BGR565() __attribute__ ((alias ("_ConvertX86p32_16BGR565"))); +- void ConvertX86p32_16RGB555() __attribute__ ((alias ("_ConvertX86p32_16RGB555"))); +- void ConvertX86p32_16BGR555() __attribute__ ((alias ("_ConvertX86p32_16BGR555"))); +- void ConvertX86p32_8RGB332() __attribute__ ((alias ("_ConvertX86p32_8RGB332"))); +- +-#if 0 +- void ConvertX86p16_32RGB888() __attribute__ ((alias ("_ConvertX86p16_32RGB888"))); +- void ConvertX86p16_32BGR888() __attribute__ ((alias ("_ConvertX86p16_32BGR888"))); +- void ConvertX86p16_32RGBA888() __attribute__ ((alias ("_ConvertX86p16_32RGBA888"))); +- void ConvertX86p16_32BGRA888() __attribute__ ((alias ("_ConvertX86p16_32BGRA888"))); +- void ConvertX86p16_24RGB888() __attribute__ ((alias ("_ConvertX86p16_24RGB888"))); +- void ConvertX86p16_24BGR888() __attribute__ ((alias ("_ConvertX86p16_24BGR888"))); +-#endif +- void ConvertX86p16_16BGR565() __attribute__ ((alias ("_ConvertX86p16_16BGR565"))); +- void ConvertX86p16_16RGB555() __attribute__ ((alias ("_ConvertX86p16_16RGB555"))); +- void ConvertX86p16_16BGR555() __attribute__ ((alias ("_ConvertX86p16_16BGR555"))); +- void ConvertX86p16_8RGB332() __attribute__ ((alias ("_ConvertX86p16_8RGB332"))); +- +-#if 0 +- void CopyX86p_4byte() __attribute__ ((alias ("_CopyX86p_4byte"))); +- void CopyX86p_3byte() __attribute__ ((alias ("_CopyX86p_3byte"))); +- void CopyX86p_2byte() __attribute__ ((alias ("_CopyX86p_2byte"))); +- void CopyX86p_1byte() __attribute__ ((alias ("_CopyX86p_1byte"))); +- +- void ConvertX86pI8_32() __attribute__ ((alias ("_ConvertX86pI8_32"))); +- void ConvertX86pI8_24() __attribute__ ((alias ("_ConvertX86pI8_24"))); +- void ConvertX86pI8_16() __attribute__ ((alias ("_ConvertX86pI8_16"))); +- +- extern int ConvertX86p16_32RGB888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGB888_LUT_X86"))); +- extern int ConvertX86p16_32BGR888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGR888_LUT_X86"))); +- extern int ConvertX86p16_32RGBA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32RGBA888_LUT_X86"))); +- extern int ConvertX86p16_32BGRA888_LUT_X86[512] __attribute__ ((alias ("_ConvertX86p16_32BGRA888_LUT_X86"))); +-#endif + + #ifdef __cplusplus + } +diff -ru SDL-1.2.9.orig/src/video/SDL_yuv_mmx.c SDL-1.2.9/src/video/SDL_yuv_mmx.c +--- SDL-1.2.9.orig/src/video/SDL_yuv_mmx.c 2006-03-21 16:34:57.000000000 -0700 ++++ SDL-1.2.9/src/video/SDL_yuv_mmx.c 2006-03-21 16:36:37.000000000 -0700 +@@ -30,42 +30,31 @@ + + #include "SDL_types.h" + +-#if __GNUC__ > 2 +-# undef GCC2_HACK +-#else +-# define GCC2_HACK +-#endif +- +- +-#if defined(GCC2_HACK) && defined (__ELF__) +-#define ASM_VAR(X) _##X +-#else +-#define ASM_VAR(X) X +-#endif ++#define ASM_ARRAY(x) x[] __asm__("_" #x) __attribute__((used)) + +-static volatile unsigned int ASM_VAR(MMX_0080w)[] = {0x00800080, 0x00800080}; +-static volatile unsigned int ASM_VAR(MMX_00FFw)[] = {0x00ff00ff, 0x00ff00ff}; +-static volatile unsigned int ASM_VAR(MMX_FF00w)[] = {0xff00ff00, 0xff00ff00}; +- +-static volatile unsigned short ASM_VAR(MMX_Ycoeff)[] = {0x004a, 0x004a, 0x004a, 0x004a}; +- +-static volatile unsigned short ASM_VAR(MMX_UbluRGB)[] = {0x0072, 0x0072, 0x0072, 0x0072}; +-static volatile unsigned short ASM_VAR(MMX_VredRGB)[] = {0x0059, 0x0059, 0x0059, 0x0059}; +-static volatile unsigned short ASM_VAR(MMX_UgrnRGB)[] = {0xffea, 0xffea, 0xffea, 0xffea}; +-static volatile unsigned short ASM_VAR(MMX_VgrnRGB)[] = {0xffd2, 0xffd2, 0xffd2, 0xffd2}; +- +-static volatile unsigned short ASM_VAR(MMX_Ublu5x5)[] = {0x0081, 0x0081, 0x0081, 0x0081}; +-static volatile unsigned short ASM_VAR(MMX_Vred5x5)[] = {0x0066, 0x0066, 0x0066, 0x0066}; +-static volatile unsigned short ASM_VAR(MMX_Ugrn555)[] = {0xffe7, 0xffe7, 0xffe7, 0xffe7}; +-static volatile unsigned short ASM_VAR(MMX_Vgrn555)[] = {0xffcc, 0xffcc, 0xffcc, 0xffcc}; +-static volatile unsigned short ASM_VAR(MMX_Ugrn565)[] = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; +-static volatile unsigned short ASM_VAR(MMX_Vgrn565)[] = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; +- +-static volatile unsigned short ASM_VAR(MMX_red555)[] = {0x7c00, 0x7c00, 0x7c00, 0x7c00}; +-static volatile unsigned short ASM_VAR(MMX_red565)[] = {0xf800, 0xf800, 0xf800, 0xf800}; +-static volatile unsigned short ASM_VAR(MMX_grn555)[] = {0x03e0, 0x03e0, 0x03e0, 0x03e0}; +-static volatile unsigned short ASM_VAR(MMX_grn565)[] = {0x07e0, 0x07e0, 0x07e0, 0x07e0}; +-static volatile unsigned short ASM_VAR(MMX_blu5x5)[] = {0x001f, 0x001f, 0x001f, 0x001f}; ++static unsigned int ASM_ARRAY(MMX_0080w) = {0x00800080, 0x00800080}; ++static unsigned int ASM_ARRAY(MMX_00FFw) = {0x00ff00ff, 0x00ff00ff}; ++static unsigned int ASM_ARRAY(MMX_FF00w) = {0xff00ff00, 0xff00ff00}; ++ ++static unsigned short ASM_ARRAY(MMX_Ycoeff) = {0x004a, 0x004a, 0x004a, 0x004a}; ++ ++static unsigned short ASM_ARRAY(MMX_UbluRGB) = {0x0072, 0x0072, 0x0072, 0x0072}; ++static unsigned short ASM_ARRAY(MMX_VredRGB) = {0x0059, 0x0059, 0x0059, 0x0059}; ++static unsigned short ASM_ARRAY(MMX_UgrnRGB) = {0xffea, 0xffea, 0xffea, 0xffea}; ++static unsigned short ASM_ARRAY(MMX_VgrnRGB) = {0xffd2, 0xffd2, 0xffd2, 0xffd2}; ++ ++static unsigned short ASM_ARRAY(MMX_Ublu5x5) = {0x0081, 0x0081, 0x0081, 0x0081}; ++static unsigned short ASM_ARRAY(MMX_Vred5x5) = {0x0066, 0x0066, 0x0066, 0x0066}; ++static unsigned short ASM_ARRAY(MMX_Ugrn555) = {0xffe7, 0xffe7, 0xffe7, 0xffe7}; ++static unsigned short ASM_ARRAY(MMX_Vgrn555) = {0xffcc, 0xffcc, 0xffcc, 0xffcc}; ++static unsigned short ASM_ARRAY(MMX_Ugrn565) = {0xffe8, 0xffe8, 0xffe8, 0xffe8}; ++static unsigned short ASM_ARRAY(MMX_Vgrn565) = {0xffcd, 0xffcd, 0xffcd, 0xffcd}; ++ ++static unsigned short ASM_ARRAY(MMX_red555) = {0x7c00, 0x7c00, 0x7c00, 0x7c00}; ++static unsigned short ASM_ARRAY(MMX_red565) = {0xf800, 0xf800, 0xf800, 0xf800}; ++static unsigned short ASM_ARRAY(MMX_grn555) = {0x03e0, 0x03e0, 0x03e0, 0x03e0}; ++static unsigned short ASM_ARRAY(MMX_grn565) = {0x07e0, 0x07e0, 0x07e0, 0x07e0}; ++static unsigned short ASM_ARRAY(MMX_blu5x5) = {0x001f, 0x001f, 0x001f, 0x001f}; + + /** + This MMX assembler is my first assembler/MMX program ever. +@@ -127,21 +116,12 @@ + "movd (%2), %%mm2\n" // 0 0 0 0 l3 l2 l1 l0 + "punpcklbw %%mm7,%%mm1\n" // 0 v3 0 v2 00 v1 00 v0 + "punpckldq %%mm1,%%mm1\n" // 00 v1 00 v0 00 v1 00 v0 +-#ifdef GCC2_HACK + "psubw _MMX_0080w,%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 +-#else +- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:r1 r1 r0 r0 r1 r1 r0 r0 +-#endif + + // create Cr_g (result in mm0) + "movq %%mm1,%%mm0\n" // r1 r1 r0 r0 r1 r1 r0 r0 +-#ifdef GCC2_HACK + "pmullw _MMX_VgrnRGB,%%mm0\n"// red*-46dec=0.7136*64 + "pmullw _MMX_VredRGB,%%mm1\n"// red*89dec=1.4013*64 +-#else +- "pmullw %[_MMX_VgrnRGB],%%mm0\n"// red*-46dec=0.7136*64 +- "pmullw %[_MMX_VredRGB],%%mm1\n"// red*89dec=1.4013*64 +-#endif + "psraw $6, %%mm0\n" // red=red/64 + "psraw $6, %%mm1\n" // red=red/64 + +@@ -150,13 +130,8 @@ + "movq (%2,%4),%%mm3\n" // 0 0 0 0 L3 L2 L1 L0 + "punpckldq %%mm3,%%mm2\n" // L3 L2 L1 L0 l3 l2 l1 l0 + "movq %%mm2,%%mm4\n" // L3 L2 L1 L0 l3 l2 l1 l0 +-#ifdef GCC2_HACK + "pand _MMX_FF00w,%%mm2\n" // L3 0 L1 0 l3 0 l1 0 + "pand _MMX_00FFw,%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 +-#else +- "pand %[_MMX_FF00w],%%mm2\n" // L3 0 L1 0 l3 0 l1 0 +- "pand %[_MMX_00FFw],%%mm4\n" // 0 L2 0 L0 0 l2 0 l0 +-#endif + "psrlw $8,%%mm2\n" // 0 L3 0 L1 0 l3 0 l1 + + // create R (result in mm6) +@@ -173,20 +148,11 @@ + "movd (%1), %%mm1\n" // 0 0 0 0 u3 u2 u1 u0 + "punpcklbw %%mm7,%%mm1\n" // 0 u3 0 u2 00 u1 00 u0 + "punpckldq %%mm1,%%mm1\n" // 00 u1 00 u0 00 u1 00 u0 +-#ifdef GCC2_HACK + "psubw _MMX_0080w,%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 +-#else +- "psubw %[_MMX_0080w],%%mm1\n" // mm1-128:u1 u1 u0 u0 u1 u1 u0 u0 +-#endif + // create Cb_g (result in mm5) + "movq %%mm1,%%mm5\n" // u1 u1 u0 u0 u1 u1 u0 u0 +-#ifdef GCC2_HACK + "pmullw _MMX_UgrnRGB,%%mm5\n" // blue*-109dec=1.7129*64 + "pmullw _MMX_UbluRGB,%%mm1\n" // blue*114dec=1.78125*64 +-#else +- "pmullw %[_MMX_UgrnRGB],%%mm5\n" // blue*-109dec=1.7129*64 +- "pmullw %[_MMX_UbluRGB],%%mm1\n" // blue*114dec=1.78125*64 +-#endif + "psraw $6, %%mm5\n" // blue=red/64 + "psraw $6, %%mm1\n" // blue=blue/64 + +@@ -268,17 +234,7 @@ + "popl %%ebx\n" + : + : "m" (cr), "r"(cb),"r"(lum), +- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) +-#ifndef GCC2_HACK +- ,[_MMX_0080w] "m" (*MMX_0080w), +- [_MMX_00FFw] "m" (*MMX_00FFw), +- [_MMX_FF00w] "m" (*MMX_FF00w), +- [_MMX_VgrnRGB] "m" (*MMX_VgrnRGB), +- [_MMX_VredRGB] "m" (*MMX_VredRGB), +- [_MMX_UgrnRGB] "m" (*MMX_UgrnRGB), +- [_MMX_UbluRGB] "m" (*MMX_UbluRGB) +-#endif +- ); ++ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)); + } + + void Color565DitherYV12MMX1X( int *colortab, Uint32 *rgb_2_pix, +@@ -307,48 +263,21 @@ + "movd (%%ebx), %%mm1\n" // 4 Cr 0 0 0 0 v3 v2 v1 v0 + "punpcklbw %%mm7, %%mm0\n" // 4 W cb 0 u3 0 u2 0 u1 0 u0 + "punpcklbw %%mm7, %%mm1\n" // 4 W cr 0 v3 0 v2 0 v1 0 v0 +-#ifdef GCC2_HACK + "psubw _MMX_0080w, %%mm0\n" + "psubw _MMX_0080w, %%mm1\n" +-#else +- "psubw %[_MMX_0080w], %%mm0\n" +- "psubw %[_MMX_0080w], %%mm1\n" +-#endif + "movq %%mm0, %%mm2\n" // Cb 0 u3 0 u2 0 u1 0 u0 + "movq %%mm1, %%mm3\n" // Cr +-#ifdef GCC2_HACK + "pmullw _MMX_Ugrn565, %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0 +-#else +- "pmullw %[_MMX_Ugrn565], %%mm2\n" // Cb2green 0 R3 0 R2 0 R1 0 R0 +-#endif + "movq (%2), %%mm6\n" // L1 l7 L6 L5 L4 L3 L2 L1 L0 +-#ifdef GCC2_HACK + "pmullw _MMX_Ublu5x5, %%mm0\n" // Cb2blue + "pand _MMX_00FFw, %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0 + "pmullw _MMX_Vgrn565, %%mm3\n" // Cr2green +-#else +- "pmullw %[_MMX_Ublu5x5], %%mm0\n" // Cb2blue +- "pand %[_MMX_00FFw], %%mm6\n" // L1 00 L6 00 L4 00 L2 00 L0 +- "pmullw %[_MMX_Vgrn565], %%mm3\n" // Cr2green +-#endif + "movq (%2), %%mm7\n" // L2 +-#ifdef GCC2_HACK + "pmullw _MMX_Vred5x5, %%mm1\n" // Cr2red +-#else +- "pmullw %[_MMX_Vred5x5], %%mm1\n" // Cr2red +-#endif + "psrlw $8, %%mm7\n" // L2 00 L7 00 L5 00 L3 00 L1 +-#ifdef GCC2_HACK + "pmullw _MMX_Ycoeff, %%mm6\n" // lum1 +-#else +- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum1 +-#endif + "paddw %%mm3, %%mm2\n" // Cb2green + Cr2green == green +-#ifdef GCC2_HACK + "pmullw _MMX_Ycoeff, %%mm7\n" // lum2 +-#else +- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum2 +-#endif + + "movq %%mm6, %%mm4\n" // lum1 + "paddw %%mm0, %%mm6\n" // lum1 +blue 00 B6 00 B4 00 B2 00 B0 +@@ -366,20 +295,11 @@ + "punpcklbw %%mm4, %%mm4\n" + "punpcklbw %%mm5, %%mm5\n" + +-#ifdef GCC2_HACK + "pand _MMX_red565, %%mm4\n" +-#else +- "pand %[_MMX_red565], %%mm4\n" +-#endif + "psllw $3, %%mm5\n" // GREEN 1 + "punpcklbw %%mm6, %%mm6\n" +-#ifdef GCC2_HACK + "pand _MMX_grn565, %%mm5\n" + "pand _MMX_red565, %%mm6\n" +-#else +- "pand %[_MMX_grn565], %%mm5\n" +- "pand %[_MMX_red565], %%mm6\n" +-#endif + "por %%mm5, %%mm4\n" // + "psrlw $11, %%mm6\n" // BLUE 1 + "movq %%mm3, %%mm5\n" // lum2 +@@ -393,44 +313,23 @@ + "packuswb %%mm3, %%mm3\n" + "packuswb %%mm5, %%mm5\n" + "packuswb %%mm7, %%mm7\n" +-#ifdef GCC2_HACK + "pand _MMX_00FFw, %%mm6\n" // L3 +-#else +- "pand %[_MMX_00FFw], %%mm6\n" // L3 +-#endif + "punpcklbw %%mm3, %%mm3\n" + "punpcklbw %%mm5, %%mm5\n" +-#ifdef GCC2_HACK + "pmullw _MMX_Ycoeff, %%mm6\n" // lum3 +-#else +- "pmullw %[_MMX_Ycoeff], %%mm6\n" // lum3 +-#endif + "punpcklbw %%mm7, %%mm7\n" + "psllw $3, %%mm5\n" // GREEN 2 +-#ifdef GCC2_HACK + "pand _MMX_red565, %%mm7\n" + "pand _MMX_red565, %%mm3\n" +-#else +- "pand %[_MMX_red565], %%mm7\n" +- "pand %[_MMX_red565], %%mm3\n" +-#endif + "psrlw $11, %%mm7\n" // BLUE 2 +-#ifdef GCC2_HACK + "pand _MMX_grn565, %%mm5\n" +-#else +- "pand %[_MMX_grn565], %%mm5\n" +-#endif + "por %%mm7, %%mm3\n" + "movq (%2,%4), %%mm7\n" // L4 load lum2 + "por %%mm5, %%mm3\n" // + "psrlw $8, %%mm7\n" // L4 + "movq %%mm4, %%mm5\n" + "punpcklwd %%mm3, %%mm4\n" +-#ifdef GCC2_HACK + "pmullw _MMX_Ycoeff, %%mm7\n" // lum4 +-#else +- "pmullw %[_MMX_Ycoeff], %%mm7\n" // lum4 +-#endif + "punpckhwd %%mm3, %%mm5\n" + + "movq %%mm4, (%3)\n" // write row1 +@@ -457,20 +356,11 @@ + "punpcklbw %%mm5, %%mm5\n" + "punpcklbw %%mm6, %%mm6\n" + "psllw $3, %%mm5\n" // GREEN 3 +-#ifdef GCC2_HACK + "pand _MMX_red565, %%mm4\n" +-#else +- "pand %[_MMX_red565], %%mm4\n" +-#endif + "psraw $6, %%mm3\n" // psr 6 + "psraw $6, %%mm0\n" +-#ifdef GCC2_HACK + "pand _MMX_red565, %%mm6\n" // BLUE + "pand _MMX_grn565, %%mm5\n" +-#else +- "pand %[_MMX_red565], %%mm6\n" // BLUE +- "pand %[_MMX_grn565], %%mm5\n" +-#endif + "psrlw $11, %%mm6\n" // BLUE 3 + "por %%mm5, %%mm4\n" + "psraw $6, %%mm7\n" +@@ -481,20 +371,11 @@ + "punpcklbw %%mm3, %%mm3\n" + "punpcklbw %%mm0, %%mm0\n" + "punpcklbw %%mm7, %%mm7\n" +-#ifdef GCC2_HACK + "pand _MMX_red565, %%mm3\n" + "pand _MMX_red565, %%mm7\n" // BLUE +-#else +- "pand %[_MMX_red565], %%mm3\n" +- "pand %[_MMX_red565], %%mm7\n" // BLUE +-#endif + "psllw $3, %%mm0\n" // GREEN 4 + "psrlw $11, %%mm7\n" +-#ifdef GCC2_HACK + "pand _MMX_grn565, %%mm0\n" +-#else +- "pand %[_MMX_grn565], %%mm0\n" +-#endif + "por %%mm7, %%mm3\n" + "por %%mm0, %%mm3\n" + +@@ -526,21 +407,7 @@ + "popl %%ebx\n" + : + :"m" (cr), "r"(cb),"r"(lum), +- "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod) +-#ifndef GCC2_HACK +- ,[_MMX_0080w] "m" (*MMX_0080w), +- [_MMX_Ugrn565] "m" (*MMX_Ugrn565), +- [_MMX_Ublu5x5] "m" (*MMX_Ublu5x5), +- [_MMX_00FFw] "m" (*MMX_00FFw), +- [_MMX_Vgrn565] "m" (*MMX_Vgrn565), +- [_MMX_Vred5x5] "m" (*MMX_Vred5x5), +- [_MMX_Ycoeff] "m" (*MMX_Ycoeff), +- [_MMX_red565] "m" (*MMX_red565), +- [_MMX_grn565] "m" (*MMX_grn565) +-#endif +- ); ++ "r"(row1),"r"(cols),"r"(row2),"m"(x),"m"(y),"m"(mod)); + } + +-#undef GCC2_HACK +- + #endif /* GCC i386 inline assembly */

1 0

r1018 - crux-2.1/ports/opt/xpdf
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:30:40 +0200 (Sun, 26 Mar 2006) New Revision: 1018 Added: crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch Removed: crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch Modified: crux-2.1/ports/opt/xpdf/.md5sum crux-2.1/ports/opt/xpdf/Pkgfile Log: [security] xpdf: updated to 3.1pl2 Modified: crux-2.1/ports/opt/xpdf/.md5sum =================================================================== --- crux-2.1/ports/opt/xpdf/.md5sum 2006-03-26 01:27:54 UTC (rev 1017) +++ crux-2.1/ports/opt/xpdf/.md5sum 2006-03-26 01:30:40 UTC (rev 1018) @@ -1,2 +1,2 @@ e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz -4184783da2885ecde3c2256de5144555 xpdf-3.01pl1.patch +8f1f5d37153c7e98f794f18d0b80fc25 xpdf-3.01pl2.patch Modified: crux-2.1/ports/opt/xpdf/Pkgfile =================================================================== --- crux-2.1/ports/opt/xpdf/Pkgfile 2006-03-26 01:27:54 UTC (rev 1017) +++ crux-2.1/ports/opt/xpdf/Pkgfile 2006-03-26 01:30:40 UTC (rev 1018) @@ -5,7 +5,7 @@ # Depends on: lesstif, t1lib name=xpdf -version=3.01pl1 +version=3.01pl2 release=1 source=(ftp://ftp.foolabs.com/pub/xpdf/$name-3.01.tar.gz \ $name-$version.patch) Deleted: crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch =================================================================== --- crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:27:54 UTC (rev 1017) +++ crux-2.1/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:30:40 UTC (rev 1018) @@ -1,168 +0,0 @@ -diff -c -r xpdf-3.01-orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc -*** xpdf-3.01-orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/JPXStream.cc Thu Nov 3 16:50:39 2005 -*************** -*** 783,789 **** - int segType; - GBool haveSIZ, haveCOD, haveQCD, haveSOT; - Guint precinctSize, style; -! Guint segLen, capabilities, comp, i, j, r; - - //----- main header - haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; ---- 783,789 ---- - int segType; - GBool haveSIZ, haveCOD, haveQCD, haveSOT; - Guint precinctSize, style; -! Guint segLen, capabilities, nTiles, comp, i, j, r; - - //----- main header - haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; -*************** -*** 818,825 **** - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -! img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, -! sizeof(JPXTile)); - for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { - img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps, - sizeof(JPXTileComp)); ---- 818,830 ---- - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -! nTiles = img.nXTiles * img.nYTiles; -! // check for overflow before allocating memory -! if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) { -! error(getPos(), "Bad tile count in JPX SIZ marker segment"); -! return gFalse; -! } -! img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); - for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { - img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps, - sizeof(JPXTileComp)); -diff -c -r xpdf-3.01-orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc -*** xpdf-3.01-orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/Stream.cc Thu Nov 3 16:50:39 2005 -*************** -*** 401,418 **** - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; - - nVals = width * nComps; - pixBytes = (nComps * nBits + 7) >> 3; -! rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; - } - - StreamPredictor::~StreamPredictor() { ---- 401,433 ---- - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { -+ int totalBits; -+ - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; - - nVals = width * nComps; -+ totalBits = nVals * nBits; -+ if (totalBits == 0 || -+ (totalBits / nBits) / nComps != width || -+ totalBits + 7 < 0) { -+ return; -+ } - pixBytes = (nComps * nBits + 7) >> 3; -! rowBytes = ((totalBits + 7) >> 3) + pixBytes; -! if (rowBytes < 0) { -! return; -! } - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -*************** -*** 1004,1009 **** ---- 1019,1028 ---- - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if (!pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -*************** -*** 2899,2904 **** ---- 2918,2931 ---- - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); -+ return gFalse; -+ } -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -*************** -*** 3827,3832 **** ---- 3854,3863 ---- - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if (!pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -diff -c -r xpdf-3.01-orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h -*** xpdf-3.01-orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/Stream.h Thu Nov 3 16:50:39 2005 -*************** -*** 232,237 **** ---- 232,239 ---- - - ~StreamPredictor(); - -+ GBool isOk() { return ok; } -+ - int lookChar(); - int getChar(); - -*************** -*** 249,254 **** ---- 251,257 ---- - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ Added: crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch =================================================================== --- crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch (rev 0) +++ crux-2.1/ports/opt/xpdf/xpdf-3.01pl2.patch 2006-03-26 01:30:40 UTC (rev 1018) @@ -0,0 +1,471 @@ +diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c +*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005 +--- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006 +*************** +*** 11,16 **** +--- 11,17 ---- + #include <stdlib.h> + #include <stddef.h> + #include <string.h> ++ #include <limits.h> + #include "gmem.h" + + #ifdef DEBUG_MEM +*************** +*** 63,69 **** + int lst; + unsigned long *trl, *p; + +! if (size == 0) + return NULL; + size1 = gMemDataSize(size); + if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) { +--- 64,70 ---- + int lst; + unsigned long *trl, *p; + +! if (size <= 0) + return NULL; + size1 = gMemDataSize(size); + if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) { +*************** +*** 86,92 **** + #else + void *p; + +! if (size == 0) + return NULL; + if (!(p = malloc(size))) { + fprintf(stderr, "Out of memory\n"); +--- 87,93 ---- + #else + void *p; + +! if (size <= 0) + return NULL; + if (!(p = malloc(size))) { + fprintf(stderr, "Out of memory\n"); +*************** +*** 102,108 **** + void *q; + int oldSize; + +! if (size == 0) { + if (p) + gfree(p); + return NULL; +--- 103,109 ---- + void *q; + int oldSize; + +! if (size <= 0) { + if (p) + gfree(p); + return NULL; +*************** +*** 120,126 **** + #else + void *q; + +! if (size == 0) { + if (p) + free(p); + return NULL; +--- 121,127 ---- + #else + void *q; + +! if (size <= 0) { + if (p) + free(p); + return NULL; +*************** +*** 140,147 **** + void *gmallocn(int nObjs, int objSize) { + int n; + + n = nObjs * objSize; +! if (objSize == 0 || n / objSize != nObjs) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +--- 141,151 ---- + void *gmallocn(int nObjs, int objSize) { + int n; + ++ if (nObjs == 0) { ++ return NULL; ++ } + n = nObjs * objSize; +! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +*************** +*** 151,158 **** + void *greallocn(void *p, int nObjs, int objSize) { + int n; + + n = nObjs * objSize; +! if (objSize == 0 || n / objSize != nObjs) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +--- 155,168 ---- + void *greallocn(void *p, int nObjs, int objSize) { + int n; + ++ if (nObjs == 0) { ++ if (p) { ++ gfree(p); ++ } ++ return NULL; ++ } + n = nObjs * objSize; +! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc +*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006 +*************** +*** 13,18 **** +--- 13,19 ---- + #endif + + #include <stdlib.h> ++ #include <limits.h> + #include "GList.h" + #include "Error.h" + #include "JArithmeticDecoder.h" +*************** +*** 681,686 **** +--- 682,691 ---- + w = wA; + h = hA; + line = (wA + 7) >> 3; ++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ data = NULL; ++ return; ++ } + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); + data[h * line] = 0; +*************** +*** 692,697 **** +--- 697,706 ---- + w = bitmap->w; + h = bitmap->h; + line = bitmap->line; ++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ data = NULL; ++ return; ++ } + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); + memcpy(data, bitmap->data, h * line); +*************** +*** 720,726 **** + } + + void JBIG2Bitmap::expand(int newH, Guint pixel) { +! if (newH <= h) { + return; + } + // need to allocate one extra guard byte for use in combine() +--- 729,735 ---- + } + + void JBIG2Bitmap::expand(int newH, Guint pixel) { +! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { + return; + } + // need to allocate one extra guard byte for use in combine() +*************** +*** 2294,2299 **** +--- 2303,2316 ---- + !readUWord(&stepX) || !readUWord(&stepY)) { + goto eofError; + } ++ if (w == 0 || h == 0 || w >= INT_MAX / h) { ++ error(getPos(), "Bad bitmap size in JBIG2 halftone segment"); ++ return; ++ } ++ if (gridH == 0 || gridW >= INT_MAX / gridH) { ++ error(getPos(), "Bad grid size in JBIG2 halftone segment"); ++ return; ++ } + + // get pattern dictionary + if (nRefSegs != 1) { +diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc +*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006 +*************** +*** 12,17 **** +--- 12,18 ---- + #pragma implementation + #endif + ++ #include <limits.h> + #include "gmem.h" + #include "Error.h" + #include "JArithmeticDecoder.h" +*************** +*** 818,823 **** +--- 819,830 ---- + / img.xTileSize; + img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) + / img.yTileSize; ++ // check for overflow before allocating memory ++ if (img.nXTiles <= 0 || img.nYTiles <= 0 || ++ img.nXTiles >= INT_MAX / img.nYTiles) { ++ error(getPos(), "Bad tile count in JPX SIZ marker segment"); ++ return gFalse; ++ } + img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, + sizeof(JPXTile)); + for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { +diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc +*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006 +*************** +*** 15,20 **** +--- 15,21 ---- + #include <stdio.h> + #include <stdlib.h> + #include <stddef.h> ++ #include <limits.h> + #ifndef WIN32 + #include <unistd.h> + #endif +*************** +*** 406,418 **** +--- 407,432 ---- + width = widthA; + nComps = nCompsA; + nBits = nBitsA; ++ predLine = NULL; ++ ok = gFalse; + + nVals = width * nComps; ++ if (width <= 0 || nComps <= 0 || nBits <= 0 || ++ nComps >= INT_MAX / nBits || ++ width >= INT_MAX / nComps / nBits || ++ nVals * nBits + 7 < 0) { ++ return; ++ } + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; ++ if (rowBytes <= 0) { ++ return; ++ } + predLine = (Guchar *)gmalloc(rowBytes); + memset(predLine, 0, rowBytes); + predIdx = rowBytes; ++ ++ ok = gTrue; + } + + StreamPredictor::~StreamPredictor() { +*************** +*** 1004,1009 **** +--- 1018,1027 ---- + FilterStream(strA) { + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; ++ } + } else { + pred = NULL; + } +*************** +*** 1259,1264 **** +--- 1277,1285 ---- + if (columns < 1) { + columns = 1; + } ++ if (columns + 4 <= 0) { ++ columns = INT_MAX - 4; ++ } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +*************** +*** 2899,2904 **** +--- 2920,2930 ---- + height = read16(); + width = read16(); + numComps = str->getChar(); ++ if (numComps <= 0 || numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream"); ++ numComps = 0; ++ return gFalse; ++ } + if (prec != 8) { + error(getPos(), "Bad DCT precision %d", prec); + return gFalse; +*************** +*** 2925,2930 **** +--- 2951,2961 ---- + height = read16(); + width = read16(); + numComps = str->getChar(); ++ if (numComps <= 0 || numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream"); ++ numComps = 0; ++ return gFalse; ++ } + if (prec != 8) { + error(getPos(), "Bad DCT precision %d", prec); + return gFalse; +*************** +*** 2947,2952 **** +--- 2978,2988 ---- + + length = read16() - 2; + scanInfo.numComps = str->getChar(); ++ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream"); ++ scanInfo.numComps = 0; ++ return gFalse; ++ } + --length; + if (length != 2 * scanInfo.numComps + 3) { + error(getPos(), "Bad DCT scan info block"); +*************** +*** 3041,3046 **** +--- 3077,3083 ---- + numACHuffTables = index+1; + tbl = &acHuffTables[index]; + } else { ++ index &= 0x0f; + if (index >= numDCHuffTables) + numDCHuffTables = index+1; + tbl = &dcHuffTables[index]; +*************** +*** 3827,3832 **** +--- 3864,3873 ---- + FilterStream(strA) { + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; ++ } + } else { + pred = NULL; + } +diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h +*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006 +*************** +*** 232,237 **** +--- 232,239 ---- + + ~StreamPredictor(); + ++ GBool isOk() { return ok; } ++ + int lookChar(); + int getChar(); + +*************** +*** 249,254 **** +--- 251,257 ---- + int rowBytes; // bytes per line + Guchar *predLine; // line buffer + int predIdx; // current index in predLine ++ GBool ok; + }; + + //------------------------------------------------------------------------ +*************** +*** 527,533 **** + short getWhiteCode(); + short getBlackCode(); + short lookBits(int n); +! void eatBits(int n) { inputBits -= n; } + }; + + //------------------------------------------------------------------------ +--- 530,536 ---- + short getWhiteCode(); + short getBlackCode(); + short lookBits(int n); +! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; } + }; + + //------------------------------------------------------------------------ +diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc +*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006 +*************** +*** 186,192 **** + } + + void SplashXPathScanner::computeIntersections(int y) { +! SplashCoord ySegMin, ySegMax, xx0, xx1; + SplashXPathSeg *seg; + int i, j; + +--- 186,192 ---- + } + + void SplashXPathScanner::computeIntersections(int y) { +! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1; + SplashXPathSeg *seg; + int i, j; + +*************** +*** 236,254 **** + } else if (seg->flags & splashXPathVert) { + xx0 = xx1 = seg->x0; + } else { +! if (ySegMin <= y) { +! // intersection with top edge +! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; + } else { +! // x coord of segment endpoint with min y coord +! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0; + } +! if (ySegMax >= y + 1) { +! // intersection with bottom edge +! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; +! } else { +! // x coord of segment endpoint with max y coord +! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1; + } + } + if (xx0 < xx1) { +--- 236,262 ---- + } else if (seg->flags & splashXPathVert) { + xx0 = xx1 = seg->x0; + } else { +! if (seg->x0 < seg->x1) { +! xSegMin = seg->x0; +! xSegMax = seg->x1; + } else { +! xSegMin = seg->x1; +! xSegMax = seg->x0; + } +! // intersection with top edge +! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; +! // intersection with bottom edge +! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; +! // the segment may not actually extend to the top and/or bottom edges +! if (xx0 < xSegMin) { +! xx0 = xSegMin; +! } else if (xx0 > xSegMax) { +! xx0 = xSegMax; +! } +! if (xx1 < xSegMin) { +! xx1 = xSegMin; +! } else if (xx1 > xSegMax) { +! xx1 = xSegMax; + } + } + if (xx0 < xx1) {

1 0

r1017 - crux-2.2/ports/opt/xpdf
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:27:54 +0200 (Sun, 26 Mar 2006) New Revision: 1017 Added: crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch Removed: crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch Modified: crux-2.2/ports/opt/xpdf/.md5sum crux-2.2/ports/opt/xpdf/Pkgfile Log: [security] xpdf: updated to 3.1pl2 Modified: crux-2.2/ports/opt/xpdf/.md5sum =================================================================== --- crux-2.2/ports/opt/xpdf/.md5sum 2006-03-26 01:15:56 UTC (rev 1016) +++ crux-2.2/ports/opt/xpdf/.md5sum 2006-03-26 01:27:54 UTC (rev 1017) @@ -1,2 +1,2 @@ e004c69c7dddef165d768b1362b44268 xpdf-3.01.tar.gz -4184783da2885ecde3c2256de5144555 xpdf-3.01pl1.patch +8f1f5d37153c7e98f794f18d0b80fc25 xpdf-3.01pl2.patch Modified: crux-2.2/ports/opt/xpdf/Pkgfile =================================================================== --- crux-2.2/ports/opt/xpdf/Pkgfile 2006-03-26 01:15:56 UTC (rev 1016) +++ crux-2.2/ports/opt/xpdf/Pkgfile 2006-03-26 01:27:54 UTC (rev 1017) @@ -5,7 +5,7 @@ # Depends on: lesstif, t1lib name=xpdf -version=3.01pl1 +version=3.01pl2 release=1 source=(ftp://ftp.foolabs.com/pub/xpdf/$name-3.01.tar.gz \ $name-$version.patch) Deleted: crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch =================================================================== --- crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:15:56 UTC (rev 1016) +++ crux-2.2/ports/opt/xpdf/xpdf-3.01pl1.patch 2006-03-26 01:27:54 UTC (rev 1017) @@ -1,168 +0,0 @@ -diff -c -r xpdf-3.01-orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc -*** xpdf-3.01-orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/JPXStream.cc Thu Nov 3 16:50:39 2005 -*************** -*** 783,789 **** - int segType; - GBool haveSIZ, haveCOD, haveQCD, haveSOT; - Guint precinctSize, style; -! Guint segLen, capabilities, comp, i, j, r; - - //----- main header - haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; ---- 783,789 ---- - int segType; - GBool haveSIZ, haveCOD, haveQCD, haveSOT; - Guint precinctSize, style; -! Guint segLen, capabilities, nTiles, comp, i, j, r; - - //----- main header - haveSIZ = haveCOD = haveQCD = haveSOT = gFalse; -*************** -*** 818,825 **** - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -! img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, -! sizeof(JPXTile)); - for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { - img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps, - sizeof(JPXTileComp)); ---- 818,830 ---- - / img.xTileSize; - img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) - / img.yTileSize; -! nTiles = img.nXTiles * img.nYTiles; -! // check for overflow before allocating memory -! if (nTiles == 0 || nTiles / img.nXTiles != img.nYTiles) { -! error(getPos(), "Bad tile count in JPX SIZ marker segment"); -! return gFalse; -! } -! img.tiles = (JPXTile *)gmallocn(nTiles, sizeof(JPXTile)); - for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { - img.tiles[i].tileComps = (JPXTileComp *)gmallocn(img.nComps, - sizeof(JPXTileComp)); -diff -c -r xpdf-3.01-orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc -*** xpdf-3.01-orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/Stream.cc Thu Nov 3 16:50:39 2005 -*************** -*** 401,418 **** - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; - - nVals = width * nComps; - pixBytes = (nComps * nBits + 7) >> 3; -! rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; - } - - StreamPredictor::~StreamPredictor() { ---- 401,433 ---- - - StreamPredictor::StreamPredictor(Stream *strA, int predictorA, - int widthA, int nCompsA, int nBitsA) { -+ int totalBits; -+ - str = strA; - predictor = predictorA; - width = widthA; - nComps = nCompsA; - nBits = nBitsA; -+ predLine = NULL; -+ ok = gFalse; - - nVals = width * nComps; -+ totalBits = nVals * nBits; -+ if (totalBits == 0 || -+ (totalBits / nBits) / nComps != width || -+ totalBits + 7 < 0) { -+ return; -+ } - pixBytes = (nComps * nBits + 7) >> 3; -! rowBytes = ((totalBits + 7) >> 3) + pixBytes; -! if (rowBytes < 0) { -! return; -! } - predLine = (Guchar *)gmalloc(rowBytes); - memset(predLine, 0, rowBytes); - predIdx = rowBytes; -+ -+ ok = gTrue; - } - - StreamPredictor::~StreamPredictor() { -*************** -*** 1004,1009 **** ---- 1019,1028 ---- - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if (!pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -*************** -*** 2899,2904 **** ---- 2918,2931 ---- - height = read16(); - width = read16(); - numComps = str->getChar(); -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); -+ return gFalse; -+ } -+ if (numComps <= 0 || numComps > 4) { -+ error(getPos(), "Bad number of components in DCT stream", prec); -+ return gFalse; -+ } - if (prec != 8) { - error(getPos(), "Bad DCT precision %d", prec); - return gFalse; -*************** -*** 3827,3832 **** ---- 3854,3863 ---- - FilterStream(strA) { - if (predictor != 1) { - pred = new StreamPredictor(this, predictor, columns, colors, bits); -+ if (!pred->isOk()) { -+ delete pred; -+ pred = NULL; -+ } - } else { - pred = NULL; - } -diff -c -r xpdf-3.01-orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h -*** xpdf-3.01-orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005 ---- xpdf-3.01/xpdf/Stream.h Thu Nov 3 16:50:39 2005 -*************** -*** 232,237 **** ---- 232,239 ---- - - ~StreamPredictor(); - -+ GBool isOk() { return ok; } -+ - int lookChar(); - int getChar(); - -*************** -*** 249,254 **** ---- 251,257 ---- - int rowBytes; // bytes per line - Guchar *predLine; // line buffer - int predIdx; // current index in predLine -+ GBool ok; - }; - - //------------------------------------------------------------------------ Added: crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch =================================================================== --- crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch (rev 0) +++ crux-2.2/ports/opt/xpdf/xpdf-3.01pl2.patch 2006-03-26 01:27:54 UTC (rev 1017) @@ -0,0 +1,471 @@ +diff -cr xpdf-3.01.orig/goo/gmem.c xpdf-3.01/goo/gmem.c +*** xpdf-3.01.orig/goo/gmem.c Tue Aug 16 22:34:30 2005 +--- xpdf-3.01/goo/gmem.c Tue Jan 17 17:03:57 2006 +*************** +*** 11,16 **** +--- 11,17 ---- + #include <stdlib.h> + #include <stddef.h> + #include <string.h> ++ #include <limits.h> + #include "gmem.h" + + #ifdef DEBUG_MEM +*************** +*** 63,69 **** + int lst; + unsigned long *trl, *p; + +! if (size == 0) + return NULL; + size1 = gMemDataSize(size); + if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) { +--- 64,70 ---- + int lst; + unsigned long *trl, *p; + +! if (size <= 0) + return NULL; + size1 = gMemDataSize(size); + if (!(mem = (char *)malloc(size1 + gMemHdrSize + gMemTrlSize))) { +*************** +*** 86,92 **** + #else + void *p; + +! if (size == 0) + return NULL; + if (!(p = malloc(size))) { + fprintf(stderr, "Out of memory\n"); +--- 87,93 ---- + #else + void *p; + +! if (size <= 0) + return NULL; + if (!(p = malloc(size))) { + fprintf(stderr, "Out of memory\n"); +*************** +*** 102,108 **** + void *q; + int oldSize; + +! if (size == 0) { + if (p) + gfree(p); + return NULL; +--- 103,109 ---- + void *q; + int oldSize; + +! if (size <= 0) { + if (p) + gfree(p); + return NULL; +*************** +*** 120,126 **** + #else + void *q; + +! if (size == 0) { + if (p) + free(p); + return NULL; +--- 121,127 ---- + #else + void *q; + +! if (size <= 0) { + if (p) + free(p); + return NULL; +*************** +*** 140,147 **** + void *gmallocn(int nObjs, int objSize) { + int n; + + n = nObjs * objSize; +! if (objSize == 0 || n / objSize != nObjs) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +--- 141,151 ---- + void *gmallocn(int nObjs, int objSize) { + int n; + ++ if (nObjs == 0) { ++ return NULL; ++ } + n = nObjs * objSize; +! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +*************** +*** 151,158 **** + void *greallocn(void *p, int nObjs, int objSize) { + int n; + + n = nObjs * objSize; +! if (objSize == 0 || n / objSize != nObjs) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +--- 155,168 ---- + void *greallocn(void *p, int nObjs, int objSize) { + int n; + ++ if (nObjs == 0) { ++ if (p) { ++ gfree(p); ++ } ++ return NULL; ++ } + n = nObjs * objSize; +! if (objSize <= 0 || nObjs < 0 || nObjs >= INT_MAX / objSize) { + fprintf(stderr, "Bogus memory allocation size\n"); + exit(1); + } +diff -cr xpdf-3.01.orig/xpdf/JBIG2Stream.cc xpdf-3.01/xpdf/JBIG2Stream.cc +*** xpdf-3.01.orig/xpdf/JBIG2Stream.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/JBIG2Stream.cc Tue Jan 17 17:29:46 2006 +*************** +*** 13,18 **** +--- 13,19 ---- + #endif + + #include <stdlib.h> ++ #include <limits.h> + #include "GList.h" + #include "Error.h" + #include "JArithmeticDecoder.h" +*************** +*** 681,686 **** +--- 682,691 ---- + w = wA; + h = hA; + line = (wA + 7) >> 3; ++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ data = NULL; ++ return; ++ } + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); + data[h * line] = 0; +*************** +*** 692,697 **** +--- 697,706 ---- + w = bitmap->w; + h = bitmap->h; + line = bitmap->line; ++ if (w <= 0 || h <= 0 || line <= 0 || h >= (INT_MAX - 1) / line) { ++ data = NULL; ++ return; ++ } + // need to allocate one extra guard byte for use in combine() + data = (Guchar *)gmalloc(h * line + 1); + memcpy(data, bitmap->data, h * line); +*************** +*** 720,726 **** + } + + void JBIG2Bitmap::expand(int newH, Guint pixel) { +! if (newH <= h) { + return; + } + // need to allocate one extra guard byte for use in combine() +--- 729,735 ---- + } + + void JBIG2Bitmap::expand(int newH, Guint pixel) { +! if (newH <= h || line <= 0 || newH >= (INT_MAX - 1) / line) { + return; + } + // need to allocate one extra guard byte for use in combine() +*************** +*** 2294,2299 **** +--- 2303,2316 ---- + !readUWord(&stepX) || !readUWord(&stepY)) { + goto eofError; + } ++ if (w == 0 || h == 0 || w >= INT_MAX / h) { ++ error(getPos(), "Bad bitmap size in JBIG2 halftone segment"); ++ return; ++ } ++ if (gridH == 0 || gridW >= INT_MAX / gridH) { ++ error(getPos(), "Bad grid size in JBIG2 halftone segment"); ++ return; ++ } + + // get pattern dictionary + if (nRefSegs != 1) { +diff -cr xpdf-3.01.orig/xpdf/JPXStream.cc xpdf-3.01/xpdf/JPXStream.cc +*** xpdf-3.01.orig/xpdf/JPXStream.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/JPXStream.cc Tue Jan 17 17:14:06 2006 +*************** +*** 12,17 **** +--- 12,18 ---- + #pragma implementation + #endif + ++ #include <limits.h> + #include "gmem.h" + #include "Error.h" + #include "JArithmeticDecoder.h" +*************** +*** 818,823 **** +--- 819,830 ---- + / img.xTileSize; + img.nYTiles = (img.ySize - img.yTileOffset + img.yTileSize - 1) + / img.yTileSize; ++ // check for overflow before allocating memory ++ if (img.nXTiles <= 0 || img.nYTiles <= 0 || ++ img.nXTiles >= INT_MAX / img.nYTiles) { ++ error(getPos(), "Bad tile count in JPX SIZ marker segment"); ++ return gFalse; ++ } + img.tiles = (JPXTile *)gmallocn(img.nXTiles * img.nYTiles, + sizeof(JPXTile)); + for (i = 0; i < img.nXTiles * img.nYTiles; ++i) { +diff -cr xpdf-3.01.orig/xpdf/Stream.cc xpdf-3.01/xpdf/Stream.cc +*** xpdf-3.01.orig/xpdf/Stream.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/Stream.cc Tue Jan 17 17:31:52 2006 +*************** +*** 15,20 **** +--- 15,21 ---- + #include <stdio.h> + #include <stdlib.h> + #include <stddef.h> ++ #include <limits.h> + #ifndef WIN32 + #include <unistd.h> + #endif +*************** +*** 406,418 **** +--- 407,432 ---- + width = widthA; + nComps = nCompsA; + nBits = nBitsA; ++ predLine = NULL; ++ ok = gFalse; + + nVals = width * nComps; ++ if (width <= 0 || nComps <= 0 || nBits <= 0 || ++ nComps >= INT_MAX / nBits || ++ width >= INT_MAX / nComps / nBits || ++ nVals * nBits + 7 < 0) { ++ return; ++ } + pixBytes = (nComps * nBits + 7) >> 3; + rowBytes = ((nVals * nBits + 7) >> 3) + pixBytes; ++ if (rowBytes <= 0) { ++ return; ++ } + predLine = (Guchar *)gmalloc(rowBytes); + memset(predLine, 0, rowBytes); + predIdx = rowBytes; ++ ++ ok = gTrue; + } + + StreamPredictor::~StreamPredictor() { +*************** +*** 1004,1009 **** +--- 1018,1027 ---- + FilterStream(strA) { + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; ++ } + } else { + pred = NULL; + } +*************** +*** 1259,1264 **** +--- 1277,1285 ---- + if (columns < 1) { + columns = 1; + } ++ if (columns + 4 <= 0) { ++ columns = INT_MAX - 4; ++ } + rows = rowsA; + endOfBlock = endOfBlockA; + black = blackA; +*************** +*** 2899,2904 **** +--- 2920,2930 ---- + height = read16(); + width = read16(); + numComps = str->getChar(); ++ if (numComps <= 0 || numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream"); ++ numComps = 0; ++ return gFalse; ++ } + if (prec != 8) { + error(getPos(), "Bad DCT precision %d", prec); + return gFalse; +*************** +*** 2925,2930 **** +--- 2951,2961 ---- + height = read16(); + width = read16(); + numComps = str->getChar(); ++ if (numComps <= 0 || numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream"); ++ numComps = 0; ++ return gFalse; ++ } + if (prec != 8) { + error(getPos(), "Bad DCT precision %d", prec); + return gFalse; +*************** +*** 2947,2952 **** +--- 2978,2988 ---- + + length = read16() - 2; + scanInfo.numComps = str->getChar(); ++ if (scanInfo.numComps <= 0 || scanInfo.numComps > 4) { ++ error(getPos(), "Bad number of components in DCT stream"); ++ scanInfo.numComps = 0; ++ return gFalse; ++ } + --length; + if (length != 2 * scanInfo.numComps + 3) { + error(getPos(), "Bad DCT scan info block"); +*************** +*** 3041,3046 **** +--- 3077,3083 ---- + numACHuffTables = index+1; + tbl = &acHuffTables[index]; + } else { ++ index &= 0x0f; + if (index >= numDCHuffTables) + numDCHuffTables = index+1; + tbl = &dcHuffTables[index]; +*************** +*** 3827,3832 **** +--- 3864,3873 ---- + FilterStream(strA) { + if (predictor != 1) { + pred = new StreamPredictor(this, predictor, columns, colors, bits); ++ if (!pred->isOk()) { ++ delete pred; ++ pred = NULL; ++ } + } else { + pred = NULL; + } +diff -cr xpdf-3.01.orig/xpdf/Stream.h xpdf-3.01/xpdf/Stream.h +*** xpdf-3.01.orig/xpdf/Stream.h Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/xpdf/Stream.h Tue Jan 17 17:19:54 2006 +*************** +*** 232,237 **** +--- 232,239 ---- + + ~StreamPredictor(); + ++ GBool isOk() { return ok; } ++ + int lookChar(); + int getChar(); + +*************** +*** 249,254 **** +--- 251,257 ---- + int rowBytes; // bytes per line + Guchar *predLine; // line buffer + int predIdx; // current index in predLine ++ GBool ok; + }; + + //------------------------------------------------------------------------ +*************** +*** 527,533 **** + short getWhiteCode(); + short getBlackCode(); + short lookBits(int n); +! void eatBits(int n) { inputBits -= n; } + }; + + //------------------------------------------------------------------------ +--- 530,536 ---- + short getWhiteCode(); + short getBlackCode(); + short lookBits(int n); +! void eatBits(int n) { if ((inputBits -= n) < 0) inputBits = 0; } + }; + + //------------------------------------------------------------------------ +diff -cr xpdf-3.01.orig/splash/SplashXPathScanner.cc xpdf-3.01/splash/SplashXPathScanner.cc +*** xpdf-3.01.orig/splash/SplashXPathScanner.cc Tue Aug 16 22:34:31 2005 +--- xpdf-3.01/splash/SplashXPathScanner.cc Wed Feb 1 17:01:14 2006 +*************** +*** 186,192 **** + } + + void SplashXPathScanner::computeIntersections(int y) { +! SplashCoord ySegMin, ySegMax, xx0, xx1; + SplashXPathSeg *seg; + int i, j; + +--- 186,192 ---- + } + + void SplashXPathScanner::computeIntersections(int y) { +! SplashCoord xSegMin, xSegMax, ySegMin, ySegMax, xx0, xx1; + SplashXPathSeg *seg; + int i, j; + +*************** +*** 236,254 **** + } else if (seg->flags & splashXPathVert) { + xx0 = xx1 = seg->x0; + } else { +! if (ySegMin <= y) { +! // intersection with top edge +! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; + } else { +! // x coord of segment endpoint with min y coord +! xx0 = (seg->flags & splashXPathFlip) ? seg->x1 : seg->x0; + } +! if (ySegMax >= y + 1) { +! // intersection with bottom edge +! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; +! } else { +! // x coord of segment endpoint with max y coord +! xx1 = (seg->flags & splashXPathFlip) ? seg->x0 : seg->x1; + } + } + if (xx0 < xx1) { +--- 236,262 ---- + } else if (seg->flags & splashXPathVert) { + xx0 = xx1 = seg->x0; + } else { +! if (seg->x0 < seg->x1) { +! xSegMin = seg->x0; +! xSegMax = seg->x1; + } else { +! xSegMin = seg->x1; +! xSegMax = seg->x0; + } +! // intersection with top edge +! xx0 = seg->x0 + ((SplashCoord)y - seg->y0) * seg->dxdy; +! // intersection with bottom edge +! xx1 = seg->x0 + ((SplashCoord)y + 1 - seg->y0) * seg->dxdy; +! // the segment may not actually extend to the top and/or bottom edges +! if (xx0 < xSegMin) { +! xx0 = xSegMin; +! } else if (xx0 > xSegMax) { +! xx0 = xSegMax; +! } +! if (xx1 < xSegMin) { +! xx1 = xSegMin; +! } else if (xx1 > xSegMax) { +! xx1 = xSegMax; + } + } + if (xx0 < xx1) {

1 0

r1016 - crux-2.2/ports/opt/xlockmore
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:15:56 +0200 (Sun, 26 Mar 2006) New Revision: 1016 Modified: crux-2.2/ports/opt/xlockmore/Pkgfile Log: xlockmore: trimmed dependencies Modified: crux-2.2/ports/opt/xlockmore/Pkgfile =================================================================== --- crux-2.2/ports/opt/xlockmore/Pkgfile 2006-03-26 01:06:11 UTC (rev 1015) +++ crux-2.2/ports/opt/xlockmore/Pkgfile 2006-03-26 01:15:56 UTC (rev 1016) @@ -2,7 +2,7 @@ # URL: http://www.tux.org/~bagleyd/xlockmore.html # Maintainer: Simone Rota, sip at varlock dot com # Packager: Daniel Mueller, daniel at danm dot de -# Depends on: esound, gtk, fortune +# Depends on: x11, fortune name=xlockmore version=5.20.1

1 0

r1015 - crux-2.2/ports/opt/lcms
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:06:11 +0200 (Sun, 26 Mar 2006) New Revision: 1015 Modified: crux-2.2/ports/opt/lcms/.footprint crux-2.2/ports/opt/lcms/.md5sum crux-2.2/ports/opt/lcms/Pkgfile Log: lcms: updated to 1.15 Modified: crux-2.2/ports/opt/lcms/.footprint =================================================================== --- crux-2.2/ports/opt/lcms/.footprint 2006-03-26 01:00:57 UTC (rev 1014) +++ crux-2.2/ports/opt/lcms/.footprint 2006-03-26 01:06:11 UTC (rev 1015) @@ -4,6 +4,7 @@ -rwxr-xr-x root/root usr/bin/icclink -rwxr-xr-x root/root usr/bin/icctrans -rwxr-xr-x root/root usr/bin/jpegicc +-rwxr-xr-x root/root usr/bin/tiffdiff -rwxr-xr-x root/root usr/bin/tifficc -rwxr-xr-x root/root usr/bin/wtpt drwxr-xr-x root/root usr/include/ @@ -12,9 +13,9 @@ drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/liblcms.a -rwxr-xr-x root/root usr/lib/liblcms.la -lrwxrwxrwx root/root usr/lib/liblcms.so -> liblcms.so.1.0.14 -lrwxrwxrwx root/root usr/lib/liblcms.so.1 -> liblcms.so.1.0.14 --rwxr-xr-x root/root usr/lib/liblcms.so.1.0.14 +lrwxrwxrwx root/root usr/lib/liblcms.so -> liblcms.so.1.0.15 +lrwxrwxrwx root/root usr/lib/liblcms.so.1 -> liblcms.so.1.0.15 +-rwxr-xr-x root/root usr/lib/liblcms.so.1.0.15 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/lcms.pc drwxr-xr-x root/root usr/man/ Modified: crux-2.2/ports/opt/lcms/.md5sum =================================================================== --- crux-2.2/ports/opt/lcms/.md5sum 2006-03-26 01:00:57 UTC (rev 1014) +++ crux-2.2/ports/opt/lcms/.md5sum 2006-03-26 01:06:11 UTC (rev 1015) @@ -1 +1 @@ -5a803460aeb10e762d97e11a37462a69 lcms-1.14.tar.gz +76c921973fdea4f880944a024197f924 lcms-1.15.tar.gz Modified: crux-2.2/ports/opt/lcms/Pkgfile =================================================================== --- crux-2.2/ports/opt/lcms/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) +++ crux-2.2/ports/opt/lcms/Pkgfile 2006-03-26 01:06:11 UTC (rev 1015) @@ -1,11 +1,11 @@ # Description: Little CMS. A free color management engine. # URL: http://www.littlecms.com/ -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: Simone Rota, sip at crux dot nu # Packager: Daniel Mueller, daniel at danm dot de # Depends on: zlib, libtiff, libjpeg name=lcms -version=1.14 +version=1.15 release=1 source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz)

1 0

r1014 - in crux-2.2/ports: attic attic/asunder attic/graveman attic/libcddb attic/sox opt
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 03:00:57 +0200 (Sun, 26 Mar 2006) New Revision: 1014 Added: crux-2.2/ports/attic/asunder/ crux-2.2/ports/attic/graveman/ crux-2.2/ports/attic/libcddb/ crux-2.2/ports/attic/sox/ Removed: crux-2.2/ports/opt/asunder/ crux-2.2/ports/opt/graveman/ crux-2.2/ports/opt/libcddb/ crux-2.2/ports/opt/sox/ Modified: crux-2.2/ports/attic/asunder/Pkgfile crux-2.2/ports/attic/graveman/Pkgfile crux-2.2/ports/attic/libcddb/Pkgfile crux-2.2/ports/attic/sox/Pkgfile Log: moved into attic: asunder, graveman, libcddb, sox Copied: crux-2.2/ports/attic/asunder (from rev 1008, crux-2.2/ports/opt/asunder) Modified: crux-2.2/ports/attic/asunder/Pkgfile =================================================================== --- crux-2.2/ports/opt/asunder/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/asunder/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,7 +1,7 @@ # Description: CD Ripping frontend # URL: http://ericlathrop.com/asunder/ -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: +# Packager: Simone Rota, sip at crux dot nu # Depends on: gtk, flac, lame, vorbis-tools, cdparanoia, libcddb name=asunder Copied: crux-2.2/ports/attic/graveman (from rev 1008, crux-2.2/ports/opt/graveman) Modified: crux-2.2/ports/attic/graveman/Pkgfile =================================================================== --- crux-2.2/ports/opt/graveman/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/graveman/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,7 +1,7 @@ # Description: CD Burning program # URL: http://www.nongnu.org/graveman/ -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: +# Packager: Simone Rota, sip at crux dot nu # Depends on: libglade, libid3tag, libmad, libvorbis, cdrtools, sox, cdrdao, p5-xml-parser, libmng name=graveman Copied: crux-2.2/ports/attic/libcddb (from rev 1008, crux-2.2/ports/opt/libcddb) Modified: crux-2.2/ports/attic/libcddb/Pkgfile =================================================================== --- crux-2.2/ports/opt/libcddb/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/libcddb/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,6 +1,6 @@ # Description: C library to access and submit data on a CDDB server # URL: http://libcddb.sf.net -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: # Packager: Han Boetes, han at mijncomputer dot nl # Depends on: Copied: crux-2.2/ports/attic/sox (from rev 1008, crux-2.2/ports/opt/sox) Modified: crux-2.2/ports/attic/sox/Pkgfile =================================================================== --- crux-2.2/ports/opt/sox/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/sox/Pkgfile 2006-03-26 01:00:57 UTC (rev 1014) @@ -1,6 +1,6 @@ # Description: audio conversion tools, (c) copyright Lance Norskog # URL: http://sox.sourceforge.net/ -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: # Packager: Martin Opel, mo at obbl-net dot de # Depends on:

1 0

r1013 - in crux-2.2/ports: attic attic/potrace opt
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:50:42 +0100 (Sun, 26 Mar 2006) New Revision: 1013 Added: crux-2.2/ports/attic/potrace/ Removed: crux-2.2/ports/opt/potrace/ Modified: crux-2.2/ports/attic/potrace/Pkgfile Log: potrace: moved into attic Copied: crux-2.2/ports/attic/potrace (from rev 1008, crux-2.2/ports/opt/potrace) Modified: crux-2.2/ports/attic/potrace/Pkgfile =================================================================== --- crux-2.2/ports/opt/potrace/Pkgfile 2006-03-25 15:54:58 UTC (rev 1008) +++ crux-2.2/ports/attic/potrace/Pkgfile 2006-03-26 00:50:42 UTC (rev 1013) @@ -1,7 +1,7 @@ # Description: Convert bitmap images into vector # URL: http://potrace.sourceforge.net -# Maintainer: Simone Rota, sip at varlock dot com -# Packager: Simone Rota, sip at varlock dot com +# Maintainer: +# Packager: Simone Rota, sip at crux dot nu # Depends on: name=potrace

1 0

r1012 - crux-2.2/ports
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:49:09 +0100 (Sun, 26 Mar 2006) New Revision: 1012 Added: crux-2.2/ports/attic/ Log: created attic

1 0

r1011 - crux-2.2/ports/opt/postgresql
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:46:42 +0100 (Sun, 26 Mar 2006) New Revision: 1011 Modified: crux-2.2/ports/opt/postgresql/.md5sum crux-2.2/ports/opt/postgresql/Pkgfile Log: postgresql: updated to 8.1.3 Modified: crux-2.2/ports/opt/postgresql/.md5sum =================================================================== --- crux-2.2/ports/opt/postgresql/.md5sum 2006-03-26 00:27:52 UTC (rev 1010) +++ crux-2.2/ports/opt/postgresql/.md5sum 2006-03-26 00:46:42 UTC (rev 1011) @@ -1,2 +1,2 @@ f5eeff17dd7117175794459f7097ad1a postgresql -12d54a11bc3a414477d37ef338bec161 postgresql-8.1.2.tar.bz2 +bb510edbb533962c0692e211b3bd8cfa postgresql-8.1.3.tar.bz2 Modified: crux-2.2/ports/opt/postgresql/Pkgfile =================================================================== --- crux-2.2/ports/opt/postgresql/Pkgfile 2006-03-26 00:27:52 UTC (rev 1010) +++ crux-2.2/ports/opt/postgresql/Pkgfile 2006-03-26 00:46:42 UTC (rev 1011) @@ -1,11 +1,11 @@ # Description: A sophisticated Object-Relational DBMS # URL: http://www.postgresql.org # Packager: Markus Heinz, su1690 at studserver.uni-dortmund dot de -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: Simone Rota, sip at crux dot nu # Depends on: name=postgresql -version=8.1.2 +version=8.1.3 release=1 source=(ftp://ftp2.de.postgresql.org/pub/postgresql/v$version/$name-$versio… postgresql)

1 0

r1010 - crux-2.2/ports/opt/minicom
by crux＠crux.nu 26 Mar '06

26 Mar '06

Author: sip Date: 2006-03-26 01:27:52 +0100 (Sun, 26 Mar 2006) New Revision: 1010 Added: crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch Modified: crux-2.2/ports/opt/minicom/.md5sum crux-2.2/ports/opt/minicom/Pkgfile Log: minicom: added gcc4 patch Modified: crux-2.2/ports/opt/minicom/.md5sum =================================================================== --- crux-2.2/ports/opt/minicom/.md5sum 2006-03-25 23:54:28 UTC (rev 1009) +++ crux-2.2/ports/opt/minicom/.md5sum 2006-03-26 00:27:52 UTC (rev 1010) @@ -1 +1,2 @@ +e1a7644e6acfcf2a67f65c032167bcf6 minicom-2.1-gcc4.patch 1c8f3b247c38fb16c3c2170df9fc102a minicom-2.1.tar.gz Modified: crux-2.2/ports/opt/minicom/Pkgfile =================================================================== --- crux-2.2/ports/opt/minicom/Pkgfile 2006-03-25 23:54:28 UTC (rev 1009) +++ crux-2.2/ports/opt/minicom/Pkgfile 2006-03-26 00:27:52 UTC (rev 1010) @@ -1,16 +1,18 @@ # Description: A menu driven communications program # URL: http://alioth.debian.org/projects/minicom/ -# Maintainer: Simone Rota, sip at varlock dot com +# Maintainer: Simone Rota, sip at crux dot nu # Packager: sten, nick dot steeves at shaw dot ca # Depends on: name=minicom version=2.1 -release=1 -source=(http://alioth.debian.org/download.php/123/minicom-$version.tar.gz) +release=2 +source=(http://alioth.debian.org/download.php/123/minicom-$version.tar.gz \ + $name-$version-gcc4.patch) build() { cd $name-$version + patch -p1 < ../$name-$version-gcc4.patch ./configure --prefix=/usr --disable-nls make make DESTDIR=$PKG install Added: crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch =================================================================== --- crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch (rev 0) +++ crux-2.2/ports/opt/minicom/minicom-2.1-gcc4.patch 2006-03-26 00:27:52 UTC (rev 1010) @@ -0,0 +1,12 @@ +diff -ur minicom-2.1-orig/src/window.c minicom-2.1/src/window.c +--- minicom-2.1-orig/src/window.c 2005-05-28 19:59:42.000000000 -0400 ++++ minicom-2.1/src/window.c 2005-05-28 20:00:22.000000000 -0400 +@@ -62,7 +62,7 @@ + static char *CS, *SF, *SR, *VB, *BL; + static char *VE, *VI, *KS, *KE; + static char *CD, *CL, *IC, *DC; +-static char *BC, *CR, *NL; ++static char *CR, *NL; + #if ST_LINE + static char *TS, *FS, *DS; + #endif

1 0