pkg/46823: Update print/mupdf to 1.1

To: pkg-manager%netbsd.org@localhost,gnats-admin%netbsd.org@localhost,pkgsrc-bugs%netbsd.org@localhost
Subject: pkg/46823: Update print/mupdf to 1.1
From: Leonardo Taccari <iamleot%gmail.com@localhost>
Date: Tue, 21 Aug 2012 12:40:00 +0000 (UTC)
>Number:         46823
>Category:       pkg
>Synopsis:       Update print/mupdf to 1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pkg-manager
>State:          open
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Tue Aug 21 12:40:00 +0000 2012
>Originator:     Leonardo Taccari
>Release:        NetBSD 6.0_BETA2
>Organization:
        
>Environment:
        
        
System: NetBSD . 6.0_BETA2 NetBSD 6.0_BETA2 (EEEPC900) #1: Sat Aug 18 13:33:10 
CEST 2012 leot@.:/usr/src/sys/arch/i386/compile/EEEPC900 i386
Architecture: i386
Machine: i386
>Description:
        print/mupdf in pkgsrc (1.0) is not the latest stable version (1.1).
>How-To-Repeat:
        $ cd pkgsrc/print/mupdf && make show-var VARNAME=PKGNAME_NOREV
>Fix:
        Please apply the attached patches.
        While here I commented previous uncommented patches, I also updated
        files/mupdf.pc version (I think that during the update to 1.0 someone
        missed to update the version).
        Here I will briefly document changes I have made, they are all minor and
        cosmetic:
         o Makefile: add INSTALL_MAKE_FLAGS+= mandir=... in order to avoid
           hardcoding it in patch-ac.
         o patch-ac: use BSD_INSTALL_MAN_DIR and BSD_INSTALL_MAN where 
appropiated
         o patch-ac: ignore QUIET_MKDIR variable in MKDIR_CMD (it's always
           undefined)

        While here I will provide also a (possible) commit message, the list of
        changes are taken from:

         http://www.mupdf.com/news

----8<--------8<--------8<--------8<--------8<--------8<----
Update mupdf to 1.1.

Changes:
MuPDF 1.1 (2012-08-16)

   The 1.1 release is here!

MuPDF 1.1 RC1 (2012-08-08)

   The 1.1 release is almost here! This version is mainly a stability and
   bug fix release.

   The command line tools have been combined into one tool that does all:
   mubusy. Where previously you would have called "mupdfclean blah blah
   blah", now call "mubusy clean blah blah blah" instead.
     * Rendering bugs fixed (text clipping, stroked text etc).
     * Better handling of 'large' (uncachable) glyphs.
     * Added a delete button to the library view on the iOS port.
     * Minor speed optimisations.
     * Shading bug fixes.
     * Move to using dynamically allocated parsing buffers (more
       resilient).
     * Support for UserUnits.
     * Fix bugs with image predictors (including with 16 bit images).
     * More resilient to out of spec files.
     * Extract pdf writing capability into the library from pdfclean, and
       expand on it to allow for linearisation. Bug fixes in the garbage
       collection of unused objects.
     * Improve pdf writing recognition of images.
     * Improved font matching.
     * Start to move away from macros to inline functions (helpful for
       applications requiring certification).
     * Many bugs fixed.
----8<--------8<--------8<--------8<--------8<--------8<----


Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile    3 Jun 2012 22:03:24 -0000       1.12
+++ Makefile    21 Aug 2012 12:06:22 -0000
@@ -1,7 +1,7 @@
 # $NetBSD: Makefile,v 1.12 2012/06/03 22:03:24 wiz Exp $
 #
 
