- 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

2 files changed, 64 insertions, 5 deletions

diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile
index a88615f5e6c6..a3cb0457475b 100644
--- a/multimedia/libmovtar/Makefile
+++ b/multimedia/libmovtar/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libmovtar
 PORTVERSION=	0.1.3
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/mjpeg/OldFiles
 
diff --git a/multimedia/libmovtar/files/patch-movtar_play.c b/multimedia/libmovtar/files/patch-movtar_play.c
index e20d199244b3..4f98ef1e2d82 100644
--- a/multimedia/libmovtar/files/patch-movtar_play.c
+++ b/multimedia/libmovtar/files/patch-movtar_play.c
@@ -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);