packages: ming/ming-build.patch, ming/ming-perl-shared.patch - updated for ...

pluto pluto at pld-linux.org
Thu Mar 4 15:45:59 CET 2010


Author: pluto                        Date: Thu Mar  4 14:45:59 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated for 0.4.3.

---- Files affected:
packages/ming:
   ming-build.patch (1.1 -> 1.2) , ming-perl-shared.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: packages/ming/ming-build.patch
diff -u packages/ming/ming-build.patch:1.1 packages/ming/ming-build.patch:1.2
--- packages/ming/ming-build.patch:1.1	Sun Feb 11 18:06:17 2007
+++ packages/ming/ming-build.patch	Thu Mar  4 15:45:53 2010
@@ -1,86 +1,43 @@
-Pliki ming-0.3.0.org/.Makefile.config.in.swp i ming-0.3.0/.Makefile.config.in.swp różnią się
-diff -urN ming-0.3.0.org/src/Makefile ming-0.3.0/src/Makefile
---- ming-0.3.0.org/src/Makefile	2005-11-29 00:09:42.000000000 +0100
-+++ ming-0.3.0/src/Makefile	2007-02-11 17:59:25.794623000 +0100
-@@ -32,7 +32,7 @@
- $(SHAREDLIB): $(OFILES)
- 	cd blocks && $(MAKE) CFLAGS="$(CFLAGS) -I.."
- 	cd actioncompiler && $(MAKE) CFLAGS="$(CFLAGS) -I.."
--	$(CC) $(OFILES) $(COMPILEROFILES) $(LDFLAGS) $(EXTRA_LIBS) blocks/*.o $(SHLIBLDFLAGS) -o $(SHAREDLIB)
-+	$(CC) $(OFILES) $(COMPILEROFILES) blocks/*.o $(SHLIBLDFLAGS) -o $(SHAREDLIB) $(LDFLAGS) $(EXTRA_LIBS)
- 	cp $(SHAREDLIB) ..
- 	ln -fs $(SHAREDLIB) ../libming$(NOVAR_SHLIBEXT)
- 	ln -fs $(SHAREDLIB) ../libming$(SHORT_SHLIBEXT)
-diff -urN ming-0.3.0.org/util/Makefile ming-0.3.0/util/Makefile
---- ming-0.3.0.org/util/Makefile	2006-01-30 15:52:48.000000000 +0100
-+++ ming-0.3.0/util/Makefile	2007-02-11 17:55:54.390623000 +0100
-@@ -28,25 +28,25 @@
- 	cd ..; $(MAKE) static
- 
- listswf_d: $(UTILOBJ) outputtxt.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) $(UTILOBJ) outputtxt.c -o listswf_d
-+	$(CC) $(CFLAGS) $(UTILOBJ) outputtxt.c -o listswf_d $(LDFLAGS)
- 
- listswf: $(UTILOBJ) outputtxt.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) -DNODECOMPILE $(UTILOBJ) outputtxt.c -o listswf
-+	$(CC) $(CFLAGS) -DNODECOMPILE $(UTILOBJ) outputtxt.c -o listswf $(LDFLAGS)
- 
- listaction_d: $(UTILOBJ) outputtxt.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) -DACTIONONLY $(LDFLAGS) $(UTILOBJ) outputtxt.c -o listaction_d
-+	$(CC) $(CFLAGS) -DACTIONONLY $(UTILOBJ) outputtxt.c -o listaction_d $(LDFLAGS)
- 
- listaction: $(UTILOBJ) outputtxt.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) -DACTIONONLY $(LDFLAGS) -DNODECOMPILE $(UTILOBJ) outputtxt.c -o listaction
-+	$(CC) $(CFLAGS) -DACTIONONLY -DNODECOMPILE $(UTILOBJ) outputtxt.c -o listaction $(LDFLAGS)
- 
- swftoperl: $(UTILOBJ) outputscript.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) -DSWFPERL $(CFLAGS) $(LDFLAGS) outputscript.c $(UTILOBJ) -o swftoperl
-+	$(CC) -DSWFPERL $(CFLAGS) outputscript.c $(UTILOBJ) -o swftoperl $(LDFLAGS)
- 
- swftophp: $(UTILOBJ) outputscript.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) -DSWFPHP $(CFLAGS) $(LDFLAGS) outputscript.c $(UTILOBJ) -o swftophp
-+	$(CC) -DSWFPHP $(CFLAGS) outputscript.c $(UTILOBJ) -o swftophp $(LDFLAGS)
- 
- swftopython: $(UTILOBJ) outputscript.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) -DSWFPYTHON $(CFLAGS) $(LDFLAGS) outputscript.c $(UTILOBJ) -o swftopython
-+	$(CC) -DSWFPYTHON $(CFLAGS) outputscript.c $(UTILOBJ) -o swftopython $(LDFLAGS)
- 
- parser.o: parser.c
- 	$(CC) $(CFLAGS) -c parser.c
-@@ -55,28 +55,28 @@
- 	$(CC) $(CFLAGS) -c decompile.c -o decompile.o
- 
- makefdb: blocktypes.o makefdb.c read.o ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) makefdb.c read.o -o makefdb
-+	$(CC) $(CFLAGS) makefdb.c read.o -o makefdb $(LDFLAGS)
- 
- gif2mask: gif2mask.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) gif2mask.c -o gif2mask 
-+	$(CC) $(CFLAGS) gif2mask.c -o gif2mask $(LDFLAGS)
- 
- png2dbl: png2dbl.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) png2dbl.c -o png2dbl
-+	$(CC) $(CFLAGS) png2dbl.c -o png2dbl $(LDFLAGS)
- 
- dbl2png: dbl2png.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) dbl2png.c -o dbl2png
-+	$(CC) $(CFLAGS) dbl2png.c -o dbl2png $(LDFLAGS)
- 
- gif2dbl: gif2dbl.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) gif2dbl.c -o gif2dbl 
-+	$(CC) $(CFLAGS) gif2dbl.c -o gif2dbl $(LDFLAGS)
- 
- raw2adpcm: raw2adpcm.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) raw2adpcm.c -o raw2adpcm 
-+	$(CC) $(CFLAGS) raw2adpcm.c -o raw2adpcm $(LDFLAGS)
- 
- png2swf: png2swf.c ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) png2swf.c -o png2swf 
-+	$(CC) $(CFLAGS) png2swf.c -o png2swf $(LDFLAGS)
- 
- makeswf: makeswf.c makeswf.h ../libming$(NOVAR_SHLIBEXT)
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< 
-+	$(CC) $(CFLAGS) -o $@ $< $(LDFLAGS)
- 
- install: $(BINARIES)
- 	install -d $(bindir)
+--- ming-0.4.3/util/Makefile.am.orig	2008-12-22 14:33:59.000000000 +0100
++++ ming-0.4.3/util/Makefile.am	2010-03-04 14:32:24.170198782 +0100
+@@ -114,16 +114,16 @@
+ makefdb_CFLAGS = -DMAKE_FDB
+ 
+ gif2mask_SOURCES = gif2mask.c
+-gif2mask_LDADD = $(top_builddir)/src/libming.la
++gif2mask_LDADD = $(GIFLIB) libutil.la $(top_builddir)/src/libming.la
+ 
+ png2dbl_SOURCES = png2dbl.c
+-png2dbl_LDADD = $(top_builddir)/src/libming.la
++png2dbl_LDADD = $(PNGLIB) libutil.la $(top_builddir)/src/libming.la
+ 
+ dbl2png_SOURCES = dbl2png.c
+-dbl2png_LDADD = $(top_builddir)/src/libming.la
++dbl2png_LDADD = $(PNGLIB) libutil.la $(top_builddir)/src/libming.la
+ 
+ gif2dbl_SOURCES = gif2dbl.c
+-gif2dbl_LDADD = $(top_builddir)/src/libming.la
++gif2dbl_LDADD = $(GIFLIB) libutil.la $(top_builddir)/src/libming.la
+ 
+ makeswf_SOURCES = makeswf.c makeswf_utils.c
+ makeswf_LDADD = $(top_builddir)/src/libming.la
+--- ming-0.4.3/util/Makefile.in.orig	2010-02-06 22:53:35.000000000 +0100
++++ ming-0.4.3/util/Makefile.in	2010-03-04 14:42:29.393680101 +0100
+@@ -395,13 +395,13 @@
+ makefdb_LDADD = libutil.la $(top_builddir)/src/libming.la
+ makefdb_CFLAGS = -DMAKE_FDB
+ gif2mask_SOURCES = gif2mask.c
+-gif2mask_LDADD = $(top_builddir)/src/libming.la
++gif2mask_LDADD = $(GIFLIB) libutil.la $(top_builddir)/src/libming.la
+ png2dbl_SOURCES = png2dbl.c
+-png2dbl_LDADD = $(top_builddir)/src/libming.la
++png2dbl_LDADD = $(PNGLIB) libutil.la $(top_builddir)/src/libming.la
+ dbl2png_SOURCES = dbl2png.c
+-dbl2png_LDADD = $(top_builddir)/src/libming.la
++dbl2png_LDADD = $(PNGLIB) libutil.la $(top_builddir)/src/libming.la
+ gif2dbl_SOURCES = gif2dbl.c
+-gif2dbl_LDADD = $(top_builddir)/src/libming.la
++gif2dbl_LDADD = $(GIFLIB) libutil.la $(top_builddir)/src/libming.la
+ makeswf_SOURCES = makeswf.c makeswf_utils.c
+ makeswf_LDADD = $(top_builddir)/src/libming.la
+ bin_SCRIPTS = ming-config

================================================================
Index: packages/ming/ming-perl-shared.patch
diff -u packages/ming/ming-perl-shared.patch:1.1 packages/ming/ming-perl-shared.patch:1.2
--- packages/ming/ming-perl-shared.patch:1.1	Fri Feb 16 23:27:20 2007
+++ packages/ming/ming-perl-shared.patch	Thu Mar  4 15:45:53 2010
@@ -1,20 +1,20 @@
---- 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.3/perl_ext/Makefile.PL.orig	2008-07-13 22:14:52.000000000 +0200
++++ ming-0.4.3/perl_ext/Makefile.PL	2010-03-04 14:00:36.260598946 +0100
+@@ -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 @@
- }
+     '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{
--	return undef unless (-e "$MING_DIR/libming.a");
-+	return undef unless (-e "$MING_DIR/libming.so");
- 	return 1;
- }
+ 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 )
+ 	{
================================================================

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



More information about the pld-cvs-commit mailing list