Index: head/graphics/libjxr/Makefile =================================================================== --- head/graphics/libjxr/Makefile (revision 452533) +++ head/graphics/libjxr/Makefile (revision 452534) @@ -1,40 +1,40 @@ # $FreeBSD$ PORTNAME= jxrlib PORTVERSION= 1.1 CATEGORIES= graphics devel MASTER_SITES= DEBIAN DISTFILES= jxrlib_${PORTVERSION}.orig.tar.gz \ jxrlib_${PORTVERSION}-6.debian.tar.xz 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" BROKEN_mips64= fails to compile: cc1: unrecognized command line option "-Wno-extra-tokens" BROKEN_powerpc64= fails to compile: cc1: unrecognized command line option "-Wno-extra-tokens" USES= dos2unix uidfix USE_LDCONFIG= yes MAKEFILE= BSDmakefile # created by do-configure MAKE_ENV= WRKDIR="${WRKDIR}" do-configure: ${RM} -f ${WRKSRC}/BSDmakefile .for d in libjpegxr jxrgluelib JxrEncApp JxrDecApp ${MKDIR} ${WRKSRC}/$d ${LN} -sf ${FILESDIR}/BSDmakefile.$d ${WRKSRC}/$d/BSDmakefile ${ECHO} "SUBDIR+=$d" >> ${WRKSRC}/BSDmakefile .endfor ${ECHO} '.include ' >> ${WRKSRC}/BSDmakefile post-build: ${MKDIR} ${STAGEDIR}${PREFIX}/include/jxrlib regression-test test check: build ${SETENV} WRKSRC="${WRKSRC}" ${SH} -x ${FILESDIR}/test.sh .include Index: head/graphics/libjxr/files/patch-bug748590 =================================================================== --- head/graphics/libjxr/files/patch-bug748590 (revision 452533) +++ head/graphics/libjxr/files/patch-bug748590 (nonexistent) @@ -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); - Property changes on: head/graphics/libjxr/files/patch-bug748590 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/libjxr/files/patch-typos =================================================================== --- head/graphics/libjxr/files/patch-typos (revision 452533) +++ head/graphics/libjxr/files/patch-typos (nonexistent) @@ -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 Property changes on: head/graphics/libjxr/files/patch-typos ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c =================================================================== --- head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c (nonexistent) +++ head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c (revision 452534) @@ -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); + Property changes on: head/graphics/libjxr/files/patch-image_decode_JXRTranscode.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c =================================================================== --- head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c (nonexistent) +++ head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c (revision 452534) @@ -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)); Property changes on: head/graphics/libjxr/files/patch-jxrencoderdecoder_JxrEncApp.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h =================================================================== --- head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h (nonexistent) +++ head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h (revision 452534) @@ -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 Property changes on: head/graphics/libjxr/files/patch-jxrgluelib_JXRMeta.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property