[oe-commits] org.oe.dev merge of 'ace7ee05b32c937d9f796b47ec02fd555802e032'

hrw commit openembedded-commits at lists.openembedded.org
Sun Nov 4 14:57:22 UTC 2007 

merge of 'ace7ee05b32c937d9f796b47ec02fd555802e032'
     and 'bea514a9446c6b1f4c44cd730bcb2c6daa5e0f7b'

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: a1273a9d2b8cdba9fe6e70ff52e597acf23f073c
ViewMTN: http://monotone.openembedded.org/revision/info/a1273a9d2b8cdba9fe6e70ff52e597acf23f073c
Files:
1
packages/alsa/files/alsa-utils-automake.patch
conf/distro/angstrom-2007.1.conf
conf/distro/include/angstrom-2007-preferred-versions.inc
packages/alsa/alsa-utils_1.0.14.bb
packages/alsa/alsa-utils_1.0.15.bb
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -race7ee05b32c937d9f796b47ec02fd555802e032 -ra1273a9d2b8cdba9fe6e70ff52e597acf23f073c
#
# 
# 
# add_file "packages/alsa/files/alsa-utils-automake.patch"
#  content [37fbab1c2566ec662238172c8583acb1a8607aed]
# 
# patch "conf/distro/angstrom-2007.1.conf"
#  from [049fc2b41b1cdbb5c3fac1992eaa84cf2757f201]
#    to [5d6ed6b4b601b39ffd196b48f39254620f34fc34]
# 
# patch "conf/distro/include/angstrom-2007-preferred-versions.inc"
#  from [c758ebcd1f9fc1a757ac3f4ee5a8678f23923052]
#    to [b92f785bc1074bbab9c6a72a360b8ce4486976cb]
# 
# patch "packages/alsa/alsa-utils_1.0.14.bb"
#  from [a96036a12ca994ce724e4448bb897a719e94a500]
#    to [3f79d74810eb9752baa58c59f1cbdc0a063b8234]
# 
# patch "packages/alsa/alsa-utils_1.0.15.bb"
#  from [a96036a12ca994ce724e4448bb897a719e94a500]
#    to [3a99134436899036704a68ba86516fb1494bf0fc]
# 
============================================================
--- packages/alsa/files/alsa-utils-automake.patch	37fbab1c2566ec662238172c8583acb1a8607aed
+++ packages/alsa/files/alsa-utils-automake.patch	37fbab1c2566ec662238172c8583acb1a8607aed
@@ -0,0 +1,10 @@
+Index: alsa-utils-1.0.14/seq/aseqnet/Makefile.am
+===================================================================
+--- alsa-utils-1.0.14.orig/seq/aseqnet/Makefile.am	2007-05-31 10:07:21.000000000 +0200
++++ alsa-utils-1.0.14/seq/aseqnet/Makefile.am	2007-10-31 21:11:41.000000000 +0100
+@@ -3,4 +3,5 @@
+ 
+ bin_PROGRAMS = aseqnet
+ aseqnet_SOURCES = aseqnet.c
++aseqnet_LDADD = $(INTLLIBS)
+ man_MANS = aseqnet.1
============================================================
--- conf/distro/angstrom-2007.1.conf	049fc2b41b1cdbb5c3fac1992eaa84cf2757f201
+++ conf/distro/angstrom-2007.1.conf	5d6ed6b4b601b39ffd196b48f39254620f34fc34
@@ -58,26 +58,6 @@ RDEPENDS_kernel-base_htcuniversal = ""
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
-# Needed for crappy ipaqs with broken hostap in the kernel
-PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
-PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
-
-PREFERRED_VERSION_file         = "4.18"
-PREFERRED_VERSION_file_native  = "4.18"
-
-PREFERRED_VERSION_fontconfig       = "2.4.1"
-PREFERRED_VERSION_freetype         = "2.3.4"
-PREFERRED_VERSION_freetype-native  = "2.2.1"
-PREFERRED_VERSION_cairo            = "1.4.10"
-PREFERRED_VERSION_glib-2.0         = "2.12.12"
-PREFERRED_VERSION_pango            = "1.16.4"
-PREFERRED_VERSION_atk              = "1.20.0"
-PREFERRED_VERSION_gtk+             = "2.10.14"
-
-# newer poppler cvs breaks some apps, fix until popper 6 and apps
-# catch up with api changes
-# PREFERRED_VERSION_poppler          = "0.5.4"
-
 # older gtk-webcore releases don't work on ARM/EABI
 # We need to switch to a fixed SRCDATE or release as soon as possible 
 PREFERRED_VERSION_osb-browser      = "0.5.0+svn${SRCDATE}"
