[oe-commits] org.oe.dev gnash: add 0.8.2 and clean up/fix for sysroot

[john_lee commit]

gnash: add 0.8.2 and clean up/fix for sysroot

Author: john_lee at openembedded.org
Branch: org.openembedded.dev
Revision: 8039583915293b076bff5a29972446eddf762a04
ViewMTN: http://monotone.openembedded.org/revision/info/8039583915293b076bff5a29972446eddf762a04
Files:
1
packages/gnash/gnash_0.8.2.bb
packages/gnash/gnash.inc
Diffs:

#
# mt diff -r790e5a95d24c755262b00482793b63d1f0efe440 -r8039583915293b076bff5a29972446eddf762a04
#
#
#
# add_file "packages/gnash/gnash_0.8.2.bb"
#  content [50014de2c3904a6950c775be0eda4815399cb573]
# 
# patch "packages/gnash/gnash.inc"
#  from [7f99a7149dd2fcb8a9df24834ec6d6ac432d96f8]
#    to [66c805eb5cfd0e18a89770e022d4420ee9013566]
#
============================================================
--- packages/gnash/gnash_0.8.2.bb	50014de2c3904a6950c775be0eda4815399cb573
+++ packages/gnash/gnash_0.8.2.bb	50014de2c3904a6950c775be0eda4815399cb573
@@ -0,0 +1 @@
+require gnash.inc
============================================================
--- packages/gnash/gnash.inc	7f99a7149dd2fcb8a9df24834ec6d6ac432d96f8
+++ packages/gnash/gnash.inc	66c805eb5cfd0e18a89770e022d4420ee9013566
@@ -1,68 +1,30 @@ DESCRIPTION = "Gnash is a GNU Flash movi
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
-
+HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-HOMEPAGE = "http://www.gnu.org/software/gnash"
+DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r1"
 
-DEPENDS = "gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl"
+SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
+          "
 
-SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
+inherit autotools pkgconfig
 
-
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-		--enable-media=none \
+                --enable-media=none \
                 --disable-klash \
-		--enable-z \
-		--enable-jpeg \
-		--disable-glext \
-		--enable-Xft \
-		--enable-expat \
-		--enable-mad \
-		--enable-cairo \
-		--disable-plugin \
-		--disable-cygnal \
-		--with-boost-incl=${STAGING_INCDIR} \
-		--with-boost-lib=${STAGING_LIBDIR} \
-		--with-libxml-incl=${STAGING_INCDIR}/libxml2 \
-		--with-libxml-lib=${STAGING_LIBDIR} \
-		--with-glib-incl=${STAGING_INCDIR}/glib-2.0 \
-#		--with-glib-lib=${STAGING_LIBDIR} \
-		--with-gtk2-incl=${STAGING_INCDIR}/gtk-2.0 \
-		--with-pango-incl=${STAGING_INCDIR}/pango-1.0 \
-#		--with-pango-lib=${STAGING_LIBDIR} \
-		--with-sdl-incl=${STAGING_INCDIR}/SDL \
-		--with-atk-incl=${STAGING_INCDIR}/atk-1.0 \
-		--with-Xft-incl=${STAGING_INCDIR}/X11 \
-		--with-expat-incl=${STAGING_INCDIR} \
-		--with-mad-incl=${STAGING_INCDIR} \
-		--with-cairo-incl=${STAGING_INCDIR}/cairo \
-		--with-curl-incl=${STAGING_INCDIR} \
-		--with-curl-lib=${STAGING_LIBDIR} \
-		" 
+                --enable-z \
+                --enable-jpeg \
+                --disable-glext \
+                --enable-Xft \
+                --enable-expat \
+                --enable-mad \
+                --enable-cairo \
+                --disable-plugin \
+                --disable-cygnal \
+                --with-top-level=${STAGING_DIR_HOST}/usr \
+                "
 
-inherit autotools pkgconfig
-
-LDFLAGS += " -L${STAGING_LIBDIR} -lcurl  -lboost_date_time -lboost_filesystem -lboost_iostreams -lboost_signals -lboost_thread-mt "
-CFLAGS += " -I${STAGING_INCDIR} -I${STAGING_LIBDIR}/gtk-2.0/include/ "
-
-do_configure_append() {
-        for i in `find . -name Makefile` ; do
-		sed -i s:I/usr/include:I${STAGING_INCDIR}:g $i
-	done
-}
-
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-        oe_runmake 'CC=${CC}' 'LD=${LD}' 'CFLAGS=${CFLAGS}' \
-                   'ZLIB_INCLUDE=${STAGING_INCDIR}' \
-                   'ZLIB_LIBS=${STAGING_LIBDIR}' \
-		   'PNG_INCLUDE=${STAGING_INCDIR}' \	
-		   'PNG_LIBS=${STAGING_LIBDIR}'
-}
-
-
 PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashgeo libgnashgui libgnashplayer libgnashserver "
 
 FILES_libgnashamf = "${libdir}/libgnashamf-${PV}.so"
@@ -73,7 +35,4 @@ FILES_libgnashserver = "${libdir}/libgna
 FILES_libgnashplayer = "${libdir}/libgnashplayer-${PV}.so"
 FILES_libgnashserver = "${libdir}/libgnashserver-${PV}.so"
 
+PARALLEL_MAKE = ""
-#do_stage() {
-#        autotools_stage_all
-#}
-