[oe-commits] org.oe.dev merge of '411e1889fa68a7d9f1fbfbfd00522a1e50051dcb'
pH5 commit
oe at amethyst.openembedded.net
Thu Mar 20 16:29:25 UTC 2008
merge of '411e1889fa68a7d9f1fbfbfd00522a1e50051dcb'
and 'c1f2a1f7dbe3e69fcd7448c9758a3a79555c74b9'
Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: e4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4
ViewMTN: http://monotone.openembedded.org/revision/info/e4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4
Files:
1
packages/pango/pango-1.18.3/pkgconfig_fixes.patch
packages/pango/files/pkgconfig_fixes.patch
conf/distro/include/angstrom-2008-preferred-versions.inc
packages/gtk+/gtk+.inc
packages/gtk+/gtk+_2.12.0.bb
packages/gtk+/gtk+_2.12.3.bb
packages/pango/pango_1.8.2.bb
packages/gstreamer/gstreamer/po-makefile-fix.patch
classes/autotools.bbclass
classes/native.bbclass
classes/package.bbclass
conf/checksums.ini
conf/distro/include/sane-srcdates.inc
conf/distro/include/sane-srcrevs.inc
conf/machine/beagleboard.conf
packages/gstreamer/gstreamer_0.10.17.bb
packages/sysvinit/sysvinit_2.86.bb
Diffs:
#
# mt diff -r411e1889fa68a7d9f1fbfbfd00522a1e50051dcb -re4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4
#
#
#
# rename "packages/pango/pango-1.18.3/pkgconfig_fixes.patch"
# to "packages/pango/files/pkgconfig_fixes.patch"
#
# patch "conf/distro/include/angstrom-2008-preferred-versions.inc"
# from [a93dbc58945bc2a58e31dc23c8a49662edf1ff28]
# to [d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0]
#
# patch "packages/gtk+/gtk+.inc"
# from [1aaf588548db151300913d0a15d5cc12dc7cdaa8]
# to [8aedbf6c56434aa2961e5238b7863e3537faba35]
#
# patch "packages/gtk+/gtk+_2.12.0.bb"
# from [08e63663afbf9b3a26edfaf43148e2e60683e7df]
# to [b7951643e667231ff2d092dd865e23dde9666222]
#
# patch "packages/gtk+/gtk+_2.12.3.bb"
# from [7160ff887391b65883e37a5a1fbb1007a4356f49]
# to [0d9c399ba649e1291ca7948faac117dd90dce289]
#
# patch "packages/pango/pango_1.8.2.bb"
# from [a17979a78d6ca8ee7191f00fd631befaadc5dcac]
# to [c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf]
#
============================================================
--- conf/distro/include/angstrom-2008-preferred-versions.inc a93dbc58945bc2a58e31dc23c8a49662edf1ff28
+++ conf/distro/include/angstrom-2008-preferred-versions.inc d88513c46c7ccd9a74ab4e7fc7b3c7ee572463e0
@@ -3,5 +3,6 @@ PREFERRED_VERSION_libtool = "1.5.10"
PREFERRED_VERSION_glib-2.0 = "2.16.1"
PREFERRED_VERSION_gst-pulse = "0.9.7"
PREFERRED_VERSION_libtool = "1.5.10"
+PREFERRED_VERSION_pango = "1.18.3"
PREFERRED_VERSION_pulseaudio = "0.9.9"
PREFERRED_VERSION_udev = "118"
============================================================
--- packages/gtk+/gtk+.inc 1aaf588548db151300913d0a15d5cc12dc7cdaa8
+++ packages/gtk+/gtk+.inc 8aedbf6c56434aa2961e5238b7863e3537faba35
@@ -23,6 +23,7 @@ FILES_${PN}-dev += " \
${libdir}/gtk-2.0/${LIBV}/loaders/*.la \
${libdir}/gtk-2.0/${LIBV}/immodules/*.la \
${libdir}/gtk-2.0/${LIBV}/engines/*.la \
+ ${libdir}/gtk-2.0/${LIBV}/printbackends/*.la \
${bindir}/gdk-pixbuf-csource \
${bindir}/gtk-builder-convert"
============================================================
--- packages/gtk+/gtk+_2.12.0.bb 08e63663afbf9b3a26edfaf43148e2e60683e7df
+++ packages/gtk+/gtk+_2.12.0.bb b7951643e667231ff2d092dd865e23dde9666222
@@ -1,6 +1,6 @@ require gtk+.inc
require gtk+.inc
-PR = "r1"
+PR = "r2"
DEPENDS += "cairo"
============================================================
--- packages/gtk+/gtk+_2.12.3.bb 7160ff887391b65883e37a5a1fbb1007a4356f49
+++ packages/gtk+/gtk+_2.12.3.bb 0d9c399ba649e1291ca7948faac117dd90dce289
@@ -1,6 +1,6 @@ require gtk+.inc
require gtk+.inc
-PR = "r0"
+PR = "r1"
DEPENDS += "cairo"
============================================================
--- packages/pango/pango_1.8.2.bb a17979a78d6ca8ee7191f00fd631befaadc5dcac
+++ packages/pango/pango_1.8.2.bb c5167cdc5d3b91d13bdc3a6bbbd7d2c772f3dedf
@@ -11,7 +11,8 @@ SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.
FULL_OPTIMIZATION_arm = "-O2"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.6/pango-${PV}.tar.bz2 \
- file://no-tests.patch;patch=1"
+ file://no-tests.patch;patch=1 \
+ file://pkgconfig_fixes.patch;patch=1"
inherit autotools pkgconfig
#
# mt diff -rc1f2a1f7dbe3e69fcd7448c9758a3a79555c74b9 -re4ac19c8fb4b1bbdef43e088c2683bcbf2c68ce4
#
#
#
# add_file "packages/gstreamer/gstreamer/po-makefile-fix.patch"
# content [f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d]
#
# patch "classes/autotools.bbclass"
# from [d5a547cefa5e9958965f5dda7aac45f65e89d575]
# to [a03edf4667fb88b98d0f6ea62adcf75168d43bea]
#
# patch "classes/native.bbclass"
# from [ff9a8ed86294577afe2ec629e61b3d86ca2eec27]
# to [49b3ea484f76f2d16525a51fd376aab503da1e3b]
#
# patch "classes/package.bbclass"
# from [e1d1b0d0d549915c2162821bd76d7e95f0baea5d]
# to [906d70a366b88e9727bc076e7246c6de0874bc0f]
#
# patch "conf/checksums.ini"
# from [92a53abc70649f35606c3e047de4cd95d6a61407]
# to [d56bc810ab61b67ed3f8810f504ed68e4e4c3a7d]
#
# patch "conf/distro/include/sane-srcdates.inc"
# from [e417185fe87a77364d7d662829af7d8b658df96e]
# to [3dd1a196e482da03ba4107a6b06975fd0f997875]
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [64e775c7452446ab8fb516b74096c5aad891a927]
# to [55633da67c926669fe7beb444ae99d39d9af5462]
#
# patch "conf/machine/beagleboard.conf"
# from [c6f1d6f7af44caca6ecaaa5778c9efda3b0f55a9]
# to [1143999fa2292dd52e80f29182a3b2a17ddd0494]
#
# patch "packages/gstreamer/gstreamer_0.10.17.bb"
# from [5ed31adc22e5c777ea6a206f57d4e85992cd22b8]
# to [ec06bc77d66c0e2f9c6286fa2dafe211dfacb017]
#
# patch "packages/sysvinit/sysvinit_2.86.bb"
# from [1c35cfa24576ba16dc1ae7020b0b5c61ddd20533]
# to [0288b0c48e4b35bdad86e6eb8ae993fa4686e6fb]
#
============================================================
--- packages/gstreamer/gstreamer/po-makefile-fix.patch f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
+++ packages/gstreamer/gstreamer/po-makefile-fix.patch f1f912aed675c4ee4a95afc10ddc87ed6ee8ef9d
@@ -0,0 +1,13 @@
+Index: gstreamer-0.10.17/po/Makefile.in.in
+===================================================================
+--- gstreamer-0.10.17.orig/po/Makefile.in.in 2008-01-25 23:21:31.000000000 +0800
++++ gstreamer-0.10.17/po/Makefile.in.in 2008-03-20 19:10:54.000000000 +0800
+@@ -30,7 +30,7 @@
+ INSTALL = @INSTALL@
+ INSTALL_DATA = @INSTALL_DATA@
+ MKINSTALLDIRS = @MKINSTALLDIRS@
+-mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac`
++mkinstalldirs = $(MKINSTALLDIRS)
+
+ GMSGFMT = @GMSGFMT@
+ MSGFMT = @MSGFMT@
============================================================
--- classes/autotools.bbclass d5a547cefa5e9958965f5dda7aac45f65e89d575
+++ classes/autotools.bbclass a03edf4667fb88b98d0f6ea62adcf75168d43bea
@@ -165,6 +165,17 @@ autotools_stage_includes() {
fi
}
+autotools_stage_dir() {
+ from="$1"
+ to="$2"
+ # This will remove empty directories so we can ignore them
+ rmdir "$from" 2> /dev/null || true
+ if [ -d "$from" ]; then
+ mkdir -p "$to"
+ cp -fpPR -t "$to" "$from"/*
+ fi
+}
+
autotools_stage_all() {
if [ "${INHIBIT_AUTO_STAGE}" = "1" ]
then
@@ -173,9 +184,13 @@ autotools_stage_all() {
rm -rf ${STAGE_TEMP}
mkdir -p ${STAGE_TEMP}
oe_runmake DESTDIR="${STAGE_TEMP}" install
- if [ -d ${STAGE_TEMP}/${includedir} ]; then
- mkdir -p ${STAGING_INCDIR}
- cp -fpPR -t ${STAGING_INCDIR} ${STAGE_TEMP}/${includedir}/*
+ autotools_stage_dir ${STAGE_TEMP}/${includedir} ${STAGING_INCDIR}
+ if [ "${BUILD_SYS}" = "${HOST_SYS}" ]; then
+ autotools_stage_dir ${STAGE_TEMP}/${bindir} ${STAGING_DIR_HOST}${layout_bindir}
+ autotools_stage_dir ${STAGE_TEMP}/${sbindir} ${STAGING_DIR_HOST}${layout_sbindir}
+ autotools_stage_dir ${STAGE_TEMP}/${base_bindir} ${STAGING_DIR_HOST}${layout_base_bindir}
+ autotools_stage_dir ${STAGE_TEMP}/${base_sbindir} ${STAGING_DIR_HOST}${layout_base_sbindir}
+ autotools_stage_dir ${STAGE_TEMP}/${libexecdir} ${STAGING_DIR_HOST}${layout_libexecdir}
fi
if [ -d ${STAGE_TEMP}/${libdir} ]
then
@@ -200,41 +215,9 @@ autotools_stage_all() {
cp -fpPR ${STAGE_TEMP}/${libdir}/* ${STAGING_LIBDIR}
fi
fi
-
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${datadir} || true
- if [ -d ${STAGE_TEMP}/${datadir} ]; then
- install -d ${STAGING_DATADIR}/
- cp -fpPR ${STAGE_TEMP}/${datadir}/* ${STAGING_DATADIR}/
- fi
-
- if [ "${AUTOTOOLS_NATIVE_STAGE_BINARIES}" = "1" ] ; then
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${bindir} || true
- if [ -d ${STAGE_TEMP}/${bindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_bindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_bindir} ${STAGE_TEMP}/${bindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${sbindir} || true
- if [ -d ${STAGE_TEMP}/${sbindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_sbindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_sbindir} ${STAGE_TEMP}/${sbindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${base_bindir} || true
- if [ -d ${STAGE_TEMP}/${base_bindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_base_bindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_base_bindir} ${STAGE_TEMP}/${base_bindir}/*
- fi
- #This will remove an empty directory so we can ignore it
- rmdir ${STAGE_TEMP}/${base_sbindir} || true
- if [ -d ${STAGE_TEMP}/${base_sbindir} ]; then
- mkdir -p ${STAGING_DIR_HOST}${layout_base_sbindir}
- cp -fpPR -t ${STAGING_DIR_HOST}/${layout_nase_sbindir} ${STAGE_TEMP}/${base_sbindir}/*
- fi
-
- fi
+ rm -rf ${STAGE_TEMP}/${mandir} || true
+ rm -rf ${STAGE_TEMP}/${infodir} || true
+ autotools_stage_dir ${STAGE_TEMP}/${datadir} ${STAGING_DATADIR}
rm -rf ${STAGE_TEMP}
}
============================================================
--- classes/native.bbclass ff9a8ed86294577afe2ec629e61b3d86ca2eec27
+++ classes/native.bbclass 49b3ea484f76f2d16525a51fd376aab503da1e3b
@@ -80,7 +80,6 @@ do_stage () {
then
oe_runmake install
else
- export AUTOTOOLS_NATIVE_STAGE_BINARIES="1"
autotools_stage_all
fi
fi
============================================================
--- classes/package.bbclass e1d1b0d0d549915c2162821bd76d7e95f0baea5d
+++ classes/package.bbclass 906d70a366b88e9727bc076e7246c6de0874bc0f
@@ -490,6 +490,8 @@ python emit_pkgdata() {
for pkg in packages.split():
subdata_file = pkgdatadir + "/runtime/%s" % pkg
sf = open(subdata_file, 'w')
+ write_if_exists(sf, pkg, 'PN')
+ write_if_exists(sf, pkg, 'PR')
write_if_exists(sf, pkg, 'DESCRIPTION')
write_if_exists(sf, pkg, 'RDEPENDS')
write_if_exists(sf, pkg, 'RPROVIDES')
@@ -497,7 +499,6 @@ python emit_pkgdata() {
write_if_exists(sf, pkg, 'RSUGGESTS')
write_if_exists(sf, pkg, 'RREPLACES')
write_if_exists(sf, pkg, 'RCONFLICTS')
- write_if_exists(sf, pkg, 'PR')
write_if_exists(sf, pkg, 'PKG')
write_if_exists(sf, pkg, 'ALLOW_EMPTY')
write_if_exists(sf, pkg, 'FILES')
============================================================
--- conf/checksums.ini 92a53abc70649f35606c3e047de4cd95d6a61407
+++ conf/checksums.ini d56bc810ab61b67ed3f8810f504ed68e4e4c3a7d
@@ -286,6 +286,10 @@ sha256=1428a61246a98411c2f16fcaf051c7acb
md5=b014170483cf85a93d08ee59196c53f9
sha256=1428a61246a98411c2f16fcaf051c7acb53fb1507b1982da52d5b6aa70f78c2b
+[http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/libwww-perl-5.808.tar.gz]
+md5=72120d9195ab1649c2d787eb1102a90c
+sha256=22e0778a16bb9ac0526efc99f7e03265e19ca5844aee7540f3f47a643ad5b9e4
+
[http://downloads.sourceforge.net/plone/Plone-2.1.2.tar.gz]
md5=863311e29550f9b4bf6c2502fdbed1fa
sha256=e9c0b53d887b53310daab656ef83b0abecdde39b679806a0f04f3cda222fbac2
@@ -5206,6 +5210,10 @@ sha256=b27763c368ceb6744bf687ba371566697
md5=1822943ce6745596b2510d2b425cb90d
sha256=b27763c368ceb6744bf687ba371566697a2828d11b576cd4ac853f0a582b0845
+[http://ftp.gnome.org/pub/GNOME/sources/intltool/0.37/intltool-0.37.1.tar.bz2]
+md5=860d392f04299c2740d0752501639c3b
+sha256=76cceaaaf188dfac032b21eb5dc4c7d231efe7ff180dee85dbf5e18bc5d27fe7
+
[http://www.iozone.org/src/current/iozone3_263.tar]
md5=44fd88df361ec4508e10c8d6615245fa
sha256=920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461
============================================================
--- conf/distro/include/sane-srcdates.inc e417185fe87a77364d7d662829af7d8b658df96e
+++ conf/distro/include/sane-srcdates.inc 3dd1a196e482da03ba4107a6b06975fd0f997875
@@ -52,7 +52,7 @@ SRCDATE_gtkhtml2 ?= "20060323"
# Enlightenment Foundation Libraries
# Caution: This is not alphabetically, but (roughly) dependency-sorted.
# Please leave it like that.
-EFL_SRCDATE = "20080216"
+EFL_SRCDATE = "20080311"
SRCDATE_edb-native ?= "${EFL_SRCDATE}"
SRCDATE_edb ?= "${EFL_SRCDATE}"
SRCDATE_eet-native ?= "${EFL_SRCDATE}"
============================================================
--- conf/distro/include/sane-srcrevs.inc 64e775c7452446ab8fb516b74096c5aad891a927
+++ conf/distro/include/sane-srcrevs.inc 55633da67c926669fe7beb444ae99d39d9af5462
@@ -137,9 +137,9 @@ SRCREV_pn-openocd-native ?= "517"
SRCREV_pn-openmoko-worldclock2 ?= "3365"
SRCREV_pn-openocd ?= "517"
SRCREV_pn-openocd-native ?= "517"
-SRCREV_pn-opkg ?= "4210"
-SRCREV_pn-opkg-native ?= "4210"
-SRCREV_pn-opkg-sdk ?= "4209"
+SRCREV_pn-opkg ?= "4235"
+SRCREV_pn-opkg-native ?= "4235"
+SRCREV_pn-opkg-sdk ?= "4235"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
SRCREV_pn-pylgrim ?= "20"
============================================================
--- conf/machine/beagleboard.conf c6f1d6f7af44caca6ecaaa5778c9efda3b0f55a9
+++ conf/machine/beagleboard.conf 1143999fa2292dd52e80f29182a3b2a17ddd0494
@@ -19,7 +19,7 @@ IMAGE_FSTYPES ?= "tar.bz2"
IMAGE_FSTYPES ?= "tar.bz2"
# Guesswork
-SERIAL_CONSOLE = "115200 ttyS0"
+SERIAL_CONSOLE = "115200 ttyS2"
# No kernel recipe yet
PREFERRED_PROVIDER_virtual/kernel = "linux-beagleboard"
============================================================
--- packages/gstreamer/gstreamer_0.10.17.bb 5ed31adc22e5c777ea6a206f57d4e85992cd22b8
+++ packages/gstreamer/gstreamer_0.10.17.bb ec06bc77d66c0e2f9c6286fa2dafe211dfacb017
@@ -1,3 +1,6 @@ require gstreamer.inc
require gstreamer.inc
+PR = "r1"
+
+SRC_URI += "file://po-makefile-fix.patch;patch=1"
+
-PR = "r0"
============================================================
--- packages/sysvinit/sysvinit_2.86.bb 1c35cfa24576ba16dc1ae7020b0b5c61ddd20533
+++ packages/sysvinit/sysvinit_2.86.bb 0288b0c48e4b35bdad86e6eb8ae993fa4686e6fb
@@ -2,7 +2,7 @@ HOMEPAGE = "http://freshmeat.net/project
SECTION = "base"
LICENSE = "GPL"
HOMEPAGE = "http://freshmeat.net/projects/sysvinit/"
-PR = "r39"
+PR = "r40"
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
More information about the Openembedded-commits
mailing list