Author: titmuss
Date: Mon Dec 22 03:45:27 2008
New Revision: 3600
URL: http://svn.slimdevices.com?rev=3600&root=Jive&view=rev
Log:
Bug: N/A
Description:
Fixes to get pango compiling in poky. Work in progress, this still does not
compile
yet.
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-pango_svn.bb
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/pango/pango.inc
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf?rev=3600&root=Jive&r1=3599&r2=3600&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
(original)
+++ 7.4/branches/pango/squeezeos/poky/meta-squeezeos/conf/distro/squeezeos.conf
Mon Dec 22 03:45:27 2008
@@ -63,8 +63,10 @@
PREFERRED_PROVIDER_marvell-wlan-tools ?= "marvell-wlan-tools-bin"
PREFERRED_PROVIDER_marvell-gspi-module ?= "marvell-gspi-module-bin"
-PREFERRED_VERSION_busybox ?= "1.7.0"
PREFERRED_VERSION_qemu-native ?= "0.9.1"
-PREFERRED_VERSION_freetype ?= "2.3.5"
-PREFERRED_VERSION_pango ?= "1.22.4"
-PREFERRED_VERSION_glib-2.0 ?= "2.18.2"
+
+PREFERRED_VERSION_busybox = "1.7.0"
+PREFERRED_VERSION_freetype = "2.3.5"
+PREFERRED_VERSION_pango = "1.22.4"
+PREFERRED_VERSION_glib-2.0 = "2.18.2"
+PREFERRED_VERSION_glib-2.0-native = "2.18.2"
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-pango_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-pango_svn.bb?rev=3600&root=Jive&r1=3599&r2=3600&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-pango_svn.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/libsdl/libsdl-pango_svn.bb
Mon Dec 22 03:45:27 2008
@@ -29,7 +29,7 @@
do_configure_append() {
for i in $(find ${S} -name Makefile) ; do
sed -i -e s:/usr/include/SDL:${STAGING_INCDIR}/SDL:g $i
- sed -i -e s:-L/usr/lib:${STAGING_LIBDIR}:g $i
+ sed -i -e s:-L/usr/lib:-L${STAGING_LIBDIR}:g $i
done
}
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/pango/pango.inc
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/pango/pango.inc?rev=3600&root=Jive&r1=3599&r2=3600&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/pango/pango.inc
(original)
+++ 7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/pango/pango.inc
Mon Dec 22 03:45:27 2008
@@ -6,13 +6,11 @@
inherit gnome
EXTRA_AUTORECONF = ""
-SECTION = "x11/libs"
-
-DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv virtual/libx11
libxft gtk-doc-native cairo"
+DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv"
PACKAGES_DYNAMIC = "pango-module-*"
-RRECOMMENDS_${PN} = "pango-module-basic-x pango-module-basic-fc"
+RRECOMMENDS_${PN} = "pango-module-basic-fc"
# seems to go wrong with default cflags
FULL_OPTIMIZATION_arm = "-O2"
Modified:
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
URL:
http://svn.slimdevices.com/7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb?rev=3600&root=Jive&r1=3599&r2=3600&view=diff
==============================================================================
---
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
(original)
+++
7.4/branches/pango/squeezeos/poky/meta-squeezeos/packages/squeezeplay/squeezeplay_svn.bb
Mon Dec 22 03:45:27 2008
@@ -7,7 +7,7 @@
DEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image pango libsdl-pango"
RDEPENDS += "libsdl libsdl-ttf libsdl-gfx libsdl-image pango libsdl-pango"
-RDEPENDS += "pango-module-arabic pango-module-hangul pango-module-hebrew
pango-module-indic pango-module-khmer pango-module-syriac pango-module-thai
pango-module-tibetan"
+RDEPENDS += "pango-module-arabic-fc pango-module-hangul-fc
pango-module-hebrew-fc pango-module-indic-fc pango-module-khmer-fc
pango-module-syriac-fc pango-module-thai-fc pango-module-tibetan-fc"
DEPENDS += "lua lua-native luatolua++"
RDEPENDS += "liblua5.1-socket liblua5.1-json liblua5.1-zipfilter
liblua5.1-loop liblua5.1-logging liblua5.1-syslog liblua5.1-filesystem
liblua5.1-profiler liblua5.1-tolua++"
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
