CVS commit: pkgsrc/multimedia/ming

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Tue Nov 13 10:18:26 UTC 2018

Modified Files:
        pkgsrc/multimedia/ming: Makefile Makefile.common PLIST distinfo
Added Files:
        pkgsrc/multimedia/ming/patches: patch-configure.in
Removed Files:
        pkgsrc/multimedia/ming/patches: patch-ae patch-php__ext_ming.c
            patch-src_blocks_gifdbl.c patch-src_libming.h patch-util_gif2dbl.c
            patch-util_gif2mask.c

Log Message:
ming: update to 0.4.8

7 Apr 2017 - Ming 0.4.8
* Add PHP7 compatibility
* Fix C++ output of disassembler
* Fix heap overflows in parser.c (CVE-2017-7578)
* Avoid division by zero in listmp3 when no valid frame was found
* Don't try printing unknown block.
* Parse Protect tag's Password as string
* Check values before deriving malloc parameters from them in parser.c
* Make readString() stop reading string past buffer's end
* Return EOF when reading unsigned values hits end of memory backed buffer
* Exit immediately when unexpected EOF is by fgetc() in utility programs
* Fix using EOF marker -1 value as a valid flag byte
* Fix division by zero sample rate due to global buffer overflow.

15 May 2015 - Ming 0.4.7
* Restore support for giflib 4.1.x

14 May 2015 - Ming 0.4.6
* Add support for building against giflib 5.1.1+
* Fix support for bison 2.6+
* Fix build on GNU/Hurd(PR #39).
* Fix possible buffer overflow in makeswf
* Change php bindings license from PHP to LGPL-2.1+
* Fix build of python binding with libgif (rather than libungif)


To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/ming/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/ming/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/multimedia/ming/PLIST
cvs rdiff -u -r1.17 -r1.18 pkgsrc/multimedia/ming/distinfo
cvs rdiff -u -r1.3 -r0 pkgsrc/multimedia/ming/patches/patch-ae \
    pkgsrc/multimedia/ming/patches/patch-php__ext_ming.c \
    pkgsrc/multimedia/ming/patches/patch-src_blocks_gifdbl.c \
    pkgsrc/multimedia/ming/patches/patch-src_libming.h \
    pkgsrc/multimedia/ming/patches/patch-util_gif2dbl.c
cvs rdiff -u -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-configure.in
cvs rdiff -u -r1.2 -r0 pkgsrc/multimedia/ming/patches/patch-util_gif2mask.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/multimedia/ming/Makefile
diff -u pkgsrc/multimedia/ming/Makefile:1.27 pkgsrc/multimedia/ming/Makefile:1.28
--- pkgsrc/multimedia/ming/Makefile:1.27        Wed Aug 22 09:45:49 2018
+++ pkgsrc/multimedia/ming/Makefile     Tue Nov 13 10:18:26 2018
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.27 2018/08/22 09:45:49 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2018/11/13 10:18:26 markd Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=   7
+PKGNAME=       ${DISTNAME:S/_/./g}
 CATEGORIES=    multimedia
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -13,6 +13,7 @@ LICENSE=      gnu-lgpl-v2.1 AND gnu-gpl-v2
 
 GNU_CONFIGURE= yes
 USE_TOOLS+=    pkg-config bison flex
+USE_TOOLS+=    aclocal autoconf automake autoheader
 USE_LANGUAGES= c c++
 USE_LIBTOOL=   yes
 
@@ -34,6 +35,9 @@ TEST_TARGET=  check
 # XXX: "man" is not in SUBDIRS of "docs"
 INSTALL_DIRS=  . docs/man
 
+pre-configure:
+       cd ${WRKSRC}; sh ./autogen.sh
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/giflib/buildlink3.mk"

Index: pkgsrc/multimedia/ming/Makefile.common
diff -u pkgsrc/multimedia/ming/Makefile.common:1.7 pkgsrc/multimedia/ming/Makefile.common:1.8
--- pkgsrc/multimedia/ming/Makefile.common:1.7  Fri Jun 14 09:00:19 2013
+++ pkgsrc/multimedia/ming/Makefile.common      Tue Nov 13 10:18:26 2018
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile.common,v 1.7 2013/06/14 09:00:19 obache Exp $
+# $NetBSD: Makefile.common,v 1.8 2018/11/13 10:18:26 markd Exp $
 #
 # used by multimedia/php-ming/Makefile
 # used by multimedia/py-ming/Makefile
 
-MING_VERSION=  0.4.5
-DISTNAME=      ming-${MING_VERSION}
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ming/}
+MING_VERSION=  0.4.8
+DISTNAME=      ming-${MING_VERSION:S/./_/g}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=libming/libming/archive/}
 
 DISTINFO_FILE= ${.CURDIR}/../../multimedia/ming/distinfo
 PATCHDIR=      ${.CURDIR}/../../multimedia/ming/patches
