[oe-commits] org.oe.dev merge of '92b50128e188e5fefd038726a401a9de2dd1ef56'

[oe commit]

merge of '92b50128e188e5fefd038726a401a9de2dd1ef56'
     and 'ca639ce6da41e90a150a4efd5a0738273cd10607'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 07c1ae9a73a5c5859b687bd20477d28675ad3f63
ViewMTN: http://monotone.openembedded.org/revision/info/07c1ae9a73a5c5859b687bd20477d28675ad3f63
Files:
1
packages/libxsettings-client/libxsettings-client_0.14.bb
packages/libxsettings-client/libxsettings-client_0.16.bb
packages/libxsettings-client/libxsettings-client_0.17.bb
packages/libxsettings-client/libxsettings-client_svn.bb
packages/gnash/gnash-minimal_0.8.2.bb
Diffs:

#
# mt diff -r92b50128e188e5fefd038726a401a9de2dd1ef56 -r07c1ae9a73a5c5859b687bd20477d28675ad3f63
#
#
#
# patch "packages/libxsettings-client/libxsettings-client_0.14.bb"
#  from [cda89fbdd16a6d0df4ed032bcd07a77af6eccef8]
#    to [9a92b3608fcbc29c1b9bb1f1d16ab3c0269e02d1]
# 
# patch "packages/libxsettings-client/libxsettings-client_0.16.bb"
#  from [3daaa52ce6005e14cd705cc3f0f2a29e4d829d0d]
#    to [0a77cd7a791e9d539fbcf81be38e536fb052bb54]
# 
# patch "packages/libxsettings-client/libxsettings-client_0.17.bb"
#  from [93a298676c441607df8e209e2940529ce44d2c17]
#    to [f8f762e4d72cf56216592291e32cc6d161eeedfa]
# 
# patch "packages/libxsettings-client/libxsettings-client_svn.bb"
#  from [93b2ac2e9238434b6399db4cda54fedae4fa0123]
#    to [aee08c837561d4659b50fc9f7f47470a914b82d3]
#
============================================================
--- packages/libxsettings-client/libxsettings-client_0.14.bb	cda89fbdd16a6d0df4ed032bcd07a77af6eccef8
+++ packages/libxsettings-client/libxsettings-client_0.14.bb	9a92b3608fcbc29c1b9bb1f1d16ab3c0269e02d1
@@ -1,21 +1,5 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libxsettings virtual/libx11 libxt"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
+require libxsettings-client.inc
 
-inherit autotools pkgconfig gpe
+PR = "r1"
 
 SRC_URI = "${GPE_MIRROR}/xsettings-client-${PV}.tar.bz2"
-S = "${WORKDIR}/xsettings-client-${PV}"
-
-
-headers = "xsettings-client.h xsettings-common.h"
-do_stage () {
-        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
-        mkdir -p ${STAGING_INCDIR}
-        for h in ${headers}; do
-                install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
-        done
-}
============================================================
--- packages/libxsettings-client/libxsettings-client_0.16.bb	3daaa52ce6005e14cd705cc3f0f2a29e4d829d0d
+++ packages/libxsettings-client/libxsettings-client_0.16.bb	0a77cd7a791e9d539fbcf81be38e536fb052bb54
@@ -1,23 +1,3 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libxsettings virtual/libx11 libxt"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
-PR="r1"
+require libxsettings-client.inc
 
+PR="r2"
-inherit autotools pkgconfig gpe
-
-SRC_URI = "${GPE_MIRROR}/libxsettings-client-${PV}.tar.bz2 \
-	file://Makefile-am.patch;patch=1"
-
-
-headers = "xsettings-client.h xsettings-common.h"
-do_stage () {
-        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
-        mkdir -p ${STAGING_INCDIR}
-        for h in ${headers}; do
-               install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
-        done
-}
-
============================================================
--- packages/libxsettings-client/libxsettings-client_0.17.bb	93a298676c441607df8e209e2940529ce44d2c17
+++ packages/libxsettings-client/libxsettings-client_0.17.bb	f8f762e4d72cf56216592291e32cc6d161eeedfa
@@ -1,22 +1,6 @@
-SECTION = "gpe/libs"
-LICENSE = "BSD-X"
-PRIORITY = "optional"
-DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
-PR="r1"
+require libxsettings-client.inc
 
