Wed Aug 26 16:50:46 2009 UTC ()
Updating package graphics/jpeg from version 6bnb4 to 7
pkgsrc changes:
- update MASTER_SITES
- bump ApI_DEPENDS in buildlink3.mk
Upstream changes:
- The new features added with version 6bnb4 are now added upstream (except
exifautotran and jpegexiforient)
Version 7 27-Jun-2009
----------------------
New scaled DCTs implemented.
djpeg now supports scalings N/8 with all N from 1 to 16.
cjpeg now supports scalings 8/N with all N from 1 to 16.
Scaled DCTs with size larger than 8 are now also used for resolving the
common 2x2 chroma subsampling case without additional spatial resampling.
Separate spatial resampling for those kind of files is now only necessary
for N>8 scaling cases.
Furthermore, separate scaled DCT functions are provided for direct resolving
of the common asymmetric subsampling cases (2x1 and 1x2) without additional
spatial resampling.
cjpeg -quality option has been extended for support of separate quality
settings for luminance and chrominance (or in general, for every provided
quantization table slot).
New API function jpeg_default_qtables() and q_scale_factor array in library.
Added -nosmooth option to cjpeg, complementary to djpeg.
New variable "do_fancy_downsampling" in library, complement to fancy
upsampling. Fancy upsampling now uses direct DCT scaling with sizes
larger than 8. The old method is not reversible and has been removed.
Support arithmetic entropy encoding and decoding.
Added files jaricom.c, jcarith.c, jdarith.c.
Straighten the file structure:
Removed files jidctred.c, jcphuff.c, jchuff.h, jdphuff.c, jdhuff.h.
jpegtran has a new "lossless" cropping feature.
Implement -perfect option in jpegtran, new API function
jtransform_perfect_transform() in transupp. (DP 204_perfect.dpatch)
Better error messages for jpegtran fopen failure.
(DP 203_jpegtran_errmsg.dpatch)
Fix byte order issue with 16bit PPM/PGM files in rdppm.c/wrppm.c:
according to Netpbm, the de facto standard implementation of the PNM formats,
the most significant byte is first. (DP 203_rdppm.dpatch)
Add -raw option to rdjpgcom not to mangle the output.
(DP 205_rdjpgcom_raw.dpatch)
Make rdjpgcom locale aware. (DP 201_rdjpgcom_locale.dpatch)
Add extern "C" to jpeglib.h.
This avoids the need to put extern "C" { ... } around #include "jpeglib.h"
in your C++ application. Defining the symbol DONT_USE_EXTERN_C in the
configuration prevents this. (DP 202_jpeglib.h_c++.dpatch)
(sno)
diff -r1.37 -r1.38 pkgsrc/graphics/jpeg/Makefile
diff -r1.7 -r1.8 pkgsrc/graphics/jpeg/PLIST
diff -r1.7 -r1.8 pkgsrc/graphics/jpeg/distinfo
diff -r1.10 -r1.11 pkgsrc/graphics/jpeg/buildlink3.mk
diff -r1.10 -r0 pkgsrc/graphics/jpeg/patches/patch-aa
diff -r1.1 -r0 pkgsrc/graphics/jpeg/patches/patch-ab
diff -r1.1 -r0 pkgsrc/graphics/jpeg/patches/patch-ac
diff -r1.1 -r0 pkgsrc/graphics/jpeg/patches/patch-ad
diff -r1.1 -r0 pkgsrc/graphics/jpeg/patches/patch-ae
diff -r0 -r1.3 pkgsrc/graphics/jpeg/patches/patch-af
diff -r0 -r1.1 pkgsrc/graphics/jpeg/patches/patch-ag
--- pkgsrc/graphics/jpeg/Makefile 2007/08/01 11:47:15 1.37
+++ pkgsrc/graphics/jpeg/Makefile 2009/08/26 16:50:46 1.38
| @@ -1,39 +1,31 @@ | | | @@ -1,39 +1,31 @@ |
1 | # $NetBSD: Makefile,v 1.37 2007/08/01 11:47:15 obache Exp $ | | 1 | # $NetBSD: Makefile,v 1.38 2009/08/26 16:50:46 sno Exp $ |
2 | # | | 2 | # |
3 | | | 3 | |
4 | DISTNAME= jpegsrc.v6b | | 4 | DISTNAME= jpegsrc.v7 |
5 | PKGNAME= jpeg-6b | | 5 | PKGNAME= jpeg-7 |
6 | PKGREVISION= 4 | | | |
7 | CATEGORIES= graphics | | 6 | CATEGORIES= graphics |
8 | MASTER_SITES= ftp://ftp.fu-berlin.de/unix/graphics/jpeg/ \ | | 7 | MASTER_SITES= http://www.ijg.org/files/ |
9 | ftp://ftp.uu.net/graphics/jpeg/ | | | |
10 | | | 8 | |
11 | MAINTAINER= pkgsrc-users@NetBSD.org | | 9 | MAINTAINER= pkgsrc-users@NetBSD.org |
12 | HOMEPAGE= http://www.ijg.org/ | | 10 | HOMEPAGE= http://www.ijg.org/ |
13 | COMMENT= IJG's jpeg compression utilities | | 11 | COMMENT= IJG's jpeg compression utilities |
14 | | | 12 | |
15 | PKG_INSTALLATION_TYPES= overwrite pkgviews | | 13 | PKG_INSTALLATION_TYPES= overwrite pkgviews |
16 | PKG_DESTDIR_SUPPORT= user-destdir | | 14 | PKG_DESTDIR_SUPPORT= user-destdir |
17 | | | 15 | |
18 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} | | 16 | WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} |
19 | USE_LIBTOOL= yes | | 17 | USE_LIBTOOL= yes |
20 | GNU_CONFIGURE= yes | | 18 | GNU_CONFIGURE= yes |
21 | | | 19 | |
22 | CONFIGURE_ARGS+= --enable-shared | | | |
23 | CONFIGURE_ARGS+= --enable-static | | | |
24 | | | | |
25 | INSTALL_TARGET= install install-lib | | | |
26 | INSTALLATION_DIRS= bin lib include ${PKGMANDIR}/man1 | | 20 | INSTALLATION_DIRS= bin lib include ${PKGMANDIR}/man1 |
27 | | | 21 | |
28 | INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} | | | |
29 | | | | |
30 | post-extract: | | 22 | post-extract: |
31 | ${CP} ${FILESDIR}/jpegexiforient.c ${WRKSRC} | | 23 | ${CP} ${FILESDIR}/jpegexiforient.c ${WRKSRC} |
32 | | | 24 | |
33 | post-install: | | 25 | post-install: |
34 | ${INSTALL_SCRIPT} ${FILESDIR}/exifautotran ${DESTDIR}${PREFIX}/bin | | 26 | ${INSTALL_SCRIPT} ${FILESDIR}/exifautotran ${DESTDIR}${PREFIX}/bin |
35 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jpeg | | 27 | ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/doc/jpeg |
36 | ${INSTALL_DATA} ${WRKSRC}/*.doc ${DESTDIR}${PREFIX}/share/doc/jpeg | | 28 | ${INSTALL_DATA} ${WRKSRC}/*.txt ${DESTDIR}${PREFIX}/share/doc/jpeg |
37 | ${INSTALL_DATA} ${WRKSRC}/jpegint.h ${DESTDIR}${PREFIX}/include | | 29 | ${INSTALL_DATA} ${WRKSRC}/jpegint.h ${DESTDIR}${PREFIX}/include |
38 | | | 30 | |
39 | .include "../../mk/bsd.pkg.mk" | | 31 | .include "../../mk/bsd.pkg.mk" |
--- pkgsrc/graphics/jpeg/PLIST 2009/06/14 17:59:19 1.7
+++ pkgsrc/graphics/jpeg/PLIST 2009/08/26 16:50:46 1.8
| @@ -1,27 +1,27 @@ | | | @@ -1,27 +1,27 @@ |
1 | @comment $NetBSD: PLIST,v 1.7 2009/06/14 17:59:19 joerg Exp $ | | 1 | @comment $NetBSD: PLIST,v 1.8 2009/08/26 16:50:46 sno Exp $ |
2 | bin/cjpeg | | 2 | bin/cjpeg |
3 | bin/djpeg | | 3 | bin/djpeg |
4 | bin/exifautotran | | 4 | bin/exifautotran |
5 | bin/jpegexiforient | | 5 | bin/jpegexiforient |
6 | bin/jpegtran | | 6 | bin/jpegtran |
7 | bin/rdjpgcom | | 7 | bin/rdjpgcom |
8 | bin/wrjpgcom | | 8 | bin/wrjpgcom |
9 | include/jconfig.h | | 9 | include/jconfig.h |
10 | include/jerror.h | | 10 | include/jerror.h |
11 | include/jmorecfg.h | | 11 | include/jmorecfg.h |
12 | include/jpegint.h | | 12 | include/jpegint.h |
13 | include/jpeglib.h | | 13 | include/jpeglib.h |
14 | lib/libjpeg.la | | 14 | lib/libjpeg.la |
15 | man/man1/cjpeg.1 | | 15 | man/man1/cjpeg.1 |
16 | man/man1/djpeg.1 | | 16 | man/man1/djpeg.1 |
17 | man/man1/jpegtran.1 | | 17 | man/man1/jpegtran.1 |
18 | man/man1/rdjpgcom.1 | | 18 | man/man1/rdjpgcom.1 |
19 | man/man1/wrjpgcom.1 | | 19 | man/man1/wrjpgcom.1 |
20 | share/doc/jpeg/coderules.doc | | 20 | share/doc/jpeg/coderules.txt |
21 | share/doc/jpeg/filelist.doc | | 21 | share/doc/jpeg/filelist.txt |
22 | share/doc/jpeg/install.doc | | 22 | share/doc/jpeg/install.txt |
23 | share/doc/jpeg/jconfig.doc | | 23 | share/doc/jpeg/jconfig.txt |
24 | share/doc/jpeg/libjpeg.doc | | 24 | share/doc/jpeg/libjpeg.txt |
25 | share/doc/jpeg/structure.doc | | 25 | share/doc/jpeg/structure.txt |
26 | share/doc/jpeg/usage.doc | | 26 | share/doc/jpeg/usage.txt |
27 | share/doc/jpeg/wizard.doc | | 27 | share/doc/jpeg/wizard.txt |
--- pkgsrc/graphics/jpeg/distinfo 2008/03/28 09:01:30 1.7
+++ pkgsrc/graphics/jpeg/distinfo 2009/08/26 16:50:46 1.8
| @@ -1,10 +1,7 @@ | | | @@ -1,10 +1,7 @@ |
1 | $NetBSD: distinfo,v 1.7 2008/03/28 09:01:30 obache Exp $ | | 1 | $NetBSD: distinfo,v 1.8 2009/08/26 16:50:46 sno Exp $ |
2 | | | 2 | |
3 | SHA1 (jpegsrc.v6b.tar.gz) = 7079f0d6c42fad0cfba382cf6ad322add1ace8f9 | | 3 | SHA1 (jpegsrc.v7.tar.gz) = 88cced0fc3dbdbc82115e1d08abce4e9d23a4b47 |
4 | RMD160 (jpegsrc.v6b.tar.gz) = 18892206014fbb8cae2a44e281f4ed53feaf7882 | | 4 | RMD160 (jpegsrc.v7.tar.gz) = 6049c5fee2682c0757d4b51740abd981d1b24487 |
5 | Size (jpegsrc.v6b.tar.gz) = 613261 bytes | | 5 | Size (jpegsrc.v7.tar.gz) = 960379 bytes |
6 | SHA1 (patch-aa) = 6a02e633084aa91e2b6b1bbd5668d91e9ec2c321 | | 6 | SHA1 (patch-af) = 77d847be360338c0cde0eef34f670a289f56ea15 |
7 | SHA1 (patch-ab) = e57da4f693e638cf58b414bfbc50e21d80270109 | | 7 | SHA1 (patch-ag) = 9b72e28530eca39821ec5c7d1698435deba29b5b |
8 | SHA1 (patch-ac) = 6c34738effc7df671d4522b4ecca06dab640ed16 | | | |
9 | SHA1 (patch-ad) = 73afda7c2c849c93d1c1dd2c632e1e67a1db97dc | | | |
10 | SHA1 (patch-ae) = 4d2b3316df3a6b3ae9c0ef5099620f5f24300cca | | | |
--- pkgsrc/graphics/jpeg/buildlink3.mk 2009/03/20 19:24:41 1.10
+++ pkgsrc/graphics/jpeg/buildlink3.mk 2009/08/26 16:50:46 1.11
| @@ -1,13 +1,13 @@ | | | @@ -1,13 +1,13 @@ |
1 | # $NetBSD: buildlink3.mk,v 1.10 2009/03/20 19:24:41 joerg Exp $ | | 1 | # $NetBSD: buildlink3.mk,v 1.11 2009/08/26 16:50:46 sno Exp $ |
2 | | | 2 | |
3 | BUILDLINK_TREE+= jpeg | | 3 | BUILDLINK_TREE+= jpeg |
4 | | | 4 | |
5 | .if !defined(JPEG_BUILDLINK3_MK) | | 5 | .if !defined(JPEG_BUILDLINK3_MK) |
6 | JPEG_BUILDLINK3_MK:= | | 6 | JPEG_BUILDLINK3_MK:= |
7 | | | 7 | |
8 | BUILDLINK_API_DEPENDS.jpeg+= jpeg>=6b | | 8 | BUILDLINK_API_DEPENDS.jpeg+= jpeg>=7 |
9 | BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=6bnb2 | | 9 | #BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=7 |
10 | BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg | | 10 | BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg |
11 | .endif # JPEG_BUILDLINK3_MK | | 11 | .endif # JPEG_BUILDLINK3_MK |
12 | | | 12 | |
13 | BUILDLINK_TREE+= -jpeg | | 13 | BUILDLINK_TREE+= -jpeg |
--- Makefile.am.orig 2009-08-23 15:48:01.000000000 +0200
+++ Makefile.am 2009-08-23 15:49:50.000000000 +0200
@@ -75,7 +75,7 @@
endif
# Executables to build
-bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom
+bin_PROGRAMS = cjpeg djpeg jpegtran rdjpgcom wrjpgcom jpegexiforient
# Executable sources & libs
cjpeg_SOURCES = cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \
@@ -88,6 +88,8 @@
jpegtran_LDADD = libjpeg.la
rdjpgcom_SOURCES = rdjpgcom.c
wrjpgcom_SOURCES = wrjpgcom.c
+jpegexiforient_SOURCES = jpegexiforient.c
+jpegexiforient_LDADD = libjpeg.la
# Manual pages to install
man_MANS = $(DISTMANS)
--- Makefile.in.orig 2009-08-23 15:47:53.000000000 +0200
+++ Makefile.in 2009-08-23 15:56:25.000000000 +0200
@@ -46,7 +46,7 @@
ANSI2KNR = @ANSI2KNR@
@HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map
bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \
- rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT)
+ rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) jpegexiforient$(EXEEXT)
subdir = .
DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \
@@ -128,6 +128,9 @@
am_wrjpgcom_OBJECTS = wrjpgcom$U.$(OBJEXT)
wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS)
wrjpgcom_LDADD = $(LDADD)
+am_jpegexiforient_OBJECTS = jpegexiforient$U.$(OBJEXT)
+jpegexiforient_OBJECTS = $(am_jpegexiforient_OBJECTS)
+jpegexiforient_DEPENDENCIES = libjpeg.la
DEFAULT_INCLUDES = -I.@am__isrc@
depcomp = $(SHELL) $(top_srcdir)/depcomp
am__depfiles_maybe = depfiles
@@ -155,7 +158,8 @@
am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY))
am__v_GEN_0 = @echo " GEN " $@;
SOURCES = $(libjpeg_la_SOURCES) $(cjpeg_SOURCES) $(djpeg_SOURCES) \
- $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES)
+ $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES) \
+ $(jpegexiforient_SOURCES)
man1dir = $(mandir)/man1
NROFF = nroff
MANS = $(man_MANS)
@@ -369,6 +373,7 @@
jpegtran_LDADD = libjpeg.la
rdjpgcom_SOURCES = rdjpgcom.c
wrjpgcom_SOURCES = wrjpgcom.c
+jpegexiforient_SOURCES = jpegexiforient.c
# Manual pages to install
man_MANS = $(DISTMANS)
@@ -535,6 +540,9 @@
wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES)
@rm -f wrjpgcom$(EXEEXT)
$(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS)
+jpegexiforient$(EXEEXT): $(jpegexiforient_OBJECTS) $(jpegexiforient_DEPENDENCIES)
+ @rm -f jpegexiforient$(EXEEXT)
+ $(AM_V_CCLD)$(LINK) $(jpegexiforient_OBJECTS) $(jpegexiforient_LDADD) $(LIBS)
mostlyclean-compile:
-rm -f *.$(OBJEXT)
@@ -597,6 +605,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctfst$U.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctint$U.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmemmgr$U.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegexiforient$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegtran$U.Po@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant1$U.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant2$U.Plo@am__quote@
@@ -732,6 +741,8 @@
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jidctint.c; then echo $(srcdir)/jidctint.c; else echo jidctint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
jmemmgr_.c: jmemmgr.c $(ANSI2KNR)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jmemmgr.c; then echo $(srcdir)/jmemmgr.c; else echo jmemmgr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
+jpegexiforient_.c: jpegexiforient.c $(ANSI2KNR)
+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jpegexiforient.c; then echo $(srcdir)/jpegexiforient.c; else echo jpegexiforient.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
jpegtran_.c: jpegtran.c $(ANSI2KNR)
$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jpegtran.c; then echo $(srcdir)/jpegtran.c; else echo jpegtran.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
jquant1_.c: jquant1.c $(ANSI2KNR)
@@ -793,6 +804,7 @@
jfdctfst_.$(OBJEXT) jfdctfst_.lo jfdctint_.$(OBJEXT) jfdctint_.lo \
jidctflt_.$(OBJEXT) jidctflt_.lo jidctfst_.$(OBJEXT) jidctfst_.lo \
jidctint_.$(OBJEXT) jidctint_.lo jmemmgr_.$(OBJEXT) jmemmgr_.lo \
+jpegexiforient_.$(OBJEXT) jpegexiforient_.lo \
jpegtran_.$(OBJEXT) jpegtran_.lo jquant1_.$(OBJEXT) jquant1_.lo \
jquant2_.$(OBJEXT) jquant2_.lo jutils_.$(OBJEXT) jutils_.lo \
rdbmp_.$(OBJEXT) rdbmp_.lo rdcolmap_.$(OBJEXT) rdcolmap_.lo \