[oe-commits] org.oe.dev merge of '1044732b8a88225ade87ce8064bd97dee00124ac'

[koen commit]

merge of '1044732b8a88225ade87ce8064bd97dee00124ac'
     and '462295240b0a06ab1c367eb883ec218b4313bf89'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: b62016981974fffda6b7f7bc543c7459f370a70f
ViewMTN: http://monotone.openembedded.org/revision/info/b62016981974fffda6b7f7bc543c7459f370a70f
Files:
1
packages/gnash/gnash-minimal.inc
packages/chromium
packages/chromium/chromium_svn.bb
packages/gnash/gnash.inc
Diffs:

#
# mt diff -r1044732b8a88225ade87ce8064bd97dee00124ac -rb62016981974fffda6b7f7bc543c7459f370a70f
#
#
#
# patch "packages/gnash/gnash-minimal.inc"
#  from [cd2bb516d2fb57c4631871f835f678dd745a5039]
#    to [eb90fecce11dc84a53c51d06768ca881e6c1bfd1]
#
============================================================
--- packages/gnash/gnash-minimal.inc	cd2bb516d2fb57c4631871f835f678dd745a5039
+++ packages/gnash/gnash-minimal.inc	eb90fecce11dc84a53c51d06768ca881e6c1bfd1
@@ -3,7 +3,6 @@ DEPENDS = "virtual/libiconv virtual/libi
 LICENSE = "GPL-2"
 
 DEPENDS = "virtual/libiconv virtual/libintl ffmpeg libtool agg libxml2 libmad zlib boost jpeg pango curl freetype"
-RDEPENDS = "libltdl"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
 S = ${WORKDIR}/gnash-${PV}
@@ -48,11 +47,10 @@ CFLAGS += " -D_GNU_SOURCE  -I${S}/libltd
 # detection because uclibc does not have argz.h which enables error_t 
 CFLAGS += " -D_GNU_SOURCE  -I${S}/libltdl  -I${STAGING_INCDIR}/libltdl"
 
-PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
+PACKAGES =+ "libgnashnet libgnashamf libgnashbase libgnashserver libgnashmedia"
 
 FILES_${PN}-dbg += "${libdir}/gnash/.debug"
 FILES_${PN}-dev += "${libdir}/gnash/*a"
-FILES_libltdl = "${libdir}/gnash/libltdl*.so*"
 FILES_libgnashamf = "${libdir}/gnash/libgnashamf-${PV}.so"
 FILES_libgnashbase = "${libdir}/gnash/libgnashbase-${PV}.so"
 FILES_libgnashmedia = "${libdir}/gnash/libgnashmedia-${PV}.so"


#
# mt diff -r462295240b0a06ab1c367eb883ec218b4313bf89 -rb62016981974fffda6b7f7bc543c7459f370a70f
#
#
#
# add_dir "packages/chromium"
# 
# add_file "packages/chromium/chromium_svn.bb"
#  content [d86439f0f6917122bf3604fe352d1d2cd30053d4]
# 
# patch "packages/gnash/gnash.inc"
#  from [f1ba5349c7103bbc21867a987ba4fd70a54822ea]
#    to [883974f7e6244647ae45d9ed5274a49bbd7f2641]
#
============================================================
--- packages/chromium/chromium_svn.bb	d86439f0f6917122bf3604fe352d1d2cd30053d4
+++ packages/chromium/chromium_svn.bb	d86439f0f6917122bf3604fe352d1d2cd30053d4
@@ -0,0 +1,16 @@
+DESCRIPTION = "Google Chrome browser"
+LICENSE = "BSD"
+
+DEPENDS = "perl-native python-native flex-native gperf-native"
+
+PV = "0.0+svnr${SRCREV}"
+
+SRCREV = "1665"
+SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http"
+
+S = "${WORKDIR}/src/chrome"
+
+do_compile() {
+	cd ${S}
+	../third_party/scons/scons.py Hammer
+}	
============================================================
--- packages/gnash/gnash.inc	f1ba5349c7103bbc21867a987ba4fd70a54822ea
+++ packages/gnash/gnash.inc	883974f7e6244647ae45d9ed5274a49bbd7f2641
@@ -1,8 +1,8 @@ LICENSE = "GPL-2"
 DESCRIPTION = "Gnash is a GNU Flash movie player that supports many SWF v7 features"
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
-DEPENDS = "libtool gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
-PR = "r1"
+DEPENDS = "libtool ffmpeg gtk+ cairo libxml2 libmad libsdl-mixer zlib boost jpeg pango curl freetype"
+PR = "r2"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2 \
           "
@@ -11,7 +11,7 @@ EXTRA_OECONF = "--enable-gui=gtk \
 
 EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-renderer=cairo \
-                --enable-media=none \
+                --enable-media=ffmpeg \
                 --disable-klash \
                 --enable-z \
                 --enable-jpeg \
@@ -20,7 +20,7 @@ EXTRA_OECONF = "--enable-gui=gtk \
                 --enable-expat \
                 --enable-mad \
                 --enable-cairo \
-                --disable-plugin \
+                --enable-plugin \
                 --disable-cygnal \
                 --with-top-level=${STAGING_DIR_HOST}/usr \
                 "