-GPE_TARBALL_SUFFIX = "bz2"
-inherit autotools pkgconfig gpe
+DEPENDS += "gtk-doc"
+PR="r2"
 
 SRC_URI += "file://no-host-includes.patch;patch=1 "
-
-headers = "xsettings-client.h xsettings-common.h"
-do_stage () {
-        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
-        mkdir -p ${STAGING_INCDIR}
-        for h in ${headers}; do
-               install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
-        done
-}
-
============================================================
--- packages/libxsettings-client/libxsettings-client_svn.bb	93b2ac2e9238434b6399db4cda54fedae4fa0123
+++ packages/libxsettings-client/libxsettings-client_svn.bb	aee08c837561d4659b50fc9f7f47470a914b82d3
@@ -1,26 +1,10 @@
-SECTION = "gpe/libs"
-PRIORITY = "optional"
-LICENSE = "BSD-X"
-DEPENDS = "libxsettings virtual/libx11 libxt gtk-doc"
+require libxsettings-client.inc
+
+DEPENDS += "gtk-doc"
 PV = "0.17+svn${SRCDATE}"
-# libxt is required to stop configure breaking builds by
-# including system paths to find it if it isn't present.
-PR = "r0"
+PR = "r1"
 
-inherit autotools pkgconfig gpe
-
 SRC_URI = "${GPE_SVN}"
-
 S = "${WORKDIR}/${PN}"
 
-do_stage () {
-        oe_libinstall -so libXsettings-client ${STAGING_LIBDIR}
-        mkdir -p ${STAGING_INCDIR}
-        for h in ${headers}; do
-               install -m 0644 ${S}/$h ${STAGING_INCDIR}/$h
-        done
-}
-
-headers = "xsettings-client.h xsettings-common.h"
-
 DEFAULT_PREFERENCE = "-1"


#
# mt diff -rca639ce6da41e90a150a4efd5a0738273cd10607 -r07c1ae9a73a5c5859b687bd20477d28675ad3f63
#
#
#
# patch "packages/gnash/gnash-minimal_0.8.2.bb"
#  from [a0c5659095170b2653b6041ef39f0ab5b0a80b97]
#    to [d256a9b9a16681f9dad49a460434ca01d7837e7b]
#
============================================================
--- packages/gnash/gnash-minimal_0.8.2.bb	a0c5659095170b2653b6041ef39f0ab5b0a80b97
+++ packages/gnash/gnash-minimal_0.8.2.bb	d256a9b9a16681f9dad49a460434ca01d7837e7b
@@ -2,7 +2,7 @@ DEPENDS = "agg libxml2 libmad zlib boost
 HOMEPAGE = "http://www.gnu.org/software/gnash"
 LICENSE = "GPL-2"
 DEPENDS = "agg libxml2 libmad zlib boost jpeg pango curl freetype"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gnash/${PV}/gnash-${PV}.tar.bz2"
 S = ${WORKDIR}/gnash-${PV}
@@ -34,15 +34,16 @@ EXTRA_OECONF="--enable-gui=gtk \
                 --disable-cygnal \
 		--disable-testsuite \
                 --enable-maintainer-mode \
+                --enable-fps-debug \
+                --enable-allstatic \
                 --with-top-level=${STAGING_DIR_HOST}/usr \
                 "
 
-PACKAGES =+ " libgnashamf libgnashbackend libgnashbase libgnashserver "
+PACKAGES =+ " libgnashamf libgnashbase libgnashserver libgnashmedia libltdl"
 
-FILES_libltdl = "${libdir}/gnash/libltdl*.so"
+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"
 FILES_libgnashserver = "${libdir}/gnash/libgnashserver-${PV}.so"
 
-PARALLEL_MAKE = ""