[oe-commits] org.oe.dev libpng 1.2.12: Switch to use autoconf'ed build.

[pfalcon commit]

libpng 1.2.12: Switch to use autoconf'ed build.
* 1.2.12 (or other version past 1.2.8) switched to the full configure support,
use autotools class to build it.

Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: eed5ae4efe4ce1cb698a47eda73593279e7c3f9a
ViewMTN: http://monotone.openembedded.org/revision.psp?id=eed5ae4efe4ce1cb698a47eda73593279e7c3f9a
Files:
1
packages/libpng/libpng_1.2.12.bb
Diffs:

#
# mt diff -r4ca57ebd1cdb163e79b0f8d5c2298ae400c6bb46 -reed5ae4efe4ce1cb698a47eda73593279e7c3f9a
#
# 
# 
# patch "packages/libpng/libpng_1.2.12.bb"
#  from [57c470e1a0907005d984c78703810a061271dba9]
#    to [2f2f29a5d0725136101005b75888a55417305df1]
# 
============================================================
--- packages/libpng/libpng_1.2.12.bb	57c470e1a0907005d984c78703810a061271dba9
+++ packages/libpng/libpng_1.2.12.bb	2f2f29a5d0725136101005b75888a55417305df1
@@ -1,10 +1,10 @@ MAINTAINER = "Chris Larson <kergoth at hand
 DESCRIPTION = "PNG Library"
 HOMEPAGE = "http://www.libpng.org/"
 LICENSE = "libpng"
 SECTION = "libs"
 PRIORITY = "required"
 MAINTAINER = "Chris Larson <kergoth at handhelds.org>"
-PR = "r3"
+PR = "r4"
 
 DEPENDS = "zlib"
 
@@ -21,36 +21,13 @@ S = "${WORKDIR}/libpng-${PV}"
 SRC_URI = "${SOURCEFORGE_MIRROR}/libpng/libpng-${PV}.tar.bz2"
 S = "${WORKDIR}/libpng-${PV}"
 
-inherit pkgconfig binconfig pkgconfig
+inherit autotools binconfig pkgconfig
 
-EXTRA_OEMAKE_append = " ZLIBINC=${STAGING_INCDIR} ZLIBLIB=${STAGING_LIBDIR}"
-CFLAGS += "-DPNG_NO_ASSEMBLER_CODE"
-
-do_compile() {
-	sed < scripts/makefile.linux > makefile -e 's/^ZLIBINC.*//' -e 's/^ZLIBLIB.*//'
-	unset LDFLAGS
-	oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-		   'ZLIBINC=${STAGING_INCDIR}' \
-		   'ZLIBLIB=${STAGING_LIBDIR}'
-}
-
-# apperently libpng doesn't expand the vars in libpng.pc, so we'll do that with sed
-# pkgconfig.bbclass will use a similar trick to fix them
-
-do_stage_prepend() {
-	sed -i  -e 's:=@libdir@:=${libdir}:;' \
-		-e 's:=@includedir@:=${includedir}:;' \
-		-e 's:=@prefix@:=${prefix}:' \
-		-e 's:=@exec_prefix@:=${exec_prefix}:' \
-            	-e 's:-lpng12:-lpng12\ -lz\ -lm:' \
-		libpng.pc
-
-}
-
 do_stage() {
 	cp libpng.pc libpng12.pc
 	install -m 644 png.h ${STAGING_INCDIR}/png.h
 	install -m 644 pngconf.h ${STAGING_INCDIR}/pngconf.h
+	oe_libinstall -so libpng ${STAGING_LIBDIR}/
 	oe_libinstall -so libpng12 ${STAGING_LIBDIR}/
 	ln -sf libpng12.so ${STAGING_LIBDIR}/libpng.so
 }