[oe-commits] org.oe.dev merge of '7b45c26182039166b20c1543f34004d0c1813f26'

[oe commit]

merge of '7b45c26182039166b20c1543f34004d0c1813f26'
     and '7ba9db8f507dcda17bc473abb075c872db42284d'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: facebe63ad80676d0290709505c58e78d9bbf78f
ViewMTN: http://monotone.openembedded.org/revision/info/facebe63ad80676d0290709505c58e78d9bbf78f
Files:
1
packages/phoneme/phoneme-advanced.inc
packages/gnash/files/libintl.patch
packages/gnash/gnash-minimal_0.8.2.bb
packages/gnash/gnash-minimal_0.8.3.bb
packages/gnash/gnash-minimal_cvs.bb
Diffs:

#
# mt diff -r7b45c26182039166b20c1543f34004d0c1813f26 -rfacebe63ad80676d0290709505c58e78d9bbf78f
#
#
#
# patch "packages/phoneme/phoneme-advanced.inc"
#  from [007bcceb2ee829e446bc8efb4e871e5750fabb1b]
#    to [71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac]
#
============================================================
--- packages/phoneme/phoneme-advanced.inc	007bcceb2ee829e446bc8efb4e871e5750fabb1b
+++ packages/phoneme/phoneme-advanced.inc	71f3ea62b1678f4a0865fd4d4927ee7d252ce7ac
@@ -29,6 +29,8 @@ COMMON_DIR  = "${libdir_jvm}/${PN}"
 
 COMMON_DIR  = "${libdir_jvm}/${PN}"
 
+PME_PROFILE ?= "foundation"
+
 do_compile() {
 	set_arch
 	oe_runmake -C cdc/build/linux-$ARCH-generic bin
@@ -50,9 +52,7 @@ do_configure() {
   cd cdc/build/linux-$ARCH-generic
 
   echo "Configuring PhoneME Advanced build"
-  # At the moment we do not support anything else than the foundation 
-  #profiles.
-  pmo_start J2ME_CLASSLIB foundation
+  pmo_start J2ME_CLASSLIB ${PME_PROFILE}
 
   # Dispatch to arch-specific functions.
   oe_phoneme_config$ARCH


#
# mt diff -r7ba9db8f507dcda17bc473abb075c872db42284d -rfacebe63ad80676d0290709505c58e78d9bbf78f
#
#
#
# add_file "packages/gnash/files/libintl.patch"
#  content [8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9]
# 
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
#  from [6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2]
#    to [c0be1ee88262033c9d6942a9e663cd67fd8f9cf0]
# 
# patch "packages/gnash/gnash-minimal_0.8.3.bb"
#  from [6396b4820385850e505d3bf5e1590f4dac5ff6b6]
#    to [36448f84bc62c99b5090bf2b25d855cc753f82a3]
# 
# patch "packages/gnash/gnash-minimal_cvs.bb"
#  from [62f9652b7093e6633562fd3ed356c137c7dba781]
#    to [db4c2629fdbc1291308a0a48419a39a584264d1d]
#
============================================================
--- packages/gnash/files/libintl.patch	8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
+++ packages/gnash/files/libintl.patch	8ffb955846a2dba97ad8eedfd7e86d04fb8bb0d9
@@ -0,0 +1,13 @@
+Index: gnash-0.8.3/gui/am-frag/fb.am
+===================================================================
+--- gnash-0.8.3.orig/gui/am-frag/fb.am	2008-08-19 00:37:45.000000000 +0200
++++ gnash-0.8.3/gui/am-frag/fb.am	2008-08-19 00:38:04.000000000 +0200
+@@ -30,7 +30,7 @@
+ fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
+ fb_gnash_SOURCES += 
+ fb_gnash_LDADD = $(top_builddir)/backend/libgnashagg.la \
+-		$(GNASH_LIBS) $(AGG_LIBS)
++		$(GNASH_LIBS) $(AGG_LIBS) $(INTLLIBS)
+ endif				# BUILD_AGG_RENDERER
+ endif				# BUILD_FB_GUI
+ 
============================================================
--- packages/gnash/gnash-minimal_0.8.2.bb	6f9e794c7a411a20a0fdc6da96482dbd8f0f3ff2
+++ packages/gnash/gnash-minimal_0.8.2.bb	c0be1ee88262033c9d6942a9e663cd67fd8f9cf0
@@ -1,2 +1,3 @@ require gnash-minimal.inc
 require gnash-minimal.inc
 
+PR = "r1"
============================================================
--- packages/gnash/gnash-minimal_0.8.3.bb	6396b4820385850e505d3bf5e1590f4dac5ff6b6
+++ packages/gnash/gnash-minimal_0.8.3.bb	36448f84bc62c99b5090bf2b25d855cc753f82a3
@@ -1,12 +1,12 @@ require gnash-minimal.inc
 require gnash-minimal.inc
 
-PR = "r6"
+PR = "r7"
 
 EXTRA_OECONF += " --without-included-ltdl \
                   --with-ltdl-include=${STAGING_INCDIR} \
                   --with-ltdl-lib=${STAGING_LIBDIR} \
 "
 
-SRC_URI += "file://libtool-2.2.patch;patch=1"
+SRC_URI += "file://libtool-2.2.patch;patch=1 file://libintl.patch;patch=1"
 
 
============================================================
--- packages/gnash/gnash-minimal_cvs.bb	62f9652b7093e6633562fd3ed356c137c7dba781
+++ packages/gnash/gnash-minimal_cvs.bb	db4c2629fdbc1291308a0a48419a39a584264d1d
@@ -1,6 +1,6 @@ require gnash-minimal.inc
 require gnash-minimal.inc
 
-PV = "0.8.2+cvs${SRCDATE}"
+PV = "0.8.3+cvs${SRCDATE}"
 
 SRC_URI = "cvs://anonymous:anonymous@cvs.sv.gnu.org/sources/gnash;module=gnash"
 S = ${WORKDIR}/gnash