diff options
| -rw-r--r-- | graphics/jpeg/Makefile | 4 | ||||
| -rw-r--r-- | graphics/jpeg/buildlink3.mk | 7 | ||||
| -rw-r--r-- | graphics/jpeg/distinfo | 12 | ||||
| -rw-r--r-- | graphics/jpeg/patches/patch-af | 8 | ||||
| -rw-r--r-- | graphics/jpeg/patches/patch-ag | 74 |
5 files changed, 44 insertions, 61 deletions
diff --git a/graphics/jpeg/Makefile b/graphics/jpeg/Makefile index a87b6a1a17d..123e4d63640 100644 --- a/graphics/jpeg/Makefile +++ b/graphics/jpeg/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.46 2012/10/06 14:11:01 asau Exp $ +# $NetBSD: Makefile,v 1.47 2013/01/24 21:49:18 adam Exp $ -DISTNAME= jpegsrc.v8d +DISTNAME= jpegsrc.v9 PKGNAME= ${DISTNAME:S/src.v/-/} CATEGORIES= graphics MASTER_SITES= http://www.ijg.org/files/ diff --git a/graphics/jpeg/buildlink3.mk b/graphics/jpeg/buildlink3.mk index 672ff18a685..1dfcd76544b 100644 --- a/graphics/jpeg/buildlink3.mk +++ b/graphics/jpeg/buildlink3.mk @@ -1,13 +1,12 @@ -# $NetBSD: buildlink3.mk,v 1.15 2012/05/07 01:53:34 dholland Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2013/01/24 21:49:18 adam Exp $ BUILDLINK_TREE+= jpeg .if !defined(JPEG_BUILDLINK3_MK) JPEG_BUILDLINK3_MK:= -BUILDLINK_API_DEPENDS.jpeg+= jpeg>=8nb1 -#BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=8nb1 -BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=8nb1 +BUILDLINK_API_DEPENDS.jpeg+= jpeg>=9 +BUILDLINK_ABI_DEPENDS.jpeg+= jpeg>=9 BUILDLINK_PKGSRCDIR.jpeg?= ../../graphics/jpeg .endif # JPEG_BUILDLINK3_MK diff --git a/graphics/jpeg/distinfo b/graphics/jpeg/distinfo index 4bf97450437..f58da19a794 100644 --- a/graphics/jpeg/distinfo +++ b/graphics/jpeg/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.14 2012/01/20 12:33:07 wiz Exp $ +$NetBSD: distinfo,v 1.15 2013/01/24 21:49:18 adam Exp $ -SHA1 (jpegsrc.v8d.tar.gz) = f080b2fffc7581f7d19b968092ba9ebc234556ff -RMD160 (jpegsrc.v8d.tar.gz) = b268252793b8050a25baf12d2bb07a507cbefb5d -Size (jpegsrc.v8d.tar.gz) = 991456 bytes -SHA1 (patch-af) = 5faed54759b871cc12447364d8b21b2fc05ecc15 -SHA1 (patch-ag) = 04d5977ad490c4ba9b2a38a8e22bc23b50359656 +SHA1 (jpegsrc.v9.tar.gz) = 724987e7690ca3d74d6ab7c1f1b6854e88ca204b +RMD160 (jpegsrc.v9.tar.gz) = 048e52334f6341424bd684458799d9c72254e8ec +Size (jpegsrc.v9.tar.gz) = 987900 bytes +SHA1 (patch-af) = aba44e1e3520d2a232f6bd949a82c150e0b3e0f4 +SHA1 (patch-ag) = 4fc698186d149f1152d30bf65a96461bc331c812 diff --git a/graphics/jpeg/patches/patch-af b/graphics/jpeg/patches/patch-af index aa6f2d9c642..fdfca90ee0d 100644 --- a/graphics/jpeg/patches/patch-af +++ b/graphics/jpeg/patches/patch-af @@ -1,8 +1,8 @@ -$NetBSD: patch-af,v 1.4 2010/01/04 19:43:39 joerg Exp $ +$NetBSD: patch-af,v 1.5 2013/01/24 21:49:18 adam Exp $ ---- Makefile.am.orig 2009-06-11 20:25:40.000000000 +0000 +--- Makefile.am.orig 2012-05-09 13:13:36.000000000 +0000 +++ Makefile.am -@@ -75,7 +75,7 @@ if HAVE_LD_VERSION_SCRIPT +@@ -76,7 +76,7 @@ if HAVE_LD_VERSION_SCRIPT endif # Executables to build @@ -11,7 +11,7 @@ $NetBSD: patch-af,v 1.4 2010/01/04 19:43:39 joerg Exp $ # Executable sources & libs cjpeg_SOURCES = cjpeg.c rdppm.c rdgif.c rdtarga.c rdrle.c rdbmp.c \ -@@ -88,6 +88,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c +@@ -89,6 +89,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c jpegtran_LDADD = libjpeg.la rdjpgcom_SOURCES = rdjpgcom.c wrjpgcom_SOURCES = wrjpgcom.c diff --git a/graphics/jpeg/patches/patch-ag b/graphics/jpeg/patches/patch-ag index 5a945834dcd..3487a5ec22a 100644 --- a/graphics/jpeg/patches/patch-ag +++ b/graphics/jpeg/patches/patch-ag @@ -1,46 +1,47 @@ -$NetBSD: patch-ag,v 1.2 2010/01/04 19:43:39 joerg Exp $ +$NetBSD: patch-ag,v 1.3 2013/01/24 21:49:18 adam Exp $ ---- Makefile.in.orig 2009-06-14 16:25:39.000000000 +0000 +--- Makefile.in.orig 2013-01-03 18:58:55.000000000 +0000 +++ Makefile.in -@@ -46,7 +46,7 @@ target_triplet = @target@ - ANSI2KNR = @ANSI2KNR@ +@@ -61,7 +61,7 @@ host_triplet = @host@ + target_triplet = @target@ @HAVE_LD_VERSION_SCRIPT_TRUE@am__append_1 = -Wl,--version-script=$(srcdir)/libjpeg.map bin_PROGRAMS = cjpeg$(EXEEXT) djpeg$(EXEEXT) jpegtran$(EXEEXT) \ - rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) + rdjpgcom$(EXEEXT) wrjpgcom$(EXEEXT) jpegexiforient$(EXEEXT) subdir = . - DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ + DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ $(top_srcdir)/configure $(am__configure_deps) \ -@@ -128,6 +128,9 @@ rdjpgcom_LDADD = $(LDADD) - am_wrjpgcom_OBJECTS = wrjpgcom$U.$(OBJEXT) +@@ -148,6 +148,9 @@ rdjpgcom_LDADD = $(LDADD) + am_wrjpgcom_OBJECTS = wrjpgcom.$(OBJEXT) wrjpgcom_OBJECTS = $(am_wrjpgcom_OBJECTS) wrjpgcom_LDADD = $(LDADD) -+am_jpegexiforient_OBJECTS = jpegexiforient$U.$(OBJEXT) ++am_jpegexiforient_OBJECTS = jpegexiforient.$(OBJEXT) +jpegexiforient_OBJECTS = $(am_jpegexiforient_OBJECTS) +jpegexiforient_DEPENDENCIES = libjpeg.la - DEFAULT_INCLUDES = -I.@am__isrc@ - depcomp = $(SHELL) $(top_srcdir)/depcomp - am__depfiles_maybe = depfiles -@@ -155,7 +158,8 @@ AM_V_GEN = $(am__v_GEN_$(V)) - am__v_GEN_ = $(am__v_GEN_$(AM_DEFAULT_VERBOSITY)) - am__v_GEN_0 = @echo " GEN " $@; + AM_V_P = $(am__v_P_@AM_V@) + am__v_P_ = $(am__v_P_@AM_DEFAULT_V@) + am__v_P_0 = false +@@ -183,7 +186,8 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V + am__v_CCLD_0 = @echo " CCLD " $@; + am__v_CCLD_1 = SOURCES = $(libjpeg_la_SOURCES) $(cjpeg_SOURCES) $(djpeg_SOURCES) \ - $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES) + $(jpegtran_SOURCES) $(rdjpgcom_SOURCES) $(wrjpgcom_SOURCES) \ + $(jpegexiforient_SOURCES) - man1dir = $(mandir)/man1 - NROFF = nroff - MANS = $(man_MANS) -@@ -369,6 +373,7 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c + am__can_run_installinfo = \ + case $$AM_UPDATE_INFO_DIR in \ + n|no|NO) false;; \ +@@ -424,6 +428,8 @@ jpegtran_SOURCES = jpegtran.c rdswitch.c jpegtran_LDADD = libjpeg.la rdjpgcom_SOURCES = rdjpgcom.c wrjpgcom_SOURCES = wrjpgcom.c +jpegexiforient_SOURCES = jpegexiforient.c ++jpegexiforient_LDADD = libjpeg.la # Manual pages to install man_MANS = $(DISTMANS) -@@ -535,6 +540,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $ - wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) +@@ -598,6 +603,9 @@ rdjpgcom$(EXEEXT): $(rdjpgcom_OBJECTS) $ + wrjpgcom$(EXEEXT): $(wrjpgcom_OBJECTS) $(wrjpgcom_DEPENDENCIES) $(EXTRA_wrjpgcom_DEPENDENCIES) @rm -f wrjpgcom$(EXEEXT) $(AM_V_CCLD)$(LINK) $(wrjpgcom_OBJECTS) $(wrjpgcom_LDADD) $(LIBS) +jpegexiforient$(EXEEXT): $(jpegexiforient_OBJECTS) $(jpegexiforient_DEPENDENCIES) @@ -49,28 +50,11 @@ $NetBSD: patch-ag,v 1.2 2010/01/04 19:43:39 joerg Exp $ mostlyclean-compile: -rm -f *.$(OBJEXT) -@@ -597,6 +605,7 @@ mostlyclean-kr: - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctfst$U.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctint$U.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmemmgr$U.Plo@am__quote@ -+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegexiforient$U.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegtran$U.Po@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant1$U.Plo@am__quote@ - @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant2$U.Plo@am__quote@ -@@ -732,6 +741,8 @@ jidctint_.c: jidctint.c $(ANSI2KNR) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jidctint.c; then echo $(srcdir)/jidctint.c; else echo jidctint.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ - jmemmgr_.c: jmemmgr.c $(ANSI2KNR) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jmemmgr.c; then echo $(srcdir)/jmemmgr.c; else echo jmemmgr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ -+jpegexiforient_.c: jpegexiforient.c $(ANSI2KNR) -+ $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jpegexiforient.c; then echo $(srcdir)/jpegexiforient.c; else echo jpegexiforient.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ - jpegtran_.c: jpegtran.c $(ANSI2KNR) - $(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/jpegtran.c; then echo $(srcdir)/jpegtran.c; else echo jpegtran.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@ - jquant1_.c: jquant1.c $(ANSI2KNR) -@@ -793,6 +804,7 @@ jerror_.$(OBJEXT) jerror_.lo jfdctflt_.$ - jfdctfst_.$(OBJEXT) jfdctfst_.lo jfdctint_.$(OBJEXT) jfdctint_.lo \ - jidctflt_.$(OBJEXT) jidctflt_.lo jidctfst_.$(OBJEXT) jidctfst_.lo \ - jidctint_.$(OBJEXT) jidctint_.lo jmemmgr_.$(OBJEXT) jmemmgr_.lo \ -+jpegexiforient_.$(OBJEXT) jpegexiforient_.lo \ - jpegtran_.$(OBJEXT) jpegtran_.lo jquant1_.$(OBJEXT) jquant1_.lo \ - jquant2_.$(OBJEXT) jquant2_.lo jutils_.$(OBJEXT) jutils_.lo \ - rdbmp_.$(OBJEXT) rdbmp_.lo rdcolmap_.$(OBJEXT) rdcolmap_.lo \ +@@ -651,6 +659,7 @@ distclean-compile: + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctfst.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jidctint.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jmemmgr.Plo@am__quote@ ++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegexiforient.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jpegtran.Po@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant1.Plo@am__quote@ + @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/jquant2.Plo@am__quote@ |