+
+WRKSRC=                ${WRKDIR}/libming-ming-${MING_VERSION:S/./_/g}

Index: pkgsrc/multimedia/ming/PLIST
diff -u pkgsrc/multimedia/ming/PLIST:1.3 pkgsrc/multimedia/ming/PLIST:1.4
--- pkgsrc/multimedia/ming/PLIST:1.3    Fri Apr  9 01:33:43 2010
+++ pkgsrc/multimedia/ming/PLIST        Tue Nov 13 10:18:26 2018
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2010/04/09 01:33:43 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/11/13 10:18:26 markd Exp $
 bin/dbl2png
 bin/gif2dbl
 bin/gif2mask
@@ -46,31 +46,178 @@ man/man3/Ming_setSWFCompression.3
 man/man3/Ming_setScale.3
 man/man3/Ming_setWarnFunction.3
 man/man3/Ming_useSWFVersion.3
+man/man3/SWFAction_compile.3
+man/man3/SWFAction_getByteCode.3
+man/man3/SWFAction_setDebug.3
+man/man3/SWFBlockList_getLastBlock.3
+man/man3/SWFBlock_isCharacter.3
+man/man3/SWFButtonRecord_addFilter.3
+man/man3/SWFButtonRecord_setBlendMode.3
+man/man3/SWFButton_addAction.3
+man/man3/SWFButton_addCharacter.3
+man/man3/SWFButton_addShape.3
+man/man3/SWFButton_removeScalingGrid.3
+man/man3/SWFButton_setScalingGrid.3
+man/man3/SWFCXform_setColorAdd.3
+man/man3/SWFCXform_setColorMult.3
+man/man3/SWFCharacter_getHeight.3
+man/man3/SWFCharacter_getWidth.3
 man/man3/SWFDisplayItem_addFilter.3
 man/man3/SWFDisplayItem_cacheAsBitmap.3
+man/man3/SWFDisplayItem_flush.3
 man/man3/SWFDisplayItem_get_x.3
 man/man3/SWFDisplayItem_setBlendMode.3
+man/man3/SWFDisplayItem_setMaskLevel.3
+man/man3/SWFDisplayItem_setName.3
+man/man3/SWFFontCharacter_addAllChars.3
+man/man3/SWFFontCharacter_addChars.3
+man/man3/SWFFontCharacter_addUTF8Chars.3
+man/man3/SWFFont_getScaledAscent.3
+man/man3/SWFGradient_addEntry.3
+man/man3/SWFGradient_setFocalPoint.3
+man/man3/SWFGradient_setInterpolationMode.3
+man/man3/SWFGradient_setSpreadMode.3
+man/man3/SWFMatrix_leftMultiply.3
+man/man3/SWFMatrix_multiply.3
+man/man3/SWFMovieClip_add.3
+man/man3/SWFMovieClip_addInitAction.3
+man/man3/SWFMovieClip_labelFrame.3
+man/man3/SWFMovieClip_nextFrame.3
+man/man3/SWFMovieClip_remove.3
+man/man3/SWFMovieClip_removeScalingGrid.3
+man/man3/SWFMovieClip_setNumberOfFrames.3
+man/man3/SWFMovieClip_setScalingGrid.3
+man/man3/SWFMovieClip_setSoundStream.3
+man/man3/SWFMovieClip_setSoundStreamAt.3
+man/man3/SWFMovieClip_startSound.3
+man/man3/SWFMovieClip_stopSound.3
 man/man3/SWFMovie_add.3
