An update to Ming 0.4.4. Tested via my amd64 Gnash buildbot typically many times a day.
Index: Makefile =================================================================== RCS file: /home/cvs/ports/multimedia/ming/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 19 Jun 2011 17:45:54 -0000 1.1.1.1 +++ Makefile 26 Oct 2011 20:09:03 -0000 @@ -2,11 +2,11 @@ COMMENT= Flash 4/5 movie output library -DISTNAME= ming-0.4.3 +DISTNAME= ming-0.4.4 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ming/} -SHARED_LIBS= ming 0.0 +SHARED_LIBS= ming 0.1 HOMEPAGE= http://www.libming.org/ @@ -15,6 +15,7 @@ PERMIT_PACKAGE_CDROM= Yes PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes + WANTLIB= c freetype m png ungif z LIB_DEPENDS= graphics/libungif \ @@ -24,7 +25,7 @@ BUILD_DEPENDS= devel/bison YACC= bison USE_LIBTOOL= Yes CONFIGURE_STYLE= autoconf -AUTOCONF_VERSION= 2.61 +AUTOCONF_VERSION= 2.65 CONFIGURE_ARGS= ${CONFIGURE_SHARED} CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" Index: distinfo =================================================================== RCS file: /home/cvs/ports/multimedia/ming/distinfo,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 distinfo --- distinfo 19 Jun 2011 17:45:54 -0000 1.1.1.1 +++ distinfo 26 Oct 2011 18:35:09 -0000 @@ -1,5 +1,5 @@ -MD5 (ming-0.4.3.tar.gz) = lXjsONlzravZ6KU0mC2guQ== -RMD160 (ming-0.4.3.tar.gz) = oRUB0LSd3jMsaMH/EWEvqKsFzGY= -SHA1 (ming-0.4.3.tar.gz) = u970ibVEbzvEBg1rgIKHsPfwPzc= -SHA256 (ming-0.4.3.tar.gz) = H76fA8khMOutD2j2HtDR41ybW0Ktuyuho0DSrJUjYks= -SIZE (ming-0.4.3.tar.gz) = 14920165 +MD5 (ming-0.4.4.tar.gz) = Yhh9S5eeBYnDs2kWbsC6+g== +RMD160 (ming-0.4.4.tar.gz) = ssdTCu9P7KkNaYs5t0b/XLXaevc= +SHA1 (ming-0.4.4.tar.gz) = Elqbpv/+ryMN7vtannPUlqZA5Tk= +SHA256 (ming-0.4.4.tar.gz) = ACq0Z+hhs9TE33FtP26xoT/1Xao58kbJ99gczxH1t5g= +SIZE (ming-0.4.4.tar.gz) = 14816668 Index: patches/patch-configure_in =================================================================== RCS file: /home/cvs/ports/multimedia/ming/patches/patch-configure_in,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-configure_in --- patches/patch-configure_in 19 Jun 2011 17:45:54 -0000 1.1.1.1 +++ patches/patch-configure_in 26 Oct 2011 22:58:52 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2011/06/19 17:45:54 kili Exp $ ---- configure.in.orig Sat Feb 6 16:49:28 2010 -+++ configure.in Sat Mar 5 22:16:25 2011 -@@ -237,9 +237,6 @@ if test x"$LIBTOOL" = x; then +--- configure.in.orig Wed Oct 26 03:29:42 2011 ++++ configure.in Wed Oct 26 18:58:44 2011 +@@ -238,9 +238,6 @@ if test x"$LIBTOOL" = x; then AC_MSG_ERROR([could not detect libtool, bailing out]) fi @@ -11,7 +11,7 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2 AC_ARG_ENABLE( [freetype], [ --enable-freetype Enable freetype support (default: enabled)], -@@ -278,13 +275,12 @@ dnl Check for the gif or ungif libraries +@@ -279,13 +276,12 @@ dnl Check for the gif or ungif libraries AC_CHECK_LIB(gif, PrintGifError, GIFLIB="-lgif", GIFLIB="") dnl MinGW check for libungif AC_CHECK_LIB(ungif, DGifOpen, GIFLIB="-lungif") @@ -27,3 +27,28 @@ $OpenBSD: patch-configure_in,v 1.1.1.1 2 dnl Check for the zlib library AC_CHECK_LIB(z, compress2, +@@ -338,24 +334,6 @@ if test -n "${PNGLIB}"; then + fi + + CFLAGS="$CFLAGS -Wall" +-MACHINE=`uname -m` +-case "$MACHINE" in +-"x86_64") +- CFLAGS="$CFLAGS -fPIC" +- ;; +-"alpha") +- CFLAGS="$CFLAGS -fPIC" +- ;; +-"ia64") +- CFLAGS="$CFLAGS -fPIC" +- ;; +-"hppa") +- CFLAGS="$CFLAGS -fPIC" +- ;; +-*) +- ;; +-esac +- + + dnl ------------------------------------------- + dnl Byteorder check Index: patches/patch-src_blocks_pngdbl_c =================================================================== RCS file: patches/patch-src_blocks_pngdbl_c diff -N patches/patch-src_blocks_pngdbl_c --- patches/patch-src_blocks_pngdbl_c 8 Jul 2011 20:38:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-src_blocks_pngdbl_c,v 1.1 2011/07/08 20:38:01 naddy Exp $ - -Fix build with png-1.5. - ---- src/blocks/pngdbl.c.orig Tue Jul 5 23:36:18 2011 -+++ src/blocks/pngdbl.c Tue Jul 5 23:37:28 2011 -@@ -61,7 +61,7 @@ static png_structp openPngFromFile(FILE *fp) - } - - static int pngReadFunc(png_structp png, unsigned char *buf, int len) --{ SWFInput input = (SWFInput) png->io_ptr; -+{ SWFInput input = (SWFInput) png_get_io_ptr(png); - return SWFInput_read(input, buf, len); - } - -@@ -127,7 +127,7 @@ static int readPNG(png_structp png_ptr, dblData result - return 0; - } - -- if(setjmp(png_ptr->jmpbuf)) -+ if(setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - return 0; Index: patches/patch-util_png2dbl_c =================================================================== RCS file: patches/patch-util_png2dbl_c diff -N patches/patch-util_png2dbl_c --- patches/patch-util_png2dbl_c 8 Jul 2011 20:38:01 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,24 +0,0 @@ -$OpenBSD: patch-util_png2dbl_c,v 1.1 2011/07/08 20:38:01 naddy Exp $ - -Fix build with png-1.5. - ---- util/png2dbl.c.orig Tue Jul 5 23:38:54 2011 -+++ util/png2dbl.c Tue Jul 5 23:40:30 2011 -@@ -91,7 +91,7 @@ struct pngdata readPNG(FILE *fp) - error("Couldn't create end_info\n"); - } - -- if(setjmp(png_ptr->jmpbuf)) -+ if(setjmp(png_jmpbuf(png_ptr))) - { - png_destroy_read_struct(&png_ptr, &info_ptr, &end_info); - fclose(fp); -@@ -108,7 +108,7 @@ struct pngdata readPNG(FILE *fp) - - if(verbose) - { -- printf("size %ld/%ld color %d/%d/%ld\n", -+ printf("size %d/%d color %d/%d/%d\n", - png.width, png.height, png.bit_depth, png.color_type, - png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)); - } -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean.