Thu Apr 3 08:42:25 2008 UTC ()
Shared libraries needs to be built with PIC code.
tolower needs unsigned char argument.
Fix a missing parameter type.
Bump revision.
(joerg)
diff -r1.4 -r1.5 pkgsrc/multimedia/ming/Makefile
diff -r1.2 -r1.3 pkgsrc/multimedia/ming/distinfo
diff -r0 -r1.3 pkgsrc/multimedia/ming/patches/patch-aa
diff -r0 -r1.3 pkgsrc/multimedia/ming/patches/patch-ab
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-ac
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-ad
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-ae
diff -r0 -r1.1 pkgsrc/multimedia/ming/patches/patch-af
--- pkgsrc/multimedia/ming/Makefile 2008/02/13 11:49:44 1.4
+++ pkgsrc/multimedia/ming/Makefile 2008/04/03 08:42:25 1.5
--- pkgsrc/multimedia/ming/distinfo 2006/09/13 15:53:51 1.2
+++ pkgsrc/multimedia/ming/distinfo 2008/04/03 08:42:25 1.3
$NetBSD: patch-aa,v 1.3 2008/04/03 08:42:25 joerg Exp $
--- Makefile.config.in.orig 2008-04-03 10:27:39.000000000 +0200
+++ Makefile.config.in
@@ -43,3 +43,8 @@ EXTRA_BINS = @EXTRA_BINS@
# zlib required for both image formats and for compressed swf6
LIBS = $(ZLIB) $(MATHLIB) $(GIFLIB) $(PNGLIB)
EXTRA_LIBS = $(LIBS)
+
+.SUFFIXES: .po
+
+.c.po:
+ ${CC} -o $@ -c -fPIC ${CFLAGS} ${CPPFLAGS} $<
$NetBSD: patch-ab,v 1.3 2008/04/03 08:42:25 joerg Exp $
--- src/Makefile.orig 2008-04-03 10:28:28.000000000 +0200
+++ src/Makefile
@@ -29,10 +29,10 @@ all: dynamic
dynamic: $(SHAREDLIB)
-$(SHAREDLIB): $(OFILES)
+$(SHAREDLIB): $(OFILES:R:S/$/.po/g)
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:R:S/$/.po/g) $(COMPILEROFILES:R:S/$/.po/g) $(LDFLAGS) $(EXTRA_LIBS) blocks/*.po $(SHLIBLDFLAGS) -o $(SHAREDLIB)
cp $(SHAREDLIB) ..
ln -fs $(SHAREDLIB) ../libming$(NOVAR_SHLIBEXT)
ln -fs $(SHAREDLIB) ../libming$(SHORT_SHLIBEXT)
$NetBSD: patch-ac,v 1.1 2008/04/03 08:42:25 joerg Exp $
--- src/blocks/Makefile.orig 2008-04-03 10:29:52.000000000 +0200
+++ src/blocks/Makefile
@@ -39,7 +39,7 @@ OFILES = \
utf8.o \
videostream.o $(EXTRA_OBJS)
-all: $(OFILES)
+all: $(OFILES) $(OFILES:R:S/$/.po/g)
clean:
rm -f *.o *.core core
$NetBSD: patch-ad,v 1.1 2008/04/03 08:42:25 joerg Exp $
--- src/actioncompiler/Makefile.orig 2008-04-03 10:29:31.000000000 +0200
+++ src/actioncompiler/Makefile
@@ -14,7 +14,7 @@ GENERATED = lex.swf4.c lex.swf5.c swf5co
OFILES = $(MOSTFILES) compileaction.o
-all: $(OFILES)
+all: $(OFILES) $(OFILES:R:S/$/.po/g)
clean:
rm -f $(OFILES) $(GENERATED) compiler compiler.exe core test main.o \
$NetBSD: patch-ae,v 1.1 2008/04/03 08:42:25 joerg Exp $
--- src/actioncompiler/compile.c.orig 2008-04-03 10:33:17.000000000 +0200
+++ src/actioncompiler/compile.c
@@ -536,7 +536,7 @@ void lower(char *s)
{
while(*s)
{
- *s = tolower(*s);
+ *s = tolower((unsigned char)*s);
++s;
}
}
$NetBSD: patch-af,v 1.1 2008/04/03 08:42:25 joerg Exp $
--- src/blocks/fromswf.c.orig 2008-04-03 10:34:05.000000000 +0200
+++ src/blocks/fromswf.c
@@ -47,7 +47,7 @@ completeSWFPrebuiltClip(SWFBlock block)
}
int
-SWFPrebuiltClipLength(block)
+SWFPrebuiltClipLength(SWFBlock block)
{ SWFPrebuiltClip clip = (SWFPrebuiltClip)block;
return SWFOutput_getLength(clip->display);
}