@@ -91,14 +71,10 @@ PREFERRED_PROVIDER_xserver          ?= "
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
 
-PREFERRED_VERSION_xserver-kdrive    ?= "1.3.0.0"
 PREFERRED_VERSION_libxrandr         ?= "1.2.1"
 PREFERRED_VERSION_xrandr            ?= "1.2.0" 
 PREFERRED_VERSION_randrproto        ?= "1.2.1"
 
-PREFERRED_VERSION_libgnomeui         = "2.18.1"
-PREFERRED_VERSION_prismstumbler      = "0.7.3"
-
 #use EABI ready toolchain
 PREFERRED_VERSION_gcc               ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross         ?= "4.1.2"
@@ -149,13 +125,6 @@ PREFERRED_VERSION_glibc-initial ?= "2.5"
 # PREFERRED_VERSION_gcc-cross = "3.4.4+csl-arm-2005q3"
 # PREFERRED_VERSION_gcc-cross-initial = "3.4.4+csl-arm-2005q3"
 
-
-# Busybox <1.1.0 doesn't have EABI support
-PREFERRED_VERSION_busybox = "1.2.1"
-
-PREFERRED_VERSION_dbus ?= "1.0.2"
-PREFERRED_VERSION_dbus-glib ?= "0.74"
-
 #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
 require conf/distro/include/preferred-gpe-versions-2.8.inc
 require conf/distro/include/preferred-e-versions.inc
============================================================
--- conf/distro/include/angstrom-2007-preferred-versions.inc	c758ebcd1f9fc1a757ac3f4ee5a8678f23923052
+++ conf/distro/include/angstrom-2007-preferred-versions.inc	b92f785bc1074bbab9c6a72a360b8ce4486976cb
@@ -620,6 +620,7 @@ PREFERRED_VERSION_gthumb ?= "2.6.9"
 PREFERRED_VERSION_gst-plugins-ugly ?= "0.10.6"
 PREFERRED_VERSION_gstreamer ?= "0.10.14"
 PREFERRED_VERSION_gthumb ?= "2.6.9"
+PREFERRED_VERSION_gtk+ ?= "2.10.14"
 PREFERRED_VERSION_gtk-clearlooks-engine ?= "0.6.2"
 PREFERRED_VERSION_gtk-doc ?= "1.0"
 PREFERRED_VERSION_gtk-doc-native ?= "1.0"
@@ -2086,7 +2087,7 @@ PREFERRED_VERSION_xserver-common ?= "1.1
 PREFERRED_VERSION_xscreensaver ?= "4.22"
 PREFERRED_VERSION_xscrnsaverh ?= "1.0"
 PREFERRED_VERSION_xserver-common ?= "1.18"
-PREFERRED_VERSION_xserver-kdrive ?= "1.4"
+PREFERRED_VERSION_xserver-kdrive    ?= "1.3.0.0"
 PREFERRED_VERSION_xserver-kdrive-common ?= "0.1"
 PREFERRED_VERSION_xserver-nodm-init ?= "1.0"
 PREFERRED_VERSION_xserver-xorg ?= "1.3.0.0"
============================================================
--- packages/alsa/alsa-utils_1.0.14.bb	a96036a12ca994ce724e4448bb897a719e94a500
+++ packages/alsa/alsa-utils_1.0.14.bb	3f79d74810eb9752baa58c59f1cbdc0a063b8234
@@ -1,18 +1,13 @@ DEPENDS = "alsa-lib ncurses"
 DESCRIPTION = "ALSA Utilities"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
