From 873a227eff2fce93882a66608e2288b51e36c5fd Mon Sep 17 00:00:00 2001 From: Steve Wills Date: Fri, 20 Oct 2017 15:17:08 +0000 Subject: 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/files/patch-bug748590 | 16 ------------- .../libjxr/files/patch-image_decode_JXRTranscode.c | 16 +++++++++++++ .../files/patch-jxrencoderdecoder_JxrEncApp.c | 16 +++++++++++++ graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h | 16 +++++++++++++ graphics/libjxr/files/patch-typos | 27 ---------------------- 5 files changed, 48 insertions(+), 43 deletions(-) delete mode 100644 graphics/libjxr/files/patch-bug748590 create mode 100644 graphics/libjxr/files/patch-image_decode_JXRTranscode.c create mode 100644 graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c create mode 100644 graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h delete mode 100644 graphics/libjxr/files/patch-typos (limited to 'graphics/libjxr/files') diff --git a/graphics/libjxr/files/patch-bug748590 b/graphics/libjxr/files/patch-bug748590 deleted file mode 100644 index cf90ebf69f6c..000000000000 --- a/graphics/libjxr/files/patch-bug748590 +++ /dev/null @@ -1,16 +0,0 @@ -Description: Fix function signature -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 -@@ -47,7 +47,7 @@ EXTERN_C Void FreeCodingContextDec(CWMIm - 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); - diff --git a/graphics/libjxr/files/patch-image_decode_JXRTranscode.c b/graphics/libjxr/files/patch-image_decode_JXRTranscode.c new file mode 100644 index 000000000000..b7e6e5e9fdc2 --- /dev/null +++ b/graphics/libjxr/files/patch-image_decode_JXRTranscode.c @@ -0,0 +1,16 @@ +Description: Fix function signature +Author: Mathieu Malaterre +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); + diff --git a/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c b/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c new file mode 100644 index 000000000000..e37c78d867cd --- /dev/null +++ b/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c @@ -0,0 +1,16 @@ +Description: Fix typos and remove some warnings +Author: Mathieu Malaterre + +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)); 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 diff --git a/graphics/libjxr/files/patch-typos b/graphics/libjxr/files/patch-typos deleted file mode 100644 index 1523b2a6bf92..000000000000 --- a/graphics/libjxr/files/patch-typos +++ /dev/null @@ -1,27 +0,0 @@ -Description: Fix typos and remove some warnings -Author: Mathieu Malaterre - -Cleaned up for FreeBSD by mi - ---- jxrencoderdecoder/JxrEncApp.c -+++ 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)); ---- 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 -- cgit v1.2.3