[packages/ming] - up to 0.4.5 - removed obsolete patches - fix building with automake 1.13
baggins
baggins at pld-linux.org
Tue Jun 11 14:45:56 CEST 2013
commit 252f575297acc39722d5194a38f2821ddb8e5817
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue Jun 11 14:45:36 2013 +0200
- up to 0.4.5
- removed obsolete patches
- fix building with automake 1.13
am.patch | 22 ++++++++++++++++++++
ming-build.patch | 54 --------------------------------------------------
ming-libpng.patch | 20 -------------------
ming-libpng15.patch | 31 -----------------------------
ming-perl-shared.patch | 9 ---------
ming.spec | 25 +++++------------------
6 files changed, 27 insertions(+), 134 deletions(-)
---
diff --git a/ming.spec b/ming.spec
index 6f458e4..806f6b6 100644
--- a/ming.spec
+++ b/ming.spec
@@ -2,16 +2,14 @@
Summary: Ming - an SWF output library
Summary(pl.UTF-8): Ming - biblioteka do produkcji plików SWF
Name: ming
-Version: 0.4.3
-Release: 10
+Version: 0.4.5
+Release: 1
License: LGPL
Group: Libraries
Source0: http://downloads.sourceforge.net/ming/%{name}-%{version}.tar.gz
-# Source0-md5: 9578ec38d973adabd9e8a534982da0b9
-Patch0: %{name}-build.patch
-Patch1: %{name}-perl-shared.patch
-Patch2: %{name}-libpng.patch
-Patch3: %{name}-libpng15.patch
+# Source0-md5: a35735a1c4f51681b96bcbfba58db2a0
+Patch0: %{name}-perl-shared.patch
+Patch1: am.patch
URL: http://ming.sourceforge.net/
BuildRequires: autoconf
BuildRequires: automake
@@ -146,11 +144,6 @@ Interfejs Tcl do biblioteki Ming generującej pliki SWF.
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
-# this is ugly (redoes make in make install), do it ourselves
-echo : > php_ext/make_module.sh
%build
%{__libtoolize}
@@ -166,14 +159,6 @@ echo : > php_ext/make_module.sh
%{__make} -j1 \
mingc_ladir=%{_libdir}/tclming
-mkdir -p php_ext/tmp
-cd php_ext/tmp
-ln -sf ../{ming.c,php_ming.h,config.m4} .
-phpize
-%configure \
- --with-ming
-%{__make}
-
%install
rm -rf $RPM_BUILD_ROOT
diff --git a/am.patch b/am.patch
new file mode 100644
index 0000000..9b0e353
--- /dev/null
+++ b/am.patch
@@ -0,0 +1,22 @@
+--- ming-0.4.3/configure.in~ 2010-02-06 22:49:28.000000000 +0100
++++ ming-0.4.3/configure.in 2013-06-11 14:16:16.657834519 +0200
+@@ -358,7 +358,7 @@
+ AC_SUBST(MICRO_VERSION)
+ AC_SUBST(MING_VERSION)
+
+-AM_CONFIG_HEADER(src/ming_config.h)
++AC_CONFIG_HEADERS(src/ming_config.h)
+ AH_TOP(
+ #ifndef __MING_CONFIG_H
+ #define __MING_CONFIG_H
+--- ming-0.4.5/perl_ext/Makefile.am~ 2010-10-10 09:19:23.000000000 +0200
++++ ming-0.4.5/perl_ext/Makefile.am 2013-06-11 14:37:29.657952856 +0200
+@@ -38,7 +38,7 @@
+ $(MAKE) -f Makefile.perl 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
diff --git a/ming-build.patch b/ming-build.patch
deleted file mode 100644
index 5a8c1db..0000000
--- a/ming-build.patch
+++ /dev/null
@@ -1,54 +0,0 @@
---- 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
---- ming-0.4.3/perl_ext/Makefile.am~ 2008-12-22 14:33:58.000000000 +0100
-+++ ming-0.4.3/perl_ext/Makefile.am 2010-03-04 15:58:05.882810823 +0100
-@@ -38,7 +38,7 @@
- $(MAKE) -f Makefile.perl 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
diff --git a/ming-libpng.patch b/ming-libpng.patch
deleted file mode 100644
index 5e14eb1..0000000
--- a/ming-libpng.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- ming-0.3.0/src/blocks/pngdbl.c~ 2006-02-08 20:09:27.000000000 +0100
-+++ ming-0.3.0/src/blocks/pngdbl.c 2010-01-28 21:54:59.729966918 +0100
-@@ -34,7 +34,7 @@
-
- if(fread(header, 1, 8, fp) != 8)
- return NULL;
-- if(!png_check_sig(header, 8))
-+ if(png_sig_cmp(header, 0, 8))
- return NULL;
- result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if(!result)
-@@ -54,7 +54,7 @@
-
- if(SWFInput_read(input, header, 8) != 8)
- return NULL;
-- if(!png_check_sig(header, 8))
-+ if(png_sig_cmp(header, 0, 8))
- return NULL;
- result = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
- if(!result)
diff --git a/ming-libpng15.patch b/ming-libpng15.patch
deleted file mode 100644
index 46630c9..0000000
--- a/ming-libpng15.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- ming-0.4.3/src/blocks/pngdbl.c~ 2012-02-11 01:44:50.562333329 +0100
-+++ ming-0.4.3/src/blocks/pngdbl.c 2012-02-11 01:47:06.689536771 +0100
-@@ -61,7 +61,7 @@
- }
-
- static int pngReadFunc(png_structp png, unsigned char *buf, int len)
--{ SWFInput input = (SWFInput) png->io_ptr;
-+{ SWFInput input = png_get_io_ptr(png);
- return SWFInput_read(input, buf, len);
- }
-
-@@ -127,7 +127,7 @@
- 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;
---- ming-0.4.3/util/png2dbl.c~ 2008-12-22 14:33:59.000000000 +0100
-+++ ming-0.4.3/util/png2dbl.c 2012-02-11 09:11:58.293241180 +0100
-@@ -91,7 +91,7 @@
- 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);
diff --git a/ming-perl-shared.patch b/ming-perl-shared.patch
index 96b27b2..dade9f1 100644
--- a/ming-perl-shared.patch
+++ b/ming-perl-shared.patch
@@ -1,14 +1,5 @@
--- 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_TOP_BUILDDIR . '/src/.libs/libming.a',
-+ 'MYEXTLIB' => $MING_TOP_BUILDDIR . '/src/.libs/libming.so',
- 'OBJECT' => "$XS_OBJECTS",
- '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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ming.git/commitdiff/252f575297acc39722d5194a38f2821ddb8e5817
More information about the pld-cvs-commit
mailing list