Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=ryuotesting2.git;a=commitdiff;h=44171369743c4bd66679c503c1795d8bf735ccbd
commit 44171369743c4bd66679c503c1795d8bf735ccbd Author: James Buren <[email protected]> Date: Wed Jun 13 21:07:25 2012 -0500 libmng-1.0.10-3-x86_64 * rebuild with lcms diff --git a/source/lib/libmng/FrugalBuild b/source/lib/libmng/FrugalBuild index 606261b..3ab04f6 100644 --- a/source/lib/libmng/FrugalBuild +++ b/source/lib/libmng/FrugalBuild @@ -4,23 +4,27 @@ pkgname=libmng pkgver=1.0.10 -pkgrel=2 +pkgrel=3 pkgdesc="A collection of routines used to create and manipulate MNG format graphics files" groups=('lib') archs=('i686' 'x86_64' 'arm') -depends=('lcms' 'libjpeg>=8a') +depends=('lcms>=1.19-4') _F_sourceforge_realname="libmng-devel" Finclude sourceforge +source=(${source[@]} linux-makefile.diff) url="http://www.libmng.com/" -sha1sums=('78ad516a1de79d00de720bf2a7c9afea2c896b09') +sha1sums=('78ad516a1de79d00de720bf2a7c9afea2c896b09' \ + '8a73a7eb6b8cd98eb80a10a6d288e0c4992aa128') build() { Fcd - cp makefiles/configure.in configure.in || Fdie - cp makefiles/Makefile.am Makefile.am || Fdie - Fautoreconf - Fbuild + Fpatchall + cp makefiles/makefile.linux Makefile || Fdie + Fsed "-O3" "$CFLAGS" Makefile + Fmake + Fmkdir /usr/include /usr/lib + Fmakeinstall } # optimization ok diff --git a/source/lib/libmng/linux-makefile.diff b/source/lib/libmng/linux-makefile.diff new file mode 100644 index 0000000..efc2351 --- /dev/null +++ b/source/lib/libmng/linux-makefile.diff @@ -0,0 +1,67 @@ +Description: Fix for Linux's makefile for 1.0.10 +Author: Kartik Mistry <[email protected]> +Forwarded: https://sourceforge.net/tracker/?func=detail&aid=3015139&group_id=5635&atid=105635 +Last-Update: 2010-06-12 + +--- libmng-1.0.10.orig/makefiles/makefile.linux ++++ libmng-1.0.10/makefiles/makefile.linux +@@ -14,25 +14,25 @@ CC=gcc + OPTIONS = -DMNG_BUILD_SO -DMNG_FULL_CMS + + # where "make install" puts libmng.a,libmng.so*,libmng.h,libmng_conf.h,libmng_types.h +-prefix=/usr/local ++prefix=/usr + + # Where the zlib library and include files are located + #ZLIBLIB=../zlib + #ZLIBINC=../zlib +-ZLIBLIB=/usr/local/lib +-ZLIBINC=/usr/local/include ++ZLIBLIB=/usr/lib ++ZLIBINC=/usr/include + + # Where the jpeg library and include files are located + #JPEGLIB=../jpgsrc + #JPEGINC=../jpgsrc +-JPEGLIB=/usr/local/lib +-JPEGINC=/usr/local/include ++JPEGLIB=/usr/lib ++JPEGINC=/usr/include + + # Where the lcms library and include files are located + #LCMSLIB=../lcms/lib + #LCMSINC=../lcms/source +-LCMSLIB=/usr/local/lib +-LCMSINC=/usr/local/include ++LCMSLIB=/usr/lib ++LCMSINC=/usr/include + + ALIGN= + # for i386: +@@ -44,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith + + # for pgcc version 2.95.1, -O3 is buggy; don't use it. + +-CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -funroll-loops \ ++CFLAGS=-I$(ZLIBINC) -I$(JPEGINC) -I$(LCMSINC) -Wall -O3 -fPIC -funroll-loops \ + $(OPTIONS) $(ALIGN) # $(WARNMORE) -g + LDFLAGS=-L. -Wl,-rpath,. \ + -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \ +@@ -57,7 +57,7 @@ RANLIB=ranlib + + # current version numbers + MNGMAJ = 1 +-MNGMIN = 1.0.9 ++MNGMIN = 1.0.10 + MNGVER = $(MNGMAJ).$(MNGMIN) + + INCPATH=$(prefix)/include +@@ -84,7 +84,7 @@ OBJS = \ + libmng_write.o \ + libmng_zlib.o + +-OBJSDLL = $(OBJS:.0=.pic.o) ++OBJSDLL = $(OBJS:.o=.pic.o) + + .SUFFIXES: .c .o .pic.o + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
