Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/graphics
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv468
Added Files:
ming.info ming.patch
Log Message:
My final attempt to fix this mess. Adding proper replace conflicts to co
exist, and added full libgif and libungif support was missing a builddepend
alternative, and restoring the ming 0.2a pkg, htodd's 0.3.0 brake binary compat
like my 0.4.0 does, but in the 0.2a I had to remove the libming.0.dylib link
and relink the libming.dylib, this keeps binary compat and still allows builds
to build properly, thought it's not nice, but it works till 0.2a can't be
removed
--- NEW FILE: ming.patch ---
diff -Naur ming-0.2a.orig/Makefile ming-0.2a/Makefile
--- ming-0.2a.orig/Makefile Sat Aug 18 02:05:49 2001
+++ ming-0.2a/Makefile Sat Oct 26 23:48:23 2002
@@ -1,28 +1,29 @@
#CC = gcc -g -pg -a # profiling flags
#CC = gcc -O5
-CC = gcc -g -Wall
-
+#CC = gcc -g -Wall
+CC = cc -fno-common -O2
#PREFIX = /usr/local
PREFIX = /usr
LIBDIR = ${PREFIX}/lib
INCLUDEDIR = ${PREFIX}/include
+DESTDIR =
all: dynamic #static
install: install-common install-dynamic #install-static
install-common:
- install -d ${LIBDIR}
- install -d ${INCLUDEDIR}
- install ming.h ${INCLUDEDIR}
- install mingpp.h ${INCLUDEDIR}
+ install -d ${DESTDIR}${LIBDIR}
+ install -d ${DESTDIR}${INCLUDEDIR}
+ install ming.h ${DESTDIR}${INCLUDEDIR}
+ install mingpp.h ${DESTDIR}${INCLUDEDIR}
install-dynamic: dynamic
- install libming.so ${LIBDIR}/libming.so.0.2
- (cd ${LIBDIR} && ln -fs libming.so.0.2 libming.so.0 && ln -fs
libming.so.0 libming.so)
+ install libming.dylib ${DESTDIR}${LIBDIR}/libming.0.2.dylib
+ (cd ${DESTDIR}${LIBDIR} && ln -fs libming.0.2.dylib libming.0.dylib &&
ln -fs libming.0.dylib libming.dylib)
install-static: static
- install libming.a ${LIBDIR}/libming.a
+ install libming.a $DESTDIR}${LIBDIR}/libming.a
dynamic:
cd src && make dynamic
@@ -36,7 +37,7 @@
cd py_ext && make clean
cd php_ext && make clean
rm -f test.o test test.exe *.core
- rm -f libming.a libming.so
+ rm -f libming.a libming.dylib
#.c.o: .c .h
# ${CC} ${FLAGS} -c $<
diff -Naur ming-0.2a.orig/mingpp.h ming-0.2a/mingpp.h
--- ming-0.2a.orig/mingpp.h Sat Aug 18 02:06:16 2001
+++ ming-0.2a/mingpp.h Sat Oct 26 23:48:50 2002
@@ -627,7 +627,7 @@
void setColor(unsigned char r, unsigned char g, unsigned char b, int a=0xff)
{ SWFText_setColor(this->text, r, g, b, a); }
- void addString(const char *string, float *advance=NULL)
+ void addString(const char *string, int *advance=NULL)
{ SWFText_addString(this->text, string, advance); }
void setSpacing(float spacing)
diff -Naur ming-0.2a.orig/src/Makefile ming-0.2a/src/Makefile
--- ming-0.2a.orig/src/Makefile Sat Aug 18 02:06:01 2001
+++ ming-0.2a/src/Makefile Sat Oct 26 23:48:23 2002
@@ -1,9 +1,10 @@
#CC = gcc -g -pg -a # profiling flags
#CC = gcc -O5
-CC = gcc -g -Wall
+#CC = gcc -g -Wall
+CC = cc -g -fno-common -O2
-LIBDIR = /usr/local/lib
+#LIBDIR = /usr/local/lib
OFILES = movie.o displaylist.o blocklist.o position.o movieclip.o \
shape_util.o shape_cubic.o text_util.o fill.o ming.o
@@ -21,9 +22,9 @@
dynamic: ${OFILES}
cd blocks && make
cd actioncompiler && make
- ${CC} ${OFILES} ${COMPILEROFILES} blocks/*.o -shared -fpic \
- -o libming.so
- cp libming.so ..
+ ${CC} ${OFILES} ${COMPILEROFILES} blocks/*.o -dynamiclib
-current_version 0.2 \
+ -compatibility_version 0.2 -install_name $(LIBDIR)/libming.0.2.dylib -o
libming.dylib
+ cp libming.dylib ..
static: ${OFILES}
cd blocks && make
@@ -35,7 +36,7 @@
clean:
cd blocks && make clean
cd actioncompiler && make clean
- rm -f *.o libming.a libming.so test test.exe core *.core
+ rm -f *.o libming.a libming.dylib test test.exe core *.core
# breaks on bsd:
#.c.o: .c .h
--- NEW FILE: ming.info ---
Package: ming
Version: 0.2a
Revision: 6
Epoch: 1
BuildConflicts: libming-dev
Replaces: libming-dev
Conflicts: libming-dev
BuildDependsOnly: True
Source: http://opaque.net/ming/%n-%v.tgz
PatchFile: %n.patch
PatchFile-MD5: 54a3ed0f70399d6e6386077fdb9016e7
Maintainer: None <[EMAIL PROTECTED]>
Depends: %N-shlibs (= %e:%v-%r)
BuildDepends: fink (>= 0.24.12)
Description: C library to make SWF ("Flash") format movies
CompileScript: <<
make CC="cc -fno-common -O2" PREFIX=%p LIBDIR=%p/lib
<<
InstallScript: <<
make PREFIX=%p LIBDIR=%p/lib DESTDIR=%d install
rm -rf %i/lib/libming.0.dylib
rm -rf %i/lib/libming.dylib
ln -s %p/lib/libming.0.2.dylib %i/lib/libming.dylib
<<
Splitoff: <<
Package: %N-shlibs
Description: Shared Libraries for ming
DocFiles: LICENSE
Replaces: %N (<< %v-%r)
Files: lib/libming.0.2.dylib
Shlibs: %p/lib/libming.0.2.dylib 0.2.0 %n (>= 0.2a-3)
<<
License: LGPL
DocFiles: README LICENSE
HomePage: http://opaque.net/ming/
Source-MD5: 72b25da0af28d9cb025c2aaf3fd0185c
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services
for just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