+man/man3/SWFMovie_addExport.3
+man/man3/SWFMovie_addFont.3
+man/man3/SWFMovie_addMetadata.3
+man/man3/SWFMovie_add_internal.3
+man/man3/SWFMovie_assignSymbol.3
+man/man3/SWFMovie_defineScene.3
+man/man3/SWFMovie_getRate.3
+man/man3/SWFMovie_importCharacter.3
+man/man3/SWFMovie_importFont.3
 man/man3/SWFMovie_labelFrame.3
 man/man3/SWFMovie_namedAnchor.3
+man/man3/SWFMovie_nextFrame.3
+man/man3/SWFMovie_output.3
+man/man3/SWFMovie_output_to_stream.3
 man/man3/SWFMovie_protect.3
+man/man3/SWFMovie_remove.3
+man/man3/SWFMovie_replace_internal.3
+man/man3/SWFMovie_save.3
 man/man3/SWFMovie_setBackground.3
 man/man3/SWFMovie_setDimension.3
+man/man3/SWFMovie_setNetworkAccess.3
 man/man3/SWFMovie_setNumberOfFrames.3
 man/man3/SWFMovie_setRate.3
+man/man3/SWFMovie_setScriptLimits.3
+man/man3/SWFMovie_setSoundStream.3
+man/man3/SWFMovie_setSoundStreamAt.3
+man/man3/SWFMovie_setTabIndex.3
+man/man3/SWFMovie_startSound.3
+man/man3/SWFMovie_stopSound.3
+man/man3/SWFMovie_writeExports.3
+man/man3/SWFOutput_checkSize.3
+man/man3/SWFOutput_writeFloat16.3
+man/man3/SWFPlaceObject2Block_addFilter.3
+man/man3/SWFPlaceObject2Block_setBlendMode.3
+man/man3/SWFPlaceObject2Block_setCacheFlag.3
+man/man3/SWFRect_includePoint.3
 man/man3/SWFShape_drawArc.3
 man/man3/SWFShape_drawCubic.3
 man/man3/SWFShape_drawScaledLineTo.3
+man/man3/SWFShape_getVersion.3
 man/man3/SWFShape_movePenTo.3
 man/man3/SWFShape_moveScaledPenTo.3
+man/man3/SWFShape_setLine.3
+man/man3/SWFShape_setLine2.3
+man/man3/SWFShape_setLine2Filled.3
+man/man3/SWFShape_setLineStyle2_internal.3
+man/man3/SWFShape_setLineStyle2filled_internal.3
+man/man3/SWFShape_setLineStyle_internal.3
+man/man3/SWFShape_setRenderHintingFlags.3
+man/man3/SWFShape_useVersion.3
+man/man3/SWFSoundInstance_addEnvelope.3
+man/man3/SWFSoundInstance_setLoopCount.3
+man/man3/SWFSoundInstance_setLoopInPoint.3
+man/man3/SWFSoundInstance_setLoopOutPoint.3
+man/man3/SWFSoundInstance_setNoMultiple.3
+man/man3/SWFSoundStream_getDuration.3
+man/man3/SWFSoundStream_getFrames.3
+man/man3/SWFSoundStream_rewind.3
+man/man3/SWFTextField_setFont.3
+man/man3/SWFTextField_setFontCharacter.3
+man/man3/SWFText_addWideString.3
+man/man3/SWFText_resolveCodes.3
 man/man3/SWFVideoStream_getNumFrames.3
 man/man3/SWFVideoStream_getVideoFrame.3
 man/man3/SWFVideoStream_hasAudio.3
