From f2a3527ad40ebda0dc322ae1f9b18660a342c5d1 Mon Sep 17 00:00:00 2001 From: Sérgio Basto Date: Sep 27 2014 05:57:29 +0000 Subject: add pngquant-2.3.0_fix-Makefile.patch --- diff --git a/pngquant-2.3.0_fix-Makefile.patch b/pngquant-2.3.0_fix-Makefile.patch new file mode 100644 index 0000000..ad7b60f --- /dev/null +++ b/pngquant-2.3.0_fix-Makefile.patch @@ -0,0 +1,94 @@ +--- ./lib/Makefile.orig 2014-07-11 23:06:08.000000000 +0100 ++++ ./lib/Makefile 2014-09-27 04:27:47.371160997 +0100 +@@ -1,6 +1,8 @@ + -include config.mk + + STATICLIB=libimagequant.a ++SHAREDLIB=libimagequant.so ++SOVER=0 + + DLL=libimagequant.dll + DLLIMP=libimagequant_dll.a +@@ -14,10 +16,12 @@ DISTFILES = $(OBJS:.o=.c) *.h MANUAL.md + TARNAME = libimagequant-$(VERSION) + TARFILE = $(TARNAME)-src.tar.bz2 + +-all: static ++all: shared + + static: $(STATICLIB) + ++shared: $(SHAREDLIB) ++ + dll: + $(MAKE) CFLAGSADD="-DLIQ_EXPORT='__declspec(dllexport)'" $(DLL) + +@@ -28,6 +32,10 @@ $(DLL) $(DLLIMP): $(OBJS) + $(STATICLIB): $(OBJS) + $(AR) $(ARFLAGS) $@ $^ + ++$(SHAREDLIB): $(OBJS) ++ $(CC) -shared -Wl,-soname,$(SHAREDLIB).$(SOVER) $(LDFLAGS) $(OBJS) -o $(SHAREDLIB).$(SOVER) ++ ln -fs $(SHAREDLIB).$(SOVER) $(SHAREDLIB) ++ + $(OBJS): $(wildcard *.h) config.mk + + dist: $(TARFILE) +--- ./configure.orig 2014-09-27 05:12:31.526575414 +0100 ++++ ./configure 2014-09-27 06:01:41.336738912 +0100 +@@ -230,7 +230,6 @@ status "Compiler" "$CC" + # init flags + CFLAGS=${CFLAGS:--O3 -fno-math-errno -funroll-loops -fomit-frame-pointer -Wall} + cflags "-std=c99 -I." +-lflags "-lm lib/libimagequant.a" + + # DEBUG + if [ -z "$DEBUG" ]; then +--- ./Makefile.orig 2014-09-27 03:58:13.754277888 +0100 ++++ ./Makefile 2014-09-27 06:14:50.903456130 +0100 +@@ -1,7 +1,7 @@ + -include config.mk + + BIN ?= pngquant +-BINPREFIX = $(PREFIX)/bin ++BINPREFIX = $(DESTDIR)/$(PREFIX)/bin + + OBJS = pngquant.o rwpng.o + COCOA_OBJS = rwpng_cocoa.o +@@ -11,6 +11,8 @@ OBJS += $(COCOA_OBJS) + endif + + STATICLIB = lib/libimagequant.a ++SHAREDLIB = lib/libimagequant.so ++SOVER = 0 + + DISTFILES = *.[chm] pngquant.1 Makefile configure README.md INSTALL CHANGELOG COPYRIGHT + TARNAME = pngquant-$(VERSION) +@@ -27,13 +29,16 @@ all: $(BIN) + $(STATICLIB):: config.mk + $(MAKE) -C lib static + ++$(SHAREDLIB):: config.mk ++ $(MAKE) -C lib shared ++ + $(OBJS): $(wildcard *.h) config.mk + + rwpng_cocoa.o: rwpng_cocoa.m + $(CC) -Wno-enum-conversion -c $(CFLAGS) -o $@ $< || clang -Wno-enum-conversion -c -O3 -o $@ $< + +-$(BIN): $(STATICLIB) $(OBJS) +- $(CC) $(OBJS) $(LDFLAGS) -o $@ ++$(BIN): $(SHAREDLIB) $(OBJS) ++ $(CC) $(OBJS) $(LDFLAGS) $(SHAREDLIB) -o $@ + + dist: $(TARFILE) + +@@ -53,7 +58,7 @@ uninstall: + rm -f $(BINPREFIX)/$(BIN) + + clean: +- rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(STATICLIB) $(TARFILE) ++ rm -f $(BIN) $(OBJS) $(COCOA_OBJS) $(SHAREDLIB) $(TARFILE) + + distclean: clean + rm -f config.mk