Date: Wed, 16 Sep 2015 20:35:14 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r397084 - in head: . Mk/Uses graphics/jpeg graphics/jpeg-turbo graphics/seejpeg/files multimedia/libmovtar multimedia/libmovtar/files Message-ID: <201509162035.t8GKZEqQ082596@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Wed Sep 16 20:35:13 2015 New Revision: 397084 URL: https://svnweb.freebsd.org/changeset/ports/397084 Log: - Update jpeg-turbo to 1.4.1 and grab maintainership after several timeouts - Change default jpeg implementation from jpeg to jpeg-turbo Reviewed by: bapt, mat Differential Revision: https://reviews.freebsd.org/D2884 Modified: head/Mk/Uses/jpeg.mk head/UPDATING head/graphics/jpeg-turbo/Makefile head/graphics/jpeg-turbo/distinfo head/graphics/jpeg-turbo/pkg-plist head/graphics/jpeg/Makefile head/graphics/seejpeg/files/patch-Makefile head/multimedia/libmovtar/Makefile head/multimedia/libmovtar/files/patch-movtar_play.c Modified: head/Mk/Uses/jpeg.mk ============================================================================== --- head/Mk/Uses/jpeg.mk Wed Sep 16 20:30:18 2015 (r397083) +++ head/Mk/Uses/jpeg.mk Wed Sep 16 20:35:13 2015 (r397084) @@ -6,12 +6,17 @@ # Usage: USES=jpeg or USES=jpeg:ARGS # Valid ARGS: lib (default, implicit), build, run, both # +# User defined variables: +# JPEG_PORT - jpeg implementation +# Valid values: graphics/jpeg and graphics/jpeg-turbo +# Default value: graphics/jpeg-turbo +# # MAINTAINER: portmgr@FreeBSD.org .if !defined(_INCLUDE_USES_JPEG_MK) _INCLUDE_USES_JPEG_MK= yes -JPEG_PORT?= graphics/jpeg +JPEG_PORT?= graphics/jpeg-turbo .if empty(jpeg_ARGS) jpeg_ARGS= lib Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Sep 16 20:30:18 2015 (r397083) +++ head/UPDATING Wed Sep 16 20:35:13 2015 (r397084) @@ -5,6 +5,25 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20150916: + AFFECTS: users of graphics/jpeg + AUTHOR: antoine@FreeBSD.org + + Default implementation of jpeg has been switched from graphics/jpeg to + graphics/jpeg-turbo. To perform the upgrade, use instructions below. + + If using binary packages: 'pkg upgrade' will do the right thing. + + If using portmgaster: + # portmaster -o graphics/jpeg-turbo graphics/jpeg + + If using portupgrade: + # portupgrade -f -o graphics/jpeg-turbo graphics/jpeg + + If you compile your ports and want to keep using IJG's jpeg implementation, + add this line to your /etc/make.conf file: + JPEG_PORT=graphics/jpeg + 20150914: AFFECTS: users of lang/perl5* AUTHOR: mat@FreeBSD.org Modified: head/graphics/jpeg-turbo/Makefile ============================================================================== --- head/graphics/jpeg-turbo/Makefile Wed Sep 16 20:30:18 2015 (r397083) +++ head/graphics/jpeg-turbo/Makefile Wed Sep 16 20:35:13 2015 (r397084) @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= jpeg-turbo -PORTVERSION= 1.4.0 -PORTREVISION?= 1 +PORTVERSION= 1.4.1 +PORTREVISION?= 0 CATEGORIES= graphics MASTER_SITES= SF/lib${PORTNAME}/${PORTVERSION} DISTNAME= lib${PORTNAME}-${PORTVERSION} -MAINTAINER= bytestore@yandex.ru +MAINTAINER= portmgr@FreeBSD.org COMMENT?= SIMD-accelerated JPEG codec which replaces libjpeg USES= cpe libtool @@ -38,15 +38,13 @@ BUILD_DEPENDS+= nasm:${PORTSDIR}/devel/n .endif .if ${SLAVE_PORT} == yes +# libturbojpeg.a has to be built with PIC for virtualgl CONFIGURE_ARGS+=--with-pic PLIST_SUB+= JPEG="@comment " LIBTURBOJPEG="" .else -CONFIGURE_ARGS+=--program-suffix=-turbo --without-turbojpeg +CONFIGURE_ARGS+=--without-turbojpeg +CONFLICTS_INSTALL= jpeg-[0-9]* PLIST_SUB+= JPEG="" LIBTURBOJPEG="@comment " - -post-install: - @${ECHO_CMD} "libjpeg.so.8 libjpeg.so.8.0.2" \ - > ${STAGEDIR}${PREFIX}/etc/libmap.d/${PORTNAME}.conf .endif .include <bsd.port.mk> Modified: head/graphics/jpeg-turbo/distinfo ============================================================================== --- head/graphics/jpeg-turbo/distinfo Wed Sep 16 20:30:18 2015 (r397083) +++ head/graphics/jpeg-turbo/distinfo Wed Sep 16 20:35:13 2015 (r397084) @@ -1,2 +1,2 @@ -SHA256 (libjpeg-turbo-1.4.0.tar.gz) = d93ad8546b510244f863b39b4c0da0fa4c0d53a77b61a8a3880f258c232bbbee -SIZE (libjpeg-turbo-1.4.0.tar.gz) = 1524645 +SHA256 (libjpeg-turbo-1.4.1.tar.gz) = 4bf5bad4ce85625bffbbd9912211e06790e00fb982b77724af7211034efafb08 +SIZE (libjpeg-turbo-1.4.1.tar.gz) = 1529614 Modified: head/graphics/jpeg-turbo/pkg-plist ============================================================================== --- head/graphics/jpeg-turbo/pkg-plist Wed Sep 16 20:30:18 2015 (r397083) +++ head/graphics/jpeg-turbo/pkg-plist Wed Sep 16 20:35:13 2015 (r397084) @@ -1,23 +1,21 @@ -%%JPEG%%etc/libmap.d/jpeg-turbo.conf -%%JPEG%%bin/cjpeg-turbo -%%JPEG%%bin/djpeg-turbo -%%JPEG%%bin/jpegtran-turbo -%%JPEG%%bin/rdjpgcom-turbo -%%JPEG%%bin/wrjpgcom-turbo -@comment %%JPEG%%include/jconfig.h -@comment %%JPEG%%include/jerror.h -@comment %%JPEG%%include/jmorecfg.h -@comment %%JPEG%%include/jpeglib.h -@comment %%JPEG%%lib/libjpeg.a -@comment %%JPEG%%lib/libjpeg.so -@comment %%JPEG%%lib/libjpeg.so.8 +%%JPEG%%bin/cjpeg +%%JPEG%%bin/djpeg +%%JPEG%%bin/jpegtran +%%JPEG%%bin/rdjpgcom +%%JPEG%%bin/wrjpgcom +%%JPEG%%include/jconfig.h +%%JPEG%%include/jerror.h +%%JPEG%%include/jmorecfg.h +%%JPEG%%include/jpeglib.h +%%JPEG%%lib/libjpeg.a +%%JPEG%%lib/libjpeg.so +%%JPEG%%lib/libjpeg.so.8 %%JPEG%%lib/libjpeg.so.8.0.2 -%%JPEG%%man/man1/cjpeg-turbo.1.gz -%%JPEG%%man/man1/djpeg-turbo.1.gz -%%JPEG%%man/man1/jpegtran-turbo.1.gz -%%JPEG%%man/man1/rdjpgcom-turbo.1.gz -%%JPEG%%man/man1/wrjpgcom-turbo.1.gz -@comment bin/tjbench-turbo +%%JPEG%%man/man1/cjpeg.1.gz +%%JPEG%%man/man1/djpeg.1.gz +%%JPEG%%man/man1/jpegtran.1.gz +%%JPEG%%man/man1/rdjpgcom.1.gz +%%JPEG%%man/man1/wrjpgcom.1.gz %%LIBTURBOJPEG%%bin/tjbench %%LIBTURBOJPEG%%include/turbojpeg.h %%LIBTURBOJPEG%%lib/libturbojpeg.a Modified: head/graphics/jpeg/Makefile ============================================================================== --- head/graphics/jpeg/Makefile Wed Sep 16 20:30:18 2015 (r397083) +++ head/graphics/jpeg/Makefile Wed Sep 16 20:35:13 2015 (r397084) @@ -16,7 +16,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= portmgr@FreeBSD.org COMMENT= IJG's jpeg compression utilities -#CONFLICTS= libjpeg-turbo-[0-9]* +CONFLICTS_INSTALL= jpeg-turbo-[0-9]* WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION2} DISTVERSION2= 8d Modified: head/graphics/seejpeg/files/patch-Makefile ============================================================================== --- head/graphics/seejpeg/files/patch-Makefile Wed Sep 16 20:30:18 2015 (r397083) +++ head/graphics/seejpeg/files/patch-Makefile Wed Sep 16 20:35:13 2015 (r397084) @@ -1,5 +1,5 @@ ---- Makefile.orig 1999-11-07 06:55:19.000000000 +0100 -+++ Makefile 2014-04-28 20:49:33.000000000 +0200 +--- Makefile.orig 1999-11-07 05:55:19 UTC ++++ Makefile @@ -6,30 +6,30 @@ # $Id: Makefile,v 1.8 1999/11/07 05:55:19 evan Exp $ @@ -11,7 +11,8 @@ # See the README for a description of these options. #OPTIONS= -DNO_32K_CASCADE -DTESTMODE=G640x480x32K -DBUG_WORKAROUND -DONLY_1_8_MODES - OPTIONS= -DBUG_WORKAROUND +-OPTIONS= -DBUG_WORKAROUND ++OPTIONS= -DBUG_WORKAROUND -DBMP_SUPPORTED -DGIF_SUPPORTED -DPPM_SUPPORTED -DTARGA_SUPPORTED # This should be the location of the JPEG v6 header files. -JPEG_HEADERS= -I /usr/local/include @@ -39,7 +40,7 @@ LDOPTS= -s SEEJPEG= seejpeg.o jpeg.o image.o display.o cmap.o \ -@@ -53,8 +53,8 @@ +@@ -53,8 +53,8 @@ seejpeg: $(SEEJPEG) $(CC) $(CFLAGS) $(LDOPTS) -o seejpeg $(SEEJPEG) $(LIBS) install: Modified: head/multimedia/libmovtar/Makefile ============================================================================== --- head/multimedia/libmovtar/Makefile Wed Sep 16 20:30:18 2015 (r397083) +++ head/multimedia/libmovtar/Makefile Wed Sep 16 20:35:13 2015 (r397084) @@ -3,7 +3,7 @@ PORTNAME= libmovtar PORTVERSION= 0.1.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= multimedia MASTER_SITES= SF/mjpeg/OldFiles Modified: head/multimedia/libmovtar/files/patch-movtar_play.c ============================================================================== --- head/multimedia/libmovtar/files/patch-movtar_play.c Wed Sep 16 20:30:18 2015 (r397083) +++ head/multimedia/libmovtar/files/patch-movtar_play.c Wed Sep 16 20:35:13 2015 (r397084) @@ -1,6 +1,22 @@ ---- movtar_play.c.orig 2007-12-12 22:22:44.000000000 +0100 -+++ movtar_play.c 2007-12-12 22:27:09.000000000 +0100 -@@ -141,9 +141,9 @@ +--- movtar_play.c.orig 2001-07-13 21:38:03 UTC ++++ movtar_play.c +@@ -12,7 +12,7 @@ + #include <SDL/SDL.h> + #include <SDL/SDL_timer.h> + +-#ifndef IRIX ++#if !defined(IRIX) && !defined(__FreeBSD__) + #define JPEG_INTERNALS + #include <jinclude.h> + #endif +@@ -135,15 +135,15 @@ jpeg_mem_src_reset (j_decompress_ptr cin + + /* end of data source manager */ + +-#ifndef IRIX ++#if !defined(IRIX) && !defined(__FreeBSD__) + /* Colorspace conversion */ + /* RGB, 32 bits, 8bits each: (Junk), R, G, B */ #if defined(__GNUC__) #define int64 unsigned long long #endif @@ -13,7 +29,7 @@ METHODDEF(void) ycc_rgb32_convert_mmx (j_decompress_ptr cinfo, -@@ -263,9 +263,9 @@ +@@ -263,9 +263,9 @@ ycc_rgb32_convert_mmx (j_decompress_ptr asm ("emms"); } @@ -26,3 +42,46 @@ static int64 rgb16offset = 6; // shift right after the whole stuff static const int64 shiftmask = 0xffff; // shift right after the whole stuff +@@ -556,7 +556,7 @@ void inline readpicfrommem(void *inbuffe + jpeg_mem_src_reset(&cinfo, size); + jpeg_read_header(&cinfo, TRUE); + +-#ifndef IRIX ++#if !defined(IRIX) && !defined(__FreeBSD__) + cinfo.dct_method = JDCT_IFAST; + cinfo.out_color_space = JCS_RGB; + #else +@@ -568,20 +568,20 @@ void inline readpicfrommem(void *inbuffe + switch (screen->format->BytesPerPixel) + { + case 4: +-#ifndef IRIX ++#if !defined(IRIX) && !defined(__FreeBSD__) + //printf("Choosing MMX color convert\n"); + cconvert = cinfo.cconvert; + //cconvert->color_convert = ycc_rgb32_convert_mmx; + #else +- fprintf(stderr, "32 bits per pixel can't be decoded by libjpeg on IRIX !\n"); ++ fprintf(stderr, "32 bits per pixel can't be decoded by libjpeg on IRIX or FreeBSD !\n"); + #endif + break; + case 2: +-#ifndef IRIX ++#if !defined(IRIX) && !defined(__FreeBSD__) + cconvert = cinfo.cconvert; + cconvert->color_convert = ycc_rgb16_convert_mmx; + #else +- fprintf(stderr, "15/16 bits per pixel can't be decoded by libjpeg on IRIX!"); ++ fprintf(stderr, "15/16 bits per pixel can't be decoded by libjpeg on IRIX or FreeBSD !"); + #endif + break; + default: break; +@@ -795,7 +795,7 @@ int main(int argc,char** argv) + + dump_pixel_format(screen->format); + +-#ifdef IRIX ++#if defined(IRIX) || defined(__FreeBSD__) + fprintf(stderr, "Screen parameters haven't been determined yet !\n"); + #else + calc_rgb16_params(screen->format);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509162035.t8GKZEqQ082596>