+man/man3/SWFVideoStream_nextFrame.3
+man/man3/SWFVideoStream_seek.3
 man/man3/SWFVideoStream_setDimension.3
+man/man3/SWFVideoStream_setFrameMode.3
+man/man3/destroySWFAction.3
+man/man3/destroySWFBinaryData.3
+man/man3/destroySWFBitmap.3
+man/man3/destroySWFBrowserFont.3
+man/man3/destroySWFCXform.3
 man/man3/destroySWFMovie.3
+man/man3/destroySWFMovieClip.3
+man/man3/destroySWFPrebuiltClip.3
+man/man3/destroySWFSoundInstance.3
+man/man3/dumpJpegBlock.3
+man/man3/getMP3Duration.3
+man/man3/getMP3Flags.3
+man/man3/newBevelFilter.3
+man/man3/newBlurFilter.3
+man/man3/newColorMatrixFilter.3
+man/man3/newConvolutionFilter.3
+man/man3/newDropShadowFilter.3
+man/man3/newGlowFilter.3
+man/man3/newGradientBevelFilter.3
+man/man3/newGradientGlowFilter.3
+man/man3/newSWFAction.3
+man/man3/newSWFAction_fromFile.3
+man/man3/newSWFAddCXform.3
+man/man3/newSWFBinaryData.3
+man/man3/newSWFBlur.3
+man/man3/newSWFBrowserFont.3
+man/man3/newSWFCXform.3
+man/man3/newSWFFilterMatrix.3
+man/man3/newSWFFontCollection_fromFile.3
+man/man3/newSWFFont_fromFile.3
+man/man3/newSWFInitAction.3
+man/man3/newSWFInitAction_withId.3
+man/man3/newSWFInput_allocedBuffer.3
+man/man3/newSWFInput_bufferCopy.3
+man/man3/newSWFJpegWithAlpha_fromInput.3
+man/man3/newSWFLineStyle.3
+man/man3/newSWFLineStyle2.3
+man/man3/newSWFLineStyle2_filled.3
+man/man3/newSWFMatrix.3
 man/man3/newSWFMovie.3
+man/man3/newSWFMovieClip.3
 man/man3/newSWFMovieWithVersion.3
+man/man3/newSWFMultCXform.3
+man/man3/newSWFPlaceObjectBlock.3
+man/man3/newSWFPosition.3
+man/man3/newSWFPrebuiltClip_fromFile.3
+man/man3/newSWFPrebuiltClip_fromInput.3
+man/man3/newSWFShadow.3
 man/man3/newSWFShapeFromBitmap.3
+man/man3/newSWFSound.3
+man/man3/newSWFSoundFromFileno.3
+man/man3/newSWFSoundInstance.3
+man/man3/newSWFSound_fromSoundStream.3
+man/man3/newSWFText2.3
 man/man3/newSWFVideoStream.3
 man/man3/newSWFVideoStream_fromFile.3
 man/man3/newSWFVideoStream_fromInput.3
+man/man3/newSizedSWFOutput.3
+man/man3/readMP3Header.3
+man/man3/writeSWFButtonSoundToMethod.3

Index: pkgsrc/multimedia/ming/distinfo
diff -u pkgsrc/multimedia/ming/distinfo:1.17 pkgsrc/multimedia/ming/distinfo:1.18
--- pkgsrc/multimedia/ming/distinfo:1.17        Tue Nov  3 23:54:30 2015
+++ pkgsrc/multimedia/ming/distinfo     Tue Nov 13 10:18:26 2018
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.17 2015/11/03 23:54:30 agc Exp $
+$NetBSD: distinfo,v 1.18 2018/11/13 10:18:26 markd Exp $
 