-DISTNAME=      mupdf-1.0-source
+DISTNAME=      mupdf-1.1-source
 PKGNAME=       ${DISTNAME:S/-source//}
 CATEGORIES=    print
 MASTER_SITES=  http://ccxvii.net/mupdf/download/ \
@@ -20,6 +20,7 @@
 
 INSTALLATION_DIRS+=    bin include lib/pkgconfig
 INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
 LDFLAGS=       ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 MAKE_FLAGS+=   LDFLAGS=${LDFLAGS:Q}
 
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- PLIST       3 Jun 2012 22:03:24 -0000       1.4
+++ PLIST       21 Aug 2012 12:06:22 -0000
@@ -1,10 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2012/06/03 22:03:24 wiz Exp $
+@comment $NetBSD$
+bin/mubusy
 bin/mudraw
 bin/mupdf
-bin/mupdfclean
-bin/mupdfextract
-bin/mupdfinfo
-bin/mupdfshow
 include/fitz.h
 include/memento.h
 include/mucbz.h
@@ -12,7 +9,6 @@
 include/muxps.h
 lib/libfitz.la
 lib/pkgconfig/mupdf.pc
+man/man1/mubusy.1
 man/man1/mudraw.1
 man/man1/mupdf.1
-man/man1/mupdfclean.1
-man/man1/mupdfshow.1
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/distinfo,v
retrieving revision 1.7
diff -u -r1.7 distinfo
--- distinfo    3 Jun 2012 22:03:24 -0000       1.7
+++ distinfo    21 Aug 2012 12:06:22 -0000
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.7 2012/06/03 22:03:24 wiz Exp $
 
-SHA1 (mupdf-1.0-source.tar.gz) = c5c4496836cdd4bdf7b2d2344ec045c9508e49e4
-RMD160 (mupdf-1.0-source.tar.gz) = 7820cf68552d64c52c7d08cdcf5a1965df39bd42
-Size (mupdf-1.0-source.tar.gz) = 4208530 bytes
-SHA1 (patch-ab) = daf909badabc04b9da8d386ecc7d4ac124b39903
-SHA1 (patch-ac) = a832241dc6166091a0a119ac1579348393988b58
-SHA1 (patch-ae) = d4e5dcee67de682e38bf537d5b93948135af5dd7
+SHA1 (mupdf-1.1-source.tar.gz) = e2c2cd555d790ed97bd6507accf29817945dfe81
+RMD160 (mupdf-1.1-source.tar.gz) = 7ebdbd3a1cc64a4de1de920d7b149a3682ba1431
+Size (mupdf-1.1-source.tar.gz) = 4281735 bytes
+SHA1 (patch-ab) = fa8d1acb5ff8cf3562e0f27f0b2a0d27408d2542
+SHA1 (patch-ac) = dbda8ee49ac4cfe43b09329d25a7d7e6b45ef164
+SHA1 (patch-ae) = 34dcd201874195ddafb1e3a00ee377f1d791f7bf
Index: files/mupdf.pc
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/files/mupdf.pc,v
retrieving revision 1.3
diff -u -r1.3 mupdf.pc
--- files/mupdf.pc      24 Mar 2012 13:31:58 -0000      1.3
+++ files/mupdf.pc      21 Aug 2012 12:06:22 -0000
@@ -5,6 +5,6 @@
 
 Name: mupdf
 Description: library for PDF files
-Version: 0.9
+Version: 1.1
 Libs: -Wl,-R${libdir} -L${libdir} -lmupdf
 Cflags: -I${includedir}
Index: patches/patch-ab
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- patches/patch-ab    3 Jun 2012 22:03:24 -0000       1.3
+++ patches/patch-ab    21 Aug 2012 12:06:22 -0000
@@ -1,8 +1,10 @@
 $NetBSD: patch-ab,v 1.3 2012/06/03 22:03:24 wiz Exp $
 
---- Makerules.orig     2012-04-24 16:41:33.000000000 +0000
+Handle the various operating systems in the same way avoiding hardcoding.
+
+--- Makerules.orig     2012-08-16 13:55:20.000000000 +0000
 +++ Makerules
-@@ -20,32 +20,8 @@ else
+@@ -23,32 +23,8 @@ else
  $(error unknown build setting: '$(build)')
  endif
  
Index: patches/patch-ac
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-ac,v
retrieving revision 1.4
diff -u -r1.4 patch-ac
--- patches/patch-ac    3 Jun 2012 22:03:24 -0000       1.4
+++ patches/patch-ac    21 Aug 2012 12:06:22 -0000
@@ -1,8 +1,10 @@
 $NetBSD: patch-ac,v 1.4 2012/06/03 22:03:24 wiz Exp $
 
---- Makefile.orig      2012-04-24 16:41:33.000000000 +0000
+libtool support and install target cleanup.
+
+--- Makefile.orig      2012-08-16 13:55:20.000000000 +0000
 +++ Makefile
-@@ -24,17 +24,9 @@ THIRD_LIBS += $(JPEG_LIB)
+@@ -24,18 +24,10 @@ THIRD_LIBS += $(JPEG_LIB)
  THIRD_LIBS += $(OPENJPEG_LIB)
  THIRD_LIBS += $(ZLIB_LIB)
  
@@ -15,14 +17,16 @@
 -endif
 -
 -CC_CMD = $(QUIET_CC) $(CC) $(CFLAGS) -o $@ -c $<
--AR_CMD = $(QUIET_AR) $(AR) cru $@ $^
+-AR_CMD = $(QUIET_AR) $(AR) cr $@ $^
 -LINK_CMD = $(QUIET_LINK) $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+-MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
 +CC_CMD = ${LIBTOOL} --mode=compile $(CC) $(CFLAGS) -o $@ -c $<
 +AR_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ -version-info 0:0:0 -rpath 
${PREFIX}/lib $^
 +LINK_CMD = ${LIBTOOL} --mode=link $(CC) -o $@ $^ $(LDFLAGS) $(LIBS)
- MKDIR_CMD = $(QUIET_MKDIR) mkdir -p $@
++MKDIR_CMD = mkdir -p $@
  
  # --- Rules ---
+ 
 @@ -47,33 +39,32 @@ MUCBZ_HDR := $(FITZ_HDR) cbz/mucbz.h
  $(OUT) $(GEN) :
        $(MKDIR_CMD)
@@ -96,42 +100,38 @@
  
  # --- Tools and Apps ---
  
-@@ -139,13 +130,13 @@ $(MU_APPS) : $(FITZ_LIB) $(THIRD_LIBS)
+@@ -137,12 +128,12 @@ MUDRAW := $(addprefix $(OUT)/, mudraw)
+ $(MUDRAW) : $(FITZ_LIB) $(THIRD_LIBS)
  
- BUSY_SRC := $(notdir $(wildcard apps/mubusy_*.c))
- BUSY_APP := $(addprefix $(OUT)/, mubusy)
--$(BUSY_APP) : $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.o))
-+$(BUSY_APP) : $(addprefix $(OUT)/, $(BUSY_SRC:%.c=%.lo))
- $(BUSY_APP) : $(FITZ_LIB) $(THIRD_LIBS)
+ MUBUSY := $(addprefix $(OUT)/, mubusy)
+-$(MUBUSY) : $(addprefix $(OUT)/, mupdfclean.o mupdfextract.o mupdfinfo.o 
mupdfposter.o mupdfshow.o) $(FITZ_LIB) $(THIRD_LIBS)
++$(MUBUSY) : $(addprefix $(OUT)/, mupdfclean.lo mupdfextract.lo mupdfinfo.lo 
mupdfposter.lo mupdfshow.lo) $(FITZ_LIB) $(THIRD_LIBS)
  
  ifeq "$(NOX11)" ""
