From 873a227eff2fce93882a66608e2288b51e36c5fd Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Fri, 20 Oct 2017 15:17:08 +0000 Subject: [PATCH] graphics/libjxr: Update license information [1] While here, fix portlint warning PR: 222459 [1] Submitted by: Yasuhiro KIMURA [1] Approved by: Mikhail T. (maintainer) [1] --- graphics/libjxr/Makefile | 2 +- ...g748590 => patch-image_decode_JXRTranscode.c} | 4 ++-- ...typos => patch-jxrencoderdecoder_JxrEncApp.c} | 13 +------------ graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h | 16 ++++++++++++++++ 4 files changed, 20 insertions(+), 15 deletions(-) rename graphics/libjxr/files/{patch-bug748590 => patch-image_decode_JXRTranscode.c} (82%) rename graphics/libjxr/files/{patch-typos => patch-jxrencoderdecoder_JxrEncApp.c} (64%) create mode 100644 graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h diff --git a/graphics/libjxr/Makefile b/graphics/libjxr/Makefile index 435c2146ef75..ccddae10a32e 100644 --- a/graphics/libjxr/Makefile +++ b/graphics/libjxr/Makefile @@ -10,7 +10,7 @@ DISTFILES= jxrlib_${PORTVERSION}.orig.tar.gz \ MAINTAINER= mi@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" diff --git a/graphics/libjxr/files/patch-bug748590 b/graphics/libjxr/files/patch-image_decode_JXRTranscode.c similarity index 82% rename from graphics/libjxr/files/patch-bug748590 rename to graphics/libjxr/files/patch-image_decode_JXRTranscode.c index cf90ebf69f6c..b7e6e5e9fdc2 100644 --- a/graphics/libjxr/files/patch-bug748590 +++ b/graphics/libjxr/files/patch-image_decode_JXRTranscode.c @@ -3,9 +3,9 @@ Author: Mathieu Malaterre Origin: upstream, https://jxrlib.codeplex.com/SourceControl/changeset/04cf339385b8196f98025b43a366a0790deac994 Bug-Debian: http://bugs.debian.org/748590 ---- image/decode/JXRTranscode.c +--- image/decode/JXRTranscode.c.orig 2017-10-20 15:09:28 UTC +++ image/decode/JXRTranscode.c -@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMIm +@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMImageStrCodec *) EXTERN_C Int StrEncInit(CWMImageStrCodec *); EXTERN_C Void StrIOEncTerm(CWMImageStrCodec *); EXTERN_C Void FreeCodingContextEnc(CWMImageStrCodec *); diff --git a/graphics/libjxr/files/patch-typos b/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c similarity index 64% rename from graphics/libjxr/files/patch-typos rename to graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c index 1523b2a6bf92..e37c78d867cd 100644 --- a/graphics/libjxr/files/patch-typos +++ b/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c @@ -3,7 +3,7 @@ Author: Mathieu Malaterre Cleaned up for FreeBSD by mi ---- jxrencoderdecoder/JxrEncApp.c +--- jxrencoderdecoder/JxrEncApp.c.orig 2017-10-20 15:09:28 UTC +++ jxrencoderdecoder/JxrEncApp.c @@ -578,7 +578,7 @@ main(int argc, char* argv[]) @@ -14,14 +14,3 @@ Cleaned up for FreeBSD by mi //---------------------------------------------------------------- Call(PKCreateTestFactory(&pTestFactory, WMP_SDK_VERSION)); ---- jxrgluelib/JXRMeta.h -+++ jxrgluelib/JXRMeta.h -@@ -34,7 +34,7 @@ - - #ifndef UNREFERENCED_PARAMETER - #define UNREFERENCED_PARAMETER(P) { (P) = (P); } --#endif UNREFERENCED_PARAMETER -+#endif /*UNREFERENCED_PARAMETER*/ - - //================================================================ - // Container diff --git a/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h b/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h new file mode 100644 index 000000000000..3d4b2a7d8d4c --- /dev/null +++ b/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h @@ -0,0 +1,16 @@ +Description: Fix typos and remove some warnings +Author: Mathieu Malaterre + +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