-SHA1 (ming-0.4.5.tar.gz) = 97c201040729917bf7c62da9616a87f4a920f473
-RMD160 (ming-0.4.5.tar.gz) = 9ef9cf769a03c6e356dca299c85e06a2cdd6a155
-SHA512 (ming-0.4.5.tar.gz) = c7b8ef7769fabfde792ad58d9d72fea380dd3091b4ef52d4779a2b28ec742ddcbeb6c69ed119cd19543554f4c1d01aa4e50e87509f495e83272a33b3c4b920c0
-Size (ming-0.4.5.tar.gz) = 15029578 bytes
-SHA1 (patch-ae) = 614e322330d2d2ab1e0ef1beadf1395014ecd880
-SHA1 (patch-php__ext_ming.c) = a6f0231a602e39b638c5c8f369e2747c978f9762
-SHA1 (patch-src_blocks_gifdbl.c) = 212535b773d373a9836facb9bbc248749ca9d552
-SHA1 (patch-src_libming.h) = bba5e6f93913359b7109e3b18177f819989be98f
-SHA1 (patch-util_gif2dbl.c) = bd897674d5146ac6d6c2b4df6399f18e283c22e6
-SHA1 (patch-util_gif2mask.c) = b98e2bcbbf6e3237acf71aaa02f3e36f6fb62dfd
+SHA1 (ming-0_4_8.tar.gz) = ef94923ea4f71fca0950c4a9ff1eb33e1712c17b
+RMD160 (ming-0_4_8.tar.gz) = 4110608567c768bb67338c4bd3967322e63c32d4
+SHA512 (ming-0_4_8.tar.gz) = e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0
+Size (ming-0_4_8.tar.gz) = 14908459 bytes
+SHA1 (patch-configure.in) = 9c231dc2e06d12e05b8e82d48f1df2aed33de697

Added files:

Index: pkgsrc/multimedia/ming/patches/patch-configure.in
diff -u /dev/null pkgsrc/multimedia/ming/patches/patch-configure.in:1.1
--- /dev/null   Tue Nov 13 10:18:26 2018
+++ pkgsrc/multimedia/ming/patches/patch-configure.in   Tue Nov 13 10:18:26 2018
@@ -0,0 +1,41 @@
+$NetBSD: patch-configure.in,v 1.1 2018/11/13 10:18:26 markd Exp $
+
+From ef3719d39e8bb7e96c6ec57d60261f1516353460 Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c%gentoo.org@localhost>
+Date: Fri, 4 May 2018 17:40:04 +0200
+Subject: [PATCH] Use pkg-config to find freetype
+
+As of freetype-2.9.1 the freetype-config script has been deprecated and
+is no longer shipped by default.
+
+--- configure.in.orig  2017-04-07 08:12:56.000000000 +0000
++++ configure.in
+@@ -257,26 +257,8 @@ freetype_support=yes)
+ 
+ if test "$freetype_support" = "yes"; then
+       dnl Check for the freetype library
+-      AC_ARG_WITH(freetype-config, [  --with-freetype-config=PROG   Use FreeType configuration program PROG], freetype_config=$withval, freetype_config=yes)
+-      if test "$freetype_config" = "yes"; then 
+-              AC_PATH_PROG(ft_config,freetype-config,no)
+-              if test "$ft_config" = "no"; then
+-                      echo "To compile ming please install freetype:"
+-                      echo " as .deb user: sudo apt-get install libfreetype6 libfreetype6-dev"
+-                      echo ""
+-                      echo "or disable the freetype configuration option:"
+-                      echo " --disable-freetype"
+-                      AC_MSG_ERROR([Could not detect freetype-config!])
+-              fi
+-      else
+-              ft_config="$freetype_config"
+-      fi
+-
+-      FREETYPE_CFLAGS="`$ft_config --cflags`"
+-      FREETYPE_LIBS="`$ft_config --libs`"
+-
+-      AC_SUBST(FREETYPE_LIBS)
+-      AC_SUBST(FREETYPE_CFLAGS)
++      PKG_PROG_PKG_CONFIG
++      PKG_CHECK_MODULES(FREETYPE, freetype2,, AC_MSG_ERROR([Could not find freetype]))
+ fi
+ 
+ dnl Check for the ungif or gif (new or old) libraries