diff options
| author | dinoex <dinoex@FreeBSD.org> | 2009-07-18 11:11:29 +0000 |
|---|---|---|
| committer | dinoex <dinoex@FreeBSD.org> | 2009-07-18 11:11:29 +0000 |
| commit | f66043401d219e6bee08b710c77b732eb36060b5 (patch) | |
| tree | 33a2c0660e6aa1ee1be77151d2f351ab35b4d41b | |
| parent | d9ee3962c7bfd2113fa777e2f591f564ae12e107 (diff) | |
| download | FreeBSD-ports-f66043401d219e6bee08b710c77b732eb36060b5.zip FreeBSD-ports-f66043401d219e6bee08b710c77b732eb36060b5.tar.gz | |
- update to jpeg7
Tested by: pav on pointyhat
353 files changed, 956 insertions, 2552 deletions
diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk index cb8303e..0c8caf9 100644 --- a/Mk/bsd.gecko.mk +++ b/Mk/bsd.gecko.mk @@ -320,7 +320,7 @@ cairo_EXTRACT_AFTER_ARGS= --exclude mozilla/gfx/cairo dbm_EXTRACT_AFTER_ARGS= --exclude mozilla/dbm -jpeg_LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +jpeg_LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg jpeg_MOZ_OPTIONS= --with-system-jpeg=${LOCALBASE} jpeg_EXTRACT_AFTER_ARGS= --exclude mozilla/jpeg diff --git a/astro/boinc-setiathome-enhanced/Makefile b/astro/boinc-setiathome-enhanced/Makefile index 8904bedd..f5439af 100644 --- a/astro/boinc-setiathome-enhanced/Makefile +++ b/astro/boinc-setiathome-enhanced/Makefile @@ -6,7 +6,7 @@ PORTNAME= boinc-setiathome-enhanced PORTVERSION= ${SETI_PORTVERSION_FULL}.${AP_PORTVERSION_FULL} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= astro MASTER_SITES= ftp://rene-ladan.nl/pub/distfiles/ DISTFILES= astropulse-${AP_PORTVERSION_FULL}.tar.bz2 setiathome-${SETI_PORTVERSION_FULL}.tar.bz2 @@ -24,7 +24,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 \ ${LOCALBASE}/bin/bash:${PORTSDIR}/shells/bash RUN_DEPENDS= boinc_client:${PORTSDIR}/net/boinc-client LIB_DEPENDS= fftw3f:${PORTSDIR}/math/fftw3-float \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ xcb.2:${PORTSDIR}/x11/libxcb USE_GL= gl glu glut diff --git a/astro/celestia/Makefile b/astro/celestia/Makefile index e272c75..eaeb8ab 100644 --- a/astro/celestia/Makefile +++ b/astro/celestia/Makefile @@ -7,7 +7,7 @@ PORTNAME= celestia PORTVERSION= 1.4.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= astro MASTER_SITES= SF PKGNAMESUFFIX= -${CELESTIA_UI} @@ -15,7 +15,7 @@ PKGNAMESUFFIX= -${CELESTIA_UI} MAINTAINER= danfe@FreeBSD.org COMMENT= Scriptable space flight simulator for X -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_AUTOTOOLS= libtool:15 diff --git a/astro/gaia/Makefile b/astro/gaia/Makefile index b49439d..aed0060 100644 --- a/astro/gaia/Makefile +++ b/astro/gaia/Makefile @@ -7,7 +7,7 @@ PORTNAME= gaia PORTVERSION= 0.1.2 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro MASTER_SITES= SF MASTER_SITE_SUBDIR= gaia-clean @@ -16,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Display geographic maps with optional GPS tracking support LIB_DEPENDS= curl.5:${PORTSDIR}/ftp/curl \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/astro/openuniverse/Makefile b/astro/openuniverse/Makefile index c3dcb51..b9a0029 100644 --- a/astro/openuniverse/Makefile +++ b/astro/openuniverse/Makefile @@ -7,14 +7,14 @@ PORTNAME= openuniverse DISTVERSION= 1.0beta3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= astro MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= OpenGL Solar System simulator for X Window System -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= glut diff --git a/astro/stellarium/Makefile b/astro/stellarium/Makefile index 2270601..e46e9a8 100644 --- a/astro/stellarium/Makefile +++ b/astro/stellarium/Makefile @@ -7,6 +7,7 @@ PORTNAME= stellarium PORTVERSION= 0.10.2 +PORTREVISION= 1 CATEGORIES= astro MASTER_SITES= SF @@ -14,7 +15,7 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= A 3D photo-realistic sky renderer LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 diff --git a/astro/sunclock/Makefile b/astro/sunclock/Makefile index 81d8d74..888f3b2 100644 --- a/astro/sunclock/Makefile +++ b/astro/sunclock/Makefile @@ -8,7 +8,7 @@ PORTNAME= sunclock PORTVERSION= 3.56 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro x11-clocks MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \ http://mbsd.msk.ru/dist/ @@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/sunclock/ \ MAINTAINER= stas@FreeBSD.org COMMENT= Shows which portion of the Earth's surface is illuminated by the Sun -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/astro/xephem/Makefile b/astro/xephem/Makefile index a672f6a..7e79952 100644 --- a/astro/xephem/Makefile +++ b/astro/xephem/Makefile @@ -7,7 +7,7 @@ PORTNAME= xephem PORTVERSION= 3.7.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= astro MASTER_SITES= # http://www.clearskyinstitute.com/xephem/ @@ -15,7 +15,7 @@ MAINTAINER= jpaetzel@FreeBSD.org COMMENT= An interactive astronomical ephemeris program LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_MOTIF= yes USE_GMAKE= yes diff --git a/astro/xplanet/Makefile b/astro/xplanet/Makefile index 7670dab..6ce7a7b 100644 --- a/astro/xplanet/Makefile +++ b/astro/xplanet/Makefile @@ -7,7 +7,7 @@ PORTNAME= xplanet PORTVERSION= 1.2.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro geography MASTER_SITES= SF @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --without-gif .if !defined(WITHOUT_JPEG) CONFIGURE_ARGS+= --with-jpeg -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg .else CONFIGURE_ARGS+= --without-jpeg .endif diff --git a/astro/xrmap/Makefile b/astro/xrmap/Makefile index 662e059..ddb7a52 100644 --- a/astro/xrmap/Makefile +++ b/astro/xrmap/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrmap PORTVERSION= 2.33 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= astro geography MASTER_SITES= ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/data/:data \ ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/:src @@ -18,7 +18,7 @@ EXTRACT_ONLY= ${SRCFILE} ${DATAFILES} MAINTAINER= serge.gagnon.1@ulaval.ca COMMENT= Map portions of the earth from a given longitude/latitude -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/audio/enscribe/Makefile b/audio/enscribe/Makefile index f25ccc0..011993e 100644 --- a/audio/enscribe/Makefile +++ b/audio/enscribe/Makefile @@ -7,6 +7,7 @@ PORTNAME= enscribe PORTVERSION= 0.1.0 +PORTREVISION= 1 CATEGORIES= audio graphics MASTER_SITES= http://www.coppercloudmusic.com/enscribe/ EXTRACT_SUFX= .tgz @@ -16,7 +17,7 @@ COMMENT= Create digital audio watermark images from photographic images LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ gd.4:${PORTSDIR}/graphics/gd \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/biology/protomol/Makefile b/biology/protomol/Makefile index 72a1cbd..59447ad 100644 --- a/biology/protomol/Makefile +++ b/biology/protomol/Makefile @@ -6,7 +6,7 @@ PORTNAME= protomol PORTVERSION= 2.0.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= biology MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -17,7 +17,7 @@ MAINTAINER= sangwoos@gmail.com COMMENT= OO, component based, framework for molecular dynamics (MD) simulations LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff GNU_CONFIGURE= yes diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index 60c8699..7d90802 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -7,6 +7,7 @@ PORTNAME= gmsh PORTVERSION= 2.3.1 +PORTREVISION= 1 CATEGORIES= cad MASTER_SITES= http://www.sfr-fresh.com/unix/privat/ \ http://www.geuz.org/gmsh/src/ @@ -17,7 +18,8 @@ MAINTAINER= stephen@missouri.edu COMMENT= An automatic 3D finite element mesh generator RUN_DEPENDS= getdp:${PORTSDIR}/science/getdp -LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk +LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ + jpeg.10:${PORTSDIR}/graphics/jpeg SLAVEDIRS= cad/gmsh-occ diff --git a/cad/leocad/Makefile b/cad/leocad/Makefile index 6e9d727..ec4ed73 100644 --- a/cad/leocad/Makefile +++ b/cad/leocad/Makefile @@ -7,7 +7,7 @@ PORTNAME= leocad PORTVERSION= 0.73 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= cad MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= arved @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A CAD program that uses bricks similar to those found in many toys EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GL= glut diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index 0990408..b877f14 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -7,6 +7,7 @@ PORTNAME= hylafax PORTVERSION= 6.0.2 +PORTREVISION= 1 CATEGORIES= comms MASTER_SITES= ftp://ftp.hylafax.org/source/ diff --git a/comms/ktrack/Makefile b/comms/ktrack/Makefile index bd5a9a0..e1b5349 100644 --- a/comms/ktrack/Makefile +++ b/comms/ktrack/Makefile @@ -6,7 +6,7 @@ PORTNAME= ktrack PORTVERSION= 0.3.0r1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ktrack diff --git a/comms/xastir/Makefile b/comms/xastir/Makefile index 7433557..93ec4d6 100644 --- a/comms/xastir/Makefile +++ b/comms/xastir/Makefile @@ -7,7 +7,7 @@ PORTNAME= xastir PORTVERSION= 1.9.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= comms hamradio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= xastir diff --git a/databases/clip/Makefile b/databases/clip/Makefile index 1214080..03eea64 100644 --- a/databases/clip/Makefile +++ b/databases/clip/Makefile @@ -7,6 +7,7 @@ PORTNAME= clip DISTVERSION= 1.2.0-0 +PORTREVISION= 1 CATEGORIES= databases lang MASTER_SITES= SF/x-clip DISTNAME= ${PORTNAME}-prg-${DISTVERSION} @@ -19,7 +20,7 @@ COMMENT= Object oriented, xBase and Clipper language compatible compiler BUILD_DEPENDS= bash:${PORTSDIR}/shells/bash \ wget:${PORTSDIR}/ftp/wget \ imake:${PORTSDIR}/devel/imake -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 \ gtkextra.17:${PORTSDIR}/x11-toolkits/gtkextra \ diff --git a/databases/grass/Makefile b/databases/grass/Makefile index 387df1d..16a4222 100644 --- a/databases/grass/Makefile +++ b/databases/grass/Makefile @@ -7,7 +7,7 @@ PORTNAME= grass PORTVERSION= 6.2.3 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 2 CATEGORIES= databases geography MASTER_SITES= http://grass.itc.it/grass62/source/ \ @@ -33,7 +33,7 @@ RUN_DEPENDS= proj:${PORTSDIR}/graphics/proj \ bash:${PORTSDIR}/shells/bash LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ fftw.2:${PORTSDIR}/math/fftw \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/deskutils/aspostit/Makefile b/deskutils/aspostit/Makefile index bab76a2..bddf278 100644 --- a/deskutils/aspostit/Makefile +++ b/deskutils/aspostit/Makefile @@ -7,7 +7,7 @@ PORTNAME= aspostit PORTVERSION= 1.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= deskutils MASTER_SITES= ${MASTER_SITE_AFTERSTEP} MASTER_SITE_SUBDIR= apps/aspostit @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/aspostit MAINTAINER= ports@FreeBSD.org COMMENT= An AfterStep dockable version of XPostIt -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg/ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg/ USE_XORG= xpm xaw xext x11 USE_GMAKE= yes diff --git a/devel/clanlib/Makefile b/devel/clanlib/Makefile index 955b533..979d3053 100644 --- a/devel/clanlib/Makefile +++ b/devel/clanlib/Makefile @@ -8,7 +8,7 @@ PORTNAME= clanlib PORTVERSION= 0.8.1 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= devel MASTER_SITES= http://www.clanlib.org/download/releases-0.8/ \ @@ -20,7 +20,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= carpetsmoker@xs4all.nl COMMENT= Cross-platform game SDK -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ mikmod:${PORTSDIR}/audio/libmikmod \ vorbis:${PORTSDIR}/audio/libvorbis diff --git a/devel/directfb/Makefile b/devel/directfb/Makefile index 52ac0a2..35297d9 100644 --- a/devel/directfb/Makefile +++ b/devel/directfb/Makefile @@ -7,6 +7,7 @@ PORTNAME= directfb PORTVERSION= 1.1.1 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.directfb.org/downloads/Core/ \ http://www.directfb.org/downloads/Old/ @@ -15,7 +16,7 @@ DISTNAME= DirectFB-${PORTVERSION} MAINTAINER= anatoly.borodin@gmail.com COMMENT= Graphic development lightweight API -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS}" LDFLAGS="${PTHREAD_LIBS}" diff --git a/devel/eet/Makefile b/devel/eet/Makefile index 1dd0dac..c87facb 100644 --- a/devel/eet/Makefile +++ b/devel/eet/Makefile @@ -7,7 +7,7 @@ PORTNAME= eet PORTVERSION= 0.9.10.042 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= devel MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ @@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ MAINTAINER= stas@FreeBSD.org COMMENT= Enlightenment Data Handling Library -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile index 8c850bd..58b327b 100644 --- a/devel/kscope/Makefile +++ b/devel/kscope/Makefile @@ -7,7 +7,7 @@ PORTNAME= kscope PORTVERSION= 1.6.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel kde MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=${PORTNAME}/ @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=${PORTNAME}/ MAINTAINER= frank@exit.com COMMENT= KDE front-end to Cscope -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= exctags:${PORTSDIR}/devel/ctags \ cscope:${PORTSDIR}/devel/cscope \ dot:${PORTSDIR}/graphics/graphviz diff --git a/devel/kyra/Makefile b/devel/kyra/Makefile index 3a78e3e..9a3813e 100644 --- a/devel/kyra/Makefile +++ b/devel/kyra/Makefile @@ -7,7 +7,7 @@ PORTNAME= kyra PORTVERSION= 2.0.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= devel MASTER_SITES= SF DISTNAME= ${PORTNAME}_src_${PORTVERSION:S/./_/g} @@ -17,7 +17,7 @@ COMMENT= A simple Sprite engine written in C++ LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/devel/libclaw/Makefile b/devel/libclaw/Makefile index 7dac25b..71ed19c 100644 --- a/devel/libclaw/Makefile +++ b/devel/libclaw/Makefile @@ -7,14 +7,14 @@ PORTNAME= libclaw PORTVERSION= 1.5.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ Library Absolutely Wonderful -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/devel/p5-SDL/Makefile b/devel/p5-SDL/Makefile index 92d5ffb..540092e 100644 --- a/devel/p5-SDL/Makefile +++ b/devel/p5-SDL/Makefile @@ -5,6 +5,7 @@ PORTNAME= SDL PORTVERSION= 2.1.3 +PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN} MASTER_SITE_SUBDIR= ../../authors/id/D/DG/DGOEHRIG @@ -15,7 +16,7 @@ MAINTAINER= spam@rm-rf.kiev.ua COMMENT= Perl Bindings for SDL LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_PERL5= yes USE_SDL= sdl diff --git a/devel/pikdev/Makefile b/devel/pikdev/Makefile index 251009a..a54f198 100644 --- a/devel/pikdev/Makefile +++ b/devel/pikdev/Makefile @@ -7,7 +7,7 @@ PORTNAME= pikdev PORTVERSION= 0.9.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel kde MASTER_SITES= http://pikdev.free.fr/ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -17,7 +17,7 @@ COMMENT= Simple graphic IDE for the development of PIC-based applications LIB_DEPENDS= fam.0:${PORTSDIR}/devel/gamin \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= gpasm:${PORTSDIR}/devel/gputils USE_KDEBASE_VER=3 diff --git a/devel/root/Makefile b/devel/root/Makefile index f284411..fd320c7 100644 --- a/devel/root/Makefile +++ b/devel/root/Makefile @@ -7,7 +7,7 @@ PORTNAME= root PORTVERSION= 5.02.00 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= devel science math MASTER_SITES= ftp://root.cern.ch/root/ DISTNAME= ${PORTNAME}_v${PORTVERSION}.source @@ -30,7 +30,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME} F77?= f77 LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png LIB_DEPENDS+= gmp.8:${PORTSDIR}/math/libgmp4 diff --git a/devel/simgear/Makefile b/devel/simgear/Makefile index 40cd902..d98d3bc 100644 --- a/devel/simgear/Makefile +++ b/devel/simgear/Makefile @@ -7,7 +7,7 @@ PORTNAME= SimGear PORTVERSION= 1.9.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel games MASTER_SITES= ftp://ftp.de.simgear.org/pub/simgear/Source/ \ ftp://ftp.simgear.org/pub/simgear/Source/ @@ -18,7 +18,7 @@ COMMENT= A toolkit for 3D games and simulations BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= openal.0:${PORTSDIR}/audio/openal \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ alut.1:${PORTSDIR}/audio/freealut \ boost_thread.4:${PORTSDIR}/devel/boost diff --git a/devel/synfig/Makefile b/devel/synfig/Makefile index 0acb10a..dfc8522 100644 --- a/devel/synfig/Makefile +++ b/devel/synfig/Makefile @@ -7,6 +7,7 @@ PORTNAME= synfig DISTVERSION= 0.61.09 +PORTREVISION= 1 CATEGORIES= devel graphics multimedia MASTER_SITES= SF diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile index c4484df..fcc2f52 100644 --- a/editors/abiword/Makefile +++ b/editors/abiword/Makefile @@ -8,7 +8,7 @@ PORTNAME= abiword PORTVERSION= 2.6.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors MASTER_SITES= http://www.abisource.com/downloads/%SUBDIR%/${PORTVERSION}/source/ MASTER_SITE_SUBDIR= abiword @@ -22,6 +22,7 @@ BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ png.5:${PORTSDIR}/graphics/png \ wv-1.2:${PORTSDIR}/textproc/wv \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ fribidi.0:${PORTSDIR}/converters/fribidi \ goffice-0.4:${PORTSDIR}/devel/goffice04 RUN_DEPENDS= ${LOCALBASE}/lib/X11/fonts/dejavu/DejaVuSerif.ttf:${PORTSDIR}/x11-fonts/dejavu diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index c410b99..6da094e 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU_ALPHA} MASTER_SITE_SUBDIR= emacs/pretest @@ -21,7 +22,7 @@ USE_XORG+= xaw xft xpm .else USE_GNOME= gtk20 .endif -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 3506a6a..a6667e7 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +19,7 @@ COMMENT= GNU editing macros .if defined(WITHOUT_GTK) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d .endif -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index fface6a..7ee6a0c 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -7,7 +7,7 @@ PORTNAME= emacs PORTVERSION= 21.3 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU:C/\/gnu\//\/old-gnu\//g} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -27,7 +27,7 @@ CONFLICTS= emacs-19.* emacs-22.* \ .if !defined(WITHOUT_X11) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index 3506a6a..a6667e7 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +19,7 @@ COMMENT= GNU editing macros .if defined(WITHOUT_GTK) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d .endif -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 3506a6a..a6667e7 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -7,6 +7,7 @@ PORTNAME= emacs PORTVERSION= ${EMACS_VER} +PORTREVISION= 1 CATEGORIES= editors ipv6 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -18,7 +19,7 @@ COMMENT= GNU editing macros .if defined(WITHOUT_GTK) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d .endif -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png diff --git a/editors/rospell/Makefile b/editors/rospell/Makefile index 99772aa..03e1593 100644 --- a/editors/rospell/Makefile +++ b/editors/rospell/Makefile @@ -6,7 +6,7 @@ PORTNAME= rospell DISTVERSION= 2007.02.rc1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= editors textproc # this should/will be romanian ;) MASTER_SITES= SF diff --git a/editors/xemacs-devel-mule/Makefile b/editors/xemacs-devel-mule/Makefile index e3d2daf..05a18fc 100644 --- a/editors/xemacs-devel-mule/Makefile +++ b/editors/xemacs-devel-mule/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-devel-mule PORTVERSION= ${XEMACS_VER:S/-/./} -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -38,7 +38,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${ RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs-devel-mule .endif .if !defined(WITHOUT_X11) -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ compface.1:${PORTSDIR}/mail/faces diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index 6c82759..8b7275b 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-devel PORTVERSION= ${XEMACS_VER:S/-/./} -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} @@ -25,7 +25,7 @@ CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDIR}/editors/xemacs-packages .if !defined(WITHOUT_X11) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ compface.1:${PORTSDIR}/mail/faces diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 6161bec..6342608 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -7,6 +7,7 @@ PORTNAME= xemacs PORTVERSION= ${XEMACS_VER} +PORTREVISION= 1 CATEGORIES= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -89,7 +90,7 @@ RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs/xemacs-packages/etc/enriched.doc:${PORTSDI .endif .if !defined(WITHOUT_X11) LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --with-png --with-jpeg --with-tiff USE_XORG= xpm x11 diff --git a/editors/xemacs21-mule/Makefile b/editors/xemacs21-mule/Makefile index 0e0b617..d9383d4 100644 --- a/editors/xemacs21-mule/Makefile +++ b/editors/xemacs21-mule/Makefile @@ -7,7 +7,7 @@ PORTNAME= xemacs-mule PORTVERSION= ${XEMACS_VER} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES+= editors MASTER_SITES= ${MASTER_SITE_XEMACS} MASTER_SITE_SUBDIR= xemacs-${XEMACS_REL} @@ -37,7 +37,7 @@ RUN_DEPENDS= ${LOCALBASE}/lib/xemacs/mule-packages/pkginfo/MANIFEST.mule-base:${ .if defined(PKGNAMEPREFIX) RUN_DEPENDS+= ${LOCALBASE}/lib/xemacs-${XEMACS_VER}/lisp/x-win-xfree86.elc:${PORTSDIR}/editors/xemacs21-mule .endif -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ compface.1:${PORTSDIR}/mail/faces diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile index 3c00286..0ed9f06 100644 --- a/emulators/gcube/Makefile +++ b/emulators/gcube/Makefile @@ -7,7 +7,7 @@ PORTNAME= gcube PORTVERSION= 0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= emulators MASTER_SITES= http://www.liquidx.org/distfiles/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= Gamecube emulator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${PORTVERSION} USE_GL= yes diff --git a/emulators/generator-cbiere/Makefile b/emulators/generator-cbiere/Makefile index 7429768..a913ea5 100644 --- a/emulators/generator-cbiere/Makefile +++ b/emulators/generator-cbiere/Makefile @@ -7,6 +7,7 @@ PORTNAME= generator PORTVERSION= 0.35.r4 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= http://www.squish.net/generator/cbiere/generator/ @@ -16,7 +17,7 @@ DISTNAME= ${PORTNAME}-0.35${PKGNAMESUFFIX}-r4 MAINTAINER= alepulver@FreeBSD.org COMMENT= SEGA Genesis emulator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes USE_SDL= sdl diff --git a/emulators/generator/Makefile b/emulators/generator/Makefile index f9e3c85..778117f 100644 --- a/emulators/generator/Makefile +++ b/emulators/generator/Makefile @@ -7,14 +7,14 @@ PORTNAME= generator PORTVERSION= 0.35 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= emulators MASTER_SITES= http://www.squish.net/generator/files/ MAINTAINER= alepulver@FreeBSD.org COMMENT= SEGA Genesis emulator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GNOME= gtk12 USE_SDL= sdl diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index c68fc4b..daff10a 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= wine DISTVERSION= 1.1.25 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SFE \ @@ -19,7 +20,7 @@ COMMENT= Microsoft Windows compatibility layer for Unix-like systems LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms \ png.5:${PORTSDIR}/graphics/png \ xml2:${PORTSDIR}/textproc/libxml2 diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index c68fc4b..daff10a 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -8,6 +8,7 @@ PORTNAME= wine DISTVERSION= 1.1.25 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SFE \ @@ -19,7 +20,7 @@ COMMENT= Microsoft Windows compatibility layer for Unix-like systems LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms \ png.5:${PORTSDIR}/graphics/png \ xml2:${PORTSDIR}/textproc/libxml2 diff --git a/emulators/xsystem35/Makefile b/emulators/xsystem35/Makefile index bc32d5b..17aab62 100644 --- a/emulators/xsystem35/Makefile +++ b/emulators/xsystem35/Makefile @@ -7,7 +7,7 @@ PORTNAME= xsystem35 PORTVERSION= 1.7.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= emulators MASTER_SITES= http://8ne.sakura.ne.jp:20008/chika/unitbase/xsys35/down/ @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= AliceSoft System 3.5/3.6/3.8/3.9 on X Window System LIB_DEPENDS= vorbis.4:${PORTSDIR}/audio/libvorbis \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_AUTOTOOLS= autoconf:262 libtool:15 USE_GETTEXT= yes diff --git a/french/xtel/Makefile b/french/xtel/Makefile index b6ab577..b882aba 100644 --- a/french/xtel/Makefile +++ b/french/xtel/Makefile @@ -7,14 +7,14 @@ PORTNAME= xtel PORTVERSION= 3.3.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= french comms emulators MASTER_SITES= http://pficheux.free.fr/xtel/download/ MAINTAINER= thierry@FreeBSD.org COMMENT= An emulator for the french Minitel -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS= bdftopcf:${PORTSDIR}/x11-fonts/bdftopcf \ mkfontdir:${PORTSDIR}/x11-fonts/mkfontdir \ mkfontscale:${PORTSDIR}/x11-fonts/mkfontscale diff --git a/games/adgali/Makefile b/games/adgali/Makefile index 0bd2c10..b73c954 100644 --- a/games/adgali/Makefile +++ b/games/adgali/Makefile @@ -8,14 +8,14 @@ PORTNAME= adgali PORTVERSION= 0.2.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games devel MASTER_SITES= http://adgali.apiou.org/download/ MAINTAINER= gahr@FreeBSD.org COMMENT= An open source game library useful for 2D game development -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ freetype.9:${PORTSDIR}/print/freetype2 \ diff --git a/games/alienarena/Makefile b/games/alienarena/Makefile index 42fb18d..366ec8d 100644 --- a/games/alienarena/Makefile +++ b/games/alienarena/Makefile @@ -7,6 +7,7 @@ PORTNAME= alienarena PORTVERSION= 2008.721 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= ftp://ftp.linux.kiev.ua/pub/Linux/Gentoo/distfiles/ \ http://ftp.jeuxlinux.fr/files/ \ @@ -43,7 +44,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .if defined(WITH_CLIENT) LIB_DEPENDS+= curl.5:${PORTSDIR}/ftp/curl \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GL= yes USE_XORG= xxf86dga diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index e03550e..0a791ac 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -7,7 +7,7 @@ PORTNAME= allacrost PORTVERSION= 0.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF DISTNAME= allacrost_demo_source_${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A single player 2D role-playing game BUILD_DEPENDS= ${LOCALBASE}/lib/libluabind.a:${PORTSDIR}/devel/luabind -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ openal.0:${PORTSDIR}/audio/openal \ ogg.6:${PORTSDIR}/audio/libogg \ diff --git a/games/armagetron/Makefile b/games/armagetron/Makefile index 0ee7fdb..14595fb 100644 --- a/games/armagetron/Makefile +++ b/games/armagetron/Makefile @@ -8,6 +8,7 @@ PORTNAME= armagetron PORTVERSION= 0.2.8.2.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF/armagetronad DISTNAME= armagetronad-${PORTVERSION} @@ -24,7 +25,7 @@ CONFIGURE_ENV= CXXFLAGS="${CFLAGS} -I${LOCALBASE}/include `${SDL_CONFIG} --cflag CONFIGURE_ARGS= --disable-etc BUILD_DEPENDS+= bash:${PORTSDIR}/shells/bash -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ xml2.5:${PORTSDIR}/textproc/libxml2 diff --git a/games/cake/Makefile b/games/cake/Makefile index d115b3f..f19cc29 100644 --- a/games/cake/Makefile +++ b/games/cake/Makefile @@ -7,7 +7,7 @@ PORTNAME= cake PORTVERSION= 2005.12.26 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://www.calodox.scene.org/morbac/cake/download/ \ ${MASTER_SITE_LOCAL} http://freebsd.nsu.ru/distfiles/ @@ -38,7 +38,7 @@ LIB_DEPENDS= glut.11:${PORTSDIR}/graphics/freeglut .else USE_GL= glut .endif -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg post-patch: .SILENT ${FIND} -E ${WRKDIR} -type f \( -iregex ".*\.(cpp|h)" -or \ diff --git a/games/crrcsim/Makefile b/games/crrcsim/Makefile index d080e48..fe542d6 100644 --- a/games/crrcsim/Makefile +++ b/games/crrcsim/Makefile @@ -7,7 +7,7 @@ PORTNAME= crrcsim PORTVERSION= 0.9.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= BERLIOS @@ -16,7 +16,7 @@ COMMENT= Model-airplane flight simulation program BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= portaudio.2:${PORTSDIR}/audio/portaudio2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes USE_GMAKE= yes diff --git a/games/demonquake/Makefile b/games/demonquake/Makefile index e35a97d..4d27fbf 100644 --- a/games/demonquake/Makefile +++ b/games/demonquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= demonquake PORTVERSION= 0.16.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/ DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -17,7 +17,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= alepulver@FreeBSD.org COMMENT= Another improved Quake engine based on FuhQuake -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GMAKE= yes diff --git a/games/edge/Makefile b/games/edge/Makefile index 2ccd95c..d1111a1 100644 --- a/games/edge/Makefile +++ b/games/edge/Makefile @@ -7,7 +7,7 @@ PORTNAME= edge PORTVERSION= 1.29 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-source @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= DOOM style engine aimed at the Total Conversion developer LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis diff --git a/games/egl/Makefile b/games/egl/Makefile index 08dfee4..1a23299 100644 --- a/games/egl/Makefile +++ b/games/egl/Makefile @@ -7,7 +7,7 @@ PORTNAME= egl PORTVERSION= 0.3.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://egl.quakedev.com/files/:src \ ftp://ftp.alepulver.com.ar/distfiles/:data @@ -40,7 +40,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .include <bsd.port.pre.mk> .if defined(WITH_CLIENT) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GL= yes PLIST_SUB+= CLIENT="" diff --git a/games/ezquake/Makefile b/games/ezquake/Makefile index a1e67ff..571ab51 100644 --- a/games/ezquake/Makefile +++ b/games/ezquake/Makefile @@ -7,6 +7,7 @@ PORTNAME= ezquake PORTVERSION= 1.9 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= games MASTER_SITES= SF:ezquake \ @@ -46,7 +47,7 @@ IGNORE= needs at least one interface (GLX or X11) .endif .if !defined(WITHOUT_GLX) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= yes ALL_TARGET+= glx PLIST_SUB+= GLX="" diff --git a/games/flightgear-atlas/Makefile b/games/flightgear-atlas/Makefile index f34353e..22ca096 100644 --- a/games/flightgear-atlas/Makefile +++ b/games/flightgear-atlas/Makefile @@ -7,6 +7,7 @@ PORTNAME= flightgear-atlas PORTVERSION= 0.3.1.20090529 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://contribs.martymac.com/FreeBSD-ports/distfiles/ \ http://freebsd.unixfreunde.de/sources/ @@ -18,7 +19,7 @@ COMMENT= A map viewer for use with the FlightGear flight simulator BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ curl.5:${PORTSDIR}/ftp/curl RUN_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib \ ${LOCALBASE}/include/simgear/version.h:${PORTSDIR}/devel/simgear \ diff --git a/games/fteqw/Makefile b/games/fteqw/Makefile index f21875d..1440adc 100644 --- a/games/fteqw/Makefile +++ b/games/fteqw/Makefile @@ -7,7 +7,7 @@ PORTNAME= fteqw PORTVERSION= 3343 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF DISTNAME= ftesrc${PORTVERSION}-all @@ -41,7 +41,7 @@ FTE_TARGETS+= fteqw.sv .endif .if !defined(WITHOUT_GL) || !defined(WITHOUT_SDL) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis .endif diff --git a/games/fuhquake/Makefile b/games/fuhquake/Makefile index 5e91fe3..e4ac458 100644 --- a/games/fuhquake/Makefile +++ b/games/fuhquake/Makefile @@ -7,7 +7,7 @@ PORTNAME= fuhquake PORTVERSION= 0.31 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://www.fuhquake.net/files/releases/v${PORTVERSION}/ \ ftp://gibbage.mine.nu/clients/fuhquake/releases/v${PORTVERSION}/ \ @@ -46,7 +46,7 @@ IGNORE= needs at least one client (GLX or X11) .if defined(WITH_GLX) USE_GL= yes LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_SUB+= GLX="" CLIENTS+= glx .else diff --git a/games/gracer/Makefile b/games/gracer/Makefile index b104972..90d2e0a 100644 --- a/games/gracer/Makefile +++ b/games/gracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= gracer PORTVERSION= 0.1.5 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= SF @@ -17,7 +17,7 @@ COMMENT= A 3D motor sport simulator BUILD_DEPENDS= ${LOCALBASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tcl84.1:${PORTSDIR}/lang/tcl84 USE_GL= glut diff --git a/games/jigzo/Makefile b/games/jigzo/Makefile index 58646b6..39521b8 100644 --- a/games/jigzo/Makefile +++ b/games/jigzo/Makefile @@ -7,6 +7,7 @@ PORTNAME= jigzo PORTVERSION= 0.6.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.iua.upf.es/~mdeboer/resorama/jigzo/ \ http://mirror.amdmi3.ru/ @@ -16,7 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= An OpenGL jigsaw puzzle game LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_SDL= sdl mixer USE_GL= gl diff --git a/games/joequake/Makefile b/games/joequake/Makefile index 6557501..6cd631f0 100644 --- a/games/joequake/Makefile +++ b/games/joequake/Makefile @@ -7,7 +7,7 @@ PORTNAME= joequake PORTVERSION= 0.15b1329 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://runecentral.com/joequake/ DISTNAME= ${PORTNAME}-v${PORTVERSION}-source @@ -44,7 +44,7 @@ IGNORE= needs at least one interface (GLX or X11) .if !defined(WITHOUT_GLX) USE_GL= yes -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg ALL_TARGET+= glx PLIST_SUB+= GLX="" .else diff --git a/games/kmquake2/Makefile b/games/kmquake2/Makefile index 7272122..afa0675 100644 --- a/games/kmquake2/Makefile +++ b/games/kmquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= kmquake2 PORTVERSION= 0.19 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/KMQuake2/:src \ http://qexpo2005.quakedev.com/uploaded/54/:data \ @@ -87,7 +87,7 @@ MAKE_ENV+= KMQ2_ADDONS="${KMQ2_ADDONS:S/-1${EXTRACT_SUFX}//}" .endif .if !defined(WITHOUT_CLIENT) || !defined(WITHOUT_SDL) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ openal.0:${PORTSDIR}/audio/openal \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis diff --git a/games/macopix/Makefile b/games/macopix/Makefile index fc43ca3..c3a65bb 100644 --- a/games/macopix/Makefile +++ b/games/macopix/Makefile @@ -7,6 +7,7 @@ PORTNAME= macopix PORTVERSION= 1.7.4 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://rosegray.sakura.ne.jp/macopix/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${RESTRICTED_FILES} @@ -15,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Window sitter for X11 LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff RESTRICTED= 'contains commercial character data' diff --git a/games/neverball/Makefile b/games/neverball/Makefile index ee599d1..054c0d7 100644 --- a/games/neverball/Makefile +++ b/games/neverball/Makefile @@ -7,7 +7,7 @@ PORTNAME= neverball PORTVERSION= 1.5.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://offload1.icculus.org:9090/neverball/ \ http://offload2.icculus.org:9090/neverball/ \ @@ -18,7 +18,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Tilt the floor to guide a ball through an obstacle course LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ vorbis.4:${PORTSDIR}/audio/libvorbis USE_GL= gl diff --git a/games/openalchemist/Makefile b/games/openalchemist/Makefile index de53973..485055c 100644 --- a/games/openalchemist/Makefile +++ b/games/openalchemist/Makefile @@ -7,6 +7,7 @@ PORTNAME= openalchemist PORTVERSION= 0.3 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -16,7 +17,7 @@ COMMENT= Tetris-like game BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip LIB_DEPENDS= clanCore-0.8:${PORTSDIR}/devel/clanlib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_AUTOTOOLS= aclocal:110 automake:110 autoconf:262 diff --git a/games/openastromenace/Makefile b/games/openastromenace/Makefile index d3b6f56..30b3421 100644 --- a/games/openastromenace/Makefile +++ b/games/openastromenace/Makefile @@ -7,7 +7,7 @@ PORTNAME= openastromenace PORTVERSION= 1.2.0 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= SF DISTFILES= openamenace-src-${PORTVERSION}${EXTRACT_SUFX} \ diff --git a/games/penguin-command/Makefile b/games/penguin-command/Makefile index 2e3643c..66b53b8 100644 --- a/games/penguin-command/Makefile +++ b/games/penguin-command/Makefile @@ -7,7 +7,7 @@ PORTNAME= penguin-command PORTVERSION= 1.6.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF @@ -15,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= A clone of the classic game Missile Command LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_SDL= mixer image sdl GNU_CONFIGURE= yes diff --git a/games/q2p/Makefile b/games/q2p/Makefile index 6be32ad..b334dfd 100644 --- a/games/q2p/Makefile +++ b/games/q2p/Makefile @@ -7,7 +7,7 @@ PORTNAME= q2p PORTVERSION= 0.2.20061231 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Q2P/ DISTNAME= Q2P-0.2-2006-12-31 @@ -40,7 +40,7 @@ LIBDIR= ${PREFIX}/lib/${PORTNAME} .if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL) USE_GL= glu -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png .endif diff --git a/games/q2pro/Makefile b/games/q2pro/Makefile index 0ddc2a9..4baf077 100644 --- a/games/q2pro/Makefile +++ b/games/q2pro/Makefile @@ -7,7 +7,7 @@ PORTNAME= q2pro PORTVERSION= ${SVN_REV} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= alepulver @@ -67,7 +67,7 @@ PLIST_SUB+= GAME="@comment " .if !defined(WITHOUT_GL) USE_GL= yes -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png ALL_TARGET+= ref_newgl PLIST_SUB+= GL="" diff --git a/games/quake2lnx/Makefile b/games/quake2lnx/Makefile index 9f93516..7757559 100644 --- a/games/quake2lnx/Makefile +++ b/games/quake2lnx/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2lnx PORTVERSION= 0.16.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games ipv6 MASTER_SITES= http://offload1.icculus.org/quake2/files/ DISTNAME= quake2-r${PORTVERSION} @@ -74,7 +74,7 @@ PLIST_SUB+= GLX="@comment " .if defined(WITH_EYECANDY) DISTFILES+= maxpak.pak -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg MAKE_ARGS+= BUILD_QMAX=YES PLIST_SUB+= QMAX="" .else diff --git a/games/quake2max/Makefile b/games/quake2max/Makefile index 0682e8e..8899d17 100644 --- a/games/quake2max/Makefile +++ b/games/quake2max/Makefile @@ -7,7 +7,7 @@ PORTNAME= quake2max PORTVERSION= 0.45 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/Quake2MaX/:src \ ${MASTER_SITE_LOCAL:S/$/:data/} @@ -47,7 +47,7 @@ Q2MAX_DATA= ${PORTNAME}.044.rar .include <bsd.port.pre.mk> .if defined(WITH_GLX) || defined(WITH_SDLGL) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GL= yes .endif diff --git a/games/qudos/Makefile b/games/qudos/Makefile index df2437d..cd15f98 100644 --- a/games/qudos/Makefile +++ b/games/qudos/Makefile @@ -7,7 +7,7 @@ PORTNAME= qudos PORTVERSION= 0.40.1 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake2/engines/QuDos/ DISTNAME= QuDos-${PORTVERSION}-src @@ -67,7 +67,7 @@ PLIST_SUB+= ${mod}="@comment " .if !defined(WITHOUT_GLX) || !defined(WITHOUT_SDLGL) USE_GL= yes -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png .endif diff --git a/games/r1q2/Makefile b/games/r1q2/Makefile index c2c807f..c1e9c3d 100644 --- a/games/r1q2/Makefile +++ b/games/r1q2/Makefile @@ -7,6 +7,7 @@ PORTNAME= r1q2 PORTVERSION= 7904 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://www.r1ch.net/stuff/r1q2/src/ DISTNAME= ${PORTNAME}-b${PORTVERSION}-src @@ -65,7 +66,7 @@ PLIST_SUB+= GAME="@comment " .if !defined(WITHOUT_REF_GL) USE_GL= yes USE_SDL= sdl -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png ALL_TARGET+= ref_gl PLIST_SUB+= REF_GL="" diff --git a/games/scorched3d/Makefile b/games/scorched3d/Makefile index 5c25234..886292f 100644 --- a/games/scorched3d/Makefile +++ b/games/scorched3d/Makefile @@ -7,7 +7,7 @@ PORTNAME= scorched3d PORTVERSION= 0.${SCORCH_VERSION}${SCORCH_REVISION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= scorched3d diff --git a/games/sdlquake2/Makefile b/games/sdlquake2/Makefile index fcc90c8..c05056f 100644 --- a/games/sdlquake2/Makefile +++ b/games/sdlquake2/Makefile @@ -7,7 +7,7 @@ PORTNAME= sdlquake2 PORTVERSION= 0.1.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://koti.mbnet.fi/~turol/sdlquake2/ @@ -32,7 +32,7 @@ PLIST_SUB= LIBDIR=${LIBDIR:S/${PREFIX}\///} .include <bsd.port.pre.mk> .if defined(WITH_CLIENT) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GL= yes USE_SDL= sdl diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile index f670495..d16723d 100644 --- a/games/stepmania-devel/Makefile +++ b/games/stepmania-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= stepmania PORTVERSION= 20071121 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= SF PKGNAMESUFFIX= -devel @@ -18,7 +18,7 @@ COMMENT= Stepmania dance and rhythm game LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ m.3:${PORTSDIR}/misc/compat5x BUILD_DEPENDS= unzip:${PORTSDIR}/archivers/unzip \ ${LOCALBASE}/include/linux/joystick.h:${PORTSDIR}/devel/linux-js diff --git a/games/tremor/Makefile b/games/tremor/Makefile index 8bd425d..8bf3f39 100644 --- a/games/tremor/Makefile +++ b/games/tremor/Makefile @@ -7,7 +7,7 @@ PORTNAME= tremor PORTVERSION= 3.2.4.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= games MASTER_SITES= http://qudos.quakedev.com/linux/quake1/:src \ http://tremor.quakedev.com/:data @@ -20,7 +20,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= alepulver@FreeBSD.org COMMENT= Enhaced Quake engine based on JoeQuake -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png EXTRACT_DEPENDS=unzip:${PORTSDIR}/archivers/unzip diff --git a/games/tuxpuck/Makefile b/games/tuxpuck/Makefile index f4e9ba0..694e0ef 100644 --- a/games/tuxpuck/Makefile +++ b/games/tuxpuck/Makefile @@ -8,14 +8,14 @@ PORTNAME= tuxpuck PORTVERSION= 0.8.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= games MASTER_SITES= http://users.student.lth.se/d00jkr/tuxpuck/ MAINTAINER= ports@FreeBSD.org COMMENT= Shufflepuck Cafe Clone -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ vorbis.4:${PORTSDIR}/audio/libvorbis \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/games/ufoai/Makefile b/games/ufoai/Makefile index 770ea44..dc89882 100644 --- a/games/ufoai/Makefile +++ b/games/ufoai/Makefile @@ -7,7 +7,7 @@ PORTNAME= ufoai PORTVERSION= 2.2.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF DISTNAME= ${PORTNAME:S/$/-/}${PORTVERSION}-source @@ -17,7 +17,7 @@ MAINTAINER= acm@FreeBSD.org COMMENT= A strategy game featuring tactical combat LIB_DEPENDS= vorbis:${PORTSDIR}/audio/libvorbis \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ curl:${PORTSDIR}/ftp/curl diff --git a/games/vavoom/Makefile b/games/vavoom/Makefile index 9bee895..b7f6de4 100644 --- a/games/vavoom/Makefile +++ b/games/vavoom/Makefile @@ -7,14 +7,14 @@ PORTNAME= vavoom PORTVERSION= 1.28 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Doom, Doom II, Heretic, Hexen and Strife source port -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/games/warsow/Makefile b/games/warsow/Makefile index 3b9fddf..a0f7320 100644 --- a/games/warsow/Makefile +++ b/games/warsow/Makefile @@ -7,7 +7,7 @@ PORTNAME= warsow PORTVERSION= 0.42 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= http://data.rodix.free.fr/warsow/files/ \ http://88.191.19.21/wsw/ @@ -45,7 +45,7 @@ IGNORE= requires at least one of CLIENT or SERVER options .endif .if !defined(WITHOUT_CLIENT) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= yes USE_SDL= yes USE_XORG= xinerama xxf86dga diff --git a/games/warzone2100/Makefile b/games/warzone2100/Makefile index f4dba8c..01d4d6b 100644 --- a/games/warzone2100/Makefile +++ b/games/warzone2100/Makefile @@ -7,7 +7,7 @@ PORTNAME= warzone2100 PORTVERSION= 2.0.10 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= games MASTER_SITES= http://download.gna.org/warzone/releases/2.0/ @@ -16,7 +16,7 @@ COMMENT= Innovative 3D real-time strategy game BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip \ unzip:${PORTSDIR}/archivers/unzip -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ ogg.6:${PORTSDIR}/audio/libogg \ openal.0:${PORTSDIR}/audio/openal \ diff --git a/games/xglk/Makefile b/games/xglk/Makefile index a397006..f351982 100644 --- a/games/xglk/Makefile +++ b/games/xglk/Makefile @@ -7,7 +7,7 @@ PORTNAME= xglk PORTVERSION= 411 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= http://www.ifarchive.org/if-archive/programming/glk/implementations/ DISTNAME= ${PORTNAME}-0${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= X Windows Implementation of the Glk API WRKSRC= ${WRKDIR}/${PORTNAME} -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg png.5:${PORTSDIR}/graphics/png +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg png.5:${PORTSDIR}/graphics/png USE_XORG= x11 diff --git a/games/xmoto/Makefile b/games/xmoto/Makefile index b1f8976..0bf4147 100644 --- a/games/xmoto/Makefile +++ b/games/xmoto/Makefile @@ -7,6 +7,7 @@ PORTNAME= xmoto PORTVERSION= 0.5.1 +PORTREVISION= 1 CATEGORIES= games MASTER_SITES= http://download.tuxfamily.org/xmoto/xmoto/${PORTVERSION}/ \ http://mirror.amdmi3.ru/ @@ -16,7 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Challenging 2D motocross platform game LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ curl.5:${PORTSDIR}/ftp/curl BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode diff --git a/games/xracer/Makefile b/games/xracer/Makefile index a6ac9b4..8e69248 100644 --- a/games/xracer/Makefile +++ b/games/xracer/Makefile @@ -7,7 +7,7 @@ PORTNAME= xracer PORTVERSION= 0.94 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_FREEBSD_ORG} MASTER_SITE_SUBDIR= distfiles @@ -16,7 +16,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${PORTNAME}-data${EXTRACT_SUFX} MAINTAINER= bsdkaffee@gmail.com COMMENT= Awesome WipeOut clone for OpenGL and X11! -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= glut USE_GMAKE= yes diff --git a/games/xrick/Makefile b/games/xrick/Makefile index a2a4f5e..fc1fb52 100644 --- a/games/xrick/Makefile +++ b/games/xrick/Makefile @@ -7,7 +7,7 @@ PORTNAME= xrick PORTVERSION= 021212 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.bigorno.net/xrick/ EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= drs@rucus.ru.ac.za COMMENT= A clone of Rick Dangerous -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg RESTRICTED= Copyright status of the graphics and sounds is uncertain USE_GMAKE= yes diff --git a/graphics/GraphicsMagick/Makefile b/graphics/GraphicsMagick/Makefile index a9a8fbe..85c01c3 100644 --- a/graphics/GraphicsMagick/Makefile +++ b/graphics/GraphicsMagick/Makefile @@ -7,6 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.1.15 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= SF \ diff --git a/graphics/GraphicsMagick12/Makefile b/graphics/GraphicsMagick12/Makefile index e8564f1..24f8de9 100644 --- a/graphics/GraphicsMagick12/Makefile +++ b/graphics/GraphicsMagick12/Makefile @@ -7,6 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.2.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/ diff --git a/graphics/GraphicsMagick13/Makefile b/graphics/GraphicsMagick13/Makefile index 9b558b2..7be2d90 100644 --- a/graphics/GraphicsMagick13/Makefile +++ b/graphics/GraphicsMagick13/Makefile @@ -7,6 +7,7 @@ PORTNAME= GraphicsMagick PORTVERSION= 1.3.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF \ ftp://ftp.graphicsmagick.org/pub/GraphicsMagick/ diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile index 6577537..aa9bf68 100644 --- a/graphics/ImageMagick/Makefile +++ b/graphics/ImageMagick/Makefile @@ -392,7 +392,10 @@ WITHOUT_IMAGEMAGICK_TESTS=yes .endif .if defined(WITH_IMAGEMAGICK_TESTS) && !defined(WITHOUT_IMAGEMAGICK_TESTS) +# jpeg-7 fails in ValidateImageFormatsOnDisk +.if defined(WITH_IMAGEMAGICK_TEST_JPEG7) post-build: test .endif +.endif .include <bsd.port.post.mk> diff --git a/graphics/amanith/Makefile b/graphics/amanith/Makefile index 2dd1d76..9efd05b 100644 --- a/graphics/amanith/Makefile +++ b/graphics/amanith/Makefile @@ -7,7 +7,7 @@ PORTNAME= amanith PORTVERSION= 0.3 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= http://www.amanith.org/download/files/ \ http://louhi.kempele.fi/~skyostil/projects/pyamanith/dist/ @@ -18,7 +18,7 @@ COMMENT= C++ CrossPlatform framework designed for 2d & 3d vector graphics BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 USE_QT_VER= 3 diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile index ec4f4e3..95ee570 100644 --- a/graphics/blender/Makefile +++ b/graphics/blender/Makefile @@ -6,6 +6,7 @@ PORTNAME= blender PORTVERSION= 2.49a +PORTREVISION= 1 CATEGORIES= graphics games MASTER_SITES= http://download.blender.org/source/ \ http://mirror.cs.umn.edu/blender.org/source/ \ @@ -15,7 +16,7 @@ MAINTAINER= mva@FreeBSD.org COMMENT= 3D modeling/rendering/animation/gaming package BUILD_DEPENDS= ${LOCALBASE}/lib/libode.a:${PORTSDIR}/devel/ode -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ GLEW.1:${PORTSDIR}/graphics/glew \ diff --git a/graphics/bmeps/Makefile b/graphics/bmeps/Makefile index 9e5ddd5..e4aae2f 100644 --- a/graphics/bmeps/Makefile +++ b/graphics/bmeps/Makefile @@ -7,6 +7,7 @@ PORTNAME= bmeps PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +16,7 @@ MAINTAINER= corky1951@comcast.net COMMENT= Convert bitmap images (PNG/JPEG/NetPBM) to EPS LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ netpbm.1:${PORTSDIR}/graphics/netpbm CONFIGURE_ENV= CPPFLAGS="-I${PREFIX}/include" diff --git a/graphics/cimg/Makefile b/graphics/cimg/Makefile index 09d1db1..6cfe5ba 100644 --- a/graphics/cimg/Makefile +++ b/graphics/cimg/Makefile @@ -7,6 +7,7 @@ PORTNAME= cimg PORTVERSION= 1.3.1 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics devel MASTER_SITES= SF diff --git a/graphics/cinepaint/Makefile b/graphics/cinepaint/Makefile index 09df0da..67cd2b2 100644 --- a/graphics/cinepaint/Makefile +++ b/graphics/cinepaint/Makefile @@ -7,7 +7,7 @@ PORTNAME= cinepaint PORTVERSION= 0.22 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-1 @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-1 MAINTAINER= ports@FreeBSD.org COMMENT= An editing tool used for painting and retouching of movies -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ lcms.1:${PORTSDIR}/graphics/lcms \ tiff.4:${PORTSDIR}/graphics/tiff \ diff --git a/graphics/corona/Makefile b/graphics/corona/Makefile index e854371..1c6eba7 100644 --- a/graphics/corona/Makefile +++ b/graphics/corona/Makefile @@ -6,7 +6,7 @@ PORTNAME= corona PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A graphics library that supports most image formats LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif USE_AUTOTOOLS= libtool:15 diff --git a/graphics/cqcam/Makefile b/graphics/cqcam/Makefile index de22e7b..c90f6c8 100644 --- a/graphics/cqcam/Makefile +++ b/graphics/cqcam/Makefile @@ -7,14 +7,14 @@ PORTNAME= cqcam PORTVERSION= 0.91 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://www.cs.duke.edu/~reynolds/cqcam/ MAINTAINER= ports@FreeBSD.org COMMENT= Color Quickcam control program -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg ONLY_FOR_ARCHS= i386 diff --git a/graphics/crystalspace/Makefile b/graphics/crystalspace/Makefile index 22b1e19..8f63aec 100644 --- a/graphics/crystalspace/Makefile +++ b/graphics/crystalspace/Makefile @@ -7,7 +7,7 @@ PORTNAME= crystalspace PORTVERSION= 1.0.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= crystal @@ -21,7 +21,7 @@ BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm \ swig:${PORTSDIR}/devel/swig13 \ jam:${PORTSDIR}/devel/jam LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ aa.1:${PORTSDIR}/graphics/aalib \ openal.0:${PORTSDIR}/audio/openal \ alut.1:${PORTSDIR}/audio/freealut \ diff --git a/graphics/dataplot/Makefile b/graphics/dataplot/Makefile index 24e306a..cf33e69 100644 --- a/graphics/dataplot/Makefile +++ b/graphics/dataplot/Makefile @@ -7,7 +7,7 @@ PORTNAME= dataplot PORTVERSION= 20080225 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.nist.gov/pub/dataplot/unix/:source \ LOCAL/beech:source \ diff --git a/graphics/dc20ctrl/Makefile b/graphics/dc20ctrl/Makefile index 6f9bee4..4c58cef 100644 --- a/graphics/dc20ctrl/Makefile +++ b/graphics/dc20ctrl/Makefile @@ -7,14 +7,14 @@ PORTNAME= dc20ctrl PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.paternostro.org/~ugo/binaries/ MAINTAINER= ports@FreeBSD.org COMMENT= Digital camera control and download tool for Kodak DC20 camera -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png diff --git a/graphics/dcraw/Makefile b/graphics/dcraw/Makefile index 7ac8baf..eaff630 100644 --- a/graphics/dcraw/Makefile +++ b/graphics/dcraw/Makefile @@ -7,13 +7,14 @@ PORTNAME= dcraw PORTVERSION= 8.93 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.SpringDaemons.com/soft/ MAINTAINER= stas@FreeBSD.org COMMENT= Decoder for RAW files from digital cameras -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms USE_BZIP2= yes diff --git a/graphics/devil/Makefile b/graphics/devil/Makefile index 9ad7bb9..90a29ae 100644 --- a/graphics/devil/Makefile +++ b/graphics/devil/Makefile @@ -8,7 +8,7 @@ PORTNAME= devil PORTVERSION= 1.7.8 PORTEPOCH= 1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF/openil DISTNAME= DevIL-${PORTVERSION} @@ -47,7 +47,7 @@ LDFLAGS= -L${LOCALBASE}/lib .if defined(WITHOUT_JPEG) CONFIGURE_ARGS+=--disable-jpeg .else -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--enable-jpeg .endif diff --git a/graphics/djvulibre-nox11/Makefile b/graphics/djvulibre-nox11/Makefile index 2215fca..d035b8e 100644 --- a/graphics/djvulibre-nox11/Makefile +++ b/graphics/djvulibre-nox11/Makefile @@ -7,7 +7,7 @@ PORTNAME= djvulibre PORTVERSION= 3.5.22 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF/djvu PKGNAMESUFFIX= -nox11 @@ -15,7 +15,7 @@ PKGNAMESUFFIX= -nox11 MAINTAINER= stas@FreeBSD.org COMMENT= DjVu base libraries and utilities -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff USE_ICONV= yes diff --git a/graphics/djvulibre/Makefile b/graphics/djvulibre/Makefile index 6295d5a..3c90f83 100644 --- a/graphics/djvulibre/Makefile +++ b/graphics/djvulibre/Makefile @@ -7,14 +7,14 @@ PORTNAME= djvulibre PORTVERSION= 3.5.22 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics www MASTER_SITES= SF/djvu MAINTAINER= stas@FreeBSD.org COMMENT= DjVu viewers and browser plugin -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ djvulibre.22:${PORTSDIR}/graphics/djvulibre-nox11 diff --git a/graphics/enblend/Makefile b/graphics/enblend/Makefile index 66616bd..b0e273c 100644 --- a/graphics/enblend/Makefile +++ b/graphics/enblend/Makefile @@ -7,7 +7,7 @@ PORTNAME= enblend PORTVERSION= 3.1.r20080615 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= vd/enblend @@ -18,7 +18,7 @@ COMMENT= A tool for image blending with multiresolution splines BUILD_DEPENDS= ${LOCALBASE}/include/boost/pool/pool.hpp:${PORTSDIR}/devel/boost \ OpenEXR>=1.0:${PORTSDIR}/graphics/OpenEXR LIB_DEPENDS= GLEW.1:${PORTSDIR}/graphics/glew \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms:${PORTSDIR}/graphics/lcms \ xmi.1:${PORTSDIR}/graphics/plotutils \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/enfle/Makefile b/graphics/enfle/Makefile index c47f3e0..3dcb9ab 100644 --- a/graphics/enfle/Makefile +++ b/graphics/enfle/Makefile @@ -7,7 +7,7 @@ PORTNAME= enfle PORTVERSION= 20071024 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://enfle.fennel.org/files/stable/ @@ -17,7 +17,7 @@ COMMENT= Simple plugin-based graphics viewer BUILD_DEPENDS= ${LOCALBASE}/lib/X11/rgb.txt:${PORTSDIR}/x11/rgb LIB_DEPENDS= arc.1:${PORTSDIR}/archivers/libarc \ jasper.4:${PORTSDIR}/graphics/jasper \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ mng.1:${PORTSDIR}/graphics/libmng \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ diff --git a/graphics/epeg/Makefile b/graphics/epeg/Makefile index e800a29..10d2f82 100644 --- a/graphics/epeg/Makefile +++ b/graphics/epeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= epeg PORTVERSION= 0.9.1.042 -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ @@ -16,7 +16,7 @@ MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ MAINTAINER= stas@FreeBSD.org COMMENT= An immensely fast JPEG thumbnailing library -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes USE_BZIP2= yes diff --git a/graphics/evas-loader-jpeg/Makefile b/graphics/evas-loader-jpeg/Makefile index 95a1d86..9d71868 100644 --- a/graphics/evas-loader-jpeg/Makefile +++ b/graphics/evas-loader-jpeg/Makefile @@ -7,6 +7,7 @@ PORTNAME= loader-jpeg PORTVERSION= 0.9.9.042 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ http://download.enlightenment.org/snapshots/2008-01-25/ @@ -16,7 +17,7 @@ DISTNAME= evas-${PORTVERSION} MAINTAINER= stas@FreeBSD.org COMMENT= A hardware accelerated canvas API (JPEG engine) -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 USE_BZIP2= yes diff --git a/graphics/exact-image/Makefile b/graphics/exact-image/Makefile index 9ef08ab..cef1689 100644 --- a/graphics/exact-image/Makefile +++ b/graphics/exact-image/Makefile @@ -7,6 +7,7 @@ PORTNAME= exact-image PORTVERSION= 0.7.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://dl.exactcode.de/oss/${PORTNAME}/ @@ -15,7 +16,7 @@ COMMENT= Fast image processing library BUILD_DEPENDS= swig>=1.3.32:${PORTSDIR}/devel/swig13 LIB_DEPENDS= agg.2:${PORTSDIR}/graphics/agg \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ ungif.5:${PORTSDIR}/graphics/libungif \ diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile index da2e71b..7ce5e44 100644 --- a/graphics/gd/Makefile +++ b/graphics/gd/Makefile @@ -7,7 +7,7 @@ PORTNAME= gd PORTVERSION= 2.0.35 -PORTREVISION?= 0 +PORTREVISION?= 1 PORTEPOCH= 1 CATEGORIES+= graphics MASTER_SITES= http://www.libgd.org/releases/ @@ -17,7 +17,7 @@ PKGNAMESUFFIX?= ${NOX11_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER?= dinoex@FreeBSD.org COMMENT?= A graphics library for fast creation of images -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/graphics/gdal/Makefile b/graphics/gdal/Makefile index cf9db4a..63b4cc8 100644 --- a/graphics/gdal/Makefile +++ b/graphics/gdal/Makefile @@ -7,6 +7,7 @@ PORTNAME= gdal PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= ftp://ftp.remotesensing.org/pub/gdal/ \ http://www.gdal.org/dl/ \ @@ -127,7 +128,7 @@ CONFIGURE_ARGS+= --with-jasper=${LOCALBASE} .endif .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+= --with-libjpeg=${LOCALBASE} .endif @@ -188,6 +189,7 @@ RUN_DEPENDS+= ${PYEASYINSTALL_CMD}:${PORTSDIR}/devel/py-setuptools PYEASYINSTALL_CMD= ${LOCALBASE}/bin/easy_install-${PYTHON_VER} PYDISTUTILS_PKGNAME= ${PORTNAME:U} PYDISTUTILS_PKGVERSION= ${PORTVERSION} +PORTREVISION= 1 _OSRELEASE!= ${UNAME} -r PYEASYINSTALL_OSARCH= -${OPSYS:L}-${_OSRELEASE}-${ARCH} PYEASYINSTALL_EGG= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_PKGVERSION:C/[^A-Za-z0-9.]+/_/g}-${PYTHON_VERSION:S/thon//}${PYEASYINSTALL_OSARCH}.egg diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile index 97e1d3a..38fc40f 100644 --- a/graphics/gdchart/Makefile +++ b/graphics/gdchart/Makefile @@ -7,7 +7,7 @@ PORTNAME= gdchart PORTVERSION= 0.11.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.fred.net/brv/chart/ \ ftp://ftp.nuug.no/pub/anders/distfiles/ diff --git a/graphics/gdk-pixbuf/Makefile b/graphics/gdk-pixbuf/Makefile index 7aa06f3..7a5b648 100644 --- a/graphics/gdk-pixbuf/Makefile +++ b/graphics/gdk-pixbuf/Makefile @@ -7,7 +7,7 @@ PORTNAME?= gdk-pixbuf PORTVERSION= 0.22.0 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES?= graphics MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gdk-pixbuf/0.22 @@ -19,7 +19,7 @@ COMMENT?= A graphic library for GTK+ LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes USE_GMAKE= yes diff --git a/graphics/gegl/Makefile b/graphics/gegl/Makefile index 9583d2f..adf4825 100644 --- a/graphics/gegl/Makefile +++ b/graphics/gegl/Makefile @@ -7,7 +7,7 @@ PORTNAME= gegl PORTVERSION= 0.0.${GEGL_MINOR} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.gimp.org/pub/gegl/0.0/ @@ -71,7 +71,7 @@ CONFIGURE_ARGS+=--without-graphviz .endif .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+=--without-libjpeg diff --git a/graphics/gephex/Makefile b/graphics/gephex/Makefile index cc73a68..9a9d709 100644 --- a/graphics/gephex/Makefile +++ b/graphics/gephex/Makefile @@ -7,13 +7,14 @@ PORTNAME= gephex PORTVERSION= 0.4.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.gephex.org/download/src/ MAINTAINER= ports@FreeBSD.org COMMENT= Software-based interactive video-effect system -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg OPTIONS= SDL "Turn on SDL support" on \ AALIB "Turn on AALIB support" on \ @@ -39,6 +40,7 @@ CONFIGURE_ARGS= --without-ASOUNDLIB --without-AVIFILE \ MAN1= gephex-engine.1 gephex-gui.1 gephex.1 PLIST_SUB= VERSION="${PORTVERSION:R}" +PORTREVISION= 1 CPPFLAGS= -I${LOCALBASE}/include ${PTHREAD_CFLAGS} LDFLAGS= -L${LOCALBASE}/lib ${PTHREAD_LIBS} diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile index 75f5a45..35f25c1 100644 --- a/graphics/gimageview/Makefile +++ b/graphics/gimageview/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimageview PORTVERSION= 0.2.27 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gtkmmviewer @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= gtkmmviewer MAINTAINER= dinoex@FreeBSD.org COMMENT= Yet another GTK+ based image viewer -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GMAKE= yes WANT_GNOME= yes diff --git a/graphics/gimp-app/Makefile b/graphics/gimp-app/Makefile index 91c4d9b..43fe5d4 100644 --- a/graphics/gimp-app/Makefile +++ b/graphics/gimp-app/Makefile @@ -8,7 +8,7 @@ PORTNAME= gimp-app DISTVERSION= 2.6.6 -PORTREVISION?= 1 +PORTREVISION?= 2 PORTEPOCH?= 1 CATEGORIES?= graphics gnome MASTER_SITES= ftp://ftp.gimp.org/pub/%SUBDIR%/ \ @@ -31,7 +31,7 @@ LIB_DEPENDS= exif.12:${PORTSDIR}/graphics/libexif \ aa.1:${PORTSDIR}/graphics/aalib \ mng.1:${PORTSDIR}/graphics/libmng \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ lcms.1:${PORTSDIR}/graphics/lcms \ gegl-0.0.22:${PORTSDIR}/graphics/gegl diff --git a/graphics/gimpshop/Makefile b/graphics/gimpshop/Makefile index 37b56e8..a796c48 100644 --- a/graphics/gimpshop/Makefile +++ b/graphics/gimpshop/Makefile @@ -7,7 +7,7 @@ PORTNAME= gimpshop PORTVERSION= 2.2.11 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= graphics gnome MASTER_SITES= http://www.plasticbugs.com/blogimg/ \ http://freebsd.powered.net/distfiles/ diff --git a/graphics/gle-graphics/Makefile b/graphics/gle-graphics/Makefile index 53a8e9f..64dc26f 100644 --- a/graphics/gle-graphics/Makefile +++ b/graphics/gle-graphics/Makefile @@ -7,7 +7,7 @@ PORTNAME= gle-graphics PORTVERSION= 4.0.12 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= glx @@ -40,7 +40,7 @@ post-patch: .include <bsd.port.pre.mk> .if !defined(WITHOUT_BITMAP_IMAGES) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiffxx.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --with-jpeg=${LOCALBASE} --with-tiff=${LOCALBASE} --with-png=${LOCALBASE} diff --git a/graphics/gnash-devel/Makefile b/graphics/gnash-devel/Makefile index 461118c..f5b14b4 100644 --- a/graphics/gnash-devel/Makefile +++ b/graphics/gnash-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnash PORTVERSION= 20081208 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics # gnashdev.org is slower MASTER_SITES= http://mirror.amdmi3.ru/ \ @@ -20,7 +20,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= GNU Flash movie player LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ curl.5:${PORTSDIR}/ftp/curl \ ungif.5:${PORTSDIR}/graphics/libungif diff --git a/graphics/gnash/Makefile b/graphics/gnash/Makefile index 6d641b8..b8907e4 100644 --- a/graphics/gnash/Makefile +++ b/graphics/gnash/Makefile @@ -7,7 +7,7 @@ PORTNAME= gnash PORTVERSION= 0.8.5 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics # getgnash.org is slow MASTER_SITES= ${MASTER_SITE_GNU} \ @@ -19,7 +19,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= GNU Flash movie player LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ curl.5:${PORTSDIR}/ftp/curl \ ungif.5:${PORTSDIR}/graphics/libungif diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile index b8459ca..3df6a89 100644 --- a/graphics/gnofract4d/Makefile +++ b/graphics/gnofract4d/Makefile @@ -7,9 +7,12 @@ PORTNAME= gnofract4d PORTVERSION= 3.10 +PORTREVISION= 1 CATEGORIES= graphics gnome MASTER_SITES= SF +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg + MAINTAINER= ports@FreeBSD.org COMMENT= Weird GNOME fractal generator diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile index da5ad06..9d63dca 100644 --- a/graphics/gphoto2/Makefile +++ b/graphics/gphoto2/Makefile @@ -7,6 +7,7 @@ PORTNAME= gphoto2 PORTVERSION= 2.4.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= gphoto @@ -16,7 +17,7 @@ COMMENT= A command-line frontend to libgphoto2 LIB_DEPENDS= popt.0:${PORTSDIR}/devel/popt \ aa.1:${PORTSDIR}/graphics/aalib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ gphoto2.2:${PORTSDIR}/graphics/libgphoto2 USE_GNOME= gnometarget diff --git a/graphics/grads/Makefile b/graphics/grads/Makefile index 025f2f9..cbd967e 100644 --- a/graphics/grads/Makefile +++ b/graphics/grads/Makefile @@ -7,6 +7,7 @@ PORTNAME= grads PORTVERSION= 1.9b4 +PORTREVISION= 1 CATEGORIES= graphics science math MASTER_SITES= ftp://grads.iges.org/grads/1.9/:src \ ftp://grads.iges.org/grads/:other @@ -21,7 +22,7 @@ COMMENT= The Grid Analysis and Display System BUILD_DEPENDS= ${LOCALBASE}/lib/libudunits.a:${PORTSDIR}/science/udunits \ ${LOCALBASE}/lib/libsx.a:${PORTSDIR}/x11/libsx LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png GNU_CONFIGURE= yes diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile index 461a77f..8ef5836 100644 --- a/graphics/graphviz/Makefile +++ b/graphics/graphviz/Makefile @@ -7,6 +7,7 @@ PORTNAME= graphviz PORTVERSION= 2.22.2 +PORTREVISION= 1 CATEGORIES= graphics tk MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ \ http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/ @@ -14,7 +15,7 @@ MASTER_SITES= http://www.graphviz.org/pub/graphviz/ARCHIVE/ \ MAINTAINER= dinoex@FreeBSD.org COMMENT= Graph Visualization Software from AT&T and Bell Labs -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ diff --git a/graphics/gridpix/Makefile b/graphics/gridpix/Makefile index e1f6de7..2942475 100644 --- a/graphics/gridpix/Makefile +++ b/graphics/gridpix/Makefile @@ -7,6 +7,7 @@ PORTNAME= gridpix PORTVERSION= 2.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pgollucci @@ -16,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Present large images efficiently over the Internet BUILD_DEPENDS= ${LOCALBASE}/lib/libnetpbm.a:${PORTSDIR}/graphics/netpbm -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg # create necessary directories -- don't want to depend on an http # server port since we don't know which one the user wants diff --git a/graphics/grx/Makefile b/graphics/grx/Makefile index f66d5da..454f8d4 100644 --- a/graphics/grx/Makefile +++ b/graphics/grx/Makefile @@ -7,7 +7,7 @@ PORTNAME= grx PORTVERSION= 2.4.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://grx.gnu.de/download/ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//g} @@ -66,7 +66,7 @@ PLIST_SUB+= GPC="@comment " .endif .if defined(WITH_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--enable-jpeg .else CONFIGURE_ARGS+=--disable-jpeg diff --git a/graphics/gstreamer-plugins-jpeg/Makefile b/graphics/gstreamer-plugins-jpeg/Makefile index 710f1f1..b30f8ea 100644 --- a/graphics/gstreamer-plugins-jpeg/Makefile +++ b/graphics/gstreamer-plugins-jpeg/Makefile @@ -6,7 +6,7 @@ # $MCom: ports/graphics/gstreamer-plugins-jpeg/Makefile,v 1.5 2008/03/19 14:05:34 ahze Exp $ # -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= graphics COMMENT= Gstreamer jpeg encoder/decoder plugin diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile index 5b84921..d416a4e 100644 --- a/graphics/gtksee/Makefile +++ b/graphics/gtksee/Makefile @@ -7,7 +7,7 @@ PORTNAME= gtksee PORTVERSION= 0.5.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_BERLIOS} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Image viewer RUN_DEPENDS= bzip:${PORTSDIR}/archivers/bzip -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/hugin/Makefile b/graphics/hugin/Makefile index 36cf59a..51aa097 100644 --- a/graphics/hugin/Makefile +++ b/graphics/hugin/Makefile @@ -7,7 +7,7 @@ PORTNAME= hugin PORTVERSION= 0.7.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile index be8647e..5a10c18 100644 --- a/graphics/ida/Makefile +++ b/graphics/ida/Makefile @@ -7,6 +7,7 @@ PORTNAME= ida PORTVERSION= 2.07 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://dl.bytesex.org/releases/fbida/ DISTNAME= fbida-${PORTVERSION} @@ -14,7 +15,7 @@ DISTNAME= fbida-${PORTVERSION} MAINTAINER= anray@FreeBSD.org COMMENT= Small and fast motif-based image viewer and editor -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ diff --git a/graphics/imgseek/Makefile b/graphics/imgseek/Makefile index e5f5817..800e8d5 100644 --- a/graphics/imgseek/Makefile +++ b/graphics/imgseek/Makefile @@ -7,7 +7,7 @@ PORTNAME= imgSeek PORTVERSION= 0.8.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics MASTER_SITES= SFE @@ -16,7 +16,7 @@ COMMENT= A photo manager and viewer with content-based search BUILD_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt RUN_DEPENDS= pyuic:${PORTSDIR}/x11-toolkits/py-qt -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ MagickWand.2:${PORTSDIR}/graphics/ImageMagick USE_PYDISTUTILS=yes diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile index 4197646..680e357 100644 --- a/graphics/imlib2/Makefile +++ b/graphics/imlib2/Makefile @@ -7,7 +7,7 @@ PORTNAME= imlib2 PORTVERSION= 1.4.1.000 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.springdaemons.com/pub/snapshots/e17/ \ @@ -52,7 +52,7 @@ PLIST_SUB= X11="" .endif .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+= --without-jpeg diff --git a/graphics/inventor/Makefile b/graphics/inventor/Makefile index dc760af..15f8db6 100644 --- a/graphics/inventor/Makefile +++ b/graphics/inventor/Makefile @@ -7,7 +7,7 @@ PORTNAME= inventor PORTVERSION= 2.1.5.p10 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://oss.sgi.com/projects/inventor/download/ DISTNAME= ${PORTNAME}-${PORTVERSION:S/.p/-/} @@ -17,7 +17,7 @@ MAINTAINER= c47g@gmx.at COMMENT= This is SGI's Open Inventor (TM) LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ GLU.1:${PORTSDIR}/graphics/libGLU USE_XORG= x11 xi diff --git a/graphics/iulib/Makefile b/graphics/iulib/Makefile index d80ad9f..fbdebde 100644 --- a/graphics/iulib/Makefile +++ b/graphics/iulib/Makefile @@ -7,7 +7,7 @@ PORTNAME= iulib PORTVERSION= 0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE EXTRACT_SUFX= .tgz @@ -16,7 +16,7 @@ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= A library of image understanding-related algorithms LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff OPTIONS= SDL "Enable SDL for graphical debugging" off \ diff --git a/graphics/jasper/Makefile b/graphics/jasper/Makefile index ddae2bc..0400edd 100644 --- a/graphics/jasper/Makefile +++ b/graphics/jasper/Makefile @@ -7,7 +7,7 @@ PORTNAME= jasper PORTVERSION= 1.900.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= graphics MASTER_SITES= http://www.ece.uvic.ca/~mdadams/jasper/software/ \ ${MASTER_SITE_IMAGEMAGICK} diff --git a/graphics/jp2a/Makefile b/graphics/jp2a/Makefile index bffa746..ceb49f3 100644 --- a/graphics/jp2a/Makefile +++ b/graphics/jp2a/Makefile @@ -7,14 +7,14 @@ PORTNAME= jp2a PORTVERSION= 1.0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Converts JPG images to ASCII -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ curl.5:${PORTSDIR}/ftp/curl USE_BZIP2= yes diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index 09cc867..748980d 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -8,8 +8,7 @@ # version number) when updating this port. Thank you. PORTNAME= jpeg -PORTVERSION= 6b -PORTREVISION= 7 +PORTVERSION= 7 CATEGORIES= graphics MASTER_SITES= http://www.ijg.org/files/ \ ftp://ftp.uu.net/graphics/jpeg/ \ @@ -22,7 +21,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= dinoex@FreeBSD.org COMMENT= IJG's jpeg compression utilities -WRKSRC= ${WRKDIR}/jpeg-6b +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_AUTOTOOLS= libtool:15 USE_LDCONFIG= yes @@ -47,13 +46,13 @@ post-build: post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/share/doc/jpeg - @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jpeg - @${INSTALL_DATA} ${WRKSRC}/*.doc ${PREFIX}/share/doc/jpeg + @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/jpeg/ + @${INSTALL_DATA} ${WRKSRC}/*.txt ${PREFIX}/share/doc/jpeg/ .endif .for header in ${ADDITIONAL_HEADER} - @${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/include + @${INSTALL_DATA} ${WRKSRC}/${header} ${PREFIX}/include/ .endfor - ${INSTALL_PROGRAM} ${WRKSRC}/jpegexiforient ${PREFIX}/bin - ${INSTALL_SCRIPT} ${WRKSRC}/exifautotran ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/jpegexiforient ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/exifautotran ${PREFIX}/bin/ .include <bsd.port.mk> diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo index 58a5edc..8e05c58 100644 --- a/graphics/jpeg/distinfo +++ b/graphics/jpeg/distinfo @@ -1,6 +1,6 @@ -MD5 (jpegsrc.v6b.tar.gz) = dbd5f3b47ed13132f04c685d608a7547 -SHA256 (jpegsrc.v6b.tar.gz) = 75c3ec241e9996504fe02a9ed4d12f16b74ade713972f3db9e65ce95cd27e35d -SIZE (jpegsrc.v6b.tar.gz) = 613261 +MD5 (jpegsrc.v7.tar.gz) = 382ef33b339c299b56baf1296cda9785 +SHA256 (jpegsrc.v7.tar.gz) = 50b7866206c5be044c4a2b0d7895898f5a58d31b50e16e79cf7dea3b90337ebf +SIZE (jpegsrc.v7.tar.gz) = 960379 MD5 (jpegexiforient.c) = ff4657764cb885b9aec06449507bf29d SHA256 (jpegexiforient.c) = bca1bc35bb53d3c189775e0ef4ecbd9be7660d636c7e044f964bde8697273b83 SIZE (jpegexiforient.c) = 8192 diff --git a/graphics/jpeg/files/patch-configure b/graphics/jpeg/files/patch-configure index 83902e5..9dd2a32 100644 --- a/graphics/jpeg/files/patch-configure +++ b/graphics/jpeg/files/patch-configure @@ -1,29 +1,10 @@ ---- configure.orig 1998-03-21 20:08:57.000000000 +0100 -+++ configure 2008-08-05 12:48:47.000000000 +0200 -@@ -1529,7 +1533,6 @@ - - if test "x$LTSHARED" != xno -o "x$LTSTATIC" != xno; then - USELIBTOOL="yes" -- LIBTOOL="./libtool" - O="lo" - A="la" - LN='$(LIBTOOL) --mode=link $(CC)' -@@ -1559,7 +1562,8 @@ - if test "x$LTSTATIC" = xno; then - disable_static="--disable-static" - fi -- $srcdir/ltconfig $disable_shared $disable_static $srcdir/ltmain.sh -+ pic_flag="-fPIC" -+ $ac_aux_dir/ltconfig $disable_shared $disable_static $ac_aux_dir/ltmain.sh - fi - - # Select memory manager depending on user input. -@@ -1647,7 +1651,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 +--- configure.orig 2009-06-14 18:25:26.000000000 +0200 ++++ configure 2009-06-30 13:10:03.000000000 +0200 +@@ -14754,6 +14754,7 @@ + JPEG_LIB_VERSION="`expr $JPEG_LIB_VERSION / 10`:`expr $JPEG_LIB_VERSION % 10`" + { $as_echo "$as_me:$LINENO: result: $JPEG_LIB_VERSION" >&5 + $as_echo "$JPEG_LIB_VERSION" >&6; } ++JPEG_LIB_VERSION="10" + ac_config_files="$ac_config_files Makefile" diff --git a/graphics/jpeg/files/patch-jconfig.cfg b/graphics/jpeg/files/patch-jconfig.cfg index f3fdec1..663cbdb 100644 --- a/graphics/jpeg/files/patch-jconfig.cfg +++ b/graphics/jpeg/files/patch-jconfig.cfg @@ -1,5 +1,5 @@ ---- jconfig.cfg.orig 2008-08-10 11:57:28.000000000 -0500 -+++ jconfig.cfg 2008-08-10 11:58:02.000000000 -0500 +--- jconfig.cfg.orig 2009-06-07 13:12:34.000000000 +0200 ++++ jconfig.cfg 2009-06-30 13:13:11.000000000 +0200 @@ -7,8 +7,12 @@ #undef void #undef const @@ -10,6 +10,6 @@ +#ifndef HAVE_STDLIB_H #undef HAVE_STDLIB_H +#endif + #undef HAVE_LOCALE_H #undef NEED_BSD_STRINGS #undef NEED_SYS_TYPES_H - #undef NEED_FAR_POINTERS diff --git a/graphics/jpeg/files/patch-jerror.h b/graphics/jpeg/files/patch-jerror.h deleted file mode 100644 index ae1d643..0000000 --- a/graphics/jpeg/files/patch-jerror.h +++ /dev/null @@ -1,30 +0,0 @@ ---- jerror.h.orig Sat Oct 18 14:59:10 1997 -+++ jerror.h Fri Jun 4 15:20:23 2004 -@@ -45,8 +45,11 @@ - JMESSAGE(JERR_BAD_ALLOC_CHUNK, "MAX_ALLOC_CHUNK is wrong, please fix") - JMESSAGE(JERR_BAD_BUFFER_MODE, "Bogus buffer control mode") - JMESSAGE(JERR_BAD_COMPONENT_ID, "Invalid component ID %d in SOS") -+JMESSAGE(JERR_BAD_CROP_SPEC, "Invalid crop request") - JMESSAGE(JERR_BAD_DCT_COEF, "DCT coefficient out of range") - JMESSAGE(JERR_BAD_DCTSIZE, "IDCT output block size %d not supported") -+JMESSAGE(JERR_BAD_DROP_SAMPLING, -+ "Component index %d: mismatching sampling ratio %d:%d, %d:%d, %c") - JMESSAGE(JERR_BAD_HUFF_TABLE, "Bogus Huffman table definition") - JMESSAGE(JERR_BAD_IN_COLORSPACE, "Bogus input colorspace") - JMESSAGE(JERR_BAD_J_COLORSPACE, "Bogus JPEG colorspace") -@@ -226,6 +229,15 @@ - (cinfo)->err->msg_parm.i[1] = (p2), \ - (cinfo)->err->msg_parm.i[2] = (p3), \ - (cinfo)->err->msg_parm.i[3] = (p4), \ -+ (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo))) -+#define ERREXIT6(cinfo,code,p1,p2,p3,p4,p5,p6) \ -+ ((cinfo)->err->msg_code = (code), \ -+ (cinfo)->err->msg_parm.i[0] = (p1), \ -+ (cinfo)->err->msg_parm.i[1] = (p2), \ -+ (cinfo)->err->msg_parm.i[2] = (p3), \ -+ (cinfo)->err->msg_parm.i[3] = (p4), \ -+ (cinfo)->err->msg_parm.i[4] = (p5), \ -+ (cinfo)->err->msg_parm.i[5] = (p6), \ - (*(cinfo)->err->error_exit) ((j_common_ptr) (cinfo))) - #define ERREXITS(cinfo,code,str) \ - ((cinfo)->err->msg_code = (code), \ diff --git a/graphics/jpeg/files/patch-jpegtran.1 b/graphics/jpeg/files/patch-jpegtran.1 index 53117e0..4a5e9d9 100644 --- a/graphics/jpeg/files/patch-jpegtran.1 +++ b/graphics/jpeg/files/patch-jpegtran.1 @@ -1,33 +1,9 @@ ---- jpegtran.1.orig Sun Aug 3 16:01:01 1997 -+++ jpegtran.1 Fri Oct 8 14:51:56 2004 -@@ -71,12 +71,23 @@ - .PP - The image can be losslessly transformed by giving one of these switches: - .TP -+.B \-crop WxH+X+Y -+Crop to a rectangular subarea of width W, height H starting at point X,Y. -+Allows the Width and or Height of the image to exceed the image. -+.TP -+.B \-drop +X+Y -+Drop another image. Overlay part of the source image at point width -+W + height H. -+.TP - .B \-flip horizontal - Mirror image horizontally (left-right). - .TP - .B \-flip vertical - Mirror image vertically (top-bottom). - .TP -+.B \-perfect -+Fails with an error if there is any loss durring the transformation. -+.TP - .B \-rotate 90 - Rotate image 90 degrees clockwise. - .TP -@@ -161,6 +172,14 @@ +--- jpegtran.1.orig 2009-03-28 19:18:21.000000000 +0100 ++++ jpegtran.1 2009-07-01 09:19:36.000000000 +0200 +@@ -195,6 +195,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. + found in the source file, such as JFIF thumbnails, Exif data, 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 @@ -36,10 +12,10 @@ +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 + .IP The default behavior is .BR "\-copy comments" . -@@ -189,6 +208,26 @@ +@@ -223,6 +231,26 @@ .B \-debug Same as .BR \-verbose . diff --git a/graphics/jpeg/files/patch-jpegtran.c b/graphics/jpeg/files/patch-jpegtran.c index 34e4539..7a992e7 100644 --- a/graphics/jpeg/files/patch-jpegtran.c +++ b/graphics/jpeg/files/patch-jpegtran.c @@ -1,19 +1,10 @@ ---- jpegtran.c.orig Wed Jul 23 22:37:26 1997 -+++ jpegtran.c Fri Jun 4 14:47:24 2004 -@@ -1,7 +1,7 @@ - /* - * jpegtran.c - * -- * Copyright (C) 1995-1997, Thomas G. Lane. -+ * Copyright (C) 1995-2001, Thomas G. Lane. - * This file is part of the Independent JPEG Group's software. - * For conditions of distribution and use, see the accompanying README file. - * +--- jpegtran.c.orig 2003-09-22 00:00:52.000000000 +0200 ++++ jpegtran.c 2009-06-30 13:41:20.000000000 +0200 @@ -37,6 +37,7 @@ static const char * progname; /* program name for error messages */ static char * outfilename; /* for -outfile switch */ -+static char * dropfilename; /* for -drop switch */ ++static char * dropfilename; /* for -drop switch */ static JCOPY_OPTION copyoption; /* -copy switch */ static jpeg_transform_info transformoption; /* image transformation options */ @@ -25,15 +16,14 @@ #ifdef ENTROPY_OPT_SUPPORTED fprintf(stderr, " -optimize Optimize Huffman table (smaller file, but slow compression)\n"); #endif -@@ -64,12 +66,16 @@ - #endif +@@ -65,13 +67,15 @@ #if TRANSFORMS_SUPPORTED fprintf(stderr, "Switches for modifying the image:\n"); -+ fprintf(stderr, " -crop WxH+X+Y Crop to a rectangular subarea\n"); + fprintf(stderr, " -crop WxH+X+Y Crop to a rectangular subarea\n"); + fprintf(stderr, " -drop +X+Y filename Drop another image\n"); fprintf(stderr, " -grayscale Reduce to grayscale (omit color data)\n"); fprintf(stderr, " -flip [horizontal|vertical] Mirror image (left-right or top-bottom)\n"); -+ fprintf(stderr, " -perfect Fail if there is non-transformable edge blocks\n"); + fprintf(stderr, " -perfect Fail if there is non-transformable edge blocks\n"); fprintf(stderr, " -rotate [90|180|270] Rotate image (degrees clockwise)\n"); fprintf(stderr, " -transpose Transpose image\n"); fprintf(stderr, " -transverse Transverse transpose image\n"); @@ -43,10 +33,10 @@ #endif /* TRANSFORMS_SUPPORTED */ fprintf(stderr, "Switches for advanced users:\n"); fprintf(stderr, " -restart N Set restart interval in rows, or in blocks with B\n"); -@@ -109,6 +115,50 @@ - #endif +@@ -112,6 +116,52 @@ } + +LOCAL(void) +handle_exif (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JCOPY_OPTION *copyoption) @@ -91,10 +81,12 @@ + srcinfo->marker_list = cur_marker; + } +} - ++ ++ LOCAL(int) parse_switches (j_compress_ptr cinfo, int argc, char **argv, -@@ -130,10 +180,13 @@ + int last_file_arg_seen, boolean for_real) +@@ -132,6 +182,7 @@ /* Set up default JPEG parameters. */ simple_progressive = FALSE; outfilename = NULL; @@ -102,45 +94,19 @@ copyoption = JCOPYOPT_DEFAULT; transformoption.transform = JXFORM_NONE; transformoption.trim = FALSE; -+ transformoption.perfect = FALSE; - transformoption.force_grayscale = FALSE; -+ transformoption.crop = FALSE; - cinfo->err->trace_level = 0; - - /* Scan command line options, adjust parameters */ -@@ -160,7 +213,7 @@ - exit(EXIT_FAILURE); - #endif - -- } else if (keymatch(arg, "copy", 1)) { -+ } else if (keymatch(arg, "copy", 2)) { - /* Select which extra markers to copy. */ - if (++argn >= argc) /* advance to next argument */ - usage(); -@@ -170,9 +223,47 @@ +@@ -174,6 +225,8 @@ copyoption = JCOPYOPT_COMMENTS; } else if (keymatch(argv[argn], "all", 1)) { copyoption = JCOPYOPT_ALL; + } else if (keymatch(argv[argn], "exif", 1)) { -+ copyoption = JCOPYOPT_EXIF; ++ copyoption = JCOPYOPT_EXIF; } else usage(); -+ } else if (keymatch(arg, "crop", 2)) { -+ /* Perform lossless cropping. */ -+#if TRANSFORMS_SUPPORTED -+ if (++argn >= argc) /* advance to next argument */ -+ usage(); -+ if (transformoption.crop /* reject multiple crop/drop requests */ || -+ ! jtransform_parse_crop_spec(&transformoption, argv[argn])) { -+ fprintf(stderr, "%s: bogus -crop argument '%s'\n", -+ progname, argv[argn]); -+ exit(EXIT_FAILURE); -+ } -+#else -+ select_transform(JXFORM_NONE); /* force an error */ -+#endif -+ +@@ -191,6 +244,26 @@ + select_transform(JXFORM_NONE); /* force an error */ + #endif + + } else if (keymatch(arg, "drop", 2)) { +#if TRANSFORMS_SUPPORTED + if (++argn >= argc) /* advance to next argument */ @@ -161,109 +127,52 @@ + select_transform(JXFORM_NONE); /* force an error */ +#endif + -+ } else if (keymatch(arg, "debug", 1) || keymatch(arg, "verbose", 1)) { /* Enable debug printouts. */ /* On first -d, print version identification */ -@@ -181,6 +272,7 @@ +@@ -199,6 +272,7 @@ if (! printed_version) { fprintf(stderr, "Independent JPEG Group's JPEGTRAN, version %s\n%s\n", JVERSION, JCOPYRIGHT); -+ fprintf(stderr, "EXIF support v 0.1 added 29-Sep-2003\n"); ++ fprintf(stderr, "EXIF support v 0.1 added 29-Sep-2003\n"); printed_version = TRUE; } cinfo->err->trace_level++; -@@ -233,7 +325,12 @@ - usage(); - outfilename = argv[argn]; /* save it away for later use */ - -- } else if (keymatch(arg, "progressive", 1)) { -+ } else if (keymatch(arg, "perfect", 2)) { -+ /* Fail if there is any partial edge MCUs that the transform can't -+ * handle. */ -+ transformoption.perfect = TRUE; -+ -+ } else if (keymatch(arg, "progressive", 2)) { - /* Select simple progressive mode. */ - #ifdef C_PROGRESSIVE_SUPPORTED - simple_progressive = TRUE; -@@ -334,16 +431,24 @@ - main (int argc, char **argv) - { +@@ -359,6 +433,11 @@ struct jpeg_decompress_struct srcinfo; -+ struct jpeg_error_mgr jsrcerr; + struct jpeg_compress_struct dstinfo; + struct jpeg_error_mgr jsrcerr, jdsterr; +#if TRANSFORMS_SUPPORTED + struct jpeg_decompress_struct dropinfo; + struct jpeg_error_mgr jdroperr; + FILE * drop_file; +#endif - struct jpeg_compress_struct dstinfo; -- struct jpeg_error_mgr jsrcerr, jdsterr; -+ struct jpeg_error_mgr jdsterr; #ifdef PROGRESS_REPORT struct cdjpeg_progress_mgr progress; #endif - jvirt_barray_ptr * src_coef_arrays; - jvirt_barray_ptr * dst_coef_arrays; - int file_index; -- FILE * input_file; -- FILE * output_file; -+ /* We assume all-in-memory processing and can therefore use only a -+ * single file pointer for sequential input and output operation. -+ */ -+ FILE * fp; - - /* On Mac, fetch a command line. */ - #ifdef USE_CCOMMAND -@@ -406,32 +511,36 @@ - - /* Open the input file. */ - if (file_index < argc) { -- if ((input_file = fopen(argv[file_index], READ_BINARY)) == NULL) { -- fprintf(stderr, "%s: can't open %s\n", progname, argv[file_index]); -+ if ((fp = fopen(argv[file_index], READ_BINARY)) == NULL) { -+ fprintf(stderr, "%s: can't open %s for reading\n", progname, argv[file_index]); - exit(EXIT_FAILURE); - } - } else { - /* default input file is stdin */ -- input_file = read_stdin(); -+ fp = read_stdin(); +@@ -440,6 +519,21 @@ + fp = read_stdin(); } -- -- /* Open the output file. */ -- if (outfilename != NULL) { -- if ((output_file = fopen(outfilename, WRITE_BINARY)) == NULL) { -- fprintf(stderr, "%s: can't open %s\n", progname, outfilename); + +#if TRANSFORMS_SUPPORTED + /* Open the drop file. */ + if (dropfilename != NULL) { + if ((drop_file = fopen(dropfilename, READ_BINARY)) == NULL) { + fprintf(stderr, "%s: can't open %s for reading\n", progname, dropfilename); - exit(EXIT_FAILURE); - } ++ exit(EXIT_FAILURE); ++ } + dropinfo.err = jpeg_std_error(&jdroperr); + jpeg_create_decompress(&dropinfo); + jpeg_stdio_src(&dropinfo, drop_file); - } else { -- /* default output file is stdout */ -- output_file = write_stdout(); ++ } else { + drop_file = NULL; - } ++ } +#endif + - #ifdef PROGRESS_REPORT start_progress_monitor((j_common_ptr) &dstinfo, &progress); #endif - - /* Specify data source for decompression */ -- jpeg_stdio_src(&srcinfo, input_file); -+ jpeg_stdio_src(&srcinfo, fp); - - /* Enable saving of extra markers that we want to copy */ - jcopy_markers_setup(&srcinfo, copyoption); -@@ -439,19 +548,46 @@ +@@ -453,6 +547,17 @@ /* Read file header */ (void) jpeg_read_header(&srcinfo, TRUE); @@ -281,19 +190,7 @@ /* Any space needed by a transform option must be requested before * jpeg_read_coefficients so that memory allocation will be done right. */ - #if TRANSFORMS_SUPPORTED -+ /* Fails right away if -perfect is given and transformation is not perfect. -+ */ -+ if (transformoption.perfect && -+ !jtransform_perfect_transform(srcinfo.image_width, srcinfo.image_height, -+ srcinfo.max_h_samp_factor * DCTSIZE, srcinfo.max_v_samp_factor * DCTSIZE, -+ transformoption.transform)) { -+ fprintf(stderr, "%s: transformation is not perfect\n", progname); -+ exit(EXIT_FAILURE); -+ } - jtransform_request_workspace(&srcinfo, &transformoption); - #endif - +@@ -472,6 +577,12 @@ /* Read source file as DCT coefficients */ src_coef_arrays = jpeg_read_coefficients(&srcinfo); @@ -306,80 +203,30 @@ /* Initialize destination compression parameters from source values */ jpeg_copy_critical_parameters(&srcinfo, &dstinfo); -+ - /* Adjust destination parameters if required by transform options; - * also find out which set of coefficient arrays will hold the output. - */ -@@ -463,11 +599,36 @@ - dst_coef_arrays = src_coef_arrays; - #endif - -+ /* Close input file, if we opened it. -+ * Note: we assume that jpeg_read_coefficients consumed all input -+ * until JPEG_REACHED_EOI, and that jpeg_finish_decompress will -+ * only consume more while (! cinfo->inputctl->eoi_reached). -+ * We cannot call jpeg_finish_decompress here since we still need the -+ * virtual arrays allocated from the source object for processing. -+ */ -+ if (fp != stdin) -+ fclose(fp); -+ -+ /* Open the output file. */ -+ if (outfilename != NULL) { -+ if ((fp = fopen(outfilename, WRITE_BINARY)) == NULL) { -+ fprintf(stderr, "%s: can't open %s for writing\n", progname, outfilename); -+ exit(EXIT_FAILURE); -+ } -+ } else { -+ /* default output file is stdout */ -+ fp = write_stdout(); -+ } -+ +@@ -510,6 +621,9 @@ /* Adjust default compression parameters by re-parsing the options */ -+ /* Save value of copyoption */ file_index = parse_switches(&dstinfo, argc, argv, 0, TRUE); + /* If we want EXIF, make sure we do not write incompatible markers */ + handle_exif(&srcinfo,&dstinfo,©option); + /* Specify data destination for compression */ -- jpeg_stdio_dest(&dstinfo, output_file); -+ jpeg_stdio_dest(&dstinfo, fp); - - /* Start compressor (note no image data is actually written here) */ - jpeg_write_coefficients(&dstinfo, dst_coef_arrays); -@@ -477,28 +638,41 @@ - - /* Execute image transformation, if any */ - #if TRANSFORMS_SUPPORTED -- jtransform_execute_transformation(&srcinfo, &dstinfo, -- src_coef_arrays, -- &transformoption); -+ jtransform_execute_transform(&srcinfo, &dstinfo, -+ src_coef_arrays, -+ &transformoption); - #endif + jpeg_stdio_dest(&dstinfo, fp); - /* Finish compression and release memory */ - jpeg_finish_compress(&dstinfo); +@@ -531,16 +645,30 @@ jpeg_destroy_compress(&dstinfo); + (void) jpeg_finish_decompress(&srcinfo); + jpeg_destroy_decompress(&srcinfo); +- +#if TRANSFORMS_SUPPORTED + if (dropfilename != NULL) { + (void) jpeg_finish_decompress(&dropinfo); + jpeg_destroy_decompress(&dropinfo); + } +#endif - (void) jpeg_finish_decompress(&srcinfo); - jpeg_destroy_decompress(&srcinfo); - -- /* Close files, if we opened them */ -- if (input_file != stdin) -- fclose(input_file); -- if (output_file != stdout) -- fclose(output_file); -+ /* Close output file, if we opened it */ -+ if (fp != stdout) -+ fclose(fp); + /* Close output file, if we opened it */ + if (fp != stdout) + fclose(fp); +#if TRANSFORMS_SUPPORTED + if (drop_file != NULL) + fclose(drop_file); diff --git a/graphics/jpeg/files/patch-rdjpgcom.c b/graphics/jpeg/files/patch-rdjpgcom.c index db6bd23..964a102 100644 --- a/graphics/jpeg/files/patch-rdjpgcom.c +++ b/graphics/jpeg/files/patch-rdjpgcom.c @@ -1,14 +1,6 @@ ---- rdjpgcom.c.orig Sun Oct 12 00:41:04 1997 -+++ rdjpgcom.c Thu Mar 18 06:37:23 2004 -@@ -14,6 +14,7 @@ - #define JPEG_CJPEG_DJPEG /* to get the command-line config symbols */ - #include "jinclude.h" /* get auto-config symbols, <stdio.h> */ - -+#include <locale.h> /* to declare setlocale() */ - #include <ctype.h> /* to declare isupper(), tolower() */ - #ifdef USE_SETMODE - #include <fcntl.h> /* to declare setmode()'s parameter macros */ -@@ -120,6 +121,7 @@ +--- rdjpgcom.c.orig 2009-04-03 01:30:13.000000000 +0200 ++++ rdjpgcom.c 2009-06-30 13:49:16.000000000 +0200 +@@ -124,6 +124,7 @@ #define M_EOI 0xD9 /* End Of Image (end of datastream) */ #define M_SOS 0xDA /* Start Of Scan (begins compressed data) */ #define M_APP0 0xE0 /* Application-specific marker, type N */ @@ -16,7 +8,7 @@ #define M_APP12 0xEC /* (we don't bother to list all 16 APPn's) */ #define M_COM 0xFE /* COMment */ -@@ -210,6 +212,175 @@ +@@ -214,6 +215,175 @@ } } @@ -192,20 +184,10 @@ /* * Process a COM marker. -@@ -231,6 +402,7 @@ - ERREXIT("Erroneous JPEG marker length"); - length -= 2; - -+ setlocale(LC_ALL, ""); - while (length > 0) { - ch = read_1_byte(); - /* Emit the character in a readable form. -@@ -363,6 +535,15 @@ +@@ -381,6 +551,15 @@ + process_COM(raw); + break; - case M_COM: - process_COM(); -+ break; -+ + case M_APP1: + /* APP1 is usually the EXIF marker used by digital cameras, attempt to + * process it to give some useful info. */ @@ -213,6 +195,8 @@ + process_APP1(); + } else + skip_variable(); - break; - ++ break; ++ case M_APP12: + /* Some digital camera makers put useful textual information into + * APP12 markers, so we print those out too when in -verbose mode. diff --git a/graphics/jpeg/files/patch-transupp.c b/graphics/jpeg/files/patch-transupp.c index 55b039b..519d07b 100644 --- a/graphics/jpeg/files/patch-transupp.c +++ b/graphics/jpeg/files/patch-transupp.c @@ -1,35 +1,8 @@ ---- transupp.c.orig Sat Aug 9 20:15:26 1997 -+++ transupp.c Fri Jun 4 15:25:29 2004 -@@ -1,7 +1,7 @@ - /* - * transupp.c - * -- * Copyright (C) 1997, Thomas G. Lane. -+ * Copyright (C) 1997-2001, Thomas G. Lane. - * This file is part of the Independent JPEG Group's software. - * For conditions of distribution and use, see the accompanying README file. - * -@@ -20,6 +20,7 @@ - #include "jinclude.h" - #include "jpeglib.h" - #include "transupp.h" /* My own external interface */ -+#include <ctype.h> /* to declare isdigit() */ - - - #if TRANSFORMS_SUPPORTED -@@ -28,7 +29,8 @@ - * Lossless image transformation routines. These routines work on DCT - * coefficient arrays and thus do not require any lossy decompression - * or recompression of the image. -- * Thanks to Guido Vollbeding for the initial design and code of this feature. -+ * Thanks to Guido Vollbeding for the initial design and code of this feature, -+ * and to Ben Jackson for introducing the cropping feature. - * - * Horizontal flipping is done in-place, using a single top-to-bottom - * pass through the virtual source array. It will thus be much the -@@ -42,6 +44,13 @@ - * arrays for most of the transforms. That could result in much thrashing - * if the image is larger than main memory. +--- transupp.c.orig 2009-06-17 11:14:27.000000000 +0200 ++++ transupp.c 2009-07-01 08:50:53.000000000 +0200 +@@ -51,6 +51,13 @@ + * guarantee we can touch more than one row at a time. So in that case, + * we have to use a separate destination array. * + * If cropping or trimming is involved, the destination arrays may be smaller + * than the source arrays. Note it is not possible to do horizontal flip @@ -41,22 +14,7 @@ * Some notes about the operating environment of the individual transform * routines: * 1. Both the source and destination virtual arrays are allocated from the -@@ -54,20 +63,366 @@ - * and we may as well take that as the effective iMCU size. - * 4. When "trim" is in effect, the destination's dimensions will be the - * trimmed values but the source's will be untrimmed. -- * 5. All the routines assume that the source and destination buffers are -+ * 5. When "crop" is in effect, the destination's dimensions will be the -+ * cropped values but the source's will be uncropped. Each transform -+ * routine is responsible for picking up source data starting at the -+ * correct X and Y offset for the crop region. (The X and Y offsets -+ * passed to the transform routines are measured in iMCU blocks of the -+ * destination.) -+ * 6. All the routines assume that the source and destination buffers are - * padded out to a full iMCU boundary. This is true, although for the - * source buffer it is an undocumented property of jdcoefct.c. -- * Notes 2,3,4 boil down to this: generally we should use the destination's -- * dimensions and ignore the source's. +@@ -75,6 +82,269 @@ */ @@ -106,10 +64,7 @@ +} + + - LOCAL(void) --do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -- jvirt_barray_ptr *src_coef_arrays) --/* Horizontal flip; done in-place, so no separate dest array is required */ ++LOCAL(void) +drop_request_from_src (j_decompress_ptr dropinfo, j_decompress_ptr srcinfo) +{ + void *save_client_data; @@ -326,1570 +281,276 @@ +} + + -+LOCAL(void) -+do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, -+ jvirt_barray_ptr *src_coef_arrays, -+ jvirt_barray_ptr *dst_coef_arrays) -+/* Crop. This is only used when no rotate/flip is requested with the crop. -+ * Extension: If the destination size is larger than the source, we fill in -+ * the extra area with zero (neutral gray). Note we also have to zero partial -+ * iMCUs at the right and bottom edge of the source image area in this case. -+ */ -+{ -+ JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height; -+ JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks; -+ int ci, offset_y; -+ JBLOCKARRAY src_buffer, dst_buffer; -+ jpeg_component_info *compptr; -+ -+ MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); -+ MCU_rows = srcinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); -+ -+ for (ci = 0; ci < dstinfo->num_components; ci++) { -+ compptr = dstinfo->comp_info + ci; -+ comp_width = MCU_cols * compptr->h_samp_factor; -+ comp_height = MCU_rows * compptr->v_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; -+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; -+ dst_blk_y += compptr->v_samp_factor) { -+ dst_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, -+ (JDIMENSION) compptr->v_samp_factor, TRUE); -+ if (dstinfo->image_height > srcinfo->image_height) { -+ if (dst_blk_y < y_crop_blocks || -+ dst_blk_y >= comp_height + y_crop_blocks) { -+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { -+ jzero_far(dst_buffer[offset_y], -+ compptr->width_in_blocks * SIZEOF(JBLOCK)); -+ } -+ continue; -+ } -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_y - y_crop_blocks, -+ (JDIMENSION) compptr->v_samp_factor, FALSE); -+ } else { -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_y + y_crop_blocks, -+ (JDIMENSION) compptr->v_samp_factor, FALSE); -+ } -+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { -+ if (dstinfo->image_width > srcinfo->image_width) { -+ if (x_crop_blocks > 0) { -+ jzero_far(dst_buffer[offset_y], -+ x_crop_blocks * SIZEOF(JBLOCK)); -+ } -+ jcopy_block_row(src_buffer[offset_y], -+ dst_buffer[offset_y] + x_crop_blocks, -+ comp_width); -+ if (compptr->width_in_blocks > comp_width + x_crop_blocks) { -+ jzero_far(dst_buffer[offset_y] + -+ comp_width + x_crop_blocks, -+ (compptr->width_in_blocks - -+ comp_width - x_crop_blocks) * SIZEOF(JBLOCK)); -+ } -+ } else { -+ jcopy_block_row(src_buffer[offset_y] + x_crop_blocks, -+ dst_buffer[offset_y], -+ compptr->width_in_blocks); -+ } -+ } -+ } -+ } -+} -+ -+ -+LOCAL(void) -+do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, -+ jvirt_barray_ptr *src_coef_arrays) -+/* Horizontal flip; done in-place, so no separate dest array is required. -+ * NB: this only works when y_crop_offset is zero. -+ */ - { -- JDIMENSION MCU_cols, comp_width, blk_x, blk_y; -+ JDIMENSION MCU_cols, comp_width, blk_x, blk_y, x_crop_blocks; - int ci, k, offset_y; - JBLOCKARRAY buffer; - JCOEFPTR ptr1, ptr2; -@@ -79,17 +434,19 @@ - * mirroring by changing the signs of odd-numbered columns. - * Partial iMCUs at the right edge are left untouched. - */ -- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); -+ MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); - - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; - comp_width = MCU_cols * compptr->h_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; - for (blk_y = 0; blk_y < compptr->height_in_blocks; - blk_y += compptr->v_samp_factor) { - buffer = (*srcinfo->mem->access_virt_barray) - ((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); - for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { -+ /* Do the mirroring */ - for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) { - ptr1 = buffer[offset_y][blk_x]; - ptr2 = buffer[offset_y][comp_width - blk_x - 1]; -@@ -105,6 +462,79 @@ - *ptr2++ = -temp1; - } - } -+ if (x_crop_blocks > 0) { -+ /* Now left-justify the portion of the data to be kept. -+ * We can't use a single jcopy_block_row() call because that routine -+ * depends on memcpy(), whose behavior is unspecified for overlapping -+ * source and destination areas. Sigh. -+ */ -+ for (blk_x = 0; blk_x < compptr->width_in_blocks; blk_x++) { -+ jcopy_block_row(buffer[offset_y] + blk_x + x_crop_blocks, -+ buffer[offset_y] + blk_x, -+ (JDIMENSION) 1); -+ } -+ } -+ } -+ } -+ } -+} -+ -+ -+LOCAL(void) -+do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, -+ jvirt_barray_ptr *src_coef_arrays, -+ jvirt_barray_ptr *dst_coef_arrays) -+/* Horizontal flip in general cropping case */ -+{ -+ JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y; -+ JDIMENSION x_crop_blocks, y_crop_blocks; -+ int ci, k, offset_y; -+ JBLOCKARRAY src_buffer, dst_buffer; -+ JBLOCKROW src_row_ptr, dst_row_ptr; -+ JCOEFPTR src_ptr, dst_ptr; -+ jpeg_component_info *compptr; -+ -+ /* Here we must output into a separate array because we can't touch -+ * different rows of a single virtual array simultaneously. Otherwise, -+ * this is essentially the same as the routine above. -+ */ -+ MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); -+ -+ for (ci = 0; ci < dstinfo->num_components; ci++) { -+ compptr = dstinfo->comp_info + ci; -+ comp_width = MCU_cols * compptr->h_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; -+ for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; -+ dst_blk_y += compptr->v_samp_factor) { -+ dst_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, -+ (JDIMENSION) compptr->v_samp_factor, TRUE); -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_y + y_crop_blocks, -+ (JDIMENSION) compptr->v_samp_factor, FALSE); -+ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { -+ dst_row_ptr = dst_buffer[offset_y]; -+ src_row_ptr = src_buffer[offset_y]; -+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) { -+ if (x_crop_blocks + dst_blk_x < comp_width) { -+ /* Do the mirrorable blocks */ -+ dst_ptr = dst_row_ptr[dst_blk_x]; -+ src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1]; -+ /* this unrolled loop doesn't need to know which row it's on... */ -+ for (k = 0; k < DCTSIZE2; k += 2) { -+ *dst_ptr++ = *src_ptr++; /* copy even column */ -+ *dst_ptr++ = - *src_ptr++; /* copy odd column with sign change */ -+ } -+ } else { -+ /* Copy last partial block(s) verbatim */ -+ jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks, -+ dst_row_ptr + dst_blk_x, -+ (JDIMENSION) 1); -+ } -+ } - } - } - } -@@ -113,11 +543,13 @@ - - LOCAL(void) - do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) - /* Vertical flip */ - { - JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; -+ JDIMENSION x_crop_blocks, y_crop_blocks; - int ci, i, j, offset_y; - JBLOCKARRAY src_buffer, dst_buffer; - JBLOCKROW src_row_ptr, dst_row_ptr; -@@ -131,33 +563,38 @@ - * of odd-numbered rows. - * Partial iMCUs at the bottom edge are copied verbatim. - */ -- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); -+ MCU_rows = srcinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); - - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; - comp_height = MCU_rows * compptr->v_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; - for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; - dst_blk_y += compptr->v_samp_factor) { - dst_buffer = (*srcinfo->mem->access_virt_barray) - ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); -- if (dst_blk_y < comp_height) { -+ if (y_crop_blocks + dst_blk_y < comp_height) { - /* Row is within the mirrorable area. */ - src_buffer = (*srcinfo->mem->access_virt_barray) - ((j_common_ptr) srcinfo, src_coef_arrays[ci], -- comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor, -+ comp_height - y_crop_blocks - dst_blk_y - -+ (JDIMENSION) compptr->v_samp_factor, - (JDIMENSION) compptr->v_samp_factor, FALSE); - } else { - /* Bottom-edge blocks will be copied verbatim. */ - src_buffer = (*srcinfo->mem->access_virt_barray) -- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y, -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_y + y_crop_blocks, - (JDIMENSION) compptr->v_samp_factor, FALSE); - } - for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { -- if (dst_blk_y < comp_height) { -+ if (y_crop_blocks + dst_blk_y < comp_height) { - /* Row is within the mirrorable area. */ - dst_row_ptr = dst_buffer[offset_y]; - src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1]; -+ src_row_ptr += x_crop_blocks; - for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; - dst_blk_x++) { - dst_ptr = dst_row_ptr[dst_blk_x]; -@@ -173,7 +610,8 @@ - } - } else { - /* Just copy row verbatim. */ -- jcopy_block_row(src_buffer[offset_y], dst_buffer[offset_y], -+ jcopy_block_row(src_buffer[offset_y] + x_crop_blocks, -+ dst_buffer[offset_y], - compptr->width_in_blocks); - } - } -@@ -184,11 +622,12 @@ - - LOCAL(void) - do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) - /* Transpose source into destination */ - { -- JDIMENSION dst_blk_x, dst_blk_y; -+ JDIMENSION dst_blk_x, dst_blk_y, x_crop_blocks, y_crop_blocks; - int ci, i, j, offset_x, offset_y; - JBLOCKARRAY src_buffer, dst_buffer; - JCOEFPTR src_ptr, dst_ptr; -@@ -201,6 +640,8 @@ - */ - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; - for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; - dst_blk_y += compptr->v_samp_factor) { - dst_buffer = (*srcinfo->mem->access_virt_barray) -@@ -210,11 +651,12 @@ - for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; - dst_blk_x += compptr->h_samp_factor) { - src_buffer = (*srcinfo->mem->access_virt_barray) -- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x, -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_x + x_crop_blocks, - (JDIMENSION) compptr->h_samp_factor, FALSE); - for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { -- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y]; - dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -+ src_ptr = src_buffer[offset_x][dst_blk_y + offset_y + y_crop_blocks]; - for (i = 0; i < DCTSIZE; i++) - for (j = 0; j < DCTSIZE; j++) - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -228,6 +670,7 @@ - - LOCAL(void) - do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) - /* 90 degree rotation is equivalent to -@@ -237,6 +680,7 @@ - */ - { - JDIMENSION MCU_cols, comp_width, dst_blk_x, dst_blk_y; -+ JDIMENSION x_crop_blocks, y_crop_blocks; - int ci, i, j, offset_x, offset_y; - JBLOCKARRAY src_buffer, dst_buffer; - JCOEFPTR src_ptr, dst_ptr; -@@ -246,11 +690,13 @@ - * at the (output) right edge properly. They just get transposed and - * not mirrored. - */ -- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); -+ MCU_cols = srcinfo->image_height / (dstinfo->max_h_samp_factor * DCTSIZE); - - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; - comp_width = MCU_cols * compptr->h_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; - for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; - dst_blk_y += compptr->v_samp_factor) { - dst_buffer = (*srcinfo->mem->access_virt_barray) -@@ -259,15 +705,26 @@ - for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { - for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; - dst_blk_x += compptr->h_samp_factor) { -- src_buffer = (*srcinfo->mem->access_virt_barray) -- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x, -- (JDIMENSION) compptr->h_samp_factor, FALSE); -+ if (x_crop_blocks + dst_blk_x < comp_width) { -+ /* Block is within the mirrorable area. */ -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ comp_width - x_crop_blocks - dst_blk_x - -+ (JDIMENSION) compptr->h_samp_factor, -+ (JDIMENSION) compptr->h_samp_factor, FALSE); -+ } else { -+ /* Edge blocks are transposed but not mirrored. */ -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_x + x_crop_blocks, -+ (JDIMENSION) compptr->h_samp_factor, FALSE); -+ } - for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { -- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y]; -- if (dst_blk_x < comp_width) { -+ dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -+ if (x_crop_blocks + dst_blk_x < comp_width) { - /* Block is within the mirrorable area. */ -- dst_ptr = dst_buffer[offset_y] -- [comp_width - dst_blk_x - offset_x - 1]; -+ src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1] -+ [dst_blk_y + offset_y + y_crop_blocks]; - for (i = 0; i < DCTSIZE; i++) { - for (j = 0; j < DCTSIZE; j++) - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -277,7 +734,8 @@ - } - } else { - /* Edge blocks are transposed but not mirrored. */ -- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -+ src_ptr = src_buffer[offset_x] -+ [dst_blk_y + offset_y + y_crop_blocks]; - for (i = 0; i < DCTSIZE; i++) - for (j = 0; j < DCTSIZE; j++) - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -292,6 +750,7 @@ - - LOCAL(void) - do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) - /* 270 degree rotation is equivalent to -@@ -301,6 +760,7 @@ - */ - { - JDIMENSION MCU_rows, comp_height, dst_blk_x, dst_blk_y; -+ JDIMENSION x_crop_blocks, y_crop_blocks; - int ci, i, j, offset_x, offset_y; - JBLOCKARRAY src_buffer, dst_buffer; - JCOEFPTR src_ptr, dst_ptr; -@@ -310,11 +770,13 @@ - * at the (output) bottom edge properly. They just get transposed and - * not mirrored. - */ -- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); -+ MCU_rows = srcinfo->image_width / (dstinfo->max_v_samp_factor * DCTSIZE); - - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; - comp_height = MCU_rows * compptr->v_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; - for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; - dst_blk_y += compptr->v_samp_factor) { - dst_buffer = (*srcinfo->mem->access_virt_barray) -@@ -324,14 +786,15 @@ - for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; - dst_blk_x += compptr->h_samp_factor) { - src_buffer = (*srcinfo->mem->access_virt_barray) -- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x, -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_x + x_crop_blocks, - (JDIMENSION) compptr->h_samp_factor, FALSE); - for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { - dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -- if (dst_blk_y < comp_height) { -+ if (y_crop_blocks + dst_blk_y < comp_height) { - /* Block is within the mirrorable area. */ - src_ptr = src_buffer[offset_x] -- [comp_height - dst_blk_y - offset_y - 1]; -+ [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1]; - for (i = 0; i < DCTSIZE; i++) { - for (j = 0; j < DCTSIZE; j++) { - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -341,7 +804,8 @@ - } - } else { - /* Edge blocks are transposed but not mirrored. */ -- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y]; -+ src_ptr = src_buffer[offset_x] -+ [dst_blk_y + offset_y + y_crop_blocks]; - for (i = 0; i < DCTSIZE; i++) - for (j = 0; j < DCTSIZE; j++) - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -356,6 +820,7 @@ - LOCAL(void) - do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) - /* 180 degree rotation is equivalent to -@@ -365,89 +830,93 @@ - */ + do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, + JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, +@@ -82,16 +352,21 @@ + jvirt_barray_ptr *dst_coef_arrays) + /* Crop. This is only used when no rotate/flip is requested with the crop. */ { - JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y; -+ JDIMENSION x_crop_blocks, y_crop_blocks; - int ci, i, j, offset_y; ++ JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height; + JDIMENSION dst_blk_y, x_crop_blocks, y_crop_blocks; + int ci, offset_y; JBLOCKARRAY src_buffer, dst_buffer; - JBLOCKROW src_row_ptr, dst_row_ptr; - JCOEFPTR src_ptr, dst_ptr; jpeg_component_info *compptr; -- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); -- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); + MCU_cols = srcinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); + MCU_rows = srcinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); - + /* We simply have to copy the right amount of data (the destination's + * image size) starting at the given X and Y offsets in the source. + */ for (ci = 0; ci < dstinfo->num_components; ci++) { compptr = dstinfo->comp_info + ci; - comp_width = MCU_cols * compptr->h_samp_factor; - comp_height = MCU_rows * compptr->v_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; ++ comp_width = MCU_cols * compptr->h_samp_factor; ++ comp_height = MCU_rows * compptr->v_samp_factor; + x_crop_blocks = x_crop_offset * compptr->h_samp_factor; + y_crop_blocks = y_crop_offset * compptr->v_samp_factor; for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; - dst_blk_y += compptr->v_samp_factor) { +@@ -99,17 +374,49 @@ dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, (JDIMENSION) compptr->v_samp_factor, TRUE); -- if (dst_blk_y < comp_height) { -+ if (y_crop_blocks + dst_blk_y < comp_height) { - /* Row is within the vertically mirrorable area. */ - src_buffer = (*srcinfo->mem->access_virt_barray) - ((j_common_ptr) srcinfo, src_coef_arrays[ci], -- comp_height - dst_blk_y - (JDIMENSION) compptr->v_samp_factor, -+ comp_height - y_crop_blocks - dst_blk_y - -+ (JDIMENSION) compptr->v_samp_factor, - (JDIMENSION) compptr->v_samp_factor, FALSE); - } else { - /* Bottom-edge rows are only mirrored horizontally. */ - src_buffer = (*srcinfo->mem->access_virt_barray) -- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y, -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_y + y_crop_blocks, - (JDIMENSION) compptr->v_samp_factor, FALSE); - } ++ if (dstinfo->image_height > srcinfo->image_height) { ++ if (dst_blk_y < y_crop_blocks || ++ dst_blk_y >= comp_height + y_crop_blocks) { ++ for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { ++ jzero_far(dst_buffer[offset_y], ++ compptr->width_in_blocks * SIZEOF(JBLOCK)); ++ } ++ continue; ++ } ++ src_buffer = (*srcinfo->mem->access_virt_barray) ++ ((j_common_ptr) srcinfo, src_coef_arrays[ci], ++ dst_blk_y - y_crop_blocks, ++ (JDIMENSION) compptr->v_samp_factor, FALSE); ++ } else { + src_buffer = (*srcinfo->mem->access_virt_barray) + ((j_common_ptr) srcinfo, src_coef_arrays[ci], + dst_blk_y + y_crop_blocks, + (JDIMENSION) compptr->v_samp_factor, FALSE); ++ } for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { -- if (dst_blk_y < comp_height) { -+ dst_row_ptr = dst_buffer[offset_y]; -+ if (y_crop_blocks + dst_blk_y < comp_height) { - /* Row is within the mirrorable area. */ -- dst_row_ptr = dst_buffer[offset_y]; - src_row_ptr = src_buffer[compptr->v_samp_factor - offset_y - 1]; -- /* Process the blocks that can be mirrored both ways. */ -- for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) { -+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) { - dst_ptr = dst_row_ptr[dst_blk_x]; -- src_ptr = src_row_ptr[comp_width - dst_blk_x - 1]; -- for (i = 0; i < DCTSIZE; i += 2) { -- /* For even row, negate every odd column. */ -- for (j = 0; j < DCTSIZE; j += 2) { -- *dst_ptr++ = *src_ptr++; -- *dst_ptr++ = - *src_ptr++; -+ if (x_crop_blocks + dst_blk_x < comp_width) { -+ /* Process the blocks that can be mirrored both ways. */ -+ src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1]; -+ for (i = 0; i < DCTSIZE; i += 2) { -+ /* For even row, negate every odd column. */ -+ for (j = 0; j < DCTSIZE; j += 2) { -+ *dst_ptr++ = *src_ptr++; -+ *dst_ptr++ = - *src_ptr++; -+ } -+ /* For odd row, negate every even column. */ -+ for (j = 0; j < DCTSIZE; j += 2) { -+ *dst_ptr++ = - *src_ptr++; -+ *dst_ptr++ = *src_ptr++; -+ } - } -- /* For odd row, negate every even column. */ -- for (j = 0; j < DCTSIZE; j += 2) { -- *dst_ptr++ = - *src_ptr++; -- *dst_ptr++ = *src_ptr++; -+ } else { -+ /* Any remaining right-edge blocks are only mirrored vertically. */ -+ src_ptr = src_row_ptr[x_crop_blocks + dst_blk_x]; -+ for (i = 0; i < DCTSIZE; i += 2) { -+ for (j = 0; j < DCTSIZE; j++) -+ *dst_ptr++ = *src_ptr++; -+ for (j = 0; j < DCTSIZE; j++) -+ *dst_ptr++ = - *src_ptr++; - } - } - } -- /* Any remaining right-edge blocks are only mirrored vertically. */ -- for (; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) { -- dst_ptr = dst_row_ptr[dst_blk_x]; -- src_ptr = src_row_ptr[dst_blk_x]; -- for (i = 0; i < DCTSIZE; i += 2) { -- for (j = 0; j < DCTSIZE; j++) -- *dst_ptr++ = *src_ptr++; -- for (j = 0; j < DCTSIZE; j++) -- *dst_ptr++ = - *src_ptr++; -- } -- } - } else { - /* Remaining rows are just mirrored horizontally. */ -- dst_row_ptr = dst_buffer[offset_y]; - src_row_ptr = src_buffer[offset_y]; -- /* Process the blocks that can be mirrored. */ -- for (dst_blk_x = 0; dst_blk_x < comp_width; dst_blk_x++) { -- dst_ptr = dst_row_ptr[dst_blk_x]; -- src_ptr = src_row_ptr[comp_width - dst_blk_x - 1]; -- for (i = 0; i < DCTSIZE2; i += 2) { -- *dst_ptr++ = *src_ptr++; -- *dst_ptr++ = - *src_ptr++; -+ for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) { -+ if (x_crop_blocks + dst_blk_x < comp_width) { -+ /* Process the blocks that can be mirrored. */ -+ dst_ptr = dst_row_ptr[dst_blk_x]; -+ src_ptr = src_row_ptr[comp_width - x_crop_blocks - dst_blk_x - 1]; -+ for (i = 0; i < DCTSIZE2; i += 2) { -+ *dst_ptr++ = *src_ptr++; -+ *dst_ptr++ = - *src_ptr++; -+ } -+ } else { -+ /* Any remaining right-edge blocks are only copied. */ -+ jcopy_block_row(src_row_ptr + dst_blk_x + x_crop_blocks, -+ dst_row_ptr + dst_blk_x, -+ (JDIMENSION) 1); - } - } -- /* Any remaining right-edge blocks are only copied. */ -- for (; dst_blk_x < compptr->width_in_blocks; dst_blk_x++) { -- dst_ptr = dst_row_ptr[dst_blk_x]; -- src_ptr = src_row_ptr[dst_blk_x]; -- for (i = 0; i < DCTSIZE2; i++) -- *dst_ptr++ = *src_ptr++; -- } - } ++ if (dstinfo->image_width > srcinfo->image_width) { ++ if (x_crop_blocks > 0) { ++ jzero_far(dst_buffer[offset_y], ++ x_crop_blocks * SIZEOF(JBLOCK)); ++ } ++ jcopy_block_row(src_buffer[offset_y], ++ dst_buffer[offset_y] + x_crop_blocks, ++ comp_width); ++ if (compptr->width_in_blocks > comp_width + x_crop_blocks) { ++ jzero_far(dst_buffer[offset_y] + ++ comp_width + x_crop_blocks, ++ (compptr->width_in_blocks - ++ comp_width - x_crop_blocks) * SIZEOF(JBLOCK)); ++ } ++ } else { ++ + jcopy_block_row(src_buffer[offset_y] + x_crop_blocks, + dst_buffer[offset_y], + compptr->width_in_blocks); } } -@@ -457,6 +926,7 @@ - - LOCAL(void) - do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, -+ JDIMENSION x_crop_offset, JDIMENSION y_crop_offset, - jvirt_barray_ptr *src_coef_arrays, - jvirt_barray_ptr *dst_coef_arrays) - /* Transverse transpose is equivalent to -@@ -470,18 +940,21 @@ - */ - { - JDIMENSION MCU_cols, MCU_rows, comp_width, comp_height, dst_blk_x, dst_blk_y; -+ JDIMENSION x_crop_blocks, y_crop_blocks; - int ci, i, j, offset_x, offset_y; - JBLOCKARRAY src_buffer, dst_buffer; - JCOEFPTR src_ptr, dst_ptr; - jpeg_component_info *compptr; - -- MCU_cols = dstinfo->image_width / (dstinfo->max_h_samp_factor * DCTSIZE); -- MCU_rows = dstinfo->image_height / (dstinfo->max_v_samp_factor * DCTSIZE); -+ MCU_cols = srcinfo->image_height / (dstinfo->max_h_samp_factor * DCTSIZE); -+ MCU_rows = srcinfo->image_width / (dstinfo->max_v_samp_factor * DCTSIZE); - - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; - comp_width = MCU_cols * compptr->h_samp_factor; - comp_height = MCU_rows * compptr->v_samp_factor; -+ x_crop_blocks = x_crop_offset * compptr->h_samp_factor; -+ y_crop_blocks = y_crop_offset * compptr->v_samp_factor; - for (dst_blk_y = 0; dst_blk_y < compptr->height_in_blocks; - dst_blk_y += compptr->v_samp_factor) { - dst_buffer = (*srcinfo->mem->access_virt_barray) -@@ -490,17 +963,26 @@ - for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { - for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; - dst_blk_x += compptr->h_samp_factor) { -- src_buffer = (*srcinfo->mem->access_virt_barray) -- ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x, -- (JDIMENSION) compptr->h_samp_factor, FALSE); -+ if (x_crop_blocks + dst_blk_x < comp_width) { -+ /* Block is within the mirrorable area. */ -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ comp_width - x_crop_blocks - dst_blk_x - -+ (JDIMENSION) compptr->h_samp_factor, -+ (JDIMENSION) compptr->h_samp_factor, FALSE); -+ } else { -+ src_buffer = (*srcinfo->mem->access_virt_barray) -+ ((j_common_ptr) srcinfo, src_coef_arrays[ci], -+ dst_blk_x + x_crop_blocks, -+ (JDIMENSION) compptr->h_samp_factor, FALSE); -+ } - for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { -- if (dst_blk_y < comp_height) { -- src_ptr = src_buffer[offset_x] -- [comp_height - dst_blk_y - offset_y - 1]; -- if (dst_blk_x < comp_width) { -+ dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -+ if (y_crop_blocks + dst_blk_y < comp_height) { -+ if (x_crop_blocks + dst_blk_x < comp_width) { - /* Block is within the mirrorable area. */ -- dst_ptr = dst_buffer[offset_y] -- [comp_width - dst_blk_x - offset_x - 1]; -+ src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1] -+ [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1]; - for (i = 0; i < DCTSIZE; i++) { - for (j = 0; j < DCTSIZE; j++) { - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -516,7 +998,8 @@ - } - } else { - /* Right-edge blocks are mirrored in y only */ -- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -+ src_ptr = src_buffer[offset_x] -+ [comp_height - y_crop_blocks - dst_blk_y - offset_y - 1]; - for (i = 0; i < DCTSIZE; i++) { - for (j = 0; j < DCTSIZE; j++) { - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -526,11 +1009,10 @@ - } - } - } else { -- src_ptr = src_buffer[offset_x][dst_blk_y + offset_y]; -- if (dst_blk_x < comp_width) { -+ if (x_crop_blocks + dst_blk_x < comp_width) { - /* Bottom-edge blocks are mirrored in x only */ -- dst_ptr = dst_buffer[offset_y] -- [comp_width - dst_blk_x - offset_x - 1]; -+ src_ptr = src_buffer[compptr->h_samp_factor - offset_x - 1] -+ [dst_blk_y + offset_y + y_crop_blocks]; - for (i = 0; i < DCTSIZE; i++) { - for (j = 0; j < DCTSIZE; j++) - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -540,7 +1022,8 @@ - } - } else { - /* At lower right corner, just transpose, no mirroring */ -- dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; -+ src_ptr = src_buffer[offset_x] -+ [dst_blk_y + offset_y + y_crop_blocks]; - for (i = 0; i < DCTSIZE; i++) - for (j = 0; j < DCTSIZE; j++) - dst_ptr[j*DCTSIZE+i] = src_ptr[i*DCTSIZE+j]; -@@ -554,8 +1037,116 @@ + } ++ } } -+/* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec. -+ * Returns TRUE if valid integer found, FALSE if not. -+ * *strptr is advanced over the digit string, and *result is set to its value. -+ */ -+ -+LOCAL(boolean) -+jt_read_integer (const char ** strptr, JDIMENSION * result) -+{ -+ const char * ptr = *strptr; -+ JDIMENSION val = 0; -+ -+ for (; isdigit(*ptr); ptr++) { -+ val = val * 10 + (JDIMENSION) (*ptr - '0'); -+ } -+ *result = val; -+ if (ptr == *strptr) -+ return FALSE; /* oops, no digits */ -+ *strptr = ptr; -+ return TRUE; -+} -+ -+ -+/* Parse a crop specification (written in X11 geometry style). -+ * The routine returns TRUE if the spec string is valid, FALSE if not. -+ * -+ * The crop spec string should have the format -+ * <width>x<height>{+-}<xoffset>{+-}<yoffset> -+ * where width, height, xoffset, and yoffset are unsigned integers. -+ * Each of the elements can be omitted to indicate a default value. -+ * (A weakness of this style is that it is not possible to omit xoffset -+ * while specifying yoffset, since they look alike.) -+ * -+ * This code is loosely based on XParseGeometry from the X11 distribution. -+ */ -+ -+GLOBAL(boolean) -+jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec) -+{ -+ info->crop = FALSE; -+ info->crop_width_set = JCROP_UNSET; -+ info->crop_height_set = JCROP_UNSET; -+ info->crop_xoffset_set = JCROP_UNSET; -+ info->crop_yoffset_set = JCROP_UNSET; -+ -+ if (isdigit(*spec)) { -+ /* fetch width */ -+ if (! jt_read_integer(&spec, &info->crop_width)) -+ return FALSE; -+ info->crop_width_set = JCROP_POS; -+ } -+ if (*spec == 'x' || *spec == 'X') { -+ /* fetch height */ -+ spec++; -+ if (! jt_read_integer(&spec, &info->crop_height)) -+ return FALSE; -+ info->crop_height_set = JCROP_POS; -+ } -+ if (*spec == '+' || *spec == '-') { -+ /* fetch xoffset */ -+ info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS; -+ spec++; -+ if (! jt_read_integer(&spec, &info->crop_xoffset)) -+ return FALSE; -+ } -+ if (*spec == '+' || *spec == '-') { -+ /* fetch yoffset */ -+ info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS; -+ spec++; -+ if (! jt_read_integer(&spec, &info->crop_yoffset)) -+ return FALSE; -+ } -+ /* We had better have gotten to the end of the string. */ -+ if (*spec != '\0') -+ return FALSE; -+ info->crop = TRUE; -+ return TRUE; -+} -+ -+ -+/* Trim off any partial iMCUs on the indicated destination edge */ -+ -+LOCAL(void) -+trim_right_edge (jpeg_transform_info *info, JDIMENSION full_width) -+{ -+ JDIMENSION MCU_cols; -+ -+ MCU_cols = info->output_width / (info->max_h_samp_factor * DCTSIZE); -+ if (MCU_cols > 0 && info->x_crop_offset + MCU_cols == -+ full_width / (info->max_h_samp_factor * DCTSIZE)) -+ info->output_width = MCU_cols * (info->max_h_samp_factor * DCTSIZE); -+} -+ -+LOCAL(void) -+trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height) -+{ -+ JDIMENSION MCU_rows; -+ -+ MCU_rows = info->output_height / (info->max_v_samp_factor * DCTSIZE); -+ if (MCU_rows > 0 && info->y_crop_offset + MCU_rows == -+ full_height / (info->max_v_samp_factor * DCTSIZE)) -+ info->output_height = MCU_rows * (info->max_v_samp_factor * DCTSIZE); -+} -+ -+ - /* Request any required workspace. - * -+ * This routine figures out the size that the output image will be -+ * (which implies that all the transform parameters must be set before -+ * it is called). -+ * - * We allocate the workspace virtual arrays from the source decompression - * object, so that all the arrays (both the original data and the workspace) - * will be taken into account while making memory management decisions. -@@ -569,9 +1160,13 @@ - jpeg_transform_info *info) - { +@@ -861,9 +1168,9 @@ jvirt_barray_ptr *coef_arrays = NULL; -+ boolean need_workspace, transpose_it; + boolean need_workspace, transpose_it; jpeg_component_info *compptr; -- int ci; +- JDIMENSION xoffset, yoffset, width_in_iMCUs, height_in_iMCUs; + JDIMENSION xoffset, yoffset, dtemp, width_in_iMCUs, height_in_iMCUs; -+ JDIMENSION width_in_blocks, height_in_blocks; + JDIMENSION width_in_blocks, height_in_blocks; +- int ci, h_samp_factor, v_samp_factor; + int itemp, ci, h_samp_factor, v_samp_factor; -+ /* Determine number of components in output image */ + /* Determine number of components in output image */ if (info->force_grayscale && - srcinfo->jpeg_color_space == JCS_YCbCr && - srcinfo->num_components == 3) { -@@ -581,55 +1176,267 @@ - /* Process all the components */ - info->num_components = srcinfo->num_components; - } -+ /* If there is only one output component, force the iMCU size to be 1; -+ * else use the source iMCU size. (This allows us to do the right thing -+ * when reducing color to grayscale, and also provides a handy way of -+ * cleaning up "funny" grayscale images whose sampling factors are not 1x1.) -+ */ - - switch (info->transform) { -+ case JXFORM_TRANSPOSE: -+ case JXFORM_TRANSVERSE: -+ case JXFORM_ROT_90: -+ case JXFORM_ROT_270: -+ info->output_width = srcinfo->image_height; -+ info->output_height = srcinfo->image_width; -+ if (info->num_components == 1) { -+ info->max_h_samp_factor = 1; -+ info->max_v_samp_factor = 1; -+ } else { -+ info->max_h_samp_factor = srcinfo->max_v_samp_factor; -+ info->max_v_samp_factor = srcinfo->max_h_samp_factor; -+ } -+ break; -+ default: -+ info->output_width = srcinfo->image_width; -+ info->output_height = srcinfo->image_height; -+ if (info->num_components == 1) { -+ info->max_h_samp_factor = 1; -+ info->max_v_samp_factor = 1; -+ } else { -+ info->max_h_samp_factor = srcinfo->max_h_samp_factor; -+ info->max_v_samp_factor = srcinfo->max_v_samp_factor; -+ } -+ break; -+ } -+ -+ /* If cropping has been requested, compute the crop area's position and -+ * dimensions, ensuring that its upper left corner falls at an iMCU boundary. -+ */ -+ if (info->crop) { -+ /* Insert default values for unset crop parameters */ -+ if (info->crop_xoffset_set == JCROP_UNSET) -+ info->crop_xoffset = 0; /* default to +0 */ -+ if (info->crop_yoffset_set == JCROP_UNSET) -+ info->crop_yoffset = 0; /* default to +0 */ +@@ -917,34 +1224,113 @@ + if (info->crop_xoffset_set == JCROP_UNSET) + info->crop_xoffset = 0; /* default to +0 */ + if (info->crop_yoffset_set == JCROP_UNSET) +- info->crop_yoffset = 0; /* default to +0 */ +- if (info->crop_xoffset >= info->output_width || +- info->crop_yoffset >= info->output_height) ++ info->crop_yoffset = 0; /* default to +0 */ + if (info->crop_width_set == JCROP_UNSET) { + if (info->crop_xoffset >= info->output_width) -+ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); -+ info->crop_width = info->output_width - info->crop_xoffset; + ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); +- if (info->crop_width_set == JCROP_UNSET) + info->crop_width = info->output_width - info->crop_xoffset; +- if (info->crop_height_set == JCROP_UNSET) + } else { + /* Check for crop extension */ + if (info->crop_width > info->output_width) { -+ /* Crop extension does not work when transforming! */ -+ if (info->transform != JXFORM_NONE || -+ info->crop_xoffset >= info->crop_width || -+ info->crop_xoffset > info->crop_width - info->output_width) -+ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); ++ /* Crop extension does not work when transforming! */ ++ if (info->transform != JXFORM_NONE || ++ info->crop_xoffset >= info->crop_width || ++ info->crop_xoffset > info->crop_width - info->output_width) ++ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); + } else { -+ if (info->crop_xoffset >= info->output_width || -+ info->crop_width <= 0 || -+ info->crop_xoffset > info->output_width - info->crop_width) -+ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); ++ if (info->crop_xoffset >= info->output_width || ++ info->crop_width <= 0 || ++ info->crop_xoffset > info->output_width - info->crop_width) ++ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); + } + } + if (info->crop_height_set == JCROP_UNSET) { + if (info->crop_yoffset >= info->output_height) -+ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); -+ info->crop_height = info->output_height - info->crop_yoffset; ++ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); + info->crop_height = info->output_height - info->crop_yoffset; +- /* Ensure parameters are valid */ +- if (info->crop_width <= 0 || info->crop_width > info->output_width || +- info->crop_height <= 0 || info->crop_height > info->output_height || +- info->crop_xoffset > info->output_width - info->crop_width || + } else { + /* Check for crop extension */ + if (info->crop_height > info->output_height) { -+ /* Crop extension does not work when transforming! */ -+ if (info->transform != JXFORM_NONE || -+ info->crop_yoffset >= info->crop_height || -+ info->crop_yoffset > info->crop_height - info->output_height) -+ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); ++ /* Crop extension does not work when transforming! */ ++ if (info->transform != JXFORM_NONE || ++ info->crop_yoffset >= info->crop_height || ++ info->crop_yoffset > info->crop_height - info->output_height) ++ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); + } else { -+ if (info->crop_yoffset >= info->output_height || -+ info->crop_height <= 0 || -+ info->crop_yoffset > info->output_height - info->crop_height) -+ ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); ++ if (info->crop_yoffset >= info->output_height || ++ info->crop_height <= 0 || + info->crop_yoffset > info->output_height - info->crop_height) + ERREXIT(srcinfo, JERR_BAD_CROP_SPEC); + } + } -+ /* Convert negative crop offsets into regular offsets */ + /* Convert negative crop offsets into regular offsets */ +- if (info->crop_xoffset_set == JCROP_NEG) + if (info->crop_xoffset_set == JCROP_NEG) { + if (info->crop_width > info->output_width) -+ xoffset = info->crop_width - info->output_width - info->crop_xoffset; ++ xoffset = info->crop_width - info->output_width - info->crop_xoffset; + else -+ xoffset = info->output_width - info->crop_width - info->crop_xoffset; + xoffset = info->output_width - info->crop_width - info->crop_xoffset; +- else + } else -+ xoffset = info->crop_xoffset; + xoffset = info->crop_xoffset; +- if (info->crop_yoffset_set == JCROP_NEG) + if (info->crop_yoffset_set == JCROP_NEG) { + if (info->crop_height > info->output_height) -+ yoffset = info->crop_height - info->output_height - info->crop_yoffset; ++ yoffset = info->crop_height - info->output_height - info->crop_yoffset; + else -+ yoffset = info->output_height - info->crop_height - info->crop_yoffset; + yoffset = info->output_height - info->crop_height - info->crop_yoffset; +- else + } else -+ yoffset = info->crop_yoffset; -+ /* Now adjust so that upper left corner falls at an iMCU boundary */ + yoffset = info->crop_yoffset; + /* Now adjust so that upper left corner falls at an iMCU boundary */ + if (info->transform == JXFORM_DROP) { + /* Ensure the effective drop region will not exceed the requested */ + itemp = info->max_h_samp_factor * DCTSIZE; + dtemp = itemp - 1 - ((xoffset + itemp - 1) % itemp); + xoffset += dtemp; + if (info->crop_width > dtemp) -+ info->drop_width = (info->crop_width - dtemp) / itemp; ++ info->drop_width = (info->crop_width - dtemp) / itemp; + else -+ info->drop_width = 0; ++ info->drop_width = 0; + itemp = info->max_v_samp_factor * DCTSIZE; + dtemp = itemp - 1 - ((yoffset + itemp - 1) % itemp); + yoffset += dtemp; + if (info->crop_height > dtemp) -+ info->drop_height = (info->crop_height - dtemp) / itemp; ++ info->drop_height = (info->crop_height - dtemp) / itemp; + else -+ info->drop_height = 0; ++ info->drop_height = 0; + /* Check if sampling factors match for dropping */ + if (info->drop_width != 0 && info->drop_height != 0) -+ for (ci = 0; ci < info->num_components && -+ ci < info->drop_ptr->num_components; ci++) { -+ if (info->drop_ptr->comp_info[ci].h_samp_factor * -+ srcinfo->max_h_samp_factor != -+ srcinfo->comp_info[ci].h_samp_factor * -+ info->drop_ptr->max_h_samp_factor) -+ ERREXIT6(srcinfo, JERR_BAD_DROP_SAMPLING, ci, -+ info->drop_ptr->comp_info[ci].h_samp_factor, -+ info->drop_ptr->max_h_samp_factor, -+ srcinfo->comp_info[ci].h_samp_factor, -+ srcinfo->max_h_samp_factor, 'h'); -+ if (info->drop_ptr->comp_info[ci].v_samp_factor * -+ srcinfo->max_v_samp_factor != -+ srcinfo->comp_info[ci].v_samp_factor * -+ info->drop_ptr->max_v_samp_factor) -+ ERREXIT6(srcinfo, JERR_BAD_DROP_SAMPLING, ci, -+ info->drop_ptr->comp_info[ci].v_samp_factor, -+ info->drop_ptr->max_v_samp_factor, -+ srcinfo->comp_info[ci].v_samp_factor, -+ srcinfo->max_v_samp_factor, 'v'); -+ } -+ } else { -+ /* Ensure the effective crop region will cover the requested */ -+ if (info->crop_width > info->output_width) -+ info->output_width = info->crop_width; -+ else -+ info->output_width = -+ info->crop_width + (xoffset % (info->max_h_samp_factor * DCTSIZE)); -+ if (info->crop_height > info->output_height) -+ info->output_height = info->crop_height; -+ else -+ info->output_height = -+ info->crop_height + (yoffset % (info->max_v_samp_factor * DCTSIZE)); ++ for (ci = 0; ci < info->num_components && ++ ci < info->drop_ptr->num_components; ci++) { ++ if (info->drop_ptr->comp_info[ci].h_samp_factor * ++ srcinfo->max_h_samp_factor != ++ srcinfo->comp_info[ci].h_samp_factor * ++ info->drop_ptr->max_h_samp_factor) ++ ERREXIT6(srcinfo, JERR_BAD_DROP_SAMPLING, ci, ++ info->drop_ptr->comp_info[ci].h_samp_factor, ++ info->drop_ptr->max_h_samp_factor, ++ srcinfo->comp_info[ci].h_samp_factor, ++ srcinfo->max_h_samp_factor, 'h'); ++ if (info->drop_ptr->comp_info[ci].v_samp_factor * ++ srcinfo->max_v_samp_factor != ++ srcinfo->comp_info[ci].v_samp_factor * ++ info->drop_ptr->max_v_samp_factor) ++ ERREXIT6(srcinfo, JERR_BAD_DROP_SAMPLING, ci, ++ info->drop_ptr->comp_info[ci].v_samp_factor, ++ info->drop_ptr->max_v_samp_factor, ++ srcinfo->comp_info[ci].v_samp_factor, ++ srcinfo->max_v_samp_factor, 'v'); ++ } ++ } else { ++ /* Ensure the effective crop region will cover the requested */ ++ if (info->crop_width > info->output_width) ++ info->output_width = info->crop_width; ++ else + info->output_width = + info->crop_width + (xoffset % (info->max_h_samp_factor * DCTSIZE)); ++ if (info->crop_height > info->output_height) ++ info->output_height = info->crop_height; ++ else + info->output_height = + info->crop_height + (yoffset % (info->max_v_samp_factor * DCTSIZE)); + } -+ /* Save x/y offsets measured in iMCUs */ -+ info->x_crop_offset = xoffset / (info->max_h_samp_factor * DCTSIZE); -+ info->y_crop_offset = yoffset / (info->max_v_samp_factor * DCTSIZE); -+ } else { -+ info->x_crop_offset = 0; -+ info->y_crop_offset = 0; -+ } -+ -+ /* Figure out whether we need workspace arrays, -+ * and if so whether they are transposed relative to the source. -+ */ -+ need_workspace = FALSE; -+ transpose_it = FALSE; -+ switch (info->transform) { + /* Save x/y offsets measured in iMCUs */ + info->x_crop_offset = xoffset / (info->max_h_samp_factor * DCTSIZE); + info->y_crop_offset = yoffset / (info->max_v_samp_factor * DCTSIZE); +@@ -960,7 +1346,9 @@ + transpose_it = FALSE; + switch (info->transform) { case JXFORM_NONE: +- if (info->x_crop_offset != 0 || info->y_crop_offset != 0) + if (info->x_crop_offset != 0 || info->y_crop_offset != 0 || -+ info->output_width > srcinfo->image_width || -+ info->output_height > srcinfo->image_height) -+ need_workspace = TRUE; -+ /* No workspace needed if neither cropping nor transforming */ -+ break; - case JXFORM_FLIP_H: -- /* Don't need a workspace array */ -+ if (info->trim) -+ trim_right_edge(info, srcinfo->image_width); -+ if (info->y_crop_offset != 0) -+ need_workspace = TRUE; -+ /* do_flip_h_no_crop doesn't need a workspace array */ ++ info->output_width > srcinfo->image_width || ++ info->output_height > srcinfo->image_height) + need_workspace = TRUE; + /* No workspace needed if neither cropping nor transforming */ break; - case JXFORM_FLIP_V: -- case JXFORM_ROT_180: -- /* Need workspace arrays having same dimensions as source image. -- * Note that we allocate arrays padded out to the next iMCU boundary, -- * so that transform routines need not worry about missing edge blocks. -- */ -- coef_arrays = (jvirt_barray_ptr *) -- (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE, -- SIZEOF(jvirt_barray_ptr) * info->num_components); -- for (ci = 0; ci < info->num_components; ci++) { -- compptr = srcinfo->comp_info + ci; -- coef_arrays[ci] = (*srcinfo->mem->request_virt_barray) -- ((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE, -- (JDIMENSION) jround_up((long) compptr->width_in_blocks, -- (long) compptr->h_samp_factor), -- (JDIMENSION) jround_up((long) compptr->height_in_blocks, -- (long) compptr->v_samp_factor), -- (JDIMENSION) compptr->v_samp_factor); -- } -+ if (info->trim) -+ trim_bottom_edge(info, srcinfo->image_height); -+ /* Need workspace arrays having same dimensions as source image. */ -+ need_workspace = TRUE; +@@ -1014,6 +1402,11 @@ + need_workspace = TRUE; + transpose_it = TRUE; break; - case JXFORM_TRANSPOSE: -+ /* transpose does NOT have to trim anything */ -+ /* Need workspace arrays having transposed dimensions. */ -+ need_workspace = TRUE; -+ transpose_it = TRUE; -+ break; - case JXFORM_TRANSVERSE: -+ if (info->trim) { -+ trim_right_edge(info, srcinfo->image_height); -+ trim_bottom_edge(info, srcinfo->image_width); -+ } -+ /* Need workspace arrays having transposed dimensions. */ -+ need_workspace = TRUE; -+ transpose_it = TRUE; -+ break; - case JXFORM_ROT_90: -+ if (info->trim) -+ trim_right_edge(info, srcinfo->image_height); -+ /* Need workspace arrays having transposed dimensions. */ -+ need_workspace = TRUE; -+ transpose_it = TRUE; -+ break; -+ case JXFORM_ROT_180: -+ if (info->trim) { -+ trim_right_edge(info, srcinfo->image_width); -+ trim_bottom_edge(info, srcinfo->image_height); -+ } -+ /* Need workspace arrays having same dimensions as source image. */ -+ need_workspace = TRUE; -+ break; - case JXFORM_ROT_270: -- /* Need workspace arrays having transposed dimensions. -- * Note that we allocate arrays padded out to the next iMCU boundary, -- * so that transform routines need not worry about missing edge blocks. -- */ -+ if (info->trim) -+ trim_bottom_edge(info, srcinfo->image_width); -+ /* Need workspace arrays having transposed dimensions. */ -+ need_workspace = TRUE; -+ transpose_it = TRUE; -+ break; + case JXFORM_DROP: +#if DROP_REQUEST_FROM_SRC + drop_request_from_src(info->drop_ptr, srcinfo); +#endif + break; -+ } -+ -+ /* Allocate workspace if needed. -+ * Note that we allocate arrays padded out to the next iMCU boundary, -+ * so that transform routines need not worry about missing edge blocks. -+ */ -+ if (need_workspace) { - coef_arrays = (jvirt_barray_ptr *) - (*srcinfo->mem->alloc_small) ((j_common_ptr) srcinfo, JPOOL_IMAGE, -- SIZEOF(jvirt_barray_ptr) * info->num_components); -+ SIZEOF(jvirt_barray_ptr) * info->num_components); -+ width_in_iMCUs = (JDIMENSION) -+ jdiv_round_up((long) info->output_width, -+ (long) (info->max_h_samp_factor * DCTSIZE)); -+ height_in_iMCUs = (JDIMENSION) -+ jdiv_round_up((long) info->output_height, -+ (long) (info->max_v_samp_factor * DCTSIZE)); - for (ci = 0; ci < info->num_components; ci++) { - compptr = srcinfo->comp_info + ci; -+ if (info->num_components == 1) { -+ /* we're going to force samp factors to 1x1 in this case */ -+ h_samp_factor = v_samp_factor = 1; -+ } else if (transpose_it) { -+ h_samp_factor = compptr->v_samp_factor; -+ v_samp_factor = compptr->h_samp_factor; -+ } else { -+ h_samp_factor = compptr->h_samp_factor; -+ v_samp_factor = compptr->v_samp_factor; -+ } -+ width_in_blocks = width_in_iMCUs * h_samp_factor; -+ height_in_blocks = height_in_iMCUs * v_samp_factor; - coef_arrays[ci] = (*srcinfo->mem->request_virt_barray) - ((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE, -- (JDIMENSION) jround_up((long) compptr->height_in_blocks, -- (long) compptr->v_samp_factor), -- (JDIMENSION) jround_up((long) compptr->width_in_blocks, -- (long) compptr->h_samp_factor), -- (JDIMENSION) compptr->h_samp_factor); -+ width_in_blocks, height_in_blocks, (JDIMENSION) v_samp_factor); - } -- break; - } -+ - info->workspace_coef_arrays = coef_arrays; - } - -@@ -642,14 +1449,8 @@ - int tblno, i, j, ci, itemp; - jpeg_component_info *compptr; - JQUANT_TBL *qtblptr; -- JDIMENSION dtemp; - UINT16 qtemp; - -- /* Transpose basic image dimensions */ -- dtemp = dstinfo->image_width; -- dstinfo->image_width = dstinfo->image_height; -- dstinfo->image_height = dtemp; -- - /* Transpose sampling factors */ - for (ci = 0; ci < dstinfo->num_components; ci++) { - compptr = dstinfo->comp_info + ci; -@@ -674,46 +1475,159 @@ - } - - --/* Trim off any partial iMCUs on the indicated destination edge */ -+/* Adjust Exif image parameters. -+ * -+ * We try to adjust the Tags ExifImageWidth and ExifImageHeight if possible. -+ */ - - LOCAL(void) --trim_right_edge (j_compress_ptr dstinfo) -+adjust_exif_parameters (JOCTET FAR * data, unsigned int length, -+ JDIMENSION new_width, JDIMENSION new_height) - { -- int ci, max_h_samp_factor; -- JDIMENSION MCU_cols; -+ boolean is_motorola; /* Flag for byte order */ -+ unsigned int number_of_tags, tagnum; -+ unsigned int firstoffset, offset; -+ JDIMENSION new_value; -+ -+ if (length < 12) return; /* Length of an IFD entry */ -+ -+ /* Discover byte order */ -+ if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49) -+ is_motorola = FALSE; -+ else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D) -+ is_motorola = TRUE; -+ else -+ return; -+ -+ /* Check Tag Mark */ -+ if (is_motorola) { -+ if (GETJOCTET(data[2]) != 0) return; -+ if (GETJOCTET(data[3]) != 0x2A) return; -+ } else { -+ if (GETJOCTET(data[3]) != 0) return; -+ if (GETJOCTET(data[2]) != 0x2A) return; -+ } - -- /* We have to compute max_h_samp_factor ourselves, -- * because it hasn't been set yet in the destination -- * (and we don't want to use the source's value). -- */ -- max_h_samp_factor = 1; -- for (ci = 0; ci < dstinfo->num_components; ci++) { -- int h_samp_factor = dstinfo->comp_info[ci].h_samp_factor; -- max_h_samp_factor = MAX(max_h_samp_factor, h_samp_factor); -+ /* Get first IFD offset (offset to IFD0) */ -+ if (is_motorola) { -+ if (GETJOCTET(data[4]) != 0) return; -+ if (GETJOCTET(data[5]) != 0) return; -+ firstoffset = GETJOCTET(data[6]); -+ firstoffset <<= 8; -+ firstoffset += GETJOCTET(data[7]); -+ } else { -+ if (GETJOCTET(data[7]) != 0) return; -+ if (GETJOCTET(data[6]) != 0) return; -+ firstoffset = GETJOCTET(data[5]); -+ firstoffset <<= 8; -+ firstoffset += GETJOCTET(data[4]); - } -- MCU_cols = dstinfo->image_width / (max_h_samp_factor * DCTSIZE); -- if (MCU_cols > 0) /* can't trim to 0 pixels */ -- dstinfo->image_width = MCU_cols * (max_h_samp_factor * DCTSIZE); --} -+ if (firstoffset > length - 2) return; /* check end of data segment */ - --LOCAL(void) --trim_bottom_edge (j_compress_ptr dstinfo) --{ -- int ci, max_v_samp_factor; -- JDIMENSION MCU_rows; -+ /* Get the number of directory entries contained in this IFD */ -+ if (is_motorola) { -+ number_of_tags = GETJOCTET(data[firstoffset]); -+ number_of_tags <<= 8; -+ number_of_tags += GETJOCTET(data[firstoffset+1]); -+ } else { -+ number_of_tags = GETJOCTET(data[firstoffset+1]); -+ number_of_tags <<= 8; -+ number_of_tags += GETJOCTET(data[firstoffset]); -+ } -+ if (number_of_tags == 0) return; -+ firstoffset += 2; -+ -+ /* Search for ExifSubIFD offset Tag in IFD0 */ -+ for (;;) { -+ if (firstoffset > length - 12) return; /* check end of data segment */ -+ /* Get Tag number */ -+ if (is_motorola) { -+ tagnum = GETJOCTET(data[firstoffset]); -+ tagnum <<= 8; -+ tagnum += GETJOCTET(data[firstoffset+1]); -+ } else { -+ tagnum = GETJOCTET(data[firstoffset+1]); -+ tagnum <<= 8; -+ tagnum += GETJOCTET(data[firstoffset]); -+ } -+ if (tagnum == 0x8769) break; /* found ExifSubIFD offset Tag */ -+ if (--number_of_tags == 0) return; -+ firstoffset += 12; -+ } -+ -+ /* Get the ExifSubIFD offset */ -+ if (is_motorola) { -+ if (GETJOCTET(data[firstoffset+8]) != 0) return; -+ if (GETJOCTET(data[firstoffset+9]) != 0) return; -+ offset = GETJOCTET(data[firstoffset+10]); -+ offset <<= 8; -+ offset += GETJOCTET(data[firstoffset+11]); -+ } else { -+ if (GETJOCTET(data[firstoffset+11]) != 0) return; -+ if (GETJOCTET(data[firstoffset+10]) != 0) return; -+ offset = GETJOCTET(data[firstoffset+9]); -+ offset <<= 8; -+ offset += GETJOCTET(data[firstoffset+8]); -+ } -+ if (offset > length - 2) return; /* check end of data segment */ - -- /* We have to compute max_v_samp_factor ourselves, -- * because it hasn't been set yet in the destination -- * (and we don't want to use the source's value). -- */ -- max_v_samp_factor = 1; -- for (ci = 0; ci < dstinfo->num_components; ci++) { -- int v_samp_factor = dstinfo->comp_info[ci].v_samp_factor; -- max_v_samp_factor = MAX(max_v_samp_factor, v_samp_factor); -- } -- MCU_rows = dstinfo->image_height / (max_v_samp_factor * DCTSIZE); -- if (MCU_rows > 0) /* can't trim to 0 pixels */ -- dstinfo->image_height = MCU_rows * (max_v_samp_factor * DCTSIZE); -+ /* Get the number of directory entries contained in this SubIFD */ -+ if (is_motorola) { -+ number_of_tags = GETJOCTET(data[offset]); -+ number_of_tags <<= 8; -+ number_of_tags += GETJOCTET(data[offset+1]); -+ } else { -+ number_of_tags = GETJOCTET(data[offset+1]); -+ number_of_tags <<= 8; -+ number_of_tags += GETJOCTET(data[offset]); -+ } -+ if (number_of_tags < 2) return; -+ offset += 2; -+ -+ /* Search for ExifImageWidth and ExifImageHeight Tags in this SubIFD */ -+ do { -+ if (offset > length - 12) return; /* check end of data segment */ -+ /* Get Tag number */ -+ if (is_motorola) { -+ tagnum = GETJOCTET(data[offset]); -+ tagnum <<= 8; -+ tagnum += GETJOCTET(data[offset+1]); -+ } else { -+ tagnum = GETJOCTET(data[offset+1]); -+ tagnum <<= 8; -+ tagnum += GETJOCTET(data[offset]); -+ } -+ if (tagnum == 0xA002 || tagnum == 0xA003) { -+ if (tagnum == 0xA002) -+ new_value = new_width; /* ExifImageWidth Tag */ -+ else -+ new_value = new_height; /* ExifImageHeight Tag */ -+ if (is_motorola) { -+ data[offset+2] = 0; /* Format = unsigned long (4 octets) */ -+ data[offset+3] = 4; -+ data[offset+4] = 0; /* Number Of Components = 1 */ -+ data[offset+5] = 0; -+ data[offset+6] = 0; -+ data[offset+7] = 1; -+ data[offset+8] = 0; -+ data[offset+9] = 0; -+ data[offset+10] = (JOCTET)((new_value >> 8) & 0xFF); -+ data[offset+11] = (JOCTET)(new_value & 0xFF); -+ } else { -+ data[offset+2] = 4; /* Format = unsigned long (4 octets) */ -+ data[offset+3] = 0; -+ data[offset+4] = 1; /* Number Of Components = 1 */ -+ data[offset+5] = 0; -+ data[offset+6] = 0; -+ data[offset+7] = 0; -+ data[offset+8] = (JOCTET)(new_value & 0xFF); -+ data[offset+9] = (JOCTET)((new_value >> 8) & 0xFF); -+ data[offset+10] = 0; -+ data[offset+11] = 0; -+ } -+ } -+ offset += 12; -+ } while (--number_of_tags); - } - - -@@ -736,18 +1650,22 @@ - { - /* If force-to-grayscale is requested, adjust destination parameters */ - if (info->force_grayscale) { -- /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed -- * properly. Among other things, the target h_samp_factor & v_samp_factor -- * will get set to 1, which typically won't match the source. -- * In fact we do this even if the source is already grayscale; that -- * provides an easy way of coercing a grayscale JPEG with funny sampling -- * factors to the customary 1,1. (Some decoders fail on other factors.) -+ /* First, ensure we have YCbCr or grayscale data, and that the source's -+ * Y channel is full resolution. (No reasonable person would make Y -+ * be less than full resolution, so actually coping with that case -+ * isn't worth extra code space. But we check it to avoid crashing.) - */ -- if ((dstinfo->jpeg_color_space == JCS_YCbCr && -- dstinfo->num_components == 3) || -- (dstinfo->jpeg_color_space == JCS_GRAYSCALE && -- dstinfo->num_components == 1)) { -- /* We have to preserve the source's quantization table number. */ -+ if (((dstinfo->jpeg_color_space == JCS_YCbCr && -+ dstinfo->num_components == 3) || -+ (dstinfo->jpeg_color_space == JCS_GRAYSCALE && -+ dstinfo->num_components == 1)) && -+ srcinfo->comp_info[0].h_samp_factor == srcinfo->max_h_samp_factor && -+ srcinfo->comp_info[0].v_samp_factor == srcinfo->max_v_samp_factor) { -+ /* We use jpeg_set_colorspace to make sure subsidiary settings get fixed -+ * properly. Among other things, it sets the target h_samp_factor & -+ * v_samp_factor to 1, which typically won't match the source. -+ * We have to preserve the source's quantization table number, however. -+ */ - int sv_quant_tbl_no = dstinfo->comp_info[0].quant_tbl_no; - jpeg_set_colorspace(dstinfo, JCS_GRAYSCALE); - dstinfo->comp_info[0].quant_tbl_no = sv_quant_tbl_no; -@@ -755,48 +1673,54 @@ - /* Sorry, can't do it */ - ERREXIT(dstinfo, JERR_CONVERSION_NOTIMPL); - } -+ } else if (info->num_components == 1) { -+ /* For a single-component source, we force the destination sampling factors -+ * to 1x1, with or without force_grayscale. This is useful because some -+ * decoders choke on grayscale images with other sampling factors. -+ */ -+ dstinfo->comp_info[0].h_samp_factor = 1; -+ dstinfo->comp_info[0].v_samp_factor = 1; } -- /* Correct the destination's image dimensions etc if necessary */ -+ /* Correct the destination's image dimensions etc as necessary -+ * for crop and rotate/flip operations. -+ */ -+ dstinfo->image_width = info->output_width; -+ dstinfo->image_height = info->output_height; - switch (info->transform) { -- case JXFORM_NONE: -- /* Nothing to do */ -- break; -- case JXFORM_FLIP_H: -- if (info->trim) -- trim_right_edge(dstinfo); -- break; -- case JXFORM_FLIP_V: -- if (info->trim) -- trim_bottom_edge(dstinfo); -- break; - case JXFORM_TRANSPOSE: -- transpose_critical_parameters(dstinfo); -- /* transpose does NOT have to trim anything */ -- break; - case JXFORM_TRANSVERSE: -- transpose_critical_parameters(dstinfo); -- if (info->trim) { -- trim_right_edge(dstinfo); -- trim_bottom_edge(dstinfo); -- } -- break; - case JXFORM_ROT_90: -- transpose_critical_parameters(dstinfo); -- if (info->trim) -- trim_right_edge(dstinfo); -- break; -- case JXFORM_ROT_180: -- if (info->trim) { -- trim_right_edge(dstinfo); -- trim_bottom_edge(dstinfo); -- } -- break; + /* Allocate workspace if needed. +@@ -1309,6 +1702,11 @@ case JXFORM_ROT_270: transpose_critical_parameters(dstinfo); -- if (info->trim) -- trim_bottom_edge(dstinfo); break; + case JXFORM_DROP: + if (info->drop_width != 0 && info->drop_height != 0) + adjust_quant(srcinfo, src_coef_arrays, -+ info->drop_ptr, info->drop_coef_arrays, -+ info->trim, dstinfo); -+ break; -+ } -+ -+ /* Adjust Exif properties */ -+ if (srcinfo->marker_list != NULL && -+ srcinfo->marker_list->marker == JPEG_APP0+1 && -+ srcinfo->marker_list->data_length >= 6 && -+ GETJOCTET(srcinfo->marker_list->data[0]) == 0x45 && -+ GETJOCTET(srcinfo->marker_list->data[1]) == 0x78 && -+ GETJOCTET(srcinfo->marker_list->data[2]) == 0x69 && -+ GETJOCTET(srcinfo->marker_list->data[3]) == 0x66 && -+ GETJOCTET(srcinfo->marker_list->data[4]) == 0 && -+ GETJOCTET(srcinfo->marker_list->data[5]) == 0) { -+ /* Suppress output of JFIF marker */ -+ dstinfo->write_JFIF_header = FALSE; -+ /* Adjust Exif image parameters */ -+ if (dstinfo->image_width != srcinfo->image_width || -+ dstinfo->image_height != srcinfo->image_height) -+ /* Align data segment to start of TIFF structure for parsing */ -+ adjust_exif_parameters(srcinfo->marker_list->data + 6, -+ srcinfo->marker_list->data_length - 6, -+ dstinfo->image_width, dstinfo->image_height); ++ info->drop_ptr, info->drop_coef_arrays, ++ info->trim, dstinfo); + default: + break; } - - /* Return the appropriate output data set */ -@@ -816,38 +1740,114 @@ - */ - - GLOBAL(void) --jtransform_execute_transformation (j_decompress_ptr srcinfo, -- j_compress_ptr dstinfo, -- jvirt_barray_ptr *src_coef_arrays, -- jpeg_transform_info *info) -+jtransform_execute_transform (j_decompress_ptr srcinfo, -+ j_compress_ptr dstinfo, -+ jvirt_barray_ptr *src_coef_arrays, -+ jpeg_transform_info *info) - { - jvirt_barray_ptr *dst_coef_arrays = info->workspace_coef_arrays; - -+ /* Note: conditions tested here should match those in switch statement -+ * in jtransform_request_workspace() -+ */ +@@ -1363,7 +1761,9 @@ + */ switch (info->transform) { case JXFORM_NONE: +- if (info->x_crop_offset != 0 || info->y_crop_offset != 0) + if (info->x_crop_offset != 0 || info->y_crop_offset != 0 || -+ info->output_width > srcinfo->image_width || -+ info->output_height > srcinfo->image_height) -+ do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); - break; - case JXFORM_FLIP_H: -- do_flip_h(srcinfo, dstinfo, src_coef_arrays); -+ if (info->y_crop_offset != 0) -+ do_flip_h(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); -+ else -+ do_flip_h_no_crop(srcinfo, dstinfo, info->x_crop_offset, -+ src_coef_arrays); - break; - case JXFORM_FLIP_V: -- do_flip_v(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays); -+ do_flip_v(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); - break; - case JXFORM_TRANSPOSE: -- do_transpose(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays); -+ do_transpose(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); - break; - case JXFORM_TRANSVERSE: -- do_transverse(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays); -+ do_transverse(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); - break; - case JXFORM_ROT_90: -- do_rot_90(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays); -+ do_rot_90(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); ++ info->output_width > srcinfo->image_width || ++ info->output_height > srcinfo->image_height) + do_crop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, + src_coef_arrays, dst_coef_arrays); break; - case JXFORM_ROT_180: -- do_rot_180(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays); -+ do_rot_180(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); -+ break; -+ case JXFORM_ROT_270: -+ do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, dst_coef_arrays); +@@ -1399,6 +1799,12 @@ + do_rot_270(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, + src_coef_arrays, dst_coef_arrays); break; + case JXFORM_DROP: + if (info->drop_width != 0 && info->drop_height != 0) + do_drop(srcinfo, dstinfo, info->x_crop_offset, info->y_crop_offset, -+ src_coef_arrays, info->drop_ptr, info->drop_coef_arrays, -+ info->drop_width, info->drop_height); -+ break; -+ } -+} -+ -+/* jtransform_perfect_transform -+ * -+ * Determine whether lossless transformation is perfectly -+ * possible for a specified image and transformation. -+ * -+ * Inputs: -+ * image_width, image_height: source image dimensions. -+ * MCU_width, MCU_height: pixel dimensions of MCU. -+ * transform: transformation identifier. -+ * Parameter sources from initialized jpeg_struct -+ * (after reading source header): -+ * image_width = cinfo.image_width -+ * image_height = cinfo.image_height -+ * MCU_width = cinfo.max_h_samp_factor * DCTSIZE -+ * MCU_height = cinfo.max_v_samp_factor * DCTSIZE -+ * Result: -+ * TRUE = perfect transformation possible -+ * FALSE = perfect transformation not possible -+ * (may use custom action then) -+ */ -+ -+GLOBAL(boolean) -+jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, -+ int MCU_width, int MCU_height, -+ JXFORM_CODE transform) -+{ -+ boolean result = TRUE; /* initialize TRUE */ -+ -+ switch (transform) { -+ case JXFORM_FLIP_H: - case JXFORM_ROT_270: -- do_rot_270(srcinfo, dstinfo, src_coef_arrays, dst_coef_arrays); -+ if (image_width % (JDIMENSION) MCU_width) -+ result = FALSE; -+ break; -+ case JXFORM_FLIP_V: -+ case JXFORM_ROT_90: -+ if (image_height % (JDIMENSION) MCU_height) -+ result = FALSE; ++ src_coef_arrays, info->drop_ptr, info->drop_coef_arrays, ++ info->drop_width, info->drop_height); + break; -+ case JXFORM_TRANSVERSE: -+ case JXFORM_ROT_180: -+ if (image_width % (JDIMENSION) MCU_width) -+ result = FALSE; -+ if (image_height % (JDIMENSION) MCU_height) -+ result = FALSE; - break; } -+ -+ return result; } - #endif /* TRANSFORMS_SUPPORTED */ diff --git a/graphics/jpeg/files/patch-transupp.h b/graphics/jpeg/files/patch-transupp.h index c8e1941..2073ae3 100644 --- a/graphics/jpeg/files/patch-transupp.h +++ b/graphics/jpeg/files/patch-transupp.h @@ -1,191 +1,36 @@ ---- transupp.h.orig Wed Jul 23 22:39:12 1997 -+++ transupp.h Fri Jun 4 15:07:31 2004 -@@ -1,7 +1,7 @@ - /* - * transupp.h - * -- * Copyright (C) 1997, Thomas G. Lane. -+ * Copyright (C) 1997-2001, Thomas G. Lane. - * This file is part of the Independent JPEG Group's software. - * For conditions of distribution and use, see the accompanying README file. - * -@@ -22,32 +22,6 @@ - #define TRANSFORMS_SUPPORTED 1 /* 0 disables transform code */ - #endif - --/* Short forms of external names for systems with brain-damaged linkers. */ -- --#ifdef NEED_SHORT_EXTERNAL_NAMES --#define jtransform_request_workspace jTrRequest --#define jtransform_adjust_parameters jTrAdjust --#define jtransform_execute_transformation jTrExec --#define jcopy_markers_setup jCMrkSetup --#define jcopy_markers_execute jCMrkExec --#endif /* NEED_SHORT_EXTERNAL_NAMES */ -- -- --/* -- * Codes for supported types of image transformations. -- */ -- --typedef enum { -- JXFORM_NONE, /* no transformation */ -- JXFORM_FLIP_H, /* horizontal flip */ -- JXFORM_FLIP_V, /* vertical flip */ -- JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */ -- JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */ -- JXFORM_ROT_90, /* 90-degree clockwise rotation */ -- JXFORM_ROT_180, /* 180-degree rotation */ +--- transupp.h.orig 2003-09-21 23:01:30.000000000 +0200 ++++ transupp.h 2009-07-01 08:54:49.000000000 +0200 +@@ -96,7 +96,8 @@ + JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */ + JXFORM_ROT_90, /* 90-degree clockwise rotation */ + JXFORM_ROT_180, /* 180-degree rotation */ - JXFORM_ROT_270 /* 270-degree clockwise (or 90 ccw) */ --} JXFORM_CODE; -- ++ JXFORM_ROT_270, /* 270-degree clockwise (or 90 ccw) */ ++ JXFORM_DROP /* drop */ + } JXFORM_CODE; + /* - * Although rotating and flipping data expressed as DCT coefficients is not - * hard, there is an asymmetry in the JPEG format specification for images -@@ -75,6 +49,19 @@ - * (For example, -rot 270 -trim trims only the bottom edge, but -rot 90 -trim - * followed by -rot 180 -trim trims both edges.) - * -+ * We also offer a lossless-crop option, which discards data outside a given -+ * image region but losslessly preserves what is inside. Like the rotate and -+ * flip transforms, lossless crop is restricted by the JPEG format: the upper -+ * left corner of the selected region must fall on an iMCU boundary. If this -+ * does not hold for the given crop parameters, we silently move the upper left -+ * corner up and/or left to make it so, simultaneously increasing the region -+ * dimensions to keep the lower right crop corner unchanged. (Thus, the -+ * output image covers at least the requested region, but may cover more.) -+ * -+ * If both crop and a rotate/flip transform are requested, the crop is applied -+ * last --- that is, the crop region is specified in terms of the destination -+ * image. -+ * - * We also offer a "force to grayscale" option, which simply discards the - * chrominance channels of a YCbCr image. This is lossless in the sense that - * the luminance channel is preserved exactly. It's not the same kind of -@@ -83,20 +70,96 @@ - * be aware of the option to know how many components to work on. - */ +@@ -136,6 +137,10 @@ + JDIMENSION crop_yoffset; /* Y offset of selected region */ + JCROP_CODE crop_yoffset_set; /* (negative measures from bottom edge) */ -+ -+/* Short forms of external names for systems with brain-damaged linkers. */ -+ -+#ifdef NEED_SHORT_EXTERNAL_NAMES -+#define jtransform_parse_crop_spec jTrParCrop -+#define jtransform_request_workspace jTrRequest -+#define jtransform_adjust_parameters jTrAdjust -+#define jtransform_execute_transform jTrExec -+#define jtransform_perfect_transform jTrPerfect -+#define jcopy_markers_setup jCMrkSetup -+#define jcopy_markers_execute jCMrkExec -+#endif /* NEED_SHORT_EXTERNAL_NAMES */ -+ -+ -+/* -+ * Codes for supported types of image transformations. -+ */ -+ -+typedef enum { -+ JXFORM_NONE, /* no transformation */ -+ JXFORM_FLIP_H, /* horizontal flip */ -+ JXFORM_FLIP_V, /* vertical flip */ -+ JXFORM_TRANSPOSE, /* transpose across UL-to-LR axis */ -+ JXFORM_TRANSVERSE, /* transpose across UR-to-LL axis */ -+ JXFORM_ROT_90, /* 90-degree clockwise rotation */ -+ JXFORM_ROT_180, /* 180-degree rotation */ -+ JXFORM_ROT_270, /* 270-degree clockwise (or 90 ccw) */ -+ JXFORM_DROP /* drop */ -+} JXFORM_CODE; -+ -+/* -+ * Codes for crop parameters, which can individually be unspecified, -+ * positive, or negative. (Negative width or height makes no sense, though.) -+ */ -+ -+typedef enum { -+ JCROP_UNSET, -+ JCROP_POS, -+ JCROP_NEG -+} JCROP_CODE; -+ -+/* -+ * Transform parameters struct. -+ * NB: application must not change any elements of this struct after -+ * calling jtransform_request_workspace. -+ */ -+ - typedef struct { - /* Options: set by caller */ - JXFORM_CODE transform; /* image transform operator */ -+ boolean perfect; /* if TRUE, fail if partial MCUs are requested */ - boolean trim; /* if TRUE, trim partial MCUs as needed */ - boolean force_grayscale; /* if TRUE, convert color image to grayscale */ -+ boolean crop; /* if TRUE, crop source image */ -+ -+ /* Crop parameters: application need not set these unless crop is TRUE. -+ * These can be filled in by jtransform_parse_crop_spec(). -+ */ -+ JDIMENSION crop_width; /* Width of selected region */ -+ JCROP_CODE crop_width_set; -+ JDIMENSION crop_height; /* Height of selected region */ -+ JCROP_CODE crop_height_set; -+ JDIMENSION crop_xoffset; /* X offset of selected region */ -+ JCROP_CODE crop_xoffset_set; /* (negative measures from right edge) */ -+ JDIMENSION crop_yoffset; /* Y offset of selected region */ -+ JCROP_CODE crop_yoffset_set; /* (negative measures from bottom edge) */ -+ + /* Drop parameters: set by caller for drop request */ + j_decompress_ptr drop_ptr; + jvirt_barray_ptr * drop_coef_arrays; - ++ /* Internal workspace: caller should not touch these */ int num_components; /* # of components in workspace */ jvirt_barray_ptr * workspace_coef_arrays; /* workspace for transformations */ -+ JDIMENSION output_width; /* cropped destination dimensions */ -+ JDIMENSION output_height; -+ JDIMENSION x_crop_offset; /* destination crop offsets measured in iMCUs */ -+ JDIMENSION y_crop_offset; -+ JDIMENSION drop_width; /* drop dimensions measured in iMCUs */ +@@ -143,6 +148,8 @@ + JDIMENSION output_height; + JDIMENSION x_crop_offset; /* destination crop offsets measured in iMCUs */ + JDIMENSION y_crop_offset; ++ JDIMENSION drop_width; /* drop dimensions measured in iMCUs */ + JDIMENSION drop_height; -+ int max_h_samp_factor; /* destination iMCU size */ -+ int max_v_samp_factor; + int max_h_samp_factor; /* destination iMCU size */ + int max_v_samp_factor; } jpeg_transform_info; - - - #if TRANSFORMS_SUPPORTED - -+/* Parse a crop specification (written in X11 geometry style) */ -+EXTERN(boolean) jtransform_parse_crop_spec -+ JPP((jpeg_transform_info *info, const char *spec)); - /* Request any required workspace */ - EXTERN(void) jtransform_request_workspace - JPP((j_decompress_ptr srcinfo, jpeg_transform_info *info)); -@@ -106,10 +169,24 @@ - jvirt_barray_ptr *src_coef_arrays, - jpeg_transform_info *info)); - /* Execute the actual transformation, if any */ --EXTERN(void) jtransform_execute_transformation -+EXTERN(void) jtransform_execute_transform - JPP((j_decompress_ptr srcinfo, j_compress_ptr dstinfo, - jvirt_barray_ptr *src_coef_arrays, - jpeg_transform_info *info)); -+/* Determine whether lossless transformation is perfectly -+ * possible for a specified image and transformation. -+ */ -+EXTERN(boolean) jtransform_perfect_transform -+ JPP((JDIMENSION image_width, JDIMENSION image_height, -+ int MCU_width, int MCU_height, -+ JXFORM_CODE transform)); -+ -+/* jtransform_execute_transform used to be called -+ * jtransform_execute_transformation, but some compilers complain about -+ * routine names that long. This macro is here to avoid breaking any -+ * old source code that uses the original name... -+ */ -+#define jtransform_execute_transformation jtransform_execute_transform - - #endif /* TRANSFORMS_SUPPORTED */ - -@@ -121,7 +198,8 @@ +@@ -191,7 +198,8 @@ typedef enum { JCOPYOPT_NONE, /* copy no optional markers */ JCOPYOPT_COMMENTS, /* copy only comment (COM) markers */ diff --git a/graphics/jpeg/pkg-plist b/graphics/jpeg/pkg-plist index 4c06241..6c08819 100644 --- a/graphics/jpeg/pkg-plist +++ b/graphics/jpeg/pkg-plist @@ -14,14 +14,14 @@ include/jpeglib.h lib/libjpeg.a lib/libjpeg.la lib/libjpeg.so -lib/libjpeg.so.9 +lib/libjpeg.so.10 %%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%%%%DOCSDIR%%/coderules.txt +%%PORTDOCS%%%%DOCSDIR%%/filelist.txt +%%PORTDOCS%%%%DOCSDIR%%/install.txt +%%PORTDOCS%%%%DOCSDIR%%/jconfig.txt +%%PORTDOCS%%%%DOCSDIR%%/libjpeg.txt +%%PORTDOCS%%%%DOCSDIR%%/structure.txt +%%PORTDOCS%%%%DOCSDIR%%/usage.txt +%%PORTDOCS%%%%DOCSDIR%%/wizard.txt %%PORTDOCS%%@dirrm %%DOCSDIR%% diff --git a/graphics/jpeginfo/Makefile b/graphics/jpeginfo/Makefile index 6947c2a..a024ffe 100644 --- a/graphics/jpeginfo/Makefile +++ b/graphics/jpeginfo/Makefile @@ -7,13 +7,14 @@ PORTNAME= jpeginfo PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.kokkonen.net/tjko/src/ MAINTAINER= ache@freebsd.org COMMENT= Generate listing and MD5, check jpegs for error, delete broken ones -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/jpegoptim/Makefile b/graphics/jpegoptim/Makefile index 18136ec..9b6dc40 100644 --- a/graphics/jpegoptim/Makefile +++ b/graphics/jpegoptim/Makefile @@ -7,13 +7,14 @@ PORTNAME= jpegoptim PORTVERSION= 1.2.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.kokkonen.net/tjko/src/ MAINTAINER= ports@FreeBSD.org COMMENT= Utility to optimize jpeg files -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libjpeg=${LOCALBASE} diff --git a/graphics/jpegpixi/Makefile b/graphics/jpegpixi/Makefile index 9530634..2af2c67 100644 --- a/graphics/jpegpixi/Makefile +++ b/graphics/jpegpixi/Makefile @@ -7,14 +7,14 @@ PORTNAME= jpegpixi PORTVERSION= 1.1.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://www.zero-based.org/software/jpegpixi/ MAINTAINER= stas@FreeBSD.org COMMENT= Useful to correct images from digtal camera with CCD defects -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/jpgtn/Makefile b/graphics/jpgtn/Makefile index 6c1481a..13ef11c 100644 --- a/graphics/jpgtn/Makefile +++ b/graphics/jpgtn/Makefile @@ -7,6 +7,7 @@ PORTNAME= jpgtn PORTVERSION= 2.06 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/misc @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= apps/graphics/misc MAINTAINER= ports@FreeBSD.org COMMENT= Creates thumbnails of JPEG images -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-libjpeg=${LOCALBASE} diff --git a/graphics/jslice/Makefile b/graphics/jslice/Makefile index 7e159af..17ef94f 100644 --- a/graphics/jslice/Makefile +++ b/graphics/jslice/Makefile @@ -7,13 +7,14 @@ PORTNAME= jslice PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.pldaniels.com/jslice/ MAINTAINER= ports@FreeBSD.org COMMENT= Graphics tool to split up a JPEG image and provide HTML for the slices -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_FILES= bin/jslice diff --git a/graphics/k3d/Makefile b/graphics/k3d/Makefile index 0f57be3..573c825 100644 --- a/graphics/k3d/Makefile +++ b/graphics/k3d/Makefile @@ -9,7 +9,7 @@ PORTNAME= k3d PORTVERSION= 0.6.7.0 DISTVERSIONSUFFIX=-src -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= SF diff --git a/graphics/kdc2tiff/Makefile b/graphics/kdc2tiff/Makefile index 9c9e15d..dfd093a 100644 --- a/graphics/kdc2tiff/Makefile +++ b/graphics/kdc2tiff/Makefile @@ -7,6 +7,7 @@ PORTNAME= kdc2tiff PORTVERSION= 0.35 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Converts Kodak .kdc to TIFF or JPEG formats -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff USE_GMAKE= yes diff --git a/graphics/lcms/Makefile b/graphics/lcms/Makefile index 511e58e..ed5c60e 100644 --- a/graphics/lcms/Makefile +++ b/graphics/lcms/Makefile @@ -7,7 +7,7 @@ PORTNAME= lcms PORTVERSION= 1.18a -PORTREVISION= 0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ @@ -40,7 +40,7 @@ PLIST_SUB+= TIFFICC="@comment " .endif .if defined(WITH_JPEGICC) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEGICC="" MAN1+= jpegicc.1 .else diff --git a/graphics/leptonica/Makefile b/graphics/leptonica/Makefile index 205c27b..5d2382e 100644 --- a/graphics/leptonica/Makefile +++ b/graphics/leptonica/Makefile @@ -7,6 +7,7 @@ PORTNAME= leptonlib PORTVERSION= 1.60 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -14,7 +15,7 @@ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= C library for efficient image processing and image analysis operations LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff PROJECTHOST= leptonica diff --git a/graphics/leptonlib/Makefile b/graphics/leptonlib/Makefile index 205c27b..5d2382e 100644 --- a/graphics/leptonlib/Makefile +++ b/graphics/leptonlib/Makefile @@ -7,6 +7,7 @@ PORTNAME= leptonlib PORTVERSION= 1.60 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= GOOGLE_CODE @@ -14,7 +15,7 @@ MAINTAINER= hiroto.kagotani@gmail.com COMMENT= C library for efficient image processing and image analysis operations LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff PROJECTHOST= leptonica diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile index bbaa940..c6ac9d6 100644 --- a/graphics/libafterimage/Makefile +++ b/graphics/libafterimage/Makefile @@ -8,6 +8,7 @@ PORTNAME= libafterimage PORTVERSION= 1.18 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF/afterstep DISTNAME= libAfterImage-${PORTVERSION} @@ -15,7 +16,7 @@ DISTNAME= libAfterImage-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Generic imaging library originally designed for AfterStep -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ diff --git a/graphics/libflash/Makefile b/graphics/libflash/Makefile index 552eed1..e3f3801 100644 --- a/graphics/libflash/Makefile +++ b/graphics/libflash/Makefile @@ -7,7 +7,7 @@ PORTNAME= libflash PORTVERSION= 0.4.13 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/gplflash DISTNAME= gplflash-${PORTVERSION} @@ -16,7 +16,7 @@ MAINTAINER= llwang@infor.org COMMENT= GPL Flash (TM) Library LIB_DEPENDS= mad.2:${PORTSDIR}/audio/libmad \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_XORG= x11 xext xkbfile xt WRKSRC= ${WRKDIR}/${DISTNAME}/lib diff --git a/graphics/libgeotiff/Makefile b/graphics/libgeotiff/Makefile index 437c3ae..4dcaf1a 100644 --- a/graphics/libgeotiff/Makefile +++ b/graphics/libgeotiff/Makefile @@ -7,6 +7,7 @@ PORTNAME= libgeotiff PORTVERSION= 1.2.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/ \ http://dl1.maptools.org/dl/geotiff/libgeotiff/ @@ -14,7 +15,7 @@ MASTER_SITES= ftp://ftp.remotesensing.org/pub/geotiff/libgeotiff/ \ MAINTAINER= ports@FreeBSD.org COMMENT= Library for reading and writing GeoTIFF information tags -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ proj.5:${PORTSDIR}/graphics/proj \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/libgfx/Makefile b/graphics/libgfx/Makefile index e37a4ca..6bfce97 100644 --- a/graphics/libgfx/Makefile +++ b/graphics/libgfx/Makefile @@ -7,7 +7,7 @@ PORTNAME= libgfx DISTVERSION= 1.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://graphics.cs.uiuc.edu/~garland/dist/ CENKES @@ -18,7 +18,7 @@ LIB_DEPENDS= fltk.1:${PORTSDIR}/x11-toolkits/fltk \ tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ gzstream.0:${PORTSDIR}/devel/gzstream \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= gl USE_GMAKE= yes diff --git a/graphics/libimg/Makefile b/graphics/libimg/Makefile index 9b40eee..e41a826 100644 --- a/graphics/libimg/Makefile +++ b/graphics/libimg/Makefile @@ -7,7 +7,7 @@ PORTNAME= libimg PORTVERSION= 1.2.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES?= graphics tk MASTER_SITES= SF/tkimg DISTNAME= img${PORTVERSION} diff --git a/graphics/libmng/Makefile b/graphics/libmng/Makefile index 93ac574..12f6424 100644 --- a/graphics/libmng/Makefile +++ b/graphics/libmng/Makefile @@ -7,6 +7,7 @@ PORTNAME= libmng PORTVERSION= 1.0.10 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.libmng.com/download/ diff --git a/graphics/libopenraw/Makefile b/graphics/libopenraw/Makefile index 7710bb7..5c7bbc5 100644 --- a/graphics/libopenraw/Makefile +++ b/graphics/libopenraw/Makefile @@ -7,6 +7,7 @@ PORTNAME= libopenraw PORTVERSION= 0.0.8 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://libopenraw.freedesktop.org/download/ @@ -14,7 +15,7 @@ MAINTAINER= pav@FreeBSD.org COMMENT= Library for camera RAW files decoding LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg MAKE_JOBS_SAFE= yes USE_GNOME= libxml2 diff --git a/graphics/libpano12/Makefile b/graphics/libpano12/Makefile index ec385f4..bbafd8a 100644 --- a/graphics/libpano12/Makefile +++ b/graphics/libpano12/Makefile @@ -10,7 +10,7 @@ PORTNAME= libpano12 PORTVERSION= 2.8.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics java MASTER_SITES= SF MASTER_SITE_SUBDIR= panotools diff --git a/graphics/libpano13/Makefile b/graphics/libpano13/Makefile index 9818d4e..f390d5d 100644 --- a/graphics/libpano13/Makefile +++ b/graphics/libpano13/Makefile @@ -7,6 +7,7 @@ PORTNAME= libpano13 PORTVERSION= 2.9.14 +PORTREVISION= 1 CATEGORIES= graphics java MASTER_SITES= SF MASTER_SITE_SUBDIR= panotools diff --git a/graphics/libraw/Makefile b/graphics/libraw/Makefile index 7715afd..97b36b9 100644 --- a/graphics/libraw/Makefile +++ b/graphics/libraw/Makefile @@ -7,6 +7,7 @@ PORTNAME= libraw PORTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libraw.su/data/ DISTNAME= LibRaw-${PORTVERSION} @@ -19,7 +20,7 @@ OPTIONS= OPTIMIZED_CFLAGS "Enable optimization" off \ .include <bsd.port.pre.mk> -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms .if defined(WITH_OPTIMIZED_CFLAGS) diff --git a/graphics/libsvg-cairo/Makefile b/graphics/libsvg-cairo/Makefile index 484b098..cc95851 100644 --- a/graphics/libsvg-cairo/Makefile +++ b/graphics/libsvg-cairo/Makefile @@ -8,14 +8,14 @@ PORTNAME= libsvg-cairo PORTVERSION= 0.1.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ MAINTAINER= gnome@FreeBSD.org COMMENT= SVG rendering library -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ svg.1:${PORTSDIR}/graphics/libsvg \ cairo.2:${PORTSDIR}/graphics/cairo diff --git a/graphics/libsvg/Makefile b/graphics/libsvg/Makefile index 8fa5055..bd7496f 100644 --- a/graphics/libsvg/Makefile +++ b/graphics/libsvg/Makefile @@ -8,7 +8,7 @@ PORTNAME= libsvg PORTVERSION= 0.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://cairographics.org/snapshots/ @@ -17,7 +17,7 @@ COMMENT= A parser for SVG content in files or buffers LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_AUTOTOOLS= libtool:15 GNU_CONFIGURE= yes diff --git a/graphics/libwmf/Makefile b/graphics/libwmf/Makefile index f3bb062..6fcbf48 100644 --- a/graphics/libwmf/Makefile +++ b/graphics/libwmf/Makefile @@ -7,7 +7,7 @@ PORTNAME= libwmf PORTVERSION= 0.2.8.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= wvware @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Tools and library for converting Microsoft WMF (windows metafile) BUILD_DEPENDS= freetype-config:${PORTSDIR}/print/freetype2 # XXX -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/graphics/libx3dtk/Makefile b/graphics/libx3dtk/Makefile index 0695eef..a3b6ed1 100644 --- a/graphics/libx3dtk/Makefile +++ b/graphics/libx3dtk/Makefile @@ -8,7 +8,7 @@ PORTNAME= libx3dtk PORTVERSION= 1.0.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://artis.imag.fr/Members/Yannick.Legoc/X3D/libs/ DISTNAME= X3DToolKit-${PORTVERSION:R}.${PORTVERSION:E} @@ -17,7 +17,7 @@ MAINTAINER= tanis@gaspode.franken.de COMMENT= An LGPL C++ Toolkit for X3D BUILD_DEPENDS= ${QMAKE}:${PORTSDIR}/devel/qmake -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ QGLViewer.2:${PORTSDIR}/graphics/libqglviewer WRKSRC= ${WRKDIR}/X3DToolKit-1.0 diff --git a/graphics/lprof-devel/Makefile b/graphics/lprof-devel/Makefile index 6adb195..1058b78 100644 --- a/graphics/lprof-devel/Makefile +++ b/graphics/lprof-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= lprof PORTVERSION= 20080514 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://mirror.amdmi3.ru/ \ ${MASTER_SITE_LOCAL:S|%SUBDIR%|amdmi3|} @@ -17,7 +17,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open source color profiler LIB_DEPENDS= lcms.1:${PORTSDIR}/graphics/lcms \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ vigraimpex.2:${PORTSDIR}/graphics/vigra diff --git a/graphics/luminance/Makefile b/graphics/luminance/Makefile index 84b6983..c107dd8 100644 --- a/graphics/luminance/Makefile +++ b/graphics/luminance/Makefile @@ -7,7 +7,7 @@ PORTNAME= qtpfsgui PORTVERSION= 1.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF @@ -16,7 +16,7 @@ COMMENT= A graphical user interface that provides a workflow for HDR imaging BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ tiff.4:${PORTSDIR}/graphics/tiff \ fftw3f.5:${PORTSDIR}/math/fftw3-float diff --git a/graphics/megapov/Makefile b/graphics/megapov/Makefile index 83fecf3..c079b0b 100644 --- a/graphics/megapov/Makefile +++ b/graphics/megapov/Makefile @@ -7,7 +7,7 @@ PORTNAME= megapov PORTVERSION= 1.2.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= http://megapov.inetart.net/packages/unix/ DISTNAME= ${PORTNAME}-${PORTVERSION} diff --git a/graphics/metapixel/Makefile b/graphics/metapixel/Makefile index 4156623d..92329ff 100644 --- a/graphics/metapixel/Makefile +++ b/graphics/metapixel/Makefile @@ -6,7 +6,7 @@ PORTNAME= metapixel PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://www.complang.tuwien.ac.at/schani/metapixel/files/ \ http://mirror.roe.ch/dist/metapixel/ @@ -15,7 +15,7 @@ MAINTAINER= daniel@roe.ch COMMENT= A photomosaic generator LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif USE_GMAKE= yes diff --git a/graphics/mtpaint/Makefile b/graphics/mtpaint/Makefile index e1d022a..1451be2 100644 --- a/graphics/mtpaint/Makefile +++ b/graphics/mtpaint/Makefile @@ -7,6 +7,7 @@ PORTNAME= mtpaint PORTVERSION= 3.31 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF @@ -15,7 +16,7 @@ COMMENT= Simple painting program LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ jasper.4:${PORTSDIR}/graphics/jasper \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ openjpeg.2:${PORTSDIR}/graphics/openjpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ diff --git a/graphics/netpbm-devel/files/patch-jpeg.c b/graphics/netpbm-devel/files/patch-jpeg.c new file mode 100644 index 0000000..d1fc425 --- /dev/null +++ b/graphics/netpbm-devel/files/patch-jpeg.c @@ -0,0 +1,11 @@ +--- converter/ppm/ppmtompeg/jpeg.c.orig 2005-11-10 04:53:40.000000000 +0100 ++++ converter/ppm/ppmtompeg/jpeg.c 2009-07-07 10:51:13.000000000 +0200 +@@ -469,7 +469,7 @@ + #ifdef JPEG4 + buffer_height = 8; /* could be 2, 4,8 rows high */ + #else +- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; ++ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; + #endif + + for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile index 205444a..6f89580 100644 --- a/graphics/netpbm/Makefile +++ b/graphics/netpbm/Makefile @@ -11,6 +11,7 @@ PORTVERSION= ${DEVEL_PORTVERSION} .else PORTVERSION= 10.26.63 .endif +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -27,7 +28,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= A toolkit for conversion of images between different formats LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ jbig.1:${PORTSDIR}/graphics/jbigkit # jasper.4:${PORTSDIR}/graphics/jasper diff --git a/graphics/netpbm/files/patch-jpeg.c b/graphics/netpbm/files/patch-jpeg.c new file mode 100644 index 0000000..9722be1 --- /dev/null +++ b/graphics/netpbm/files/patch-jpeg.c @@ -0,0 +1,11 @@ +--- converter/ppm/ppmtompeg/jpeg.c.orig 2002-10-17 16:49:49.000000000 +0200 ++++ converter/ppm/ppmtompeg/jpeg.c 2009-07-07 09:29:29.000000000 +0200 +@@ -481,7 +481,7 @@ + #ifdef JPEG4 + buffer_height = 8; /* could be 2, 4,8 rows high */ + #else +- buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_scaled_size; ++ buffer_height = cinfo.max_v_samp_factor * cinfo.min_DCT_v_scaled_size; + #endif + + for(cp=0,compptr = cinfo.comp_info;cp<cinfo.num_components; diff --git a/graphics/nvidia-texture-tools/Makefile b/graphics/nvidia-texture-tools/Makefile index 6780a93..1604b85 100644 --- a/graphics/nvidia-texture-tools/Makefile +++ b/graphics/nvidia-texture-tools/Makefile @@ -7,6 +7,7 @@ PORTNAME= nvidia-texture-tools PORTVERSION= 2.0.6 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -14,7 +15,7 @@ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Texture Tools with support for DirectX 10 texture formats LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR diff --git a/graphics/ocaml-images/Makefile b/graphics/ocaml-images/Makefile index 758188e..d8a9506 100644 --- a/graphics/ocaml-images/Makefile +++ b/graphics/ocaml-images/Makefile @@ -8,7 +8,7 @@ PORTNAME= images PORTVERSION= 2.2 -PORTREVISION= 5 +PORTREVISION= 6 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= ftp://ftp.inria.fr/INRIA/caml-light/bazar-ocaml/ @@ -27,7 +27,7 @@ RUN_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ lablgtk2:${PORTSDIR}/x11-toolkits/ocaml-lablgtk2 LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff USE_GHOSTSCRIPT= yes diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index b0d353c..d4e23a7 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -8,7 +8,7 @@ PORTNAME= opencv PORTVERSION= 1.0.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= SF/opencvlibrary diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile index b127224..116f63f 100644 --- a/graphics/openrm/Makefile +++ b/graphics/openrm/Makefile @@ -7,7 +7,7 @@ PORTNAME= openrm PORTVERSION= 1.6.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}-devel-${PORTVERSION}-1 @@ -19,7 +19,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ MAINTAINER= ports@FreeBSD.org COMMENT= Development environment used to build 2D/3D/stereo graphics -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/rm${PORTVERSION:S/.//g} .ifdef (WITH_DEMOS) diff --git a/graphics/osg-devel/Makefile b/graphics/osg-devel/Makefile index 70f1afb..49f8f45 100644 --- a/graphics/osg-devel/Makefile +++ b/graphics/osg-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= osg PORTVERSION= 2.9.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/developer_releases/ \ http://mirror.amdmi3.ru/distfiles/ @@ -16,7 +17,7 @@ DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/osg/Makefile b/graphics/osg/Makefile index a743b09..7b70ddb 100644 --- a/graphics/osg/Makefile +++ b/graphics/osg/Makefile @@ -7,6 +7,7 @@ PORTNAME= osg PORTVERSION= 2.8.1 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.openscenegraph.org/downloads/stable_releases/OpenSceneGraph-${PORTVERSION}/source/ \ http://mirror.amdmi3.ru/ @@ -15,7 +16,7 @@ DISTNAME= OpenSceneGraph-${PORTVERSION} MAINTAINER= amdmi3@FreeBSD.org COMMENT= C++ OpenGL scene graph library for real-time rendering -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/p5-Imager/Makefile b/graphics/p5-Imager/Makefile index dbb244a..38f4fd9 100644 --- a/graphics/p5-Imager/Makefile +++ b/graphics/p5-Imager/Makefile @@ -8,7 +8,7 @@ PORTNAME= Imager PORTVERSION= 0.67 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/graphics/p5-Tk-JPEG-Lite/Makefile b/graphics/p5-Tk-JPEG-Lite/Makefile index da8da445..2b66d7e 100644 --- a/graphics/p5-Tk-JPEG-Lite/Makefile +++ b/graphics/p5-Tk-JPEG-Lite/Makefile @@ -7,7 +7,7 @@ PORTNAME= Tk-JPEG-Lite PORTVERSION= 2.01403 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Very simplistic image viewer that loads JPEG images BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/Tk.pm:${PORTSDIR}/x11-toolkits/p5-Tk -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ${BUILD_DEPENDS} PERL_CONFIGURE= 5.8.0+ diff --git a/graphics/paintlib/Makefile b/graphics/paintlib/Makefile index 7bab626..cf8d35f 100644 --- a/graphics/paintlib/Makefile +++ b/graphics/paintlib/Makefile @@ -7,7 +7,7 @@ PORTNAME= paintlib PORTVERSION= 2.6.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics devel MASTER_SITES= http://www.paintlib.de/paintlib/ diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index bb270d0..36519ac 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -8,14 +8,14 @@ PORTNAME= poppler PORTVERSION= 0.10.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= graphics print MASTER_SITES= http://poppler.freedesktop.org/ MAINTAINER?= gnome@FreeBSD.org COMMENT?= A PDF rendering library -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig RUN_DEPENDS= poppler-data>0:${PORTSDIR}/graphics/poppler-data diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index cab67e0..fdcd316 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ diff --git a/graphics/povray36/Makefile b/graphics/povray36/Makefile index cab67e0..fdcd316 100644 --- a/graphics/povray36/Makefile +++ b/graphics/povray36/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ diff --git a/graphics/povray37/Makefile b/graphics/povray37/Makefile index cab67e0..fdcd316 100644 --- a/graphics/povray37/Makefile +++ b/graphics/povray37/Makefile @@ -7,7 +7,7 @@ PORTNAME= povray PORTVERSION= 3.6.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= ftp://ftp.povray.org/pub/povray/%SUBDIR%/ \ ftp://ftp.mirrorservice.org/sites/ftp.povray.org/pub/povray/%SUBDIR%/ \ diff --git a/graphics/py-imaging/Makefile b/graphics/py-imaging/Makefile index b65a3d0..36ab87c 100644 --- a/graphics/py-imaging/Makefile +++ b/graphics/py-imaging/Makefile @@ -7,7 +7,7 @@ PORTNAME= imaging PORTVERSION= 1.1.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics python MASTER_SITES= http://effbot.org/media/downloads/ \ http://www.pythonware.net/storage/ @@ -17,7 +17,7 @@ DISTNAME= Imaging-${PORTVERSION} MAINTAINER= mainland@apeiron.net COMMENT= The Python Imaging Library -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 UNIQUENAME= py-${PORTNAME} diff --git a/graphics/pyro/Makefile b/graphics/pyro/Makefile index 14d03c5..2031b2f 100644 --- a/graphics/pyro/Makefile +++ b/graphics/pyro/Makefile @@ -7,7 +7,7 @@ PORTNAME= pyro PORTVERSION= 1.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://nostatic.org/pyro/ EXTRACT_SUFX= .tgz @@ -15,7 +15,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A simple OpenGL-based firework simulator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= gl glut USE_XORG= xi xmu xext diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile index 3b7f9cb6..1c63e85 100644 --- a/graphics/qt4-imageformats/Makefile +++ b/graphics/qt4-imageformats/Makefile @@ -8,7 +8,7 @@ PORTNAME= imageformats PORTVERSION= ${QT4_VERSION} -PORTREVISION=0 +PORTREVISION= 1 CATEGORIES?= graphics MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- diff --git a/graphics/qtpfsgui/Makefile b/graphics/qtpfsgui/Makefile index 84b6983..c107dd8 100644 --- a/graphics/qtpfsgui/Makefile +++ b/graphics/qtpfsgui/Makefile @@ -7,7 +7,7 @@ PORTNAME= qtpfsgui PORTVERSION= 1.9.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= SF @@ -16,7 +16,7 @@ COMMENT= A graphical user interface that provides a workflow for HDR imaging BUILD_DEPENDS= ${LOCALBASE}/include/fftw3.h:${PORTSDIR}/math/fftw3 LIB_DEPENDS= exiv2.7:${PORTSDIR}/graphics/exiv2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ IlmImf.6:${PORTSDIR}/graphics/OpenEXR \ tiff.4:${PORTSDIR}/graphics/tiff \ fftw3f.5:${PORTSDIR}/math/fftw3-float diff --git a/graphics/rawstudio/Makefile b/graphics/rawstudio/Makefile index 1fb2708..b400f7a 100644 --- a/graphics/rawstudio/Makefile +++ b/graphics/rawstudio/Makefile @@ -7,13 +7,14 @@ PORTNAME= rawstudio PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://rawstudio.org/files/release/ MAINTAINER= samm@os2.kiev.ua COMMENT= Rawstudio is an open-source program to read and manipulate RAW images -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms \ exiv2.7:${PORTSDIR}/graphics/exiv2 \ dbus-1.3:${PORTSDIR}/devel/dbus diff --git a/graphics/ruby-libart2/Makefile b/graphics/ruby-libart2/Makefile index ca28f64..d001888 100644 --- a/graphics/ruby-libart2/Makefile +++ b/graphics/ruby-libart2/Makefile @@ -8,6 +8,7 @@ PORTNAME= libart2 PORTVERSION= ${RUBY_GNOME_PORTVERSION} +PORTREVISION= 1 CATEGORIES= graphics ruby MASTER_SITES= ${RUBY_GNOME_MASTER_SITES} MASTER_SITE_SUBDIR= ${RUBY_GNOME_MASTER_SITE_SUBDIR} @@ -18,7 +19,7 @@ DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= Ruby binding for Libart2 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_RUBY= yes diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile index 06599a7..1f730d2 100644 --- a/graphics/sam2p/Makefile +++ b/graphics/sam2p/Makefile @@ -8,6 +8,7 @@ PORTNAME= sam2p PORTVERSION= 0.45 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://www.inf.bme.hu/~pts/ diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile index c5c3e58..b47e25f 100644 --- a/graphics/sane-backends/Makefile +++ b/graphics/sane-backends/Makefile @@ -7,7 +7,7 @@ PORTNAME= sane-backends PORTVERSION= 1.0.20 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= http://alioth.debian.org/frs/download.php/3026/ \ ftp://ftp.sane-project.org/pub/sane/%SUBDIR%/ \ @@ -20,7 +20,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= API for access to scanners, digitals camera, frame grabbers etc -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff MAKE_JOBS_UNSAFE= yes diff --git a/graphics/sdl_image/Makefile b/graphics/sdl_image/Makefile index a44258f..386923d 100644 --- a/graphics/sdl_image/Makefile +++ b/graphics/sdl_image/Makefile @@ -7,6 +7,7 @@ PORTNAME= sdl_image PORTVERSION= 1.2.7 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.libsdl.org/projects/SDL_image/release/ DISTNAME= SDL_image-${PORTVERSION} @@ -14,7 +15,7 @@ DISTNAME= SDL_image-${PORTVERSION} MAINTAINER= mva@FreeBSD.org COMMENT= A simple library to load images of various formats as SDL surfaces -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/graphics/seejpeg/Makefile b/graphics/seejpeg/Makefile index 0908545..de6b512 100644 --- a/graphics/seejpeg/Makefile +++ b/graphics/seejpeg/Makefile @@ -7,7 +7,7 @@ PORTNAME= seejpeg PORTVERSION= 1.10 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/svga @@ -17,7 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A console graphics viewer using the svga console graphics library LIB_DEPENDS= vga.1:${PORTSDIR}/graphics/svgalib \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg ALL_TARGET= seejpeg diff --git a/graphics/show/Makefile b/graphics/show/Makefile index 0e4e7aa..ebae832 100644 --- a/graphics/show/Makefile +++ b/graphics/show/Makefile @@ -7,7 +7,7 @@ PORTNAME= show PORTVERSION= 2.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://www.ibiblio.org/propaganda/ \ http://www.freebsdbrasil.com.br/~jmelo/ @@ -15,7 +15,7 @@ MASTER_SITES= http://www.ibiblio.org/propaganda/ \ MAINTAINER= jmelo@FreeBSD.org COMMENT= A fast, flexible, extensible and bloat-free image viewer for X11 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ ungif.5:${PORTSDIR}/graphics/libungif \ diff --git a/graphics/simage/Makefile b/graphics/simage/Makefile index 5bd2723..cd6c330 100644 --- a/graphics/simage/Makefile +++ b/graphics/simage/Makefile @@ -16,7 +16,7 @@ COMMENT= Library with image format loaders and front-ends LIB_DEPENDS= sndfile.1:${PORTSDIR}/audio/libsndfile \ vorbis.4:${PORTSDIR}/audio/libvorbis \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png diff --git a/graphics/sswf/Makefile b/graphics/sswf/Makefile index 91a2957..8652e83 100644 --- a/graphics/sswf/Makefile +++ b/graphics/sswf/Makefile @@ -7,6 +7,7 @@ PORTNAME= sswf PORTVERSION= 1.8.4 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= SF DISTNAME= ${PORTNAME}-${PORTVERSION}-src @@ -14,7 +15,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}-src MAINTAINER= ports@FreeBSD.org COMMENT= A library and script language tool to create Flash movies -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} diff --git a/graphics/stamp/Makefile b/graphics/stamp/Makefile index 64311ba..71f391c 100644 --- a/graphics/stamp/Makefile +++ b/graphics/stamp/Makefile @@ -7,7 +7,7 @@ PORTNAME= stamp PORTVERSION= 2.0.8 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= stamp @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= stamp MAINTAINER= ports@FreeBSD.org COMMENT= Adds a graphical, configurable timestamp to a grayscale image -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ diff --git a/graphics/swftools/Makefile b/graphics/swftools/Makefile index ea15c75..a18668e 100644 --- a/graphics/swftools/Makefile +++ b/graphics/swftools/Makefile @@ -8,6 +8,7 @@ PORTNAME= swftools PORTVERSION= 0.9.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.swftools.org/ @@ -15,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= SWF manipulation and generation utilities LIB_DEPENDS= t1.5:${PORTSDIR}/devel/t1lib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ freetype.9:${PORTSDIR}/print/freetype2 \ fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig diff --git a/graphics/tiff/Makefile b/graphics/tiff/Makefile index 8285c8c..5796401 100644 --- a/graphics/tiff/Makefile +++ b/graphics/tiff/Makefile @@ -9,7 +9,7 @@ PORTNAME= tiff PORTVERSION= 3.8.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ http://dl1.maptools.org/dl/libtiff/ @@ -17,7 +17,7 @@ MASTER_SITES= ftp://ftp.remotesensing.org/pub/libtiff/ \ MAINTAINER= dinoex@FreeBSD.org COMMENT= Tools and library routines for working with TIFF images -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_LDCONFIG= yes USE_AUTOTOOLS= libtool:15 diff --git a/graphics/tiff2png/Makefile b/graphics/tiff2png/Makefile index 077ed3f..4fd6af7 100644 --- a/graphics/tiff2png/Makefile +++ b/graphics/tiff2png/Makefile @@ -7,6 +7,7 @@ PORTNAME= tiff2png PORTVERSION= 0.91 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -16,6 +17,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Converts TIFF images to PNG format LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png MAKEFILE= Makefile.unx diff --git a/graphics/ufraw/Makefile b/graphics/ufraw/Makefile index 7f535ac..2e5ff73 100644 --- a/graphics/ufraw/Makefile +++ b/graphics/ufraw/Makefile @@ -7,14 +7,14 @@ PORTNAME= ufraw PORTVERSION= 0.15 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics gnome MASTER_SITES= SF MAINTAINER= stas@FreeBSD.org COMMENT= Read and manipulate raw images from digital cameras -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ gtkimageview.0:${PORTSDIR}/x11-toolkits/gtkimageview \ diff --git a/graphics/vigra/Makefile b/graphics/vigra/Makefile index caf13fc..3dc6c80 100644 --- a/graphics/vigra/Makefile +++ b/graphics/vigra/Makefile @@ -11,6 +11,7 @@ PORTNAME= vigra PORTVERSION= 1.6.0 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://hci.iwr.uni-heidelberg.de/vigra/ DISTNAME= ${PORTNAME}${PORTVERSION} @@ -33,7 +34,7 @@ CONFIGURE_ARGS+= --without-tiff .endif .if !defined(WITHOUT_VIGRA_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+= --with-jpeg .else CONFIGURE_ARGS+= --without-jpeg diff --git a/graphics/vips/Makefile b/graphics/vips/Makefile index 3a737c7..90310da 100644 --- a/graphics/vips/Makefile +++ b/graphics/vips/Makefile @@ -7,6 +7,7 @@ PORTNAME= vips PORTVERSION= 7.14.5 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.vips.ecs.soton.ac.uk/supported/${PORTVERSION:R}/ diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile index caeef5f..e66af53 100644 --- a/graphics/white_dune/Makefile +++ b/graphics/white_dune/Makefile @@ -9,7 +9,7 @@ PORTNAME= white_dune PORTVERSION= ${DISTVERSION:S/pl/./} DISTVERSION= 0.28pl14 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= graphics MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES @@ -17,7 +17,7 @@ MASTER_SITES= http://vrml.cip.ica.uni-stuttgart.de/dune/ CENKES MAINTAINER= ports@FreeBSD.org COMMENT= Graphical VRML97 Editor and animation tool -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_MOTIF= yes diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile index e9ffbbf..f9d7c41 100644 --- a/graphics/xfig-devel/Makefile +++ b/graphics/xfig-devel/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfig PORTVERSION= 3.2.5.a5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= graphics MASTER_SITES= http://xfig.org/software/xfig/${PORTVERSION:R}-alpha/ DISTNAME= ${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION:S,.a,-alpha,}.full MAINTAINER= lesi@FreeBSD.org COMMENT= A drawing program for X11 (Alpha version) -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile index 6362291..e1f17f8 100644 --- a/graphics/xfig/Makefile +++ b/graphics/xfig/Makefile @@ -7,7 +7,7 @@ PORTNAME= xfig PORTVERSION= 3.2.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics MASTER_SITES= http://files.xfig.org/ DISTNAME= ${PORTNAME}.${PORTVERSION}.full @@ -15,7 +15,7 @@ DISTNAME= ${PORTNAME}.${PORTVERSION}.full MAINTAINER= ports@FreeBSD.org COMMENT= A drawing program for X11 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ Xaw3d.8:${PORTSDIR}/x11-toolkits/Xaw3d RUN_DEPENDS= fig2dev:${PORTSDIR}/print/transfig diff --git a/graphics/xli/Makefile b/graphics/xli/Makefile index af450cf..5ceb2b7 100644 --- a/graphics/xli/Makefile +++ b/graphics/xli/Makefile @@ -7,7 +7,7 @@ PORTNAME= xli PORTVERSION= 1.17.0 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= graphics MASTER_SITES= http://pantransit.reptiles.org/prog/xli/ \ ${MASTER_SITE_XCONTRIB} @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Xli, xsetbg, xview, xlito - utilities to display images on X11 LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/xli-${XLI_SNAPVER} diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index a5e7cfb..edf37af 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -7,6 +7,7 @@ PORTNAME= xsane PORTVERSION= 0.996 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ @@ -15,7 +16,7 @@ MASTER_SITES= http://www.xsane.org/download/ \ MAINTAINER= domi@nonsensss.de COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy) -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ sane.1:${PORTSDIR}/graphics/sane-backends diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile index edc5c49..edacaa6 100644 --- a/graphics/xv/Makefile +++ b/graphics/xv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xv PORTVERSION= 3.10a -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES+= graphics MASTER_SITES= ftp://ftp.cis.upenn.edu/pub/xv/:base \ ${MASTER_SITE_SOURCEFORGE} @@ -22,7 +22,7 @@ PATCHFILES= xv-3.10a-enhancements.20070520-20081216.diff MAINTAINER?= dinoex@FreeBSD.org COMMENT?= An X11 program that displays images of various formats -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ png.5:${PORTSDIR}/graphics/png \ jasper.4:${PORTSDIR}/graphics/jasper diff --git a/graphics/yafaray/Makefile b/graphics/yafaray/Makefile index e26316f..57f99c3 100644 --- a/graphics/yafaray/Makefile +++ b/graphics/yafaray/Makefile @@ -6,13 +6,14 @@ PORTNAME= yafray PORTVERSION= 0.0.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.yafray.org/sec/2/downloads/ MAINTAINER= ports@FreeBSD.org COMMENT= A fast XML based raytracer -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_SCONS= yes USE_LDCONFIG= yes diff --git a/graphics/yafray/Makefile b/graphics/yafray/Makefile index e26316f..57f99c3 100644 --- a/graphics/yafray/Makefile +++ b/graphics/yafray/Makefile @@ -6,13 +6,14 @@ PORTNAME= yafray PORTVERSION= 0.0.9 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.yafray.org/sec/2/downloads/ MAINTAINER= ports@FreeBSD.org COMMENT= A fast XML based raytracer -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_SCONS= yes USE_LDCONFIG= yes diff --git a/graphics/zgv/Makefile b/graphics/zgv/Makefile index 6b635b8..7edddab 100644 --- a/graphics/zgv/Makefile +++ b/graphics/zgv/Makefile @@ -7,7 +7,7 @@ PORTNAME= zgv PORTVERSION= 5.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SUNSITE} MASTER_SITE_SUBDIR= apps/graphics/viewers/svga @@ -17,7 +17,7 @@ COMMENT= Graphics viewer for SVGAlib LIB_DEPENDS= tiff.4:${PORTSDIR}/graphics/tiff \ vga.1:${PORTSDIR}/graphics/svgalib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png ONLY_FOR_ARCHS= i386 diff --git a/japanese/aterm/Makefile b/japanese/aterm/Makefile index 25d0445..f7124cf 100644 --- a/japanese/aterm/Makefile +++ b/japanese/aterm/Makefile @@ -7,7 +7,7 @@ PORTNAME= aterm PORTVERSION= 0.4.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES+= japanese x11 MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -22,7 +22,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= yoichi@FreeBSD.org COMMENT= A color vt102 terminal emulator with transparency support -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_AUTOTOOLS= autoconf:262:env diff --git a/java/kaffe/Makefile b/java/kaffe/Makefile index 5a0702e..14632a0f 100644 --- a/java/kaffe/Makefile +++ b/java/kaffe/Makefile @@ -7,7 +7,7 @@ PORTNAME= kaffe PORTVERSION= 1.1.7.r1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= java devel #MASTER_SITES= ftp://ftp.kaffe.org/pub/kaffe/v1.1.x-development/ MASTER_SITES= http://www.kaffe.org/~robilad/ @@ -16,7 +16,7 @@ DISTNAME= ${PORTNAME}-1.1.7-rc1 MAINTAINER= ports@FreeBSD.org COMMENT= Multi-platform Java virtual machine with JIT compiler and AWT package -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ gmp.8:${PORTSDIR}/math/libgmp4 diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 1f8dbb6..df2f4a4 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= drscheme PORTVERSION= 370 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/ \ http://www.cs.utah.edu/plt/download/${PORTVERSION}/plt/ \ @@ -24,7 +24,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An interactive, integrated, graphical Scheme programming environment LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_XORG= xft x11 xrender xaw diff --git a/lang/ofc/Makefile b/lang/ofc/Makefile index 4c488d4..4943ee0 100644 --- a/lang/ofc/Makefile +++ b/lang/ofc/Makefile @@ -7,7 +7,7 @@ PORTNAME= ofc PORTVERSION= 0.8.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://ofc.dvoudheusden.net/download/ @@ -16,7 +16,7 @@ COMMENT= The Objective-C Foundation Classes library LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ freetype.9:${PORTSDIR}/print/freetype2 USE_SDL= sdl diff --git a/lang/php4/Makefile.ext b/lang/php4/Makefile.ext index 2cc8628..08eae8d 100644 --- a/lang/php4/Makefile.ext +++ b/lang/php4/Makefile.ext @@ -97,7 +97,7 @@ CONFIGURE_ARGS+=--enable-ftp .if ${PHP_MODNAME} == "gd" LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg . if !defined(WITHOUT_X11) USE_XORG= xpm . endif diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index 0f2064b..95677fa 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -93,7 +93,7 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "gd" LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg . if !defined(WITHOUT_X11) USE_XORG= xpm . endif diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 0f2064b..95677fa 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -93,7 +93,7 @@ USE_OPENSSL= yes .if ${PHP_MODNAME} == "gd" LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg . if !defined(WITHOUT_X11) USE_XORG= xpm . endif diff --git a/lang/pike72/Makefile b/lang/pike72/Makefile index 759abb2b..5376c20 100644 --- a/lang/pike72/Makefile +++ b/lang/pike72/Makefile @@ -7,7 +7,7 @@ PORTNAME= pike72 PORTVERSION= 7.2.570 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= lang MASTER_SITES= ftp://ftp.oav.net/pike/7.2/unofficial/ \ ftp://ftp.us.caudium.net/pub/pike/7.2/unofficial/ @@ -16,7 +16,7 @@ DISTNAME= pike-${PORTVERSION} MAINTAINER= kiwi@oav.net COMMENT= A dynamic programming language with a syntax similar to C++ -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ gdbm.3:${PORTSDIR}/databases/gdbm \ mird.1:${PORTSDIR}/databases/mird \ diff --git a/lang/pike76/Makefile b/lang/pike76/Makefile index 482dbbe..df2a60a 100644 --- a/lang/pike76/Makefile +++ b/lang/pike76/Makefile @@ -7,7 +7,7 @@ PORTNAME= pike76 PORTVERSION= 7.6.112 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= lang MASTER_SITES= ftp://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ http://pike.ida.liu.se/pub/pike/beta/${PORTVERSION}/ \ @@ -20,7 +20,7 @@ DISTNAME= Pike-v${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= A dynamic programming language with a syntax similar to C++ -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ gdbm.3:${PORTSDIR}/databases/gdbm \ pcre.0:${PORTSDIR}/devel/pcre \ diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile index 1902701..269420f 100644 --- a/lang/pike78/Makefile +++ b/lang/pike78/Makefile @@ -7,6 +7,7 @@ PORTNAME= pike78 PORTVERSION= 7.8.316 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= ftp://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \ http://pike.ida.liu.se/pub/pike/all/${PORTVERSION}/ \ @@ -18,7 +19,7 @@ DISTNAME= Pike-v${PORTVERSION} MAINTAINER= johans@stack.nl COMMENT= A dynamic programming language with a syntax similar to C++ -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ gdbm.3:${PORTSDIR}/databases/gdbm \ pcre.0:${PORTSDIR}/devel/pcre \ diff --git a/lang/plt-scheme/Makefile b/lang/plt-scheme/Makefile index a5221a9..a7d8a1b 100644 --- a/lang/plt-scheme/Makefile +++ b/lang/plt-scheme/Makefile @@ -7,7 +7,7 @@ PORTNAME= plt-scheme PORTVERSION= 4.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/\ http://plt.cs.uchicago.edu/bundles/${PORTVERSION}/plt/\ @@ -23,7 +23,7 @@ MAINTAINER= areilly@bigpond.net.au COMMENT= An interactive, integrated, graphical Scheme programming environment LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_XORG= xft x11 xrender xaw diff --git a/lang/racket-textual/Makefile b/lang/racket-textual/Makefile index a5221a9..a7d8a1b 100644 --- a/lang/racket-textual/Makefile +++ b/lang/racket-textual/Makefile @@ -7,7 +7,7 @@ PORTNAME= plt-scheme PORTVERSION= 4.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/\ http://plt.cs.uchicago.edu/bundles/${PORTVERSION}/plt/\ @@ -23,7 +23,7 @@ MAINTAINER= areilly@bigpond.net.au COMMENT= An interactive, integrated, graphical Scheme programming environment LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_XORG= xft x11 xrender xaw diff --git a/lang/racket/Makefile b/lang/racket/Makefile index a5221a9..a7d8a1b 100644 --- a/lang/racket/Makefile +++ b/lang/racket/Makefile @@ -7,7 +7,7 @@ PORTNAME= plt-scheme PORTVERSION= 4.1.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang scheme MASTER_SITES= http://download.plt-scheme.org/bundles/${PORTVERSION}/plt/\ http://plt.cs.uchicago.edu/bundles/${PORTVERSION}/plt/\ @@ -23,7 +23,7 @@ MAINTAINER= areilly@bigpond.net.au COMMENT= An interactive, integrated, graphical Scheme programming environment LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_XORG= xft x11 xrender xaw diff --git a/lang/swi-pl/Makefile b/lang/swi-pl/Makefile index 4779977..a2a1eaa 100644 --- a/lang/swi-pl/Makefile +++ b/lang/swi-pl/Makefile @@ -7,6 +7,7 @@ PORTNAME= swi-pl PORTVERSION= 5.6.64 +PORTREVISION= 1 CATEGORIES= lang MASTER_SITES= http://www.swi-prolog.org/download/stable/src/ \ ftp://ftp.swi.psy.uva.nl/SWI-Prolog/ diff --git a/mail/enigmail-thunderbird/Makefile b/mail/enigmail-thunderbird/Makefile index 9600101..47c18d8 100644 --- a/mail/enigmail-thunderbird/Makefile +++ b/mail/enigmail-thunderbird/Makefile @@ -7,6 +7,7 @@ PORTNAME= enigmail PORTVERSION= 0.95.7 +PORTREVISION= 1 CATEGORIES= mail security MASTER_SITES= http://www.mozilla-enigmail.org/download/source/ PKGNAMEPREFIX?= thunderbird- @@ -16,7 +17,7 @@ COMMENT?= A GnuPG extension for the Thunderbird mail client EXTRACT_DEPENDS=${NONEXISTENT}:${PORTSDIR}/${GECKO_PORTDIR}:patch BUILD_DEPENDS= zip:${PORTSDIR}/archivers/zip -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ nspr4:${PORTSDIR}/devel/nspr \ nss3:${PORTSDIR}/security/nss diff --git a/mail/spamprobe/Makefile b/mail/spamprobe/Makefile index c0d4dc2..78e1ab4 100644 --- a/mail/spamprobe/Makefile +++ b/mail/spamprobe/Makefile @@ -14,7 +14,7 @@ PORTNAME= spamprobe PORTVERSION= 1.4d -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE_EXTENDED} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -68,7 +68,7 @@ LDFLAGS+= -L${LOCALBASE}/lib .if defined(WITHOUT_JPEG) CONFIGURE_ARGS+= --without-jpeg .else -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib .endif diff --git a/math/R/Makefile b/math/R/Makefile index b741563..127aa80 100644 --- a/math/R/Makefile +++ b/math/R/Makefile @@ -8,6 +8,7 @@ PORTNAME= R PORTVERSION= 2.9.0 +PORTREVISION= 1 CATEGORIES= math lang MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \ ftp://cran.r-project.org/pub/R/src/base/R-2/ \ @@ -90,7 +91,7 @@ CONFIGURE_ARGS+=--with-ICU .if defined(WITHOUT_JPEG) CONFIGURE_ARGS+=--without-jpeglib .else -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--with-jpeglib .endif diff --git a/math/grace/Makefile b/math/grace/Makefile index 578f472..5463d59 100644 --- a/math/grace/Makefile +++ b/math/grace/Makefile @@ -7,6 +7,7 @@ PORTNAME= grace PORTVERSION= 5.1.22 +PORTREVISION= 1 CATEGORIES= math print # MASTER_SITES= ftp://plasma-gate.weizmann.ac.il/pub/grace/src/stable/ \ @@ -20,7 +21,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A powerful plotting tool (successor of xmgr) LIB_DEPENDS= t1:${PORTSDIR}/devel/t1lib \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ fftw.2:${PORTSDIR}/math/fftw \ diff --git a/math/ploticus/Makefile b/math/ploticus/Makefile index 378481d..240990f 100644 --- a/math/ploticus/Makefile +++ b/math/ploticus/Makefile @@ -8,6 +8,7 @@ PORTNAME= ploticus PORTVERSION= 2.40 +PORTREVISION= 1 CATEGORIES= math MASTER_SITES= SF DISTNAME= pl${PORTVERSION:S/.//}src @@ -16,7 +17,7 @@ MAINTAINER?= linimon@FreeBSD.org COMMENT?= Generates plots and graphs from data LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ ming.4:${PORTSDIR}/graphics/ming \ png.5:${PORTSDIR}/graphics/png \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/math/surf/Makefile b/math/surf/Makefile index 7f6bcce..3ec9dd8 100644 --- a/math/surf/Makefile +++ b/math/surf/Makefile @@ -8,7 +8,7 @@ PORTNAME= surf PORTVERSION= 1.0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= math MASTER_SITES= SF @@ -16,7 +16,7 @@ USE_XORG= x11 xmu MAINTAINER= ports@FreeBSD.org COMMENT= Visualize some real algebraic geometry -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ gmp.8:${PORTSDIR}/math/libgmp4 diff --git a/math/vtk/Makefile b/math/vtk/Makefile index b7cd6b1..02b2482 100644 --- a/math/vtk/Makefile +++ b/math/vtk/Makefile @@ -15,7 +15,7 @@ PORTNAME= vtk PORTVERSION= 4.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math graphics MASTER_SITES= http://ovt.irfu.se/vtk/files/ DISTFILES?= VTK-${PORTVERSION}-LatestRelease.tar.gz @@ -48,7 +48,7 @@ WRKSRC= ${WRKDIR}/${PORTNAME}${PKGNAMESUFFIX}-build BUILD_DEPENDS+= ${CMAKE}:${PORTSDIR}/devel/cmake LIB_DEPENDS+= expat.6:${PORTSDIR}/textproc/expat2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/math/vtk5/Makefile b/math/vtk5/Makefile index 75f9039..65a30a5 100644 --- a/math/vtk5/Makefile +++ b/math/vtk5/Makefile @@ -8,7 +8,7 @@ PORTNAME= vtk PORTVERSION= 5.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= math graphics MASTER_SITES= http://www.vtk.org/files/release/${PORTVERSION:R}/ \ http://www.neuro.mcw.edu/Ports/distfiles/VTK5/ @@ -18,7 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= The Visualization Toolkit LIB_DEPENDS= expat.[5-6]:${PORTSDIR}/textproc/expat2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/misc/gman/Makefile b/misc/gman/Makefile index 3f92eb8..5b91b9c 100644 --- a/misc/gman/Makefile +++ b/misc/gman/Makefile @@ -8,7 +8,7 @@ PORTNAME= gman PORTVERSION= 0.9.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_DEBIAN} MASTER_SITE_SUBDIR= pool/main/g/gman @@ -22,7 +22,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ports@FreeBSD.org COMMENT= A user-friendly graphical front end for the man system -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= ghostview:${PORTSDIR}/print/ghostview \ man2html:${PORTSDIR}/textproc/man2html diff --git a/misc/wmweather+/Makefile b/misc/wmweather+/Makefile index 0dead1c..a74aa6f 100644 --- a/misc/wmweather+/Makefile +++ b/misc/wmweather+/Makefile @@ -6,7 +6,7 @@ PORTNAME= wmweather+ PORTVERSION= 2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= misc windowmaker geography MASTER_SITES= SF MASTER_SITE_SUBDIR= wmweatherplus diff --git a/multimedia/avifile/Makefile b/multimedia/avifile/Makefile index 52f95c0..b6e07e6 100644 --- a/multimedia/avifile/Makefile +++ b/multimedia/avifile/Makefile @@ -7,7 +7,7 @@ PORTNAME= avifile PORTVERSION= 0.7.43 -PORTREVISION= 10 +PORTREVISION= 11 PORTEPOCH= 2 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -18,6 +18,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= AVI player/converter with numerous codecs, including MPEG-4(DivX ;-)) BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm +LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg USE_SUBMAKE= yes USE_BZIP2= yes diff --git a/multimedia/camserv/Makefile b/multimedia/camserv/Makefile index 774591f..63f7c46 100644 --- a/multimedia/camserv/Makefile +++ b/multimedia/camserv/Makefile @@ -7,7 +7,7 @@ PORTNAME= camserv PORTVERSION= 0.5.1 -PORTREVISION= 9 +PORTREVISION= 10 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= cserv MAINTAINER= uspoerlein@gmail.com COMMENT= Camserv is a free program to do streaming video via the web -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \ freetype.9:${PORTSDIR}/print/freetype2 diff --git a/multimedia/ffmpegthumbnailer/Makefile b/multimedia/ffmpegthumbnailer/Makefile index 9f13faf..d95ae71 100644 --- a/multimedia/ffmpegthumbnailer/Makefile +++ b/multimedia/ffmpegthumbnailer/Makefile @@ -6,6 +6,7 @@ PORTNAME= ffmpegthumbnailer PORTVERSION= 1.2.6 +PORTREVISION= 1 CATEGORIES= multimedia graphics MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} @@ -14,7 +15,7 @@ COMMENT= Lightweight video thumbnailer that can be used by file managers LIB_DEPENDS= png:${PORTSDIR}/graphics/png \ swscale:${PORTSDIR}/multimedia/ffmpeg \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ENV= CPPFLAGS="${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \ LDFLAGS="${PTHREAD_LIBS} -L${LOCALBASE}/lib" diff --git a/multimedia/gmerlin/Makefile b/multimedia/gmerlin/Makefile index 2b868b6..6ff7b4d 100644 --- a/multimedia/gmerlin/Makefile +++ b/multimedia/gmerlin/Makefile @@ -7,7 +7,7 @@ PORTNAME= gmerlin PORTVERSION= 0.3.8 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF @@ -104,7 +104,7 @@ PLIST_SUB+= ESOUND="@comment " .endif .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" .else CONFIGURE_ARGS+=--disable-libjpeg diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common index b2cbf30..8863901 100644 --- a/multimedia/gstreamer-plugins/Makefile.common +++ b/multimedia/gstreamer-plugins/Makefile.common @@ -294,7 +294,7 @@ gst_jack_PLIST_FILES= ${GST_LIB_DIR}/libgstjack.la \ gst_jack_DIST= bad # jpeg -gst_jpeg_LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +gst_jpeg_LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg gst_jpeg_PLIST_FILES= ${GST_LIB_DIR}/libgstjpeg.la \ ${GST_LIB_DIR}/libgstjpeg.so diff --git a/multimedia/jahshaka/Makefile b/multimedia/jahshaka/Makefile index be66ad3..c07fe81 100644 --- a/multimedia/jahshaka/Makefile +++ b/multimedia/jahshaka/Makefile @@ -7,7 +7,7 @@ PORTNAME= jahshaka PORTVERSION= 1.9a9 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= SF/${PORTNAME}fx DISTNAME= ${PORTNAME}_${PORTVERSION} @@ -18,7 +18,7 @@ COMMENT= Video and film composing, editing and special fx system BUILD_DEPENDS= qmake:${PORTSDIR}/devel/qmake LIB_DEPENDS= aviplay.0:${PORTSDIR}/multimedia/avifile \ freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_GL= glut USE_QT_VER= 3 diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index d9a96d6..5f7668d 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -7,7 +7,7 @@ PORTNAME= kissdx PORTVERSION= 0.13.10a -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia net MASTER_SITES= http://paragi.dk/kiss/ diff --git a/multimedia/libdv/Makefile b/multimedia/libdv/Makefile index 9583e2f..8f04300 100644 --- a/multimedia/libdv/Makefile +++ b/multimedia/libdv/Makefile @@ -7,13 +7,14 @@ PORTNAME= libdv PORTVERSION= 1.0.0 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= SF MAINTAINER= baptiste.daroussin@gmail.com COMMENT= Quasar DV codec (libdv): software codec for DV video encoding format -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ popt.0:${PORTSDIR}/devel/popt GNU_CONFIGURE= yes diff --git a/multimedia/libmovtar/Makefile b/multimedia/libmovtar/Makefile index d208516..154d847 100644 --- a/multimedia/libmovtar/Makefile +++ b/multimedia/libmovtar/Makefile @@ -7,7 +7,7 @@ PORTNAME= libmovtar PORTVERSION= 0.1.3 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= mjpeg @@ -24,7 +24,7 @@ CONFIGURE_ENV= LOCALBASE="${LOCALBASE}" MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ PTHREAD_LIBS=${PTHREAD_LIBS} -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg .include <bsd.port.pre.mk> diff --git a/multimedia/libquicktime/Makefile b/multimedia/libquicktime/Makefile index 5849af4..0baefdd 100644 --- a/multimedia/libquicktime/Makefile +++ b/multimedia/libquicktime/Makefile @@ -7,7 +7,7 @@ PORTNAME= libquicktime PORTVERSION= 1.1.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SFE @@ -85,7 +85,7 @@ CONFIGURE_ARGS+= --without-libdv .endif .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg PLIST_SUB+= JPEG="" CONFIGURE_ARGS+= --with-libjpeg .else diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile index 3afa76d..cd5e015 100644 --- a/multimedia/mjpegtools/Makefile +++ b/multimedia/mjpegtools/Makefile @@ -7,14 +7,14 @@ PORTNAME= mjpegtools DISTVERSION= 1.9.0rc3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= multimedia MASTER_SITES= SF/mjpeg MAINTAINER= multimedia@FreeBSD.org COMMENT= Set of tools to record/playback/edit videos in MPEG format -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm CONFLICTS= mplex-[0-9]* diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 8cc2857..653f663 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -7,7 +7,7 @@ PORTNAME= motion PORTVERSION= 3.2.11 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia MASTER_SITES= SF @@ -18,7 +18,7 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ack@telefonica.net COMMENT= A motion detection application -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ avformat.1:${PORTSDIR}/multimedia/ffmpeg ONLY_FOR_ARCHS= i386 amd64 diff --git a/multimedia/mplayerxp/Makefile b/multimedia/mplayerxp/Makefile index 94d9d36..175cb0e 100644 --- a/multimedia/mplayerxp/Makefile +++ b/multimedia/mplayerxp/Makefile @@ -7,13 +7,14 @@ PORTNAME= mplayerxp PORTVERSION= 0.7.2 +PORTREVISION= 1 CATEGORIES= multimedia audio MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= Multi-threaded branch of the well known mplayer media player -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ vcdinfo.2:${PORTSDIR}/multimedia/vcdimager RUN_DEPENDS= ${LOCALBASE}/share/mplayer/fonts:${PORTSDIR}/multimedia/mplayer-fonts diff --git a/multimedia/nmm/Makefile b/multimedia/nmm/Makefile index 2669d3d..2677293 100644 --- a/multimedia/nmm/Makefile +++ b/multimedia/nmm/Makefile @@ -7,7 +7,7 @@ PORTNAME= nmm PORTVERSION= 1.0.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= http://www.motama.com/download/ diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile index 4601d1c..1ecfcfd 100644 --- a/multimedia/ogle/Makefile +++ b/multimedia/ogle/Makefile @@ -7,7 +7,7 @@ PORTNAME= ogle PORTVERSION= 0.9.2 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= multimedia MASTER_SITES= http://www.dtek.chalmers.se/groups/dvd/dist/ @@ -16,7 +16,7 @@ COMMENT= Open DVD player that supports DVD menus LIB_DEPENDS= a52.0:${PORTSDIR}/audio/liba52 \ dvdread.4:${PORTSDIR}/multimedia/libdvdread \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ mad.2:${PORTSDIR}/audio/libmad \ xml2.5:${PORTSDIR}/textproc/libxml2 diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile index ca8df8c..485d73a 100644 --- a/multimedia/openquicktime/Makefile +++ b/multimedia/openquicktime/Makefile @@ -7,7 +7,7 @@ PORTNAME= openquicktime PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= openquicktime @@ -17,7 +17,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= Portable library for handling Apple's QuickTime(TM) files -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes USE_GNOME= gtk12 diff --git a/multimedia/pwcbsd/Makefile b/multimedia/pwcbsd/Makefile index cee615e..28f73a2 100644 --- a/multimedia/pwcbsd/Makefile +++ b/multimedia/pwcbsd/Makefile @@ -7,7 +7,7 @@ PORTNAME= pwcbsd PORTVERSION= 1.4.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= multimedia sysutils kld MASTER_SITES= http://raaf.atspace.org/ \ http://www.bsd-geek.de/FreeBSD/distfiles/ \ @@ -51,7 +51,7 @@ ALL_TARGET= all .if !defined(WITHOUT_PROGRAMS) ALL_TARGET+= pwcview PROGRAMS= pwcview -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg MAN1= pwcview.1 USE_SDL= sdl PLIST_SUB+= PROGRAMS="" diff --git a/multimedia/spook/Makefile b/multimedia/spook/Makefile index a1c8dcd..34d2ca7 100644 --- a/multimedia/spook/Makefile +++ b/multimedia/spook/Makefile @@ -7,6 +7,7 @@ PORTNAME= spook PORTVERSION= 20050207 +PORTREVISION= 1 CATEGORIES= multimedia MASTER_SITES= http://www.litech.org/spook/dist/ DISTNAME= ${PORTNAME}-${PORTVERSION} @@ -37,7 +38,7 @@ CONFIGURE_ENV+= CFLAGS=-I${LOCALBASE}/include LDFLAGS=-L${LOCALBASE}/lib .include <bsd.port.pre.mk> .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+= --enable-encoder-jpeg .endif diff --git a/multimedia/transcode/Makefile b/multimedia/transcode/Makefile index 6a277a8..e0f2194 100644 --- a/multimedia/transcode/Makefile +++ b/multimedia/transcode/Makefile @@ -7,7 +7,7 @@ PORTNAME= transcode PORTVERSION= 1.0.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= multimedia MASTER_SITES= http://transcode.kabewm.com/ \ http://fromani.exit1.org/ @@ -16,7 +16,7 @@ MAINTAINER= multimedia@FreeBSD.org COMMENT= A text-console utility for video stream processing LIB_DEPENDS= dvdread.4:${PORTSDIR}/multimedia/libdvdread \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ mpeg2.0:${PORTSDIR}/multimedia/libmpeg2 \ avcodec.1:${PORTSDIR}/multimedia/ffmpeg BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile index 30377ec..cfc6bb8 100644 --- a/multimedia/xawtv/Makefile +++ b/multimedia/xawtv/Makefile @@ -7,7 +7,7 @@ PORTNAME= xawtv PORTVERSION= 3.95 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= multimedia MASTER_SITES= http://dl.bytesex.org/releases/xawtv/ @@ -19,7 +19,7 @@ BUILD_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ RUN_DEPENDS= iconv:${PORTSDIR}/converters/libiconv \ ${LOCALBASE}/lib/X11/fonts/misc/led-iso8859-1.pcf.gz:${PORTSDIR}/x11-fonts/tv-fonts LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg OPTIONS= AA "Enable AA support" on \ DV "Enable reading/writing raw dv files" off \ diff --git a/net-mgmt/driftnet/Makefile b/net-mgmt/driftnet/Makefile index 0736133..65023d6 100644 --- a/net-mgmt/driftnet/Makefile +++ b/net-mgmt/driftnet/Makefile @@ -7,7 +7,7 @@ PORTNAME= driftnet PORTVERSION= 0.1.6 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net-mgmt MASTER_SITES= http://www.ex-parrot.com/~chris/driftnet/ \ http://www.vanheusden.com/mirrors/ @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Tool to grab images out of (your) TCP connections LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg BUILD_DEPENDS= makedepend:${PORTSDIR}/devel/makedepend USE_GNOME= gtk12 diff --git a/net-p2p/dclib/Makefile b/net-p2p/dclib/Makefile index 84c19a8..5f86a47 100644 --- a/net-p2p/dclib/Makefile +++ b/net-p2p/dclib/Makefile @@ -9,6 +9,7 @@ PORTNAME= dclib PORTVERSION= 0.3.23 +PORTREVISION= 1 CATEGORIES= net-p2p MASTER_SITES= SF MASTER_SITE_SUBDIR= wxdcgui @@ -16,7 +17,7 @@ MASTER_SITE_SUBDIR= wxdcgui MAINTAINER= gahr@FreeBSD.org COMMENT= Direct connect interface library for valknut -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${DISTNAME} diff --git a/net/boinc-client/Makefile b/net/boinc-client/Makefile index 2532fcd..be3e261 100644 --- a/net/boinc-client/Makefile +++ b/net/boinc-client/Makefile @@ -7,7 +7,7 @@ PORTNAME= boinc-client PORTVERSION= 6.4.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_LOCAL} MASTER_SITE_SUBDIR= pav diff --git a/net/libvncserver/Makefile b/net/libvncserver/Makefile index 90953a9..f65eeb0 100644 --- a/net/libvncserver/Makefile +++ b/net/libvncserver/Makefile @@ -8,6 +8,7 @@ PORTNAME= libvncserver PORTVERSION= 0.9.7 +PORTREVISION= 1 CATEGORIES= net devel MASTER_SITES= SF DISTNAME= LibVNCServer-${PORTVERSION} @@ -15,7 +16,7 @@ DISTNAME= LibVNCServer-${PORTVERSION} MAINTAINER= chinsan@FreeBSD.org COMMENT= Provide an easy API to write one's own vnc server -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_GNOME= gnometarget USE_LDCONFIG= yes diff --git a/net/mugshot/Makefile b/net/mugshot/Makefile index 35ad6ff..e578b18 100644 --- a/net/mugshot/Makefile +++ b/net/mugshot/Makefile @@ -7,14 +7,14 @@ PORTNAME= mugshot PORTVERSION= 1.1.95 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= http://download.mugshot.org/client/sources/linux/ MAINTAINER= wahjava@gmail.com COMMENT= The official client for Mugshot network -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg:install \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg:install \ Xss.1:${PORTSDIR}/x11/xorg-libraries:install \ dbus-1.3:${PORTSDIR}/devel/dbus \ dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \ diff --git a/net/nxserver/Makefile b/net/nxserver/Makefile index 18daf2f..089c848 100644 --- a/net/nxserver/Makefile +++ b/net/nxserver/Makefile @@ -7,7 +7,7 @@ PORTNAME= nxserver PORTVERSION= 2.1.0 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net MASTER_SITES= http://web04.nomachine.com/download/${PORTVERSION}/sources/ DISTFILES= nx-X11-${PORTVERSION}-3.tar.gz \ @@ -26,7 +26,7 @@ MAINTAINER= freenx@deweyonline.com COMMENT= Low-bandwidth X network server LIB_DEPENDS= audiofile.0:${PORTSDIR}/audio/libaudiofile \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png # freetype version included does not compile on 64bit diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile index dfc26b6..cf11755 100644 --- a/net/ssvnc/Makefile +++ b/net/ssvnc/Makefile @@ -7,6 +7,7 @@ PORTNAME= ssvnc PORTVERSION= 1.0.22 +PORTREVISION= 1 CATEGORIES= net security MASTER_SITES= SF DISTFILES= ${DISTNAME}.src${EXTRACT_SUFX} @@ -15,7 +16,7 @@ MAINTAINER= alepulver@FreeBSD.org COMMENT= Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer) BUILD_DEPENDS= imake:${PORTSDIR}/devel/imake -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel \ xterm:${PORTSDIR}/x11/xterm diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile index 0487d61..6c5de72 100644 --- a/net/tightvnc/Makefile +++ b/net/tightvnc/Makefile @@ -8,7 +8,7 @@ PORTNAME= tightvnc PORTVERSION= 1.3.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR= vnc-tight @@ -17,7 +17,7 @@ DISTNAME= ${PORTNAME}-${PORTVERSION}_unixsrc MAINTAINER= itetcu@FreeBSD.org COMMENT= Enhanced version of VNC -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg RUN_DEPENDS= showrgb:${PORTSDIR}/x11/rgb \ xauth:${PORTSDIR}/x11/xauth \ xorg-fonts>=7.2:${PORTSDIR}/x11-fonts/xorg-fonts diff --git a/net/vncreflector/Makefile b/net/vncreflector/Makefile index 02c90af..e7ed5dc 100644 --- a/net/vncreflector/Makefile +++ b/net/vncreflector/Makefile @@ -7,7 +7,7 @@ PORTNAME= vncreflector PORTVERSION= 1.2.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR=vnc-reflector @@ -16,7 +16,7 @@ DISTNAME= vnc_reflector-${PORTVERSION} MAINTAINER= brooks@FreeBSD.org COMMENT= Multi-client VNC proxy server -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg USE_RC_SUBR= vncreflector.sh diff --git a/net/wizd/Makefile b/net/wizd/Makefile index ca64500..2e09abc 100644 --- a/net/wizd/Makefile +++ b/net/wizd/Makefile @@ -7,7 +7,7 @@ PORTNAME= wizd PORTVERSION= 24 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net multimedia MASTER_SITES= SF DISTFILES= wizd_sources_v${PORTVERSION}.zip simplicity_v1-2.zip diff --git a/net/x11vnc/Makefile b/net/x11vnc/Makefile index ee1d6ea..baa255f 100644 --- a/net/x11vnc/Makefile +++ b/net/x11vnc/Makefile @@ -7,7 +7,7 @@ PORTNAME= x11vnc PORTVERSION= 0.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net MASTER_SITES= SF MASTER_SITE_SUBDIR=libvncserver @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR=libvncserver MAINTAINER= beech@FreeBSD.org COMMENT= VNC server for use with real X displays -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ dbus:${PORTSDIR}/devel/dbus \ avahi-common.3:${PORTSDIR}/net/avahi-app diff --git a/news/knews/Makefile b/news/knews/Makefile index e5f4e69..53746cc 100644 --- a/news/knews/Makefile +++ b/news/knews/Makefile @@ -7,14 +7,14 @@ PORTNAME= knews PORTVERSION= 1.0b.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= news MASTER_SITES= http://www.matematik.su.se/~kjj/ MAINTAINER= dinoex@FreeBSD.org COMMENT= A threaded nntp newsreader for X -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ compface:${PORTSDIR}/mail/faces RUN_DEPENDS= newsp:${PORTSDIR}/print/mp-letter diff --git a/print/advi/Makefile b/print/advi/Makefile index 582bf76..d9fa119 100644 --- a/print/advi/Makefile +++ b/print/advi/Makefile @@ -8,7 +8,7 @@ PORTNAME= advi PORTVERSION= 1.6.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= http://caml.inria.fr/distrib/bazar-ocaml/${PORTNAME}/ EXTRACT_SUFX= .tgz @@ -20,7 +20,7 @@ BUILD_DEPENDS= ${CI_DEPEND}:${PORTSDIR}/graphics/ocaml-images \ kpsewhich:${PORTSDIR}/print/teTeX-base LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff RUN_DEPENDS= kpsewhich:${PORTSDIR}/print/teTeX-base diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index c0d5045..e864a7f 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -8,7 +8,7 @@ PORTNAME= cups PORTVERSION= 1.3.10 DISTVERSIONSUFFIX= -source -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= EASYSW/${PORTNAME}/${DISTVERSION} PKGNAMESUFFIX= ${CUPS_SUFFIX}${PKGNAMESUFFIX2} @@ -71,7 +71,7 @@ DESCR= ${MASTERDIR}/pkg-descr.client .elif defined(CUPS_IMAGE) CUPS_SUFFIX= -image LIB_DEPENDS+= cups.2:${PORTSDIR}/${PKGCATEGORY}/cups-client \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff COMMENT2= Library cupsimage diff --git a/print/fontforge/Makefile b/print/fontforge/Makefile index fdf7e06..4386ac8 100644 --- a/print/fontforge/Makefile +++ b/print/fontforge/Makefile @@ -7,6 +7,7 @@ PORTNAME= fontforge PORTVERSION= 20090622 +PORTREVISION= 1 CATEGORIES= print MASTER_SITES= SF DISTFILES= ${EXTRACT_ONLY} ${DOCFILES} @@ -17,7 +18,7 @@ COMMENT= Type 1/TrueType/OpenType/bitmap font editor LIB_DEPENDS= uninameslist.0:${PORTSDIR}/textproc/libuninameslist \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ ungif.5:${PORTSDIR}/graphics/libungif \ freetype.9:${PORTSDIR}/print/freetype2 \ diff --git a/print/ghostscript7/Makefile b/print/ghostscript7/Makefile index 5cae5b0..71ac081 100644 --- a/print/ghostscript7/Makefile +++ b/print/ghostscript7/Makefile @@ -7,7 +7,7 @@ PORTNAME= ghostscript7 PORTVERSION= 7.07 -PORTREVISION= 20 +PORTREVISION= 21 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \ ${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \ @@ -22,7 +22,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 7.x PostScript interpreter -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts diff --git a/print/ghostscript8/Makefile b/print/ghostscript8/Makefile index c6cf000..94f2fe8 100644 --- a/print/ghostscript8/Makefile +++ b/print/ghostscript8/Makefile @@ -7,7 +7,7 @@ PORTNAME= ghostscript8 PORTVERSION= 8.64 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \ ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \ @@ -21,7 +21,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= doceng@FreeBSD.org COMMENT= Ghostscript 8.x PostScript interpreter -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= ${LOCALBASE}/share/${PORTNAME:S,8,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile index 07f8e8e..b1d1ac7 100644 --- a/print/hpijs/Makefile +++ b/print/hpijs/Makefile @@ -7,7 +7,7 @@ PORTNAME= hpijs PORTVERSION= 2.1.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hpinkjet @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= hpinkjet MAINTAINER= DougB@FreeBSD.org COMMENT= Drivers and support resources for HP Inkjet Printers -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-dependency-tracking diff --git a/print/hplip/Makefile b/print/hplip/Makefile index 0cea557..a8629e4 100644 --- a/print/hplip/Makefile +++ b/print/hplip/Makefile @@ -7,7 +7,7 @@ PORTNAME= hplip PORTVERSION= 2.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= hplip MAINTAINER= amistry@am-productions.biz COMMENT= Drivers and utilities for HP Printers and All-in-One devices -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ sane.1:${PORTSDIR}/graphics/sane-backends \ cups.2:${PORTSDIR}/print/cups-base \ netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp diff --git a/print/hplip3/Makefile b/print/hplip3/Makefile index 0cea557..a8629e4 100644 --- a/print/hplip3/Makefile +++ b/print/hplip3/Makefile @@ -7,7 +7,7 @@ PORTNAME= hplip PORTVERSION= 2.8.2 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= hplip @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= hplip MAINTAINER= amistry@am-productions.biz COMMENT= Drivers and utilities for HP Printers and All-in-One devices -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ sane.1:${PORTSDIR}/graphics/sane-backends \ cups.2:${PORTSDIR}/print/cups-base \ netsnmp.16:${PORTSDIR}/net-mgmt/net-snmp diff --git a/print/panda/Makefile b/print/panda/Makefile index 12f9ab1..1d9b9db 100644 --- a/print/panda/Makefile +++ b/print/panda/Makefile @@ -7,7 +7,7 @@ PORTNAME= panda PORTVERSION= 0.5.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ ${MASTER_SITE_SAVANNAH} \ @@ -17,7 +17,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= A PDF generation library -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/print/pslib/Makefile b/print/pslib/Makefile index 3ab6362..1e21e88 100644 --- a/print/pslib/Makefile +++ b/print/pslib/Makefile @@ -8,7 +8,7 @@ PORTNAME= pslib PORTVERSION= 0.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= mva@FreeBSD.org COMMENT= A C-library for generating multi page PostScript documents -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/print/ruby-panda/Makefile b/print/ruby-panda/Makefile index f0b71a6..d8f1846 100644 --- a/print/ruby-panda/Makefile +++ b/print/ruby-panda/Makefile @@ -7,7 +7,7 @@ PORTNAME= panda PORTVERSION= 0.0.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= print ruby MASTER_SITES= http://www2s.biglobe.ne.jp/~Nori/ruby/dist/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -18,7 +18,7 @@ MAINTAINER= ruby@FreeBSD.org COMMENT= A Ruby extension library to access Panda LIB_DEPENDS= panda.0:${PORTSDIR}/print/panda \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/print/ruby-pdflib/Makefile b/print/ruby-pdflib/Makefile index 3c50cb1..d6c442c 100644 --- a/print/ruby-pdflib/Makefile +++ b/print/ruby-pdflib/Makefile @@ -7,7 +7,7 @@ PORTNAME= pdflib PORTVERSION= 0.71 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= print ruby MASTER_SITES= http://www-nh.scphys.kyoto-u.ac.jp/~thitoshi/ruby/pdflib/ PKGNAMEPREFIX= ${RUBY_PKGNAMEPREFIX} @@ -17,7 +17,7 @@ DIST_SUBDIR= ruby MAINTAINER= ruby@FreeBSD.org COMMENT= A Ruby extension library to access PDFlib -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ pdf.8:${PORTSDIR}/print/pdflib diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 4db866f..e0b5820 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -8,6 +8,7 @@ PORTNAME= scribus PORTVERSION= 1.3.3.13 +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= SF \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -15,7 +16,7 @@ MASTER_SITES= SF \ MAINTAINER= scjamorim@bsd.com.br COMMENT= A comprehensive desktop publishing program -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 4db866f..e0b5820 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -8,6 +8,7 @@ PORTNAME= scribus PORTVERSION= 1.3.3.13 +PORTREVISION= 1 CATEGORIES= print editors MASTER_SITES= SF \ http://www.scribus.net/downloads/${PORTVERSION}/ @@ -15,7 +16,7 @@ MASTER_SITES= SF \ MAINTAINER= scjamorim@bsd.com.br COMMENT= A comprehensive desktop publishing program -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ lcms.1:${PORTSDIR}/graphics/lcms \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ diff --git a/science/hdf/Makefile b/science/hdf/Makefile index cc75a0b..98efcf3 100644 --- a/science/hdf/Makefile +++ b/science/hdf/Makefile @@ -7,7 +7,7 @@ PORTNAME= hdf PORTVERSION= 4.2r3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= science archivers graphics MASTER_SITES= ftp://ftp.hdfgroup.org/HDF/HDF_Current/src/:src \ ftp://ftp.hdfgroup.org/HDF/Documentation/${PORTVERSION}/:doc \ @@ -22,7 +22,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= ports@FreeBSD.org COMMENT= Hierarchical Data Format library (from NCSA) -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ sz.2:${PORTSDIR}/science/szip CONFLICTS= netcdf-* diff --git a/science/paraview/Makefile b/science/paraview/Makefile index 1521bc3..5e4bdbc 100644 --- a/science/paraview/Makefile +++ b/science/paraview/Makefile @@ -7,7 +7,7 @@ PORTNAME= paraview PORTVERSION= 2.4.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= science graphics MASTER_SITES= http://www.paraview.org/files/v2.4/ @@ -16,7 +16,7 @@ COMMENT= ParaView is a powerful scientific data visualization application LIB_DEPENDS= hdf5.0:${PORTSDIR}/science/hdf5 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ freetype.9:${PORTSDIR}/print/freetype2 \ expat.6:${PORTSDIR}/textproc/expat2 diff --git a/sysutils/ascpu/Makefile b/sysutils/ascpu/Makefile index f74d5ac..ad0dbf9 100644 --- a/sysutils/ascpu/Makefile +++ b/sysutils/ascpu/Makefile @@ -7,14 +7,14 @@ PORTNAME= ascpu PORTVERSION= 1.11 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= sysutils afterstep MASTER_SITES= http://www.tigr.net/afterstep/download/ascpu/ MAINTAINER= demon@FreeBSD.org COMMENT= CPU statistics monitor utility for XFree86 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_XORG= xpm GNU_CONFIGURE= yes diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile index fb02a4b..08b1373 100644 --- a/sysutils/testdisk/Makefile +++ b/sysutils/testdisk/Makefile @@ -7,7 +7,7 @@ PORTNAME= testdisk PORTVERSION= 6.10 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= sysutils MASTER_SITES= http://www.cgsecurity.org/ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} @@ -15,7 +15,7 @@ DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= flz@FreeBSD.org COMMENT= Tool to check and undelete partitions -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes GNU_CONFIGURE= yes diff --git a/textproc/htmldoc/Makefile b/textproc/htmldoc/Makefile index 339e8a6..7bd6f665 100644 --- a/textproc/htmldoc/Makefile +++ b/textproc/htmldoc/Makefile @@ -7,7 +7,7 @@ PORTNAME= htmldoc PORTVERSION= 1.8.27 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= textproc MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= ${PORTNAME}/${PORTVERSION} diff --git a/www/analog/Makefile b/www/analog/Makefile index 289d1f5..c045699 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -7,7 +7,7 @@ PORTNAME= analog PORTVERSION= 6.0 -PORTREVISION= 2 +PORTREVISION= 3 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= http://www.analog.cx/ \ @@ -25,7 +25,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= An extremely fast program for analysing WWW logfiles LIB_DEPENDS= gd.4:${PORTSDIR}/graphics/gd \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png LIMGDIR?= www/data/images diff --git a/www/cheetah/Makefile b/www/cheetah/Makefile index 2a38da9..160963f 100644 --- a/www/cheetah/Makefile +++ b/www/cheetah/Makefile @@ -7,7 +7,7 @@ PORTNAME= cheetah PORTVERSION= 0.10 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= www MASTER_SITES= SF @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= GTK+ based light-weight web browser LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_GNOME= gtk12 diff --git a/www/dillo-i18n/Makefile b/www/dillo-i18n/Makefile index 6393d08..50658a6 100644 --- a/www/dillo-i18n/Makefile +++ b/www/dillo-i18n/Makefile @@ -16,7 +16,7 @@ PORTNAME= dillo PORTVERSION= ${DILLOVERSION}.${I18NVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MASTER_SITES= http://teki.jpn.ph/pc/software/ PKGNAMESUFFIX= -i18n @@ -26,7 +26,7 @@ MAINTAINER= tmseck@netcologne.de COMMENT= A fast, small graphical Web browser with support for i18n RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png DILLOVERSION= 0.8.6 diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 3a4c77a..fab2cfd 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -11,7 +11,7 @@ PORTNAME= dillo PORTVERSION= 0.8.6 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= www ipv6 MASTER_SITES= http://www.dillo.org/download/ @@ -19,7 +19,7 @@ MAINTAINER= tmseck@netcologne.de COMMENT= A fast, small graphical Web browser built upon GTK+ RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/www/dillo2/Makefile b/www/dillo2/Makefile index 330d46c..e2ad643 100644 --- a/www/dillo2/Makefile +++ b/www/dillo2/Makefile @@ -6,6 +6,7 @@ PORTNAME= dillo PORTVERSION= 2.1.1 +PORTREVISION= 1 CATEGORIES= www ipv6 MASTER_SITES= http://www.dillo.org/download/ @@ -15,7 +16,7 @@ COMMENT= A fast, small graphical Web browser built upon fltk2 BUILD_DEPENDS= ${LOCALBASE}/lib/libfltk2.a:${PORTSDIR}/x11-toolkits/fltk2 RUN_DEPENDS= ${LOCALBASE}/lib/libfltk2.a:${PORTSDIR}/x11-toolkits/fltk2 \ wget:${PORTSDIR}/ftp/wget -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/www/ilias/Makefile b/www/ilias/Makefile index 78ace09..9a0b464 100644 --- a/www/ilias/Makefile +++ b/www/ilias/Makefile @@ -6,6 +6,7 @@ PORTNAME= ilias PORTVERSION= 3.10.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF @@ -19,7 +20,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/share/pear/Auth/Auth.php:${PORTSDIR}/security/pear-Auth \ ${LOCALBASE}/share/pear/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \ ${LOCALBASE}/share/pear/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png NO_BUILD= yes diff --git a/www/ilias3/Makefile b/www/ilias3/Makefile index 78ace09..9a0b464 100644 --- a/www/ilias3/Makefile +++ b/www/ilias3/Makefile @@ -6,6 +6,7 @@ PORTNAME= ilias PORTVERSION= 3.10.7 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF @@ -19,7 +20,7 @@ RUN_DEPENDS= convert:${PORTSDIR}/graphics/ImageMagick \ ${LOCALBASE}/share/pear/Auth/Auth.php:${PORTSDIR}/security/pear-Auth \ ${LOCALBASE}/share/pear/MDB2.php:${PORTSDIR}/databases/pear-MDB2 \ ${LOCALBASE}/share/pear/HTML/Template/IT.php:${PORTSDIR}/devel/pear-HTML_Template_IT -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png NO_BUILD= yes diff --git a/www/links/Makefile b/www/links/Makefile index 4c4e84e..5341a63 100644 --- a/www/links/Makefile +++ b/www/links/Makefile @@ -40,7 +40,7 @@ OPTIONS= SVGALIB "non-X11 graphics support" off \ .ifdef(WITH_SVGALIB) || defined(WITH_X11) || defined(WITH_DIRECTFB) LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff CONFIGURE_ARGS+= --enable-graphics .else diff --git a/www/mmosaic/Makefile b/www/mmosaic/Makefile index 82bf86a..cc0614b 100644 --- a/www/mmosaic/Makefile +++ b/www/mmosaic/Makefile @@ -7,7 +7,7 @@ PORTNAME= mmosaic PORTVERSION= 3.7.2 -PORTREVISION?= 3 +PORTREVISION?= 4 CATEGORIES= www MASTER_SITES= ftp://ftp.enst.fr/pub/mbone/mMosaic/ \ ftp://ftp.uni-koeln.de/net/inet/WWW/mosaic/unix/ \ @@ -17,7 +17,7 @@ DISTNAME= mMosaic-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Web browser based on Mosaic, but with many modernizations -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RESTRICTED= "academic, research and internal business purposes only, without a fee" diff --git a/www/openvrml/Makefile b/www/openvrml/Makefile index f3fbf8c..2bdd508 100644 --- a/www/openvrml/Makefile +++ b/www/openvrml/Makefile @@ -7,7 +7,7 @@ PORTNAME= openvrml PORTVERSION= 0.17.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -19,7 +19,7 @@ BUILD_DEPENDS= ${LOCALBASE}/include/argp.h:${PORTSDIR}/devel/argp-standalone \ pkg-config:${PORTSDIR}/devel/pkg-config LIB_DEPENDS= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig \ js.1:${PORTSDIR}/lang/spidermonkey \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ curl.5:${PORTSDIR}/ftp/curl diff --git a/www/swiggle/Makefile b/www/swiggle/Makefile index 1cce9f7..fff860b 100644 --- a/www/swiggle/Makefile +++ b/www/swiggle/Makefile @@ -6,7 +6,7 @@ PORTNAME= swiggle PORTVERSION= 0.4 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= www MASTER_SITES= http://homepage.univie.ac.at/l.ertl/swiggle/files/ \ http://bsd-geek.de/FreeBSD/distfiles/ @@ -14,7 +14,7 @@ MASTER_SITES= http://homepage.univie.ac.at/l.ertl/swiggle/files/ \ MAINTAINER= lme@FreeBSD.org COMMENT= Swiggle is a commandline web image gallery generator -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ exif.12:${PORTSDIR}/graphics/libexif post-patch: diff --git a/www/wb0/Makefile b/www/wb0/Makefile index 1771b3c..b2a0ee1 100644 --- a/www/wb0/Makefile +++ b/www/wb0/Makefile @@ -7,7 +7,7 @@ PORTNAME= wb0 PORTVERSION= 000324 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www graphics MASTER_SITES= ftp://atrey.karlin.mff.cuni.cz/pub/local/clock/wb0/ EXTRACT_SUFX= .tgz @@ -16,7 +16,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Web browser for svgalib which can show pictures RUN_DEPENDS= lynx:${PORTSDIR}/www/lynx-current -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ vga.1:${PORTSDIR}/graphics/svgalib \ png.5:${PORTSDIR}/graphics/png diff --git a/www/ziproxy/Makefile b/www/ziproxy/Makefile index 0bc7ab9..afe668e 100644 --- a/www/ziproxy/Makefile +++ b/www/ziproxy/Makefile @@ -6,6 +6,7 @@ PORTNAME= ziproxy PORTVERSION= 2.7.0 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= SF @@ -14,7 +15,7 @@ COMMENT= A forwarding, non-caching, compressing proxy server LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_BZIP2= yes diff --git a/x11-fm/ezfm/Makefile b/x11-fm/ezfm/Makefile index 95e512c..74d6a35 100644 --- a/x11-fm/ezfm/Makefile +++ b/x11-fm/ezfm/Makefile @@ -7,7 +7,7 @@ PORTNAME= ezfm PORTVERSION= 0.4.3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fm MASTER_SITES= ftp://ftp.ma.utexas.edu/pub/mzou/ DISTNAME= EZFM-0.4-src @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= gahr@FreeBSD.org COMMENT= EZWGL-based file manager for X Window System -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ EZ.1:${PORTSDIR}/graphics/EZWGL WRKSRC= ${WRKDIR}/EZFM-${PORTVERSION} diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile index 85938ae..f34145e 100644 --- a/x11-fm/thunar/Makefile +++ b/x11-fm/thunar/Makefile @@ -7,6 +7,7 @@ PORTNAME= Thunar PORTVERSION= 1.0.1 +PORTREVISION= 1 CATEGORIES= x11-fm xfce MASTER_SITES= ${MASTER_SITE_XFCE} DIST_SUBDIR= xfce4 @@ -54,7 +55,7 @@ PLIST_SUB+= WITH_DBUS="@comment " .endif .if !defined(WITHOUT_JPEG) -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg CONFIGURE_ARGS+=--enable-jpeg .else CONFIGURE_ARGS+=--disable-jpeg diff --git a/x11-fm/xnc/Makefile b/x11-fm/xnc/Makefile index dc7a7da..6a0052f 100644 --- a/x11-fm/xnc/Makefile +++ b/x11-fm/xnc/Makefile @@ -7,7 +7,7 @@ PORTNAME= xnc PORTVERSION= 5.0.4 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-fm MASTER_SITES= http://www.xnc.dubna.su/src-5/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src @@ -22,7 +22,7 @@ COMMENT= File manager for X Window # rar:${PORTSDIR}/archivers/rar \ # unarj:${PORTSDIR}/archivers/unarj \ # lha:${PORTSDIR}/archivers/lha -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11-toolkits/efltk/Makefile b/x11-toolkits/efltk/Makefile index 09c0b84..7f49204 100644 --- a/x11-toolkits/efltk/Makefile +++ b/x11-toolkits/efltk/Makefile @@ -7,7 +7,7 @@ PORTNAME= efltk PORTVERSION= 2.0.7 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= SF/ede @@ -15,7 +15,7 @@ MAINTAINER= sem@FreeBSD.org COMMENT= Extended Fast Light Toolkit LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg WRKSRC= ${WRKDIR}/${PORTNAME} diff --git a/x11-toolkits/fltk/Makefile b/x11-toolkits/fltk/Makefile index a277247..f884694 100644 --- a/x11-toolkits/fltk/Makefile +++ b/x11-toolkits/fltk/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk PORTVERSION= 1.1.9 +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= fltk/${PORTVERSION} @@ -19,7 +20,7 @@ MAINTAINER= gahr@FreeBSD.org COMMENT= Cross-platform C++ graphical user interface toolkit LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg .if defined(WITH_THREADS) CONFIGURE_ARGS+=--enable-threads diff --git a/x11-toolkits/fltk2/Makefile b/x11-toolkits/fltk2/Makefile index c777053..9567555 100644 --- a/x11-toolkits/fltk2/Makefile +++ b/x11-toolkits/fltk2/Makefile @@ -7,6 +7,7 @@ PORTNAME= fltk PORTVERSION= 2.0.${SNAPSHOT} +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_EASYSW} MASTER_SITE_SUBDIR= fltk/snapshots @@ -26,7 +27,7 @@ COMMENT= Fast Light Toolkit version 2 (development snapshot) # support will be disabled without breaking the build. BUILD_DEPENDS= xprop:${PORTSDIR}/x11/xprop LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ Xft.2:${PORTSDIR}/x11-fonts/libXft SNAPSHOT= r6671 diff --git a/x11-toolkits/fox12/Makefile b/x11-toolkits/fox12/Makefile index 4d951ca..79305b3 100644 --- a/x11-toolkits/fox12/Makefile +++ b/x11-toolkits/fox12/Makefile @@ -7,7 +7,7 @@ PORTNAME= fox PORTVERSION= ${MAJORVER}.${SHVER} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ \ @@ -16,7 +16,7 @@ MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ MAINTAINER?= araujo@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.2 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/x11-toolkits/fox14/Makefile b/x11-toolkits/fox14/Makefile index 659c523..950a708 100644 --- a/x11-toolkits/fox14/Makefile +++ b/x11-toolkits/fox14/Makefile @@ -7,7 +7,7 @@ PORTNAME= fox PORTVERSION= ${MAJORVER}.${SHVER} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11-toolkits MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ \ @@ -16,7 +16,7 @@ MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ MAINTAINER?= araujo@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/x11-toolkits/fox16/Makefile b/x11-toolkits/fox16/Makefile index 1c5cbe5..eab92513 100644 --- a/x11-toolkits/fox16/Makefile +++ b/x11-toolkits/fox16/Makefile @@ -7,6 +7,7 @@ PORTNAME= fox PORTVERSION= ${MAJORVER}.${SHVER} +PORTREVISION= 1 CATEGORIES= x11-toolkits MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ ftp://ftp.fox-toolkit.org/pub/ \ @@ -16,7 +17,7 @@ MASTER_SITES= http://www.fox-toolkit.org/ftp/ \ MAINTAINER?= araujo@FreeBSD.org COMMENT= Fast and extensive C++ GUI toolkit -- ver.1.6 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ Xft.2:${PORTSDIR}/x11-fonts/libXft diff --git a/x11-toolkits/gnustep-back/Makefile b/x11-toolkits/gnustep-back/Makefile index fd83bf3..885bd2f 100644 --- a/x11-toolkits/gnustep-back/Makefile +++ b/x11-toolkits/gnustep-back/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnustep-back PORTVERSION= 0.16.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core @@ -15,7 +16,7 @@ PKGNAMESUFFIX?= ${BACK_SUFFIX}${PKGNAMESUFFIX2} MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep GUI backend -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff LIB_DEPENDS+= Xft.2:${PORTSDIR}/x11-fonts/libXft LIB_DEPENDS+= fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile index 5b89b61..d15c266 100644 --- a/x11-toolkits/gnustep-gui/Makefile +++ b/x11-toolkits/gnustep-gui/Makefile @@ -7,6 +7,7 @@ PORTNAME= gnustep-gui PORTVERSION= 0.16.0 +PORTREVISION= 1 CATEGORIES= x11-toolkits gnustep MASTER_SITES= ${MASTER_SITE_GNUSTEP} MASTER_SITE_SUBDIR= core @@ -15,6 +16,7 @@ MAINTAINER= dinoex@FreeBSD.org COMMENT= GNUstep GUI library LIB_DEPENDS+= tiff.4:${PORTSDIR}/graphics/tiff +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png LIB_DEPENDS+= audiofile.0:${PORTSDIR}/audio/libaudiofile LIB_DEPENDS+= ungif.5:${PORTSDIR}/graphics/libungif diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 3cc2c94..3257e08 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.16.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -31,7 +31,7 @@ LATEST_LINK= gtk20 LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ jasper.4:${PORTSDIR}/graphics/jasper RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 3cc2c94..3257e08 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.16.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -31,7 +31,7 @@ LATEST_LINK= gtk20 LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ jasper.4:${PORTSDIR}/graphics/jasper RUN_DEPENDS+= ${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \ ${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme diff --git a/x11-toolkits/irrlicht/Makefile b/x11-toolkits/irrlicht/Makefile index 81f0f04..fd0e55c 100644 --- a/x11-toolkits/irrlicht/Makefile +++ b/x11-toolkits/irrlicht/Makefile @@ -7,6 +7,7 @@ PORTNAME= irrlicht PORTVERSION= 1.5 +PORTREVISION= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= acm@FreeBSD.org COMMENT= High performance realtime 3D engine -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_ZIP= yes diff --git a/x11-toolkits/nucleo/Makefile b/x11-toolkits/nucleo/Makefile index 2af4c60..1e83eea 100644 --- a/x11-toolkits/nucleo/Makefile +++ b/x11-toolkits/nucleo/Makefile @@ -7,7 +7,7 @@ PORTNAME= nucleo PORTVERSION= 0.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-toolkits MASTER_SITES= http://insitu.lri.fr/metisse/download/latest/ \ http://freebsd.nsu.ru/distfiles/metisse/ @@ -16,7 +16,7 @@ MAINTAINER= danfe@FreeBSD.org COMMENT= Toolkit to explore video and human-computer interaction LIB_DEPENDS= freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/x11-toolkits/p5-Prima/Makefile b/x11-toolkits/p5-Prima/Makefile index 0ed7232..a55d1ae 100644 --- a/x11-toolkits/p5-Prima/Makefile +++ b/x11-toolkits/p5-Prima/Makefile @@ -7,6 +7,7 @@ PORTNAME= Prima PORTVERSION= 1.27 +PORTREVISION= 1 CATEGORIES= x11-toolkits perl5 graphics MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -16,7 +17,7 @@ COMMENT= An extensible Perl toolkit for multi-platform GUI development LIB_DEPENDS= ungif.5:${PORTSDIR}/graphics/libungif \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff MAN1= gencls.1.gz VB.1.gz cfgmaint.1.gz diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index a14f4c7..0658013 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -8,7 +8,7 @@ PORTNAME= qt PORTVERSION= 3.3.8 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES?= x11-toolkits ipv6 MASTER_SITES= ${MASTER_SITE_QT} DISTNAME= qt-x11-free-${PORTVERSION} diff --git a/x11-toolkits/ruby-fox12/Makefile b/x11-toolkits/ruby-fox12/Makefile index 1942339..dbd55f8 100644 --- a/x11-toolkits/ruby-fox12/Makefile +++ b/x11-toolkits/ruby-fox12/Makefile @@ -7,7 +7,7 @@ PORTNAME= fox PORTVERSION= 1.2.6 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits ruby MASTER_SITES= RF MASTER_SITE_SUBDIR= fxruby @@ -20,7 +20,7 @@ COMMENT= Ruby extension module to use FOX 1.2, aka FXRuby LIB_DEPENDS= FOX-1.2:${PORTSDIR}/x11-toolkits/fox12 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ fxscintilla.19:${PORTSDIR}/x11-toolkits/fxscintilla-fox12 LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}12 diff --git a/x11-toolkits/ruby-fox16/Makefile b/x11-toolkits/ruby-fox16/Makefile index 731640f..ac03be8 100644 --- a/x11-toolkits/ruby-fox16/Makefile +++ b/x11-toolkits/ruby-fox16/Makefile @@ -7,7 +7,7 @@ PORTNAME= fox PORTVERSION= 1.6.16 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11-toolkits ruby MASTER_SITES= RF MASTER_SITE_SUBDIR= fxruby @@ -20,7 +20,7 @@ COMMENT= Ruby extension module to use FOX 1.6, aka FXRuby LIB_DEPENDS= FOX-1.6:${PORTSDIR}/x11-toolkits/fox16 \ png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff \ fxscintilla.19:${PORTSDIR}/x11-toolkits/fxscintilla diff --git a/x11-toolkits/wxgtk24/Makefile b/x11-toolkits/wxgtk24/Makefile index 138ed88..9a643bb 100644 --- a/x11-toolkits/wxgtk24/Makefile +++ b/x11-toolkits/wxgtk24/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.4.2 -PORTREVISION?= 16 +PORTREVISION?= 17 PKGNAMESUFFIX= ${WXGTK_FLAVOR} CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows @@ -17,7 +17,7 @@ MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff USE_BZIP2= yes diff --git a/x11-toolkits/wxgtk26/Makefile b/x11-toolkits/wxgtk26/Makefile index 1ecd16e..bfa5b7d 100644 --- a/x11-toolkits/wxgtk26/Makefile +++ b/x11-toolkits/wxgtk26/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.6.4 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -17,7 +17,7 @@ MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ - jpeg.9:${PORTSDIR}/graphics/jpeg\ + jpeg.10:${PORTSDIR}/graphics/jpeg\ tiff.4:${PORTSDIR}/graphics/tiff\ expat.6:${PORTSDIR}/textproc/expat2\ mspack.1:${PORTSDIR}/archivers/libmspack diff --git a/x11-toolkits/wxgtk28/Makefile b/x11-toolkits/wxgtk28/Makefile index 2adff34..ac59369 100644 --- a/x11-toolkits/wxgtk28/Makefile +++ b/x11-toolkits/wxgtk28/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.8.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -17,7 +17,7 @@ MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ - jpeg.9:${PORTSDIR}/graphics/jpeg\ + jpeg.10:${PORTSDIR}/graphics/jpeg\ tiff.4:${PORTSDIR}/graphics/tiff\ expat.6:${PORTSDIR}/textproc/expat2\ mspack.1:${PORTSDIR}/archivers/libmspack diff --git a/x11-toolkits/wxgtk29/Makefile b/x11-toolkits/wxgtk29/Makefile index 2adff34..ac59369 100644 --- a/x11-toolkits/wxgtk29/Makefile +++ b/x11-toolkits/wxgtk29/Makefile @@ -7,7 +7,7 @@ PORTNAME= wx PORTVERSION= 2.8.10 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= SF/wxwindows PKGNAMESUFFIX= ${WXGTK_FLAVOR} @@ -17,7 +17,7 @@ MAINTAINER?= fjoe@FreeBSD.org COMMENT?= The wxWidgets GUI toolkit with GTK+ bindings LIB_DEPENDS+= png.5:${PORTSDIR}/graphics/png\ - jpeg.9:${PORTSDIR}/graphics/jpeg\ + jpeg.10:${PORTSDIR}/graphics/jpeg\ tiff.4:${PORTSDIR}/graphics/tiff\ expat.6:${PORTSDIR}/textproc/expat2\ mspack.1:${PORTSDIR}/archivers/libmspack diff --git a/x11-toolkits/xforms/Makefile b/x11-toolkits/xforms/Makefile index 86d10b7..de035fc 100644 --- a/x11-toolkits/xforms/Makefile +++ b/x11-toolkits/xforms/Makefile @@ -7,7 +7,7 @@ PORTNAME= xforms PORTVERSION= 1.0 -PORTREVISION= 4 +PORTREVISION= 5 PORTEPOCH= 1 CATEGORIES= x11-toolkits graphics MASTER_SITES= ${MASTER_SITE_SAVANNAH:S/$/:savannah/} \ @@ -21,7 +21,7 @@ REINPLACE_ARGS= -i "" MAINTAINER?= ports@FreeBSD.ORG COMMENT?= A graphical user interface toolkit for X Window System -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ tiff.4:${PORTSDIR}/graphics/tiff .if defined(WITH_I18N) diff --git a/x11-toolkits/xmhtml/Makefile b/x11-toolkits/xmhtml/Makefile index 0c89b3f..0e7b431 100644 --- a/x11-toolkits/xmhtml/Makefile +++ b/x11-toolkits/xmhtml/Makefile @@ -7,7 +7,7 @@ PORTNAME= XmHTML PORTVERSION= 1.1.7 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= x11-toolkits www MASTER_SITES= ${MASTER_SITE_NETBSD} @@ -15,7 +15,7 @@ MAINTAINER= ports@FreeBSD.org COMMENT= A Motif widget set for displaying HTML 3.2 documents LIB_DEPENDS= png.5:${PORTSDIR}/graphics/png \ - jpeg.9:${PORTSDIR}/graphics/jpeg + jpeg.10:${PORTSDIR}/graphics/jpeg USE_AUTOTOOLS= libtool:15:env USE_MOTIF= yes diff --git a/x11-wm/afterstep-stable/Makefile b/x11-wm/afterstep-stable/Makefile index b1ee6830..3ed9750 100644 --- a/x11-wm/afterstep-stable/Makefile +++ b/x11-wm/afterstep-stable/Makefile @@ -7,7 +7,7 @@ PORTNAME= afterstep PORTVERSION= 2.2.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= x11-wm afterstep MASTER_SITES= ftp://ftp.afterstep.org/stable/ \ ${MASTER_SITE_SOURCEFORGE} @@ -20,7 +20,7 @@ COMMENT= A stable version of the AfterStep window manager LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ execinfo.1:${PORTSDIR}/devel/libexecinfo \ freetype.9:${PORTSDIR}/print/freetype2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ rplay.1:${PORTSDIR}/audio/rplay \ rsvg-2.2:${PORTSDIR}/graphics/librsvg2 \ diff --git a/x11-wm/ctwm/Makefile b/x11-wm/ctwm/Makefile index ddd0ee7..d0bc476 100644 --- a/x11-wm/ctwm/Makefile +++ b/x11-wm/ctwm/Makefile @@ -7,7 +7,7 @@ PORTNAME= ctwm PORTVERSION= 3.8a -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11-wm MASTER_SITES= http://ctwm.free.lp.se/dist/ \ http://www.centralmiss.com/~matt/distfiles/ diff --git a/x11-wm/pekwm/Makefile b/x11-wm/pekwm/Makefile index 7837d5d..766ef98 100644 --- a/x11-wm/pekwm/Makefile +++ b/x11-wm/pekwm/Makefile @@ -7,6 +7,7 @@ PORTNAME= pekwm PORTVERSION= 0.1.11 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= x11-wm MASTER_SITES= http://pekwm.org/projects/3/files/ \ @@ -17,7 +18,7 @@ MASTER_SITES= http://pekwm.org/projects/3/files/ \ MAINTAINER= carpetsmoker@rwxrwxrwx.net COMMENT= Light, Unobtrusive, and configurable windowmanager -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png USE_BZIP2= yes diff --git a/x11/aterm/Makefile b/x11/aterm/Makefile index b719c86..1ad6a8d 100644 --- a/x11/aterm/Makefile +++ b/x11/aterm/Makefile @@ -7,7 +7,7 @@ PORTNAME= aterm PORTVERSION= 1.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES+= x11 # `+=' is for slave ports MASTER_SITES= SF @@ -37,7 +37,7 @@ CONFIGURE_ARGS+= --with-png=no .if !defined(WITHOUT_JPEG) CONFIGURE_ARGS+= --with-jpeg -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg .else CONFIGURE_ARGS+= --with-jpeg=no .endif diff --git a/x11/dgs/Makefile b/x11/dgs/Makefile index f7fd96b..56d553c 100644 --- a/x11/dgs/Makefile +++ b/x11/dgs/Makefile @@ -7,7 +7,7 @@ PORTNAME= dgs PORTVERSION= 0.5.9.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_GNU} MASTER_SITE_SUBDIR= ../old-gnu/dgs @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ../old-gnu/dgs MAINTAINER= dinoex@FreeBSD.org COMMENT= A display ghostscript system -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11/eaglemode/Makefile b/x11/eaglemode/Makefile index b6eac56..392e2fc 100644 --- a/x11/eaglemode/Makefile +++ b/x11/eaglemode/Makefile @@ -7,13 +7,14 @@ PORTNAME= eaglemode PORTVERSION= 0.75.0 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF MAINTAINER= amdmi3@FreeBSD.org COMMENT= Futuristic zoomable user environment -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11/electricsheep/Makefile b/x11/electricsheep/Makefile index 78d6d3c..8c89bdd 100644 --- a/x11/electricsheep/Makefile +++ b/x11/electricsheep/Makefile @@ -7,7 +7,7 @@ PORTNAME= electricsheep PORTVERSION= 2.6.8 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 CATEGORIES= x11 MASTER_SITES= http://electricsheep.org/ @@ -16,7 +16,7 @@ MAINTAINER= dougb@FreeBSD.org COMMENT= A nice distributed screensaver LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \ - jpeg.9:${PORTSDIR}/graphics/jpeg \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png RUN_DEPENDS= xloadimage:${PORTSDIR}/x11/xloadimage \ xsetbg:${PORTSDIR}/x11/xloadimage \ diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile index 89bb52a..75f941f 100644 --- a/x11/kdelibs4/Makefile +++ b/x11/kdelibs4/Makefile @@ -8,6 +8,7 @@ PORTNAME= kdelibs PORTVERSION= ${KDE4_VERSION} +PORTREVISION= 1 CATEGORIES= x11 kde ipv6 MASTER_SITES= ${MASTER_SITE_KDE} MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile index edc9cbf..fe06dc5 100644 --- a/x11/mrxvt-devel/Makefile +++ b/x11/mrxvt-devel/Makefile @@ -7,6 +7,7 @@ PORTNAME= mrxvt-devel PORTVERSION= 0.5.4 +PORTREVISION= 1 CATEGORIES= x11 MASTER_SITES= SF MASTER_SITE_SUBDIR= materm @@ -57,7 +58,7 @@ CONFIGURE_ARGS+= --disable-xpm .if defined(WITHOUT_JPEG) || defined(WITHOUT_BACKGROUND) CONFIGURE_ARGS+= --disable-jpeg .else -LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg +LIB_DEPENDS+= jpeg.10:${PORTSDIR}/graphics/jpeg .endif .if defined(WITHOUT_PNG) || defined(WITHOUT_BACKGROUND) diff --git a/x11/mrxvt/Makefile b/x11/mrxvt/Makefile index 7990fe6..36c614c 100644 --- a/x11/mrxvt/Makefile +++ b/x11/mrxvt/Makefile @@ -7,7 +7,7 @@ PORTNAME= mrxvt PORTVERSION= 0.4.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= x11 MASTER_SITES= SF MASTER_SITE_SUBDIR= materm @@ -16,7 +16,7 @@ EXTRACT_SUFX= .tgz MAINTAINER= ports@FreeBSD.org COMMENT= A tabbed version of rxvt -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png CONFLICTS= mrxvt-0.5.* diff --git a/x11/slim/Makefile b/x11/slim/Makefile index 80194d4..e97ac96 100644 --- a/x11/slim/Makefile +++ b/x11/slim/Makefile @@ -7,7 +7,7 @@ PORTNAME= slim PORTVERSION= 1.3.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_BERLIOS} \ http://depot.fsck.ch/mirror/distfiles/ @@ -16,7 +16,7 @@ MASTER_SITE_SUBDIR=slim MAINTAINER= ports@fsck.ch COMMENT= Graphical login manager for X11, derived from Login.app -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ freetype:${PORTSDIR}/print/freetype2 \ fontconfig:${PORTSDIR}/x11-fonts/fontconfig diff --git a/x11/xloadimage/Makefile b/x11/xloadimage/Makefile index 6634aa5..f75ee27 100644 --- a/x11/xloadimage/Makefile +++ b/x11/xloadimage/Makefile @@ -7,7 +7,7 @@ VERSION= 4.1 REVISION= 16 -PORTREVISION= 4 +PORTREVISION= 5 PORTNAME= xloadimage PORTVERSION= ${VERSION}.${REVISION} @@ -25,7 +25,7 @@ PATCH_STRIP= -p1 EXTRA_PATCHES= ${WRKSRC}/debian/patches/*.dpatch USE_XORG= x11 -LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \ +LIB_DEPENDS= jpeg.10:${PORTSDIR}/graphics/jpeg \ png.5:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff diff --git a/x11/xscreensaver-gnome/Makefile b/x11/xscreensaver-gnome/Makefile index 37702a7..9cfc527 100644 --- a/x11/xscreensaver-gnome/Makefile +++ b/x11/xscreensaver-gnome/Makefile @@ -8,7 +8,7 @@ PORTNAME?= xscreensaver-gnome PORTVERSION= 5.08 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11 gnome MASTER_SITES= http://www.jwz.org/xscreensaver/ DISTNAME= xscreensaver-${PORTVERSION} @@ -16,7 +16,8 @@ DISTNAME= xscreensaver-${PORTVERSION} MAINTAINER= gnome@FreeBSD.org COMMENT= Save your screen while you entertain your cat (for GNOME users) -LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle +LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \ + jpeg.10:${PORTSDIR}/graphics/jpeg CONFLICTS?= xscreensaver-[0-9]* xscreensaver-gnome-hacks-[0-9]* diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index 018d7e5..5bebac8 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -7,6 +7,7 @@ PORTNAME= xscreensaver PORTVERSION= 5.08 +PORTREVISION= 1 CATEGORIES?= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ \ http://dougbarton.us/Downloads/ @@ -15,6 +16,7 @@ MAINTAINER?= DougB@FreeBSD.org COMMENT= Save your screen while you entertain your cat LIB_DEPENDS= gle.4:${PORTSDIR}/graphics/gle \ + jpeg.10:${PORTSDIR}/graphics/jpeg \ gtk-x11-2.0:${PORTSDIR}/x11-toolkits/gtk20 \ xml2.5:${PORTSDIR}/textproc/libxml2 \ glade-2.0.0:${PORTSDIR}/devel/libglade2 |
