SOURCES (DEVEL): ming-perl-shared.patch, ming-link.patch (NEW) - for 0.4.2

[qboosh]

Author: qboosh                       Date: Wed Oct 15 17:25:44 2008 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- for 0.4.2

---- Files affected:
SOURCES:
   ming-perl-shared.patch (1.1 -> 1.1.2.1) , ming-link.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/ming-perl-shared.patch
diff -u SOURCES/ming-perl-shared.patch:1.1 SOURCES/ming-perl-shared.patch:1.1.2.1
--- SOURCES/ming-perl-shared.patch:1.1	Fri Feb 16 23:27:20 2007
+++ SOURCES/ming-perl-shared.patch	Wed Oct 15 19:25:38 2008
@@ -1,20 +1,39 @@
---- ming-0.3.0/perl_ext/Makefile.PL.orig	2006-02-01 07:45:17.000000000 +0100
-+++ ming-0.3.0/perl_ext/Makefile.PL	2007-02-16 23:14:25.929759689 +0100
-@@ -78,7 +78,7 @@
+--- ming-0.4.2/perl_ext/Makefile.PL.orig	2008-07-13 22:14:52.000000000 +0200
++++ ming-0.4.2/perl_ext/Makefile.PL	2008-10-14 22:51:17.854630631 +0200
+@@ -146,7 +146,7 @@
      clean   => {
          FILES   => "@do_clean",
      },
--    'MYEXTLIB'     => $MING_DIR . '/libming.a',
-+    'MYEXTLIB'     => $MING_DIR . '/libming.so',
+-    'MYEXTLIB'     => $MING_TOP_BUILDDIR . '/src/.libs/libming.a',
++    'MYEXTLIB'     => $MING_TOP_BUILDDIR . '/src/.libs/libming.so',
      'OBJECT'       => "$XS_OBJECTS",
-     #'LIBS'         => [ "-lz" ],
- 		'LIBS'         => [ $libs ],
-@@ -96,7 +96,7 @@
- }
- 
- sub ming_is_compiled{
--	return undef unless (-e "$MING_DIR/libming.a");
-+	return undef unless (-e "$MING_DIR/libming.so");
- 	return 1;
- }
+     'LDFROM'       => "$LD_OBJECTS",
+     'INC'          => "-I$MING_TOP_SRCDIR/src -I$BUILDDIR -I$MING_TOP_BUILDDIR/src -I$SRCDIR",
+@@ -164,7 +164,7 @@
  
+ sub ming_is_compiled
+ {
+-	my $libming = $MING_TOP_BUILDDIR."/src/.libs/libming.a";
++	my $libming = $MING_TOP_BUILDDIR."/src/.libs/libming.so";
+ 
+ 	if ( -e $libming )
+ 	{
+--- ming-0.4.2/perl_ext/Makefile.am.orig	2008-07-13 15:46:56.000000000 +0200
++++ ming-0.4.2/perl_ext/Makefile.am	2008-10-15 17:58:44.486630631 +0200
+@@ -32,13 +32,13 @@
+ #abs_builddir=`cd $(TMP_DIR); pwd`
+ 
+ all: Makefile.perl
+-	$(MAKE) -f Makefile.perl
++	$(MAKE) -f Makefile.perl OPTIMIZE="$(CFLAGS)"
+ 
+ install: Makefile.perl
+-	$(MAKE) -f Makefile.perl install PREFIX=$(prefix)
++	$(MAKE) -f Makefile.perl pure_install PREFIX=$(prefix)
+ 
+ Makefile.perl: Makefile.PL
+-	srcdir=$(srcdir) builddir=$(abs_builddir) $(PERL) $< PREFIX=$(prefix) FIRST_MAKEFILE=Makefile.perl
++	srcdir=$(srcdir) builddir=$(abs_builddir) $(PERL) $< PREFIX=$(prefix) FIRST_MAKEFILE=Makefile.perl INSTALLDIRS=vendor
+ 
+ clean-local: Makefile.perl
+ 	$(MAKE) -f Makefile.perl realclean

================================================================
Index: SOURCES/ming-link.patch
diff -u /dev/null SOURCES/ming-link.patch:1.1.2.1
--- /dev/null	Wed Oct 15 19:25:45 2008
+++ SOURCES/ming-link.patch	Wed Oct 15 19:25:38 2008
@@ -0,0 +1,43 @@
+--- ming-0.4.2/util/Makefile.am.orig	2008-09-17 09:07:05.000000000 +0200
++++ ming-0.4.2/util/Makefile.am	2008-10-15 01:08:41.694630631 +0200
+@@ -115,19 +115,19 @@
+ makefdb_CFLAGS = -DMAKE_FDB
+ 
+ gif2mask_SOURCES = gif2mask.c
+-gif2mask_LDADD = $(top_builddir)/src/libming.la
++gif2mask_LDADD = $(top_builddir)/src/libming.la $(GIFLIB) $(ZLIB) $(MATHLIB)
+ 
+ png2dbl_SOURCES = png2dbl.c
+-png2dbl_LDADD = $(top_builddir)/src/libming.la
++png2dbl_LDADD = $(top_builddir)/src/libming.la $(PNGLIB) $(ZLIB) $(MATHLIB)
+ 
+ img2swf_SOURCES = img2swf.c
+ img2swf_LDADD = $(top_builddir)/src/libming.la
+ 
+ dbl2png_SOURCES = dbl2png.c
+-dbl2png_LDADD = $(top_builddir)/src/libming.la
++dbl2png_LDADD = $(top_builddir)/src/libming.la $(PNGLIB)
+ 
+ gif2dbl_SOURCES = gif2dbl.c
+-gif2dbl_LDADD = $(top_builddir)/src/libming.la
++gif2dbl_LDADD = $(top_builddir)/src/libming.la $(GIFLIB) $(ZLIB) $(MATHLIB)
+ 
+ makeswf_SOURCES = makeswf.c makeswf_utils.c
+ makeswf_LDADD = $(top_builddir)/src/libming.la
+--- ming-0.4.2/configure.in.orig	2008-09-18 02:44:39.000000000 +0200
++++ ming-0.4.2/configure.in	2008-10-15 01:09:55.882630631 +0200
+@@ -275,11 +275,11 @@
+ fi
+ 
+ dnl Check for the gif or ungif libraries
+-AC_CHECK_LIB(gif, PrintGifError, GIFLIB="-lgif", GIFLIB="")
++AC_CHECK_LIB(gif, PrintGifError, GIFLIB="-lgif", [
+ dnl MinGW check for libungif
+-AC_CHECK_LIB(ungif, DGifOpen, GIFLIB="-lungif")
++AC_CHECK_LIB(ungif, DGifOpen, GIFLIB="-lungif", [
+ dnl Solaris needs -lX11 on the linker line for ungif to work
+-AC_CHECK_LIB(ungif, PrintGifError, GIFLIB="-lungif",, "-lX11")
++AC_CHECK_LIB(ungif, PrintGifError, GIFLIB="-lungif",GIFLIB="", "-lX11")])])
+ AC_CHECK_HEADERS([gif_lib.h], GIFINC="true", GIFINC="")
+ 
+ dnl Check for the png library
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/ming-perl-shared.patch?r1=1.1&r2=1.1.2.1&f=u