-
-# lazy hack. needs proper fixing in gettext.m4, see
-# http://bugs.openembedded.org/show_bug.cgi?id=2348
-# please close bug and remove this comment when properly fixed
-#
-EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
-
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+	   file://alsa-utils-automake.patch;patch=1 \
+	  "
 inherit autotools
 
 # This are all packages that we need to make. Also, the now empty alsa-utils
============================================================
--- packages/alsa/alsa-utils_1.0.15.bb	a96036a12ca994ce724e4448bb897a719e94a500
+++ packages/alsa/alsa-utils_1.0.15.bb	3a99134436899036704a68ba86516fb1494bf0fc
@@ -1,18 +1,14 @@ DEPENDS = "alsa-lib ncurses"
 DESCRIPTION = "ALSA Utilities"
 HOMEPAGE = "http://www.alsa-project.org"
 SECTION = "console/utils"
 LICENSE = "GPL"
 DEPENDS = "alsa-lib ncurses"
+PR = "r1"
 
-SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.alsa-project.org/pub/utils/alsa-utils-${PV}.tar.bz2 \
+           file://alsa-utils-automake.patch;patch=1 \
+	  "
 
-# lazy hack. needs proper fixing in gettext.m4, see
-# http://bugs.openembedded.org/show_bug.cgi?id=2348
-# please close bug and remove this comment when properly fixed
-#
-EXTRA_OECONF_linux-uclibc = "--disable-nls"
-EXTRA_OECONF_linux-uclibcgnueabi = "--disable-nls"
-
 inherit autotools
 
 # This are all packages that we need to make. Also, the now empty alsa-utils


#
# mt diff -rbea514a9446c6b1f4c44cd730bcb2c6daa5e0f7b -ra1273a9d2b8cdba9fe6e70ff52e597acf23f073c
#
# 
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [4cccc462178d50332e2bc4a32a7176a7f9cb5a07]
#    to [aeb878a6ba9cbff6b25dd706669b4071e11f3214]
# 
============================================================
--- conf/distro/include/sane-srcrevs.inc	4cccc462178d50332e2bc4a32a7176a7f9cb5a07
+++ conf/distro/include/sane-srcrevs.inc	aeb878a6ba9cbff6b25dd706669b4071e11f3214
@@ -42,7 +42,7 @@ SRCREV_pn-maemo-mapper ?= "108"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-maemo-mapper ?= "108"
-SRCREV_pn-matchbox-desktop-2 ?= "1649"
+SRCREV_pn-matchbox-desktop-2 ?= "1778"
 SRCREV_pn-matchbox-keyboard ?= "1739"
 SRCREV_pn-matchbox-keyboard-inputmethod ?= "1739"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
@@ -65,7 +65,7 @@ SRCREV_pn-openmoko-dates ?= "467"
 SRCREV_pn-openmoko-contacts ?= "2298"
 SRCREV_pn-openmoko-contacts2 ?= "358"
 SRCREV_pn-openmoko-dates ?= "467"
-SRCREV_pn-openmoko-dates2 ?= "658"
+SRCREV_pn-openmoko-dates2 ?= "659"
 SRCREV_pn-openmoko-dialer ?= "2811"
 SRCREV_pn-openmoko-dialer2 ?= "3298"
 SRCREV_pn-openmoko-feedreader2 ?= "3080"
@@ -102,7 +102,7 @@ SRCREV_pn-openmoko-today ?= "3056"
 SRCREV_pn-openmoko-theme-standard2 ?= "3289"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3289"
 SRCREV_pn-openmoko-today ?= "3056"
-SRCREV_pn-openmoko-today2 ?= "3287"
+SRCREV_pn-openmoko-today2 ?= "3342"
 SRCREV_pn-openmoko-today2-folders ?= "2680"
 SRCREV_pn-openmoko-worldclock2 ?= "3301"
 SRCREV_pn-openocd ?= "206"

More information about the Openembedded-commits mailing list