Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 24 Feb 2019 18:39:43 +0000 (UTC)
From:      =?UTF-8?Q?Alexandre_C=2e_Guimar=c3=a3es?= <rigoletto@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r493796 - in head/graphics/mupdf: . files
Message-ID:  <201902241839.x1OIdht0061451@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: rigoletto
Date: Sun Feb 24 18:39:42 2019
New Revision: 493796
URL: https://svnweb.freebsd.org/changeset/ports/493796

Log:
  graphics/mupdf: fix mupdf-gl not being built.
  
  PR:		236002
  Reported by:	Oleh Hushchenkov <o.hushchenkov@gmail.com>
  Approved by:	tcberner (mentor)

Modified:
  head/graphics/mupdf/Makefile
  head/graphics/mupdf/files/patch-Makerules
  head/graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c
  head/graphics/mupdf/pkg-plist

Modified: head/graphics/mupdf/Makefile
==============================================================================
--- head/graphics/mupdf/Makefile	Sun Feb 24 18:37:58 2019	(r493795)
+++ head/graphics/mupdf/Makefile	Sun Feb 24 18:39:42 2019	(r493796)
@@ -4,6 +4,7 @@
 PORTNAME=	mupdf
 DISTVERSION=	1.14.0
 DISTVERSIONSUFFIX=	-source
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.mupdf.com/downloads/ \

Modified: head/graphics/mupdf/files/patch-Makerules
==============================================================================
--- head/graphics/mupdf/files/patch-Makerules	Sun Feb 24 18:37:58 2019	(r493795)
+++ head/graphics/mupdf/files/patch-Makerules	Sun Feb 24 18:39:42 2019	(r493796)
@@ -43,7 +43,7 @@
    LIBS += -lprofiler
  else
    $(error unknown build setting: '$(build)')
-@@ -143,7 +143,58 @@ else ifeq ($(OS),Linux)
+@@ -143,7 +143,59 @@ else ifeq ($(OS),Linux)
  	PTHREAD_LIBS := -lpthread
    endif
  
@@ -60,6 +60,7 @@
 +  SYS_FREETYPE_CFLAGS := $(shell pkg-config --cflags freetype2)
 +  SYS_FREETYPE_LIBS := $(shell pkg-config --libs freetype2)
 +  # glut
++  HAVE_GLUT := yes
 +  USE_SYSTEM_GLUT := yes
 +  SYS_GLUT_CFLAGS :=
 +  SYS_GLUT_LIBS := -lglut -lGL

Modified: head/graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c
==============================================================================
--- head/graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c	Sun Feb 24 18:37:58 2019	(r493795)
+++ head/graphics/mupdf/files/patch-thirdparty_lcms2_src_cmsmd5.c	Sun Feb 24 18:39:42 2019	(r493796)
@@ -9,7 +9,7 @@
  {
      do {
  
-@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, c
+@@ -42,7 +42,7 @@ void byteReverse(cmsUInt8Number * buf, cmsUInt32Number
  }
  
  #else
@@ -18,7 +18,7 @@
  #endif
  
  
-@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu
+@@ -196,7 +196,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cms
          }
  
          memmove(p, buf, t);
@@ -27,7 +27,7 @@
  
          MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
          buf += t;
-@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Nu
+@@ -205,7 +205,7 @@ void MD5add(cmsHANDLE Handle, cmsUInt8Number* buf, cms
  
      while (len >= 64) {
          memmove(ctx->in, buf, 64);
@@ -36,7 +36,7 @@
          MD5_Transform(ctx->buf, (cmsUInt32Number *) ctx->in);
          buf += 64;
          len -= 64;
-@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID, 
+@@ -232,21 +232,21 @@ void MD5finish(cmsProfileID* ProfileID,  cmsHANDLE Han
      if (count < 8) {
  
          memset(p, 0, count);

Modified: head/graphics/mupdf/pkg-plist
==============================================================================
--- head/graphics/mupdf/pkg-plist	Sun Feb 24 18:37:58 2019	(r493795)
+++ head/graphics/mupdf/pkg-plist	Sun Feb 24 18:39:42 2019	(r493796)
@@ -1,6 +1,7 @@
 bin/mjsgen
 bin/mujstest
 bin/mupdf
+bin/mupdf-gl
 bin/muraster
 bin/mutool
 include/mupdf/fitz.h
@@ -80,10 +81,10 @@ include/mupdf/pdf/resource.h
 include/mupdf/pdf/widget.h
 include/mupdf/pdf/xref.h
 include/mupdf/ucdn.h
-lib/libmupdf.so
-lib/libmupdf.so.%%SOVERSION%%
 lib/libmupdf-third.so
 lib/libmupdf-third.so.%%SOVERSION%%
+lib/libmupdf.so
+lib/libmupdf.so.%%SOVERSION%%
 man/man1/mupdf.1.gz
 man/man1/mutool.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201902241839.x1OIdht0061451>