svn commit: r452534 - in head/graphics/libjxr: . files

[Steve Wills]

Author: swills
Date: Fri Oct 20 15:17:08 2017
New Revision: 452534
URL: https://svnweb.freebsd.org/changeset/ports/452534

Log:
  graphics/libjxr: Update license information [1]
  
  While here, fix portlint warning
  
  PR:		222459 [1]
  Submitted by:	Yasuhiro KIMURA <yasu at utahime.org> [1]
  Approved by:	Mikhail T. <mi at ALDAN.algebra.com> (maintainer) [1]

Added:
  head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c   (contents, props changed)
  head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c   (contents, props changed)
  head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h   (contents, props changed)
Deleted:
  head/graphics/libjxr/files/patch-bug748590
  head/graphics/libjxr/files/patch-typos
Modified:
  head/graphics/libjxr/Makefile

Modified: head/graphics/libjxr/Makefile
==============================================================================
--- head/graphics/libjxr/Makefile	Fri Oct 20 15:00:36 2017	(r452533)
+++ head/graphics/libjxr/Makefile	Fri Oct 20 15:17:08 2017	(r452534)
@@ -10,7 +10,7 @@ DISTFILES=	jxrlib_${PORTVERSION}.orig.tar.gz	\
 MAINTAINER=	mi at aldan.algebra.com
 COMMENT=	Library for JPEG XR, a.k.a. Windows MediaTM Photo
 
-LICENSE=	BSD
+LICENSE=	BSD2CLAUSE
 
 BROKEN_aarch64=		fails to link: cc: linker command failed with exit code 1 (use -v to see invocation)
 BROKEN_mips=		fails to compile: cc1: unrecognized command line option "-Wno-extra-tokens"

Added: head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c	Fri Oct 20 15:17:08 2017	(r452534)
@@ -0,0 +1,16 @@
+Description: Fix function signature
+Author: Mathieu Malaterre <malat at debian.org>
+Origin: upstream, https://jxrlib.codeplex.com/SourceControl/changeset/04cf339385b8196f98025b43a366a0790deac994
+Bug-Debian: http://bugs.debian.org/748590
+
+--- image/decode/JXRTranscode.c.orig	2017-10-20 15:09:28 UTC
++++ image/decode/JXRTranscode.c
+@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMImageStrCodec *)
+ EXTERN_C Int StrEncInit(CWMImageStrCodec *);
+ EXTERN_C Void StrIOEncTerm(CWMImageStrCodec *);
+ EXTERN_C Void FreeCodingContextEnc(CWMImageStrCodec *);
+-EXTERN_C Void encodeMB(CWMImageStrCodec *, Int, Int);
++EXTERN_C Int encodeMB(CWMImageStrCodec *, Int, Int);
+ EXTERN_C Int  writeIndexTableNull(CWMImageStrCodec *);
+ EXTERN_C Void writePacketHeader(BitIOInfo *, U8, U8);
+ 

Added: head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c	Fri Oct 20 15:17:08 2017	(r452534)
@@ -0,0 +1,16 @@
+Description: Fix typos and remove some warnings
+Author: Mathieu Malaterre <malat at debian.org>
+
+Cleaned up for FreeBSD by mi
+
+--- jxrencoderdecoder/JxrEncApp.c.orig	2017-10-20 15:09:28 UTC
++++ jxrencoderdecoder/JxrEncApp.c
+@@ -578,7 +578,7 @@ main(int argc, char* argv[])
+ 
+     //================================
+     Call(PKCreateCodecFactory(&pCodecFactory, WMP_SDK_VERSION));
+-    Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, &pEncoder));
++    Call(pCodecFactory->CreateCodec(&IID_PKImageWmpEncode, (void**)&pEncoder));
+ 
+     //----------------------------------------------------------------
+     Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION));

Added: head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h	Fri Oct 20 15:17:08 2017	(r452534)
@@ -0,0 +1,16 @@
+Description: Fix typos and remove some warnings
+Author: Mathieu Malaterre <malat at debian.org>
+
+Cleaned up for FreeBSD by mi
+
+--- jxrgluelib/JXRMeta.h.orig	2017-10-20 15:09:28 UTC
++++ jxrgluelib/JXRMeta.h
+@@ -34,7 +34,7 @@
+ 
+ #ifndef UNREFERENCED_PARAMETER
+ #define UNREFERENCED_PARAMETER(P) { (P) = (P); }
+-#endif UNREFERENCED_PARAMETER
++#endif /*UNREFERENCED_PARAMETER*/
+ 
+ //================================================================
+ // Container