[oe-commits] org.oe.dev merge of '5cd89c63882a1e57930ed1be15c9bda18d042494'
xora commit
openembedded-commits at lists.openembedded.org
Thu Jul 19 07:00:50 UTC 2007
merge of '5cd89c63882a1e57930ed1be15c9bda18d042494'
and '9d4814a9341ee6a1b96dfdcd86607d26eb6050f1'
Author: xora at openembedded.org
Branch: org.openembedded.dev
Revision: 64298b1eccb4cb0a71eec967d40f9b07077b3e4f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=64298b1eccb4cb0a71eec967d40f9b07077b3e4f
Files:
1
packages/bluez/files/pkgconfig-add-gthread.patch
packages/coreutils/coreutils-5.3.0/futimens.patch
conf/distro/angstrom-2007.1.conf
packages/coreutils/coreutils_5.3.0.bb
packages/gstreamer/gst-plugins-base_0.10.12.bb
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:
#
# mt diff -r5cd89c63882a1e57930ed1be15c9bda18d042494 -r64298b1eccb4cb0a71eec967d40f9b07077b3e4f
#
#
#
# add_file "packages/bluez/files/pkgconfig-add-gthread.patch"
# content [6c09cd3241b74b602c6af47bd99cbda71e53d7e0]
#
============================================================
--- packages/bluez/files/pkgconfig-add-gthread.patch 6c09cd3241b74b602c6af47bd99cbda71e53d7e0
+++ packages/bluez/files/pkgconfig-add-gthread.patch 6c09cd3241b74b602c6af47bd99cbda71e53d7e0
@@ -0,0 +1,50 @@
+Index: git/configure.in
+===================================================================
+--- git.orig/configure.in 2007-07-17 17:25:52.000000000 +0100
++++ git/configure.in 2007-07-17 17:25:52.000000000 +0100
+@@ -75,6 +75,10 @@
+ AC_SUBST(OPENOBEX_CFLAGS)
+ AC_SUBST(OPENOBEX_LIBS)
+
++PKG_CHECK_MODULES(GTHREAD, gthread-2.0 >= 2.10, dummy=yes, dummy=no)
++AC_SUBST(GTHREAD_CFLAGS)
++AC_SUBST(GTHREAD_LIBS)
++
+ AC_ARG_BLUEZ
+
+ AC_OUTPUT(Makefile compat/Makefile common/Makefile applet/Makefile properties/Makefile sendto/Makefile wizard/Makefile proximity/Makefile po/Makefile.in)
+Index: git/applet/Makefile.am
+===================================================================
+--- git.orig/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100
++++ git/applet/Makefile.am 2007-07-17 17:25:52.000000000 +0100
+@@ -4,12 +4,12 @@
+ bluetooth_applet_SOURCES = main.c
+
+ bluetooth_applet_LDADD = $(top_builddir)/compat/libcompat.a $(top_builddir)/common/libcommon.a \
+- @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++ @NOTIFY_LIBS@ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+
+ nodist_bluetooth_applet_SOURCES = $(top_builddir)/common/passkey-agent-glue.h \
+ $(top_builddir)/common/auth-agent-glue.h
+
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @NOTIFY_CFLAGS@ @GTHREAD_CFLAGS@ -DSYSCONFDIR=\"$(sysconfdir)\"
+
+ INCLUDES = -I$(top_builddir)/common -I$(top_srcdir)/compat
+
+Index: git/properties/Makefile.am
+===================================================================
+--- git.orig/properties/Makefile.am 2007-07-17 17:28:11.000000000 +0100
++++ git/properties/Makefile.am 2007-07-17 17:28:44.000000000 +0100
+@@ -4,9 +4,9 @@
+ bluetooth_properties_SOURCES = main.c
+
+ bluetooth_properties_LDADD = $(top_builddir)/common/libcommon.a \
+- @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@
++ @GCONF_LIBS@ @GTK_LIBS@ @HAL_LIBS@ @DBUS_LIBS@ @GTHREAD_LIBS@
+
+-AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@
++AM_CFLAGS = @DBUS_CFLAGS@ @HAL_CFLAGS@ @GTK_CFLAGS@ @GCONF_CFLAGS@ @GTHREAD_CFLAGS@
+
+ INCLUDES = -I$(top_srcdir)/common
+
#
# mt diff -r9d4814a9341ee6a1b96dfdcd86607d26eb6050f1 -r64298b1eccb4cb0a71eec967d40f9b07077b3e4f
#
#
#
# add_file "packages/coreutils/coreutils-5.3.0/futimens.patch"
# content [8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86]
#
# patch "conf/distro/angstrom-2007.1.conf"
# from [4f1751db4fd4753a555b5926606037d8cd0d71dc]
# to [bc35278cf8c5d44e6ab31bce0f0b305c606887ef]
#
# patch "packages/coreutils/coreutils_5.3.0.bb"
# from [e3c222c8a27658bb6f3092680fe67a444fd60c47]
# to [2223f1c92c49c889593d31301609cfa7d888d1cb]
#
# patch "packages/gstreamer/gst-plugins-base_0.10.12.bb"
# from [869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38]
# to [42b568147310d58a2ca061df2db79c873973b472]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [b5c6d74044d20fbe2710fadff21c3676d6f43b87]
# to [a8284b7deef4a1ca0d5158e8652e7e712758cba6]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [cd42cd7f0ae55e16a0c08e5c2c504eafebdf97a6]
# to [82877749c15b87c3894f9a82392b7125e7091e16]
#
============================================================
--- packages/coreutils/coreutils-5.3.0/futimens.patch 8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
+++ packages/coreutils/coreutils-5.3.0/futimens.patch 8b0fd4cbd9f8b4c19f8690c6a0df9844f864da86
@@ -0,0 +1,44 @@
+Index: coreutils-5.3.0/lib/utimens.c
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.c 2005-01-03 22:19:15.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.c 2007-07-01 19:12:32.000000000 +0000
+@@ -55,8 +55,8 @@
+ If TIMESPEC is null, set the time stamps to the current time. */
+
+ int
+-futimens (int fd ATTRIBUTE_UNUSED,
+- char const *file, struct timespec const timespec[2])
++gl_futimens (int fd ATTRIBUTE_UNUSED,
++ char const *file, struct timespec const timespec[2])
+ {
+ /* There's currently no interface to set file timestamps with
+ nanosecond resolution, so do the best we can, discarding any
+@@ -117,5 +117,5 @@
+ int
+ utimens (char const *file, struct timespec const timespec[2])
+ {
+- return futimens (-1, file, timespec);
++ return gl_futimens (-1, file, timespec);
+ }
+Index: coreutils-5.3.0/lib/utimens.h
+===================================================================
+--- coreutils-5.3.0.orig/lib/utimens.h 2004-11-23 20:54:33.000000000 +0000
++++ coreutils-5.3.0/lib/utimens.h 2007-07-01 19:12:37.000000000 +0000
+@@ -1,3 +1,3 @@
+ #include "timespec.h"
+-int futimens (int, char const *, struct timespec const [2]);
++int gl_futimens (int, char const *, struct timespec const [2]);
+ int utimens (char const *, struct timespec const [2]);
+Index: coreutils-5.3.0/src/touch.c
+===================================================================
+--- coreutils-5.3.0.orig/src/touch.c 2004-11-23 20:54:35.000000000 +0000
++++ coreutils-5.3.0/src/touch.c 2007-07-01 19:11:52.000000000 +0000
+@@ -191,7 +191,7 @@
+ t = timespec;
+ }
+
+- ok = (futimens (fd, file, t) == 0);
++ ok = (gl_futimens (fd, file, t) == 0);
+ if (fd != -1)
+ ok &= (close (fd) == 0);
+
============================================================
--- conf/distro/angstrom-2007.1.conf 4f1751db4fd4753a555b5926606037d8cd0d71dc
+++ conf/distro/angstrom-2007.1.conf bc35278cf8c5d44e6ab31bce0f0b305c606887ef
@@ -128,7 +128,7 @@ PCMCIA_MANAGER = "pcmciautils"
PCMCIA_MANAGER = "pcmciautils"
#Preferred version for the kernel on various machines
-PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh11"
+PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh12"
RDEPENDS_kernel-base_hx4700 = ""
RDEPENDS_kernel-base_htcuniversal = ""
============================================================
--- packages/coreutils/coreutils_5.3.0.bb e3c222c8a27658bb6f3092680fe67a444fd60c47
+++ packages/coreutils/coreutils_5.3.0.bb 2223f1c92c49c889593d31301609cfa7d888d1cb
@@ -1,12 +1,13 @@ require coreutils.inc
require coreutils.inc
-PR = "r1"
+PR = "r2"
SRC_URI = "ftp://alpha.gnu.org/gnu/coreutils/coreutils-${PV}.tar.bz2 \
file://install-cross.patch;patch=1;pnum=0 \
file://man.patch;patch=1 \
file://rename-tee-for-glibc2.5.patch;patch=1 \
- file://uptime-pow-lib.patch;patch=1"
+ file://uptime-pow-lib.patch;patch=1 \
+ file://futimens.patch;patch=1"
# [ gets a special treatment and is not included in this
bindir_progs = "basename cksum comm csplit cut dir dircolors dirname du \
============================================================
--- packages/gstreamer/gst-plugins-base_0.10.12.bb 869ff5fd4c0a0a6c0be50c18079d9aaaa40ceb38
+++ packages/gstreamer/gst-plugins-base_0.10.12.bb 42b568147310d58a2ca061df2db79c873973b472
@@ -1,5 +1,12 @@ PROVIDES += "gst-plugins"
require gst-plugins.inc
PROVIDES += "gst-plugins"
-PR = "r1"
+# gst-plugins-base only builds the alsa plugin
+# if alsa has been built and is present. You will
+# not get an error if this is not present, just
+# a missing alsa plugin
+DEPENDS += "alsa-lib"
+
+PR = "r2"
+
============================================================
--- packages/qte/qte-common_2.3.10.inc b5c6d74044d20fbe2710fadff21c3676d6f43b87
+++ packages/qte/qte-common_2.3.10.inc a8284b7deef4a1ca0d5158e8652e7e712758cba6
@@ -117,13 +117,13 @@ EXTRA_DEFINES_palmz72 = "-DQT_QWS_TSLIB
EXTRA_DEFINES_palmt650 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_palmtx = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
EXTRA_DEFINES_palmz72 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ"
-EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD -DQT_QWS_DEVFS"
+EXTRA_DEFINES_simpad = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_SIMPAD"
EXTRA_DEFINES_c7x0 = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700"
EXTRA_DEFINES_spitz = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
EXTRA_DEFINES_akita = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SLC700 -DQT_QWS_SLCXK"
EXTRA_DEFINES_collie = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
EXTRA_DEFINES_poodle = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
-EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX -DQT_QWS_SL6000"
+EXTRA_DEFINES_tosa = "-DQT_QWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX"
#
# don't touch anything below here
============================================================
--- packages/qte/qte-mt_2.3.10.bb cd42cd7f0ae55e16a0c08e5c2c504eafebdf97a6
+++ packages/qte/qte-mt_2.3.10.bb 82877749c15b87c3894f9a82392b7125e7091e16
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r19"
+PR = "r20"
EXTRA_OECONF += "-thread"
More information about the Openembedded-commits
mailing list