- MUPDF := $(OUT)/mupdf
- $(MUPDF) : $(FITZ_LIB) $(THIRD_LIBS)
--$(MUPDF) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
-+$(MUPDF) : $(addprefix $(OUT)/, x11_main.lo x11_image.lo pdfapp.lo)
+ MUVIEW := $(OUT)/mupdf
+ $(MUVIEW) : $(FITZ_LIB) $(THIRD_LIBS)
+-$(MUVIEW) : $(addprefix $(OUT)/, x11_main.o x11_image.o pdfapp.o)
++$(MUVIEW) : $(addprefix $(OUT)/, x11_main.lo x11_image.lo pdfapp.lo)
        $(LINK_CMD) $(X11_LIBS)
  endif
  
-@@ -165,14 +156,16 @@ prefix ?= /usr/local
- bindir ?= $(prefix)/bin
- libdir ?= $(prefix)/lib
- incdir ?= $(prefix)/include
--mandir ?= $(prefix)/share/man
-+mandir ?= $(prefix)/man
+@@ -165,11 +156,14 @@ incdir ?= $(prefix)/include
+ mandir ?= $(prefix)/share/man
  
- install: $(FITZ_LIB) $(MU_APPS) $(MUPDF)
+ install: $(FITZ_LIB) $(MUVIEW) $(MUDRAW) $(MUBUSY)
 -      install -d $(bindir) $(libdir) $(incdir) $(mandir)/man1
 -      install $(FITZ_LIB) $(libdir)
 -      install fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h cbz/mucbz.h 
$(incdir)
--      install $(MU_APPS) $(MUPDF) $(bindir)
+-      install $(MUVIEW) $(MUDRAW) $(MUBUSY) $(bindir)
 -      install $(wildcard apps/man/*.1) $(mandir)/man1
-+      ${BSD_INSTALL_DATA_DIR} $(bindir) $(libdir) $(incdir) $(mandir)/man1
-+      libtool --mode=install ${BSD_INSTALL_LIB} $(FITZ_LIB) $(libdir)
++      ${BSD_INSTALL_DATA_DIR} $(bindir) $(libdir) $(incdir)
++      ${BSD_INSTALL_MAN_DIR} $(mandir)/man1
++      ${LIBTOOL} --mode=install ${BSD_INSTALL_LIB} $(FITZ_LIB) $(libdir)
 +      ${BSD_INSTALL_DATA} fitz/memento.h fitz/fitz.h pdf/mupdf.h xps/muxps.h 
cbz/mucbz.h $(incdir)
-+      for f in $(MU_APPS) $(MUPDF); do \
-+              libtool --mode=install ${BSD_INSTALL_PROGRAM} $$f $(bindir); \
++      for f in $(MUVIEW) $(MUDRAW) $(MUBUSY); do \
++              ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM} $$f $(bindir); 
\
 +      done
-+      ${BSD_INSTALL_DATA} $(wildcard apps/man/*.1) $(mandir)/man1
++      ${BSD_INSTALL_MAN} $(wildcard apps/man/*.1) $(mandir)/man1
  
  # --- Clean and Default ---
  
Index: patches/patch-ae
===================================================================
RCS file: /cvsroot/pkgsrc/print/mupdf/patches/patch-ae,v
retrieving revision 1.1
diff -u -r1.1 patch-ae
--- patches/patch-ae    8 Mar 2011 17:09:25 -0000       1.1
+++ patches/patch-ae    21 Aug 2012 12:06:22 -0000
@@ -2,38 +2,73 @@
 
 avoid namespace conflict on NetBSD
 
---- fitz/crypt_sha2.c.orig     2011-03-08 16:13:19.000000000 +0000
+--- fitz/crypt_sha2.c.orig     2012-08-16 13:55:20.000000000 +0000
 +++ fitz/crypt_sha2.c
-@@ -15,7 +15,7 @@ static inline int isbigendian(void)
+@@ -17,7 +17,7 @@ static inline int isbigendian(void)
        return *(char*)&one == 0;
  }
  
 -static inline unsigned int bswap32(unsigned int num)
-+static inline unsigned int mup_bswap32(unsigned int num)
++static inline unsigned int mu_bswap32(unsigned int num)
  {
        if (!isbigendian())
        {
-@@ -86,7 +86,7 @@ transform(unsigned int state[8], const u
+@@ -29,7 +29,7 @@ static inline unsigned int bswap32(unsig
+       return num;
+ }
+ 
+-static inline uint64_t bswap64(uint64_t num)
++static inline uint64_t mu_bswap64(uint64_t num)
+ {
+       if (!isbigendian())
+       {
+@@ -107,7 +107,7 @@ transform256(unsigned int state[8], cons
  
        /* ensure big-endian integers */
        for (j = 0; j < 16; j++)
 -              data[j] = bswap32(data_xe[j]);
-+              data[j] = mup_bswap32(data_xe[j]);
++              data[j] = mu_bswap32(data_xe[j]);
  
        /* Copy state[] to working vars. */
        memcpy(T, state, sizeof(T));
-@@ -172,11 +172,11 @@ void fz_sha256final(fz_sha256 *context, 
+@@ -198,12 +198,12 @@ void fz_sha256_final(fz_sha256 *context,
        context->count[1] = (context->count[1] << 3) + (context->count[0] >> 
29);
        context->count[0] = context->count[0] << 3;
  
 -      context->buffer.u32[14] = bswap32(context->count[1]);
 -      context->buffer.u32[15] = bswap32(context->count[0]);
-+      context->buffer.u32[14] = mup_bswap32(context->count[1]);
-+      context->buffer.u32[15] = mup_bswap32(context->count[0]);
-       transform(context->state, context->buffer.u32);
++      context->buffer.u32[14] = mu_bswap32(context->count[1]);
++      context->buffer.u32[15] = mu_bswap32(context->count[0]);
+       transform256(context->state, context->buffer.u32);
  
        for (j = 0; j < 8; j++)
 -              ((unsigned int *)digest)[j] = bswap32(context->state[j]);
-+              ((unsigned int *)digest)[j] = mup_bswap32(context->state[j]);
++              ((unsigned int *)digest)[j] = mu_bswap32(context->state[j]);
        memset(context, 0, sizeof(fz_sha256));
  }
+ 
+@@ -268,7 +268,7 @@ transform512(uint64_t state[8], const ui
+ 
+       /* ensure big-endian integers */
+       for (j = 0; j < 16; j++)
+-              data[j] = bswap64(data_xe[j]);
++              data[j] = mu_bswap64(data_xe[j]);
+ 
+       /* Copy state[] to working vars. */
+       memcpy(T, state, sizeof(T));
+@@ -359,12 +359,12 @@ void fz_sha512_final(fz_sha512 *context,
+       context->count[1] = (context->count[1] << 3) + (context->count[0] >> 
29);
+       context->count[0] = context->count[0] << 3;
+ 
+-      context->buffer.u64[14] = bswap64(context->count[1]);
+-      context->buffer.u64[15] = bswap64(context->count[0]);
++      context->buffer.u64[14] = mu_bswap64(context->count[1]);
++      context->buffer.u64[15] = mu_bswap64(context->count[0]);
+       transform512(context->state, context->buffer.u64);
+ 
+       for (j = 0; j < 16; j++)
+-              ((uint64_t *)digest)[j] = bswap64(context->state[j]);
++              ((uint64_t *)digest)[j] = mu_bswap64(context->state[j]);
+       memset(context, 0, sizeof(fz_sha512));
+ }
+ 

>Unformatted:
Prev by Date: Re: pkg/46670: sysutils/e2fsprogs fix for DragonFly
Next by Date: Re: pkg/46823: Update print/mupdf to 1.1
Previous by Thread: PR/46549 CVS commit: pkgsrc/devel/p5-App-cpanminus
Next by Thread: Re: pkg/46823: Update print/mupdf to 1.1
Indexes:
Home | Main Index | Thread Index | Old Index