[oe-commits] org.oe.dev merge of '095df9699f7a69f0e2ef180dff98382e29bbd36a'

koen commit oe at amethyst.openembedded.net
Mon Sep 1 18:15:42 UTC 2008


merge of '095df9699f7a69f0e2ef180dff98382e29bbd36a'
     and 'aaeb3250ce3e4d0a1735765cda4a2b588c527969'

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 8b637b30a202acea4cdf2f227b1a23a64e440b1d
ViewMTN: http://monotone.openembedded.org/revision/info/8b637b30a202acea4cdf2f227b1a23a64e440b1d
Files:
1
packages/sugar/sugar-base_0.82.0.bb
packages/proxy-libintl
packages/proxy-libintl/proxy-libintl-20080418
packages/dbus-java/dbus-java_2.5.bb
packages/gstreamer/gst-ffmpeg/autotools.patch
packages/php/php-5.2.6/acinclude-xml2-config.patch
packages/php/php-5.2.6/pear-makefile.patch
packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch
packages/proxy-libintl/proxy-libintl_20080418.bb
conf/distro/include/preferred-om-2008-versions.inc
conf/distro/openmoko.conf
packages/cacao/cacaoh-cldc-native_0.98.bb
packages/dbus-java/dbus-java_2.3.bb
packages/dbus-java/dbus-java_2.4.bb
packages/flumotion/flumotion_0.4.1.bb
packages/gnash/gnash-minimal.inc
packages/gstreamer/gst-ffmpeg_0.10.2.bb
packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb
packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb
packages/openjade/openjade-native_1.3.2.bb
packages/openjade/openjade_1.3.2.bb
packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb
packages/python/python-pygame_1.8.1.bb
packages/tasks/task-openmoko-feed.bb
Diffs:

#
# mt diff -r095df9699f7a69f0e2ef180dff98382e29bbd36a -r8b637b30a202acea4cdf2f227b1a23a64e440b1d
#
#
#
# add_file "packages/sugar/sugar-base_0.82.0.bb"
#  content [222d6d3f00da874f79551cb34f5c1303ca257ed0]
#
============================================================
--- packages/sugar/sugar-base_0.82.0.bb	222d6d3f00da874f79551cb34f5c1303ca257ed0
+++ packages/sugar/sugar-base_0.82.0.bb	222d6d3f00da874f79551cb34f5c1303ca257ed0
@@ -0,0 +1,23 @@
+DESCRIPTION = "Sugar base system"
+LICENSE = "LGPLv2"
+
+DEPENDS = "sugar-toolkit"
+RDEPENDS = "sugar-toolkit"
+
+SRC_URI = "http://dev.laptop.org/pub/sugar/sources/sugar-base/${PN}-${PV}.tar.bz2"
+
+inherit autotools distutils-base
+
+
+FILES_${PN} += "${datadir}/${PN} \
+		${datadir}/dbus-1 \
+		${sysconfdir} "
+
+FILES_${PN}-dbg += "${libdir}/python*/site-packages/sugar/.debug"
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_stage() {
+        autotools_stage_all
+}
+


#
# mt diff -raaeb3250ce3e4d0a1735765cda4a2b588c527969 -r8b637b30a202acea4cdf2f227b1a23a64e440b1d
#
#
#
# add_dir "packages/proxy-libintl"
# 
# add_dir "packages/proxy-libintl/proxy-libintl-20080418"
# 
# add_file "packages/dbus-java/dbus-java_2.5.bb"
#  content [086dc07a09255825ba9edd8b9bab5b2df169cc09]
# 
# add_file "packages/gstreamer/gst-ffmpeg/autotools.patch"
#  content [26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb]
# 
# add_file "packages/php/php-5.2.6/acinclude-xml2-config.patch"
#  content [4080e8e868b4269682c9d79d897bbffeb000a730]
# 
# add_file "packages/php/php-5.2.6/pear-makefile.patch"
#  content [a628c96a8b13cab5b2845c3ce7143c1781e07b7c]
# 
# add_file "packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch"
#  content [cd5a6eadb3df3174fd8fb17a1a794e0f11573a03]
# 
# add_file "packages/proxy-libintl/proxy-libintl_20080418.bb"
#  content [5f098356ea6c56a4a64655b7ed87cc62a7afed12]
# 
# patch "conf/distro/include/preferred-om-2008-versions.inc"
#  from [cbbb69b48411373416615825a20788cb411d02dc]
#    to [b9fff997cf9168d27a2b9124a6eb016820bc9466]
# 
# patch "conf/distro/openmoko.conf"
#  from [ee68bedb7c293916d63371c4a1679786be088e72]
#    to [1e59e3f5d022ae68bc761167efa36f32da031173]
# 
# patch "packages/cacao/cacaoh-cldc-native_0.98.bb"
#  from [cc2ee6f43a136dc2ba76ed7bea4fec2f935c6fdb]
#    to [21799fcb0417b38523f83c803b588582ad360d24]
# 
# patch "packages/dbus-java/dbus-java_2.3.bb"
#  from [575d1bce4f960e8739b07964559e58e5768379d1]
#    to [061fae181a63b2fd115413ac49ae154b1e460c30]
# 
# patch "packages/dbus-java/dbus-java_2.4.bb"
#  from [3be815bf6755338045753a524ff10c510c2494e9]
#    to [3f5fc4bd6d7ad822cbce130de00dc47d49b71806]
# 
# patch "packages/flumotion/flumotion_0.4.1.bb"
#  from [888ee41205578b445b00295429cddc535e80a0f3]
#    to [9674eb392f880147b7136e7db7db37ac7e9fa7af]
# 
# patch "packages/gnash/gnash-minimal.inc"
#  from [8dabbe35069c1d216e834268bca9dfc522bdea92]
#    to [1d97af65dabb8f2af969bd858ef3578a722d92d2]
# 
# patch "packages/gstreamer/gst-ffmpeg_0.10.2.bb"
#  from [e0e185738811f0607a57b4d5b4948e0b92301af6]
#    to [907ebdb116c5b75cda56d4b12d53ca1f6d6a8ba9]
# 
# patch "packages/midpath/midpath-backend-qt3x11_0.2+0.3rc1.bb"
#  from [3973ded34b696092b34b03f4883501088965b583]
#    to [d52dd9d399e3ae8b6c66f999229e5f797d319665]
# 
# patch "packages/midpath/midpath-backend-qt4x11_0.2+0.3rc1.bb"
#  from [b41941b0d420980c4211a1fa04fd53db33d07f92]
#    to [098380e73ab98a0ac07f4437a937edd32324eea7]
# 
# patch "packages/midpath/midpath-backend-qte_0.2+0.3rc1.bb"
#  from [966b5d88b9928c4b7654a06ca0c5250612b72485]
#    to [0dd83a30378cbd321e2891c6fdce475de1149853]
# 
# patch "packages/openjade/openjade-native_1.3.2.bb"
#  from [fe4d7272d3a91055775804bedf2ab7af3fcc45f2]
#    to [71010dc2c983fe59f78867b3ee655ce1f89d7baa]
# 
# patch "packages/openjade/openjade_1.3.2.bb"
#  from [76bc945ead3da7d2228e8c419c0a3fa3f1fd193e]
#    to [d3a31831d26d84480a79570ca2fb3c0d309d1459]
# 
# patch "packages/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb"
#  from [3c5864ec8c49138cc893c47ab0e73877b04d0783]
#    to [458508adc8e06b4cf1c7cf861dfebd603b5f58c8]
# 
# patch "packages/python/python-pygame_1.8.1.bb"
#  from [d20237c5870066d97af5c40249900e87c039beda]
#    to [7c06795fb776e2174fb4c60091adb29c826fe448]
# 
# patch "packages/tasks/task-openmoko-feed.bb"
#  from [baa4e904acab8916566bec7f5b14359d063354e9]
#    to [968c9b16cfd524a38a3a8060e3d1ee79f68bac95]
#
============================================================
--- packages/dbus-java/dbus-java_2.5.bb	086dc07a09255825ba9edd8b9bab5b2df169cc09
+++ packages/dbus-java/dbus-java_2.5.bb	086dc07a09255825ba9edd8b9bab5b2df169cc09
@@ -0,0 +1,87 @@
+DESCRIPTION = "A pure Java D-Bus Implementation"
+DESCRIPTION_dbus-java-viewer = "${DESCRIPTION} (DBusViewer Binary)"
+DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)"
+AUTHOR = "Matthew Johnson <dbus at matthew.ath.cx>"
+HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java"
+SECTION = "libs"
+LICENSE = "LGPLv2 AFL"
+DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native"
+RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}"
+RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}"
+RSUGGESTS_libdbus-java = "libunixsocket-java dbus"
+PR = "r0"
+
+SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz"
+
+S = "${WORKDIR}/dbus-java-${PV}"
+
+inherit java-library
+
+# jamvm-native unfortunately contains non-generificed java/lang/reflect classes
+# which are accessed in this package. Work around this by setting the bootclasspath
+# explicitly.
+JCFLAGS = "-bootclasspath ${STAGING_DATADIR}/classpath/glibj.zip"
+
+do_compile () {
+  oe_runmake \
+	JCFLAGS="-source 1.5 ${JCFLAGS}" \
+	JAVAC="javac" \
+	JARPREFIX="${STAGING_DATADIR_JAVA}" \
+	JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \
+	CLASSPATH="${S}/classes" \
+	JAR="fastjar" \
+	bin
+
+  # Generated shell scripts will have staging paths inside them.
+	rm bin/*
+  
+	# Generate them again with target paths.
+	oe_runmake \
+		JAVAC="oefatal \"No Java compilation expected here.\"" \
+		JAR="oefatal \"No jar invocation expected here.\"" \
+		JARPREFIX=${datadir_java} \
+		JAVAUNIXPATH=${datadir_java} \
+		bin
+
+	# Generate man pages.
+	oe_runmake \
+		JAVAC="oefatal \"No Java compilation expected here.\"" \
+		JAR="oefatal \"No jar invocation expected here.\"" \
+		JARPREFIX=${datadir_java} \
+		JAVAUNIXPATH=${datadir_java} \
+		man
+}
+
+do_install () {
+	oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar
+  oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar
+  oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar
+  
+	install -d ${D}${bindir}
+  install bin/DBusViewer ${D}${bindir}
+  install bin/DBusCall ${D}${bindir}
+  install bin/CreateInterface ${D}${bindir}
+  install bin/ListDBus ${D}${bindir}
+  install bin/DBusDaemon ${D}${bindir}
+
+	oe_runmake \
+		JAVAC="oefatal \"No Java compilation expected here.\"" \
+		JAR="oefatal \"No jar invocation expected here.\"" \
+		MANPREFIX=${D}${mandir} \
+		DOCPREFIX=${D}${docdir}/${JPN} \
+		install-man
+}
+
+do_stage () {
+	oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar
+}
+
+PACKAGE_ARCH = "all"
+# ${JPN} must be last otherwise it would pick up dbus-viewer*.jar
+# and dbus-bin*.jar
+PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}"
+
+FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer"
+FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*"
+FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}"
+FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}"
============================================================
--- packages/gstreamer/gst-ffmpeg/autotools.patch	26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb
+++ packages/gstreamer/gst-ffmpeg/autotools.patch	26e0e0b7ba6e33eab90fc6305cfdd9f90dcb2ebb
@@ -0,0 +1,21 @@
+Index: gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac
+===================================================================
+--- gst-ffmpeg-0.10.2.orig/gst-libs/ext/ffmpeg/configure.ac	2008-08-20 00:20:19.177850039 +0200
++++ gst-ffmpeg-0.10.2/gst-libs/ext/ffmpeg/configure.ac	2008-08-20 00:26:24.567809464 +0200
+@@ -27,13 +27,15 @@
+ 
+ AM_MAINTAINER_MODE
+ AC_GNU_SOURCE
++
++AC_PROG_LIBTOOL
+ AM_PROG_AS
+ AC_PROG_CC
++AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_SYS_LARGEFILE
+ AC_STDC_HEADERS
+ AM_DISABLE_STATIC
+-AC_PROG_LIBTOOL
+ 
+ dnl Warning for anyone using these custom macros.
+ dnl before asking me questions on why it doesn't work and why you
============================================================
--- packages/php/php-5.2.6/acinclude-xml2-config.patch	4080e8e868b4269682c9d79d897bbffeb000a730
+++ packages/php/php-5.2.6/acinclude-xml2-config.patch	4080e8e868b4269682c9d79d897bbffeb000a730
@@ -0,0 +1,18 @@
+--- /orig-acinclude.m4 2007-02-20 15:03:25.000000000 +0200
++++ /acinclude.m4      2007-02-20 15:03:24.000000000 +0200
+@@ -2359,12 +2359,9 @@
+ AC_DEFUN([PHP_SETUP_LIBXML], [
+ AC_CACHE_CHECK([for xml2-config path], ac_cv_php_xml2_config_path,
+ [
+-  for i in $PHP_LIBXML_DIR /usr/local /usr; do
+-    if test -x "$i/bin/xml2-config"; then
+-      ac_cv_php_xml2_config_path="$i/bin/xml2-config"
+-      break
+-    fi
+-  done
++
++      ac_cv_php_xml2_config_path="$PHP_LIBXML_DIR/xml2-config"
++
+ ])
+
+   if test -x "$ac_cv_php_xml2_config_path"; then
============================================================
--- packages/php/php-5.2.6/pear-makefile.patch	a628c96a8b13cab5b2845c3ce7143c1781e07b7c
+++ packages/php/php-5.2.6/pear-makefile.patch	a628c96a8b13cab5b2845c3ce7143c1781e07b7c
@@ -0,0 +1,11 @@
+--- /pear/orig-Makefile.frag	2007-03-16 12:18:33.000000000 +0200
++++ /pear/Makefile.frag	2007-03-16 12:35:48.000000000 +0200
+@@ -6,7 +6,7 @@
+ PEAR_INSTALL_FLAGS = -n -dshort_open_tag=0 -dsafe_mode=0 -dopen_basedir= -derror_reporting=E_ALL -dmemory_limit=-1 -ddetect_unicode=0
+ 
+ install-pear-installer: $(SAPI_CLI_PATH)
+-	@$(top_builddir)/sapi/cli/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
++	@$(PHP_NATIVE_DIR)/php $(PEAR_INSTALL_FLAGS) $(builddir)/install-pear-nozlib.phar -d "$(peardir)" -b "$(bindir)"
+ 
+ install-pear:
+ 	@echo "Installing PEAR environment:      $(INSTALL_ROOT)$(peardir)/"
============================================================
--- packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch	cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
+++ packages/proxy-libintl/proxy-libintl-20080418/stub-only.patch	cd5a6eadb3df3174fd8fb17a1a794e0f11573a03
@@ -0,0 +1,72 @@
+Index: proxy-libintl/src/proxy-libintl/libintl.c
+===================================================================
+--- proxy-libintl.orig/src/proxy-libintl/libintl.c
++++ proxy-libintl/src/proxy-libintl/libintl.c
+@@ -18,9 +18,12 @@
+  */
+ 
+ #ifdef _WIN32
+-#include <windows.h>
++#  include <windows.h>
+ #else
+-#include <dlfcn.h>
++#  include <stddef.h>
++#  if !STUB_ONLY
++#    include <dlfcn.h>
++#  endif
+ typedef void* HMODULE;
+ #endif
+ 
+@@ -65,11 +68,13 @@ static char * (*p_bind_textdomain_codese
+ static int
+ use_intl_dll (HMODULE dll)
+ {
+-#ifdef _WIN32
+-#define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
+-#else
+-#define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
+-#endif
++#if !STUB_ONLY
++#  ifdef _WIN32
++#    define LOOKUP(fn) p_##fn = (void *) GetProcAddress (dll, #fn); if (p_##fn == NULL) return 0
++#  else
++#    define LOOKUP(fn) p_##fn = (void *) dlsym (dll, #fn); if (p_##fn == NULL) return 0
++#  endif  /* _WIN32 */
++
+ 
+   LOOKUP (gettext);
+   LOOKUP (dgettext);
+@@ -82,7 +87,7 @@ use_intl_dll (HMODULE dll)
+   LOOKUP (bind_textdomain_codeset);
+   
+ #undef LOOKUP
+-
++#endif  /* !STUB_ONLY */
+   return 1;
+ }
+ 
+@@ -171,13 +176,17 @@ setup (void)
+ 
+   if (!beenhere)
+     {
+-#ifdef _WIN32
+-      HMODULE intl_dll = LoadLibrary ("intl.dll");
+-#elif defined(__APPLE__) && defined(__MACH__)
+-      HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
+-#else
+-      HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
+-#endif
++#if !STUB_ONLY
++#  ifdef _WIN32
++    HMODULE intl_dll = LoadLibrary ("intl.dll");
++#  elif defined(__APPLE__) && defined(__MACH__)
++    HMODULE intl_dll = dlopen ("libintl.dylib", RTLD_LAZY);
++#  else
++    HMODULE intl_dll = dlopen ("libintl.so", RTLD_LAZY);
++#  endif
++#else  /* !STUB_ONLY */
++    HMODULE intl_dll = NULL;
++#endif  /* STUB_ONLY */
+ 
+       if (intl_dll != NULL &&
+ 	  use_intl_dll (intl_dll))
============================================================
--- packages/proxy-libintl/proxy-libintl_20080418.bb	5f098356ea6c56a4a64655b7ed87cc62a7afed12
+++ packages/proxy-libintl/proxy-libintl_20080418.bb	5f098356ea6c56a4a64655b7ed87cc62a7afed12
@@ -0,0 +1,46 @@
+DESCRIPTION = "Proxy libintl"
+HOMEPAGE = "http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/"
+SECTION = "libs"
+LICENSE = "LGPL"
+
+PR = "r1"
+PROVIDES = "virtual/libintl"
+
+
+SRC_URI = " \
+    http://ftp.gnome.org/pub/GNOME/binaries/win32/dependencies/${PN}-${PV}.zip \
+    file://stub-only.patch;patch=1 \
+"
+
+
+S = "${WORKDIR}"
+FILES_${PN}-dev = "${includedir} ${libdir}"
+
+
+CFLAGS_append = " -Wall -I ../../include ${@['-DSTUB_ONLY', ''][bb.data.getVar('USE_NLS', d, 1) != 'no']}"
+
+do_compile() {
+    cd ${WORKDIR}/src/proxy-libintl
+    oe_runmake
+}
+
+
+
+
+do_install() {
+    install -d ${D}/usr/include
+    install -d ${D}/usr/lib
+    
+    install -m 0644 ${WORKDIR}/include/libintl.h ${D}/${includedir}
+    install -m 0644 ${WORKDIR}/lib/libintl.a ${D}/${libdir}
+}
+
+
+
+do_stage() {
+    install -m 0644 ${WORKDIR}/include/libintl.h ${STAGING_INCDIR}/
+    oe_libinstall -a -C lib libintl ${STAGING_LIBDIR}/
+}
+
+
+
============================================================
--- conf/distro/include/preferred-om-2008-versions.inc	cbbb69b48411373416615825a20788cb411d02dc
+++ conf/distro/include/preferred-om-2008-versions.inc	b9fff997cf9168d27a2b9124a6eb016820bc9466
@@ -202,7 +202,7 @@ PREFERRED_VERSION_curl ?= "7.18.2"
 PREFERRED_VERSION_cumulus ?= "1.2.1"
 PREFERRED_VERSION_cups ?= "1.2.12"
 PREFERRED_VERSION_curl ?= "7.18.2"
-PREFERRED_VERSION_curl-native ?= "7.18.0"
+PREFERRED_VERSION_curl-native ?= "7.18.2"
 PREFERRED_VERSION_custominput ?= "1.1.0"
 PREFERRED_VERSION_cvs ?= "1.12.9"
 PREFERRED_VERSION_cxcrypt ?= "1.0"
@@ -323,7 +323,8 @@ PREFERRED_VERSION_evince ?= "2.20.0"
 PREFERRED_VERSION_eventlog ?= "0.2.5"
 PREFERRED_VERSION_evieext ?= "1.0.2"
 PREFERRED_VERSION_evince ?= "2.20.0"
-PREFERRED_VERSION_e-wm ?= "0.16.999.041"
+# The only e-wm recipe is a cvs one with SRCDATE floating!
+# PREFERRED_VERSION_e-wm ?= "0.16.999.042"
 PREFERRED_VERSION_exiv2 ?= "0.15"
 PREFERRED_VERSION_exmap-console ?= "0.4.1"
 PREFERRED_VERSION_exml ?= "cvs"
@@ -390,7 +391,7 @@ PREFERRED_VERSION_fpdf ?= "1.53"
 PREFERRED_VERSION_foonas-packages ?= "1.0"
 PREFERRED_VERSION_fortune-mod ?= "1.99.1"
 PREFERRED_VERSION_fpdf ?= "1.53"
-PREFERRED_VERSION_free42-vga ?= "1.4.36"
+PREFERRED_VERSION_free42-vga ?= "1.4.41"
 PREFERRED_VERSION_freeciv ?= "2.0.8"
 PREFERRED_VERSION_freedoom ?= "0.3"
 PREFERRED_VERSION_freedroid ?= "1.0.2"
@@ -810,7 +811,7 @@ PREFERRED_VERSION_libbedic ?= "1.0"
 PREFERRED_VERSION_libassuan ?= "0.6.9"
 PREFERRED_VERSION_libatomics-ops ?= "1.2"
 PREFERRED_VERSION_libbedic ?= "1.0"
-PREFERRED_VERSION_libbonobo ?= "2.14.0"
+PREFERRED_VERSION_libbonobo ?= "2.22.0"
 PREFERRED_VERSION_libbonoboui ?= "2.18.0"
 PREFERRED_VERSION_libcache-cache-perl ?= "1.05"
 PREFERRED_VERSION_libcache-cache-perl-native ?= "1.05"
@@ -944,7 +945,7 @@ PREFERRED_VERSION_libmng ?= "1.0.8"
 PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
 PREFERRED_VERSION_libmimedir ?= "0.4.2"
 PREFERRED_VERSION_libmng ?= "1.0.8"
-PREFERRED_VERSION_libmodplug ?= "0.7"
+PREFERRED_VERSION_libmodplug ?= "0.8"
 PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
 PREFERRED_VERSION_libmodule-build-perl-native ?= "0.2805"
 PREFERRED_VERSION_libmrss ?= "0.17.2"
@@ -983,8 +984,8 @@ PREFERRED_VERSION_libpcl ?= "1.4"
 PREFERRED_VERSION_libparams-validate-perl-native ?= "0.86"
 PREFERRED_VERSION_libpcap ?= "0.9.8"
 PREFERRED_VERSION_libpcl ?= "1.4"
-PREFERRED_VERSION_libpcre ?= "4.4"
-PREFERRED_VERSION_libpcre-native ?= "4.4"
+PREFERRED_VERSION_libpcre ?= "7.6"
+PREFERRED_VERSION_libpcre-native ?= "7.6"
 PREFERRED_VERSION_libperl6-junction-perl ?= "1.10"
 PREFERRED_VERSION_libpng ?= "1.2.20"
 PREFERRED_VERSION_libpng-native ?= "1.2.20"
@@ -1056,7 +1057,7 @@ PREFERRED_VERSION_libvisual-plugins ?= "
 PREFERRED_VERSION_libversion-perl-native ?= "0.6701"
 PREFERRED_VERSION_libvisual ?= "0.1.3"
 PREFERRED_VERSION_libvisual-plugins ?= "0.1.3"
-PREFERRED_VERSION_libvncserver ?= "0.8.2"
+PREFERRED_VERSION_libvncserver ?= "0.9"
 PREFERRED_VERSION_libvocenabler ?= "0.1"
 PREFERRED_VERSION_libvorbis ?= "1.0.1"
 PREFERRED_VERSION_libw100 ?= "0.0.2"
@@ -1107,7 +1108,7 @@ PREFERRED_VERSION_libxslt ?= "1.1.22"
 PREFERRED_VERSION_libxsettings ?= "0.11"
 PREFERRED_VERSION_libxsettings-client ?= "0.17"
 PREFERRED_VERSION_libxslt ?= "1.1.22"
-PREFERRED_VERSION_libxslt-native ?= "1.1.22"
+PREFERRED_VERSION_libxslt-native ?= "1.1.21"
 PREFERRED_VERSION_libxt ?= "1.0.5"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxtst ?= "1.0.3"
@@ -1312,7 +1313,7 @@ PREFERRED_VERSION_nautilus-cd-burner ?= 
 PREFERRED_VERSION_nasm-native ?= "0.98.38"
 PREFERRED_VERSION_nautilus ?= "2.12.2"
 PREFERRED_VERS%s
>>> DIFF TRUNCATED @ 16K






More information about the Openembedded-commits mailing list