ports/69829: [NEW PORTS] graphics/jpeg-mmx: IJG's jpeg compression utilities with MMX optimization
Michael Johnson
ahze at ahze.net
Fri Jul 30 22:31:22 UTC 2004
>Number: 69829
>Category: ports
>Synopsis: [NEW PORTS] graphics/jpeg-mmx: IJG's jpeg compression utilities with MMX optimization
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Jul 30 22:30:29 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: Michael Johnson
>Release: FreeBSD 5.2-CURRENT i386
>Organization:
>Environment:
System: FreeBSD gentoo.ahze.net 5.2-CURRENT FreeBSD 5.2-CURRENT #58: Fri Jul 23 20:15:17 EDT 2004
>Description:
IJG's jpeg compression utilities with MMX optimization
Please repo-copy graphics/jpeg -> graphics/jpeg-mmx and then apply patch
and remove pkg-plist, files/patch-exifautotran, and files/patch-jpegtran.1
Generated with FreeBSD Port Tools 0.50
>How-To-Repeat:
>Fix:
--- jpeg-mmx-0.1.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile 5 Jun 2004 08:11:31 -0000 1.40
+++ Makefile 30 Jul 2004 20:44:49 -0000
@@ -4,56 +4,59 @@
#
# $FreeBSD: ports/graphics/jpeg/Makefile,v 1.40 2004/06/05 08:11:31 dinoex Exp $
#
-# PLEASE update print/ghostscript5 (there's a symlink that uses a hardwired
-# version number) when updating this port. Thank you.
-PORTNAME= jpeg
-PORTVERSION= 6b
-PORTREVISION= 3
+PORTNAME= jpeg-mmx
+PORTVERSION= 0.1.5
CATEGORIES= graphics
-MASTER_SITES= http://www.ijg.org/files/ \
- ftp://ftp.uu.net/graphics/jpeg/ \
- http://sylvana.net/jpegcrop/:exif
-DISTNAME= jpegsrc.v${PORTVERSION}
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- jpegexiforient.c:exif exifautotran.txt:exif
-EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= mjpeg
-MAINTAINER= dinoex at FreeBSD.org
-COMMENT= IJG's jpeg compression utilities
+MAINTAINER= ahze at ahze.net
+COMMENT= IJG's jpeg compression utilities with MMX optimization
-WRKSRC= ${WRKDIR}/jpeg-6b
+BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
+RUN_DEPENDS= cjpeg:${PORTSDIR}/graphics/jpeg
+
+ONLY_FOR_ARCHS= i386
USE_LIBTOOL_VER=13
+USE_GMAKE= yes
INSTALLS_SHLIB= yes
CONFIGURE_ARGS= --enable-shared --enable-static
-ADDITIONAL_HEADER= jinclude.h jpegint.h
+JPEG_EXT= -mmx
+INCDIR= include/${PORTNAME}
+
+BIN_FILES= cjpeg djpeg jpegtran
+INC_FILES= jconfig.h jerror.h jinclude.h jmorecfg.h jpegint.h jpeglib.h
+LIB_FILES= libjpeg-mmx.a libjpeg-mmx.so libjpeg-mmx.so.62
+
+PORTDOCS= README coderules.doc filelist.doc install.doc jconfig.doc \
+ libjpeg.doc structure.doc usage.doc wizard.doc
+PLIST_FILES= ${BIN_FILES:S|^|bin/|:S|$|${JPEG_EXT}|} \
+ ${INC_FILES:S|^|${INCDIR}/|} \
+ ${LIB_FILES:S|^|lib/|}
# define J_MAXMEM like "make J_MAXMEM=32" to limit max processing memory to 32Mb
.if defined(J_MAXMEM)
CONFIGURE_ARGS+= --enable-maxmem=${J_MAXMEM}
.endif
-MAN1= cjpeg.1 djpeg.1 jpegtran.1 rdjpgcom.1 wrjpgcom.1
-
-post-extract:
- @${CP} ${DISTDIR}/jpegexiforient.c ${WRKSRC}/
- @${CP} ${DISTDIR}/exifautotran.txt ${WRKSRC}/exifautotran
-
-post-build:
- @cd ${WRKSRC} && ${CC} ${CFLAGS} -o jpegexiforient jpegexiforient.c
-
-post-install:
+do-install:
+.for f in ${BIN_FILES}
+ @${INSTALL_PROGRAM} ${WRKSRC}/.libs/${f} ${PREFIX}/bin/${f}${JPEG_EXT}
+.endfor
+ @${MKDIR} ${PREFIX}/${INCDIR}
+.for f in ${INC_FILES}
+ @${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${INCDIR}
+.endfor
+.for f in ${LIB_FILES}
+ @${INSTALL_DATA} ${WRKSRC}/.libs/${f} ${PREFIX}/lib/
+.endfor
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/jpeg
- @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jpeg
- @${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/jpeg
+ @${MKDIR} ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+ @${INSTALL_DATA} ${WRKSRC}/*.doc ${DOCSDIR}
.endif
-.for header in ${ADDITIONAL_HEADER}
- @${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/include
-.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/jpegexiforient ${PREFIX}/bin
- ${INSTALL_SCRIPT} ${WRKSRC}/exifautotran ${PREFIX}/bin
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo 18 Mar 2004 14:53:46 -0000 1.7
+++ distinfo 30 Jul 2004 20:07:13 -0000
@@ -1,6 +1,2 @@
-MD5 (jpegsrc.v6b.tar.gz) = dbd5f3b47ed13132f04c685d608a7547
-SIZE (jpegsrc.v6b.tar.gz) = 613261
-MD5 (jpegexiforient.c) = ff4657764cb885b9aec06449507bf29d
-SIZE (jpegexiforient.c) = 8192
-MD5 (exifautotran.txt) = c1cd9c876f900601682cf9db8d232386
-SIZE (exifautotran.txt) = 684
+MD5 (jpeg-mmx-0.1.5.tar.gz) = da10eb1bdea0ca3798636b2b7a645ed8
+SIZE (jpeg-mmx-0.1.5.tar.gz) = 578350
Index: pkg-descr
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/pkg-descr,v
retrieving revision 1.5
diff -u -r1.5 pkg-descr
--- pkg-descr 18 Mar 2004 14:53:46 -0000 1.5
+++ pkg-descr 30 Jul 2004 20:33:11 -0000
@@ -1,23 +1,7 @@
-The Independent JPEG Group's JPEG software
-==========================================
+IJG's jpeg compression utilities and libraries with MMX optimization
-This distribution contains the sixth public release of the Independent JPEG
-Group's free JPEG software. You are welcome to redistribute this software and
-to use it for any purpose, subject to the conditions under LEGAL ISSUES, below.
+This is NOT a drop in replacement to graphics/jpeg
-Serious users of this software (particularly those incorporating it into
-larger programs) should contact IJG at jpeg-info at uunet.uu.net to be added to
-our electronic mailing list. Mailing list members are notified of updates
-and have a chance to participate in technical discussions, etc.
+See graphics/jpeg/pkg-descr for more information
-This software is the work of Tom Lane, Philip Gladstone, Luis Ortiz, Jim
-Boucher, Lee Crocker, Julian Minguillon, George Phillips, Davide Rossi,
-Ge' Weijers, and other members of the Independent JPEG Group.
-
-IJG is not affiliated with the official ISO JPEG standards committee.
-
-Includes EXIF patches from:
-http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=106060
-http://sylvana.net/jpegcrop/exifpatch.html
-
-WWW: http://www.ijg.org/
+WWW: http://mjpeg.sf.net/
Index: pkg-plist
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/pkg-plist,v
retrieving revision 1.25
diff -u -r1.25 pkg-plist
--- pkg-plist 18 Mar 2004 14:53:46 -0000 1.25
+++ pkg-plist 30 Jul 2004 19:08:15 -0000
@@ -1,26 +1 @@
-bin/cjpeg
-bin/djpeg
-bin/exifautotran
-bin/jpegexiforient
-bin/jpegtran
-bin/rdjpgcom
-bin/wrjpgcom
-include/jconfig.h
-include/jerror.h
-include/jinclude.h
-include/jmorecfg.h
-include/jpegint.h
-include/jpeglib.h
-lib/libjpeg.a
-lib/libjpeg.so
-lib/libjpeg.so.9
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/coderules.doc
-%%PORTDOCS%%%%DOCSDIR%%/filelist.doc
-%%PORTDOCS%%%%DOCSDIR%%/install.doc
-%%PORTDOCS%%%%DOCSDIR%%/jconfig.doc
-%%PORTDOCS%%%%DOCSDIR%%/libjpeg.doc
-%%PORTDOCS%%%%DOCSDIR%%/structure.doc
-%%PORTDOCS%%%%DOCSDIR%%/usage.doc
-%%PORTDOCS%%%%DOCSDIR%%/wizard.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+
Index: files/patch-configure
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/files/patch-configure,v
retrieving revision 1.1
diff -u -r1.1 patch-configure
--- files/patch-configure 18 Mar 2004 14:53:47 -0000 1.1
+++ files/patch-configure 30 Jul 2004 18:22:41 -0000
@@ -1,5 +1,14 @@
---- configure.orig Sat Mar 21 14:08:57 1998
-+++ configure Mon Aug 4 21:49:44 2003
+--- configure.orig Tue Feb 3 16:49:23 2004
++++ configure Fri Jul 30 04:20:34 2004
+@@ -1530,7 +1530,7 @@
+ if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then
+ USELIBTOOL="yes"
+ LIBTOOL="./libtool"
+- O="lo"
++ O="o"
+ A="la"
+ LN='$(LIBTOOL) --mode=link $(CC)'
+ INSTALL_LIB='$(LIBTOOL) --mode=install ${INSTALL}'
@@ -1559,7 +1559,8 @@
if test "x$LTSTATIC" = xno; then
disable_static="--disable-static"
@@ -10,12 +19,3 @@
fi
# Select memory manager depending on user input.
-@@ -1647,7 +1648,7 @@
- # Extract the library version ID from jpeglib.h.
- echo $ac_n "checking libjpeg version number""... $ac_c" 1>&6
- echo "configure:1650: checking libjpeg version number" >&5
--JPEG_LIB_VERSION=`sed -e '/^#define JPEG_LIB_VERSION/!d' -e 's/^[^0-9]*\([0-9][0-9]*\).*$/\1/' $srcdir/jpeglib.h`
-+JPEG_LIB_VERSION=9
- echo "$ac_t""$JPEG_LIB_VERSION" 1>&6
-
-
Index: files/patch-exifautotran
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/files/patch-exifautotran,v
retrieving revision 1.1
diff -u -r1.1 patch-exifautotran
--- files/patch-exifautotran 18 Mar 2004 14:53:47 -0000 1.1
+++ files/patch-exifautotran 30 Jul 2004 19:02:34 -0000
@@ -1,7 +1 @@
---- exifautotran.orig Thu Mar 18 06:25:27 2004
-+++ exifautotran Thu Mar 18 06:28:29 2004
-@@ -1,3 +1,4 @@
-+#!/bin/sh
- # exifautotran [list of files]
- #
- # Transforms Exif files so that Orientation becomes 1
+
Index: files/patch-jpegtran.1
===================================================================
RCS file: /usr/opt/cvs/freebsd-src/ports/graphics/jpeg/files/patch-jpegtran.1,v
retrieving revision 1.1
diff -u -r1.1 patch-jpegtran.1
--- files/patch-jpegtran.1 18 Mar 2004 14:53:47 -0000 1.1
+++ files/patch-jpegtran.1 30 Jul 2004 19:39:36 -0000
@@ -1,44 +1 @@
---- jpegtran.1.exif 1997-08-03 22:01:01.000000000 +0200
-+++ jpegtran.1 2003-09-30 14:35:36.000000000 +0200
-@@ -161,6 +161,14 @@
- Copy all extra markers. This setting preserves miscellaneous markers
- found in the source file, such as JFIF thumbnails and Photoshop settings.
- In some files these extra markers can be sizable.
-+See 'EXIF FILES' for special tratement of EXIF markers.
-+.TP
-+.B \-copy exif
-+This setting preserves the EXIF marker, commonly found in JPEG files produced
-+by digital cameras, in addition to any comment markers. If there is an EXIF
-+marker it is copied and the JFIF marker (incompatible with EXIF) is
-+omitted. If there is no EXIF marker a JFIF one is emitted as usual. See 'EXIF
-+FILES' for special tratement of EXIF markers.
- .PP
- The default behavior is
- .BR "\-copy comments" .
-@@ -189,6 +197,26 @@
- .B \-debug
- Same as
- .BR \-verbose .
-+.SH EXIF FILES
-+The EXIF variety of JPEG files, which are often produced by digital cameras,
-+are recognized by jpegtran as EXIF files (i.e. not as JFIF, the
-+usual variety of JPEG files). If the input file is recognized as EXIF (i.e.,
-+there is an EXIF marker and no JFIF marker) the '-copy exif' option is
-+automatically turned on if '-copy comments', or no '-copy' option, was
-+specified. Thus, unless '-copy none' is specified an EXIF file is kept as EXIF
-+and not converted to JFIF.
-+.PP
-+If a geometrical transformation is applied (e.g., rotate, transpose) the EXIF
-+width and height fields are set to the width and height of the output
-+image. Furthermore, the orientation field is reset to one, meaning tha the
-+orientation of the output image is upright (i.e. normal).
-+.PP
-+Note that an explicitely given '-copy exif' option will output an EXIF file if
-+the input is an EXIF file that was saved as JFIF, and that the EXIF marker is
-+still present. This option is useful for recovering EXIF files that where
-+converted to JFIF by a non EXIF-aware software. Note however, that the data in
-+the EXIF marker is not validated, unless a geometrical transformation is
-+applied.
- .SH EXAMPLES
- .LP
- This example converts a baseline JPEG file to progressive form:
+
--- jpeg-mmx-0.1.5.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list