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

[mickeyl commit]

merge of 'bdcb6216662449a5df98e3180f1fafcd2fb13858'
     and 'ccee86b315f75cb78aaeb21eeb14a0b85ad9dec9'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 4f9b07a5e7bd097ff0b8bc2cb95bcae248ba7f81
ViewMTN: http://monotone.openembedded.org/revision/info/4f9b07a5e7bd097ff0b8bc2cb95bcae248ba7f81
Files:
1
packages/alsa/alsa-state/asoundrc
packages/alsa/alsa-state.bb
packages/gpicview
packages/gpicview/gpicview_0.1.5.bb
packages/meta/meta-sdk-gpe.bb
packages/meta/meta-sdk-sbox-gpe.bb
packages/meta/meta-sdk-sbox.bb
packages/meta/meta-sdk.bb
Diffs:

#
# mt diff -rbdcb6216662449a5df98e3180f1fafcd2fb13858 -r4f9b07a5e7bd097ff0b8bc2cb95bcae248ba7f81
#
# 
# 
# add_file "packages/alsa/alsa-state/asoundrc"
#  content [b43d47be2ff32313c7616db36eb8999e6702492f]
# 
# patch "packages/alsa/alsa-state.bb"
#  from [fccf05313122b3efcff06e12d6028c79070b3f7b]
#    to [69fceb77079fc74157e916309a95f6d27dc0998e]
# 
============================================================
--- packages/alsa/alsa-state/asoundrc	b43d47be2ff32313c7616db36eb8999e6702492f
+++ packages/alsa/alsa-state/asoundrc	b43d47be2ff32313c7616db36eb8999e6702492f
@@ -0,0 +1,12 @@
+#
+# simple dmix configuration
+#
+pcm.dsp0 {
+    type plug
+    slave.pcm "dmix"
+}
+
+ctl.mixer0 {
+    type hw
+    card 0
+}
============================================================
--- packages/alsa/alsa-state.bb	fccf05313122b3efcff06e12d6028c79070b3f7b
+++ packages/alsa/alsa-state.bb	69fceb77079fc74157e916309a95f6d27dc0998e
@@ -1,20 +1,19 @@
-#! /bin/sh
-#
 # Copyright Matthias Hentges <devel at hentges.net> (c) 2007
 # License: MIT (see http://www.opensource.org/licenses/mit-license.php
 #               for a copy of the license)
 #
 # Filename: alsa-state.bb
-# Date: 20070308 (YMD)
 
 DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
-PV = "0.0.4"
-PR = "r3"
+PV = "0.1.0"
+PR = "r0"
 
-SRC_URI = "file://asound.state \
-           file://alsa-state "
+SRC_URI = " \
+  file://asoundrc \
+  file://asound.state \
+  file://alsa-state "
 
 SRC_URI_append_fic-gta01 = " \
   file://capturehandset.state \
@@ -33,11 +32,12 @@ do_install() {
     install -d ${D}${sysconfdir}/init.d
     install -m 0755 ${WORKDIR}/alsa-state ${D}${sysconfdir}/init.d
 
+	install -m 0644 ${WORKDIR}/asoundrc ${D}${sysconfdir}
 	install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
 }
 
 PACKAGES += "alsa-states"
-FILES_${PN} = "${sysconfdir}/init.d"
+FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
 FILES_alsa-states = "${sysconfdir}/*.state"
 PACKAGE_ARCH_${PN} = "all"
 PACKAGE_ARCH_alsa-states = "${MACHINE}"


#
# mt diff -rccee86b315f75cb78aaeb21eeb14a0b85ad9dec9 -r4f9b07a5e7bd097ff0b8bc2cb95bcae248ba7f81
#
# 
# 
# add_dir "packages/gpicview"
# 
# add_file "packages/gpicview/gpicview_0.1.5.bb"
#  content [09a9f64c3af2522abb34e45b8dcd531c006a04da]
# 
# patch "packages/meta/meta-sdk-gpe.bb"
#  from [911556373f204b869c56247be3aa3b40fc1f128a]
#    to [168bac5c253cc509f7e5e8bee4a82abf222085ee]
# 
# patch "packages/meta/meta-sdk-sbox-gpe.bb"
#  from [6218cc413965307bc4cf9a63945a77f67968bb4a]
#    to [1b0cb4d51ce5392de802c3b9c5a87960b14c922b]
# 
# patch "packages/meta/meta-sdk-sbox.bb"
#  from [5c6d37e9c25484ea705abaf57c0939c4a39fb6f5]
#    to [1f8cd04d3ac676d97cd8d6bdd4c2fa55ce125e11]
# 
# patch "packages/meta/meta-sdk.bb"
#  from [807b4b0871d6078e260e5f860e81d01c4d38a7b1]
#    to [b2faf69ae5af220743ae4e02e79cd929a649518e]
# 
============================================================
--- packages/gpicview/gpicview_0.1.5.bb	09a9f64c3af2522abb34e45b8dcd531c006a04da
+++ packages/gpicview/gpicview_0.1.5.bb	09a9f64c3af2522abb34e45b8dcd531c006a04da
@@ -0,0 +1,10 @@
+DESCRIPTION = "Extremely lightweight and fast with low memory usage"
+LICENSE = "GPL"
+
+DEPENDS = "gtk+"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz"
+
+inherit autotools pkgconfig
+
+
============================================================
--- packages/meta/meta-sdk-gpe.bb	911556373f204b869c56247be3aa3b40fc1f128a
+++ packages/meta/meta-sdk-gpe.bb	168bac5c253cc509f7e5e8bee4a82abf222085ee
@@ -26,16 +26,11 @@ RDEPENDS = "${TARGET_INSTALL} ${HOST_INS
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-sdk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        sdk_ipk_do_indexes
-        set +ex
-}
+do_populate_sdk() {
+	set -ex
+	package_update_index_ipk
+	set +ex
 
-do_populate_sdk() {
-        sdk_do_indexes
- 
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
============================================================
--- packages/meta/meta-sdk-sbox-gpe.bb	6218cc413965307bc4cf9a63945a77f67968bb4a
+++ packages/meta/meta-sdk-sbox-gpe.bb	1b0cb4d51ce5392de802c3b9c5a87960b14c922b
@@ -29,11 +29,10 @@ do_populate_sdk() {
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
 do_populate_sdk() {
+	set -ex
+	package_update_index_ipk
+	set +ex
 
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
-
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
============================================================
--- packages/meta/meta-sdk-sbox.bb	5c6d37e9c25484ea705abaf57c0939c4a39fb6f5
+++ packages/meta/meta-sdk-sbox.bb	1f8cd04d3ac676d97cd8d6bdd4c2fa55ce125e11
@@ -25,11 +25,10 @@ do_populate_sdk() {
 IPKG_TARGET = "ipkg-cl -f ${SDK_DIR}/ipkg-target.conf -o ${SDK_OUTPUT}/${prefix}"
 
 do_populate_sdk() {
+	set -ex
+	package_update_index_ipk
+	set +ex
 
-        set -ex
-        rootfs_ipk_do_indexes
-        set +ex
-
 	rm -rf ${SDK_OUTPUT}
 	mkdir -p ${SDK_OUTPUT}
 
============================================================
--- packages/meta/meta-sdk.bb	807b4b0871d6078e260e5f860e81d01c4d38a7b1
+++ packages/meta/meta-sdk.bb	b2faf69ae5af220743ae4e02e79cd929a649518e
@@ -23,15 +23,11 @@ RDEPENDS = "${TARGET_INSTALL} ${HOST_INS
 
 RDEPENDS = "${TARGET_INSTALL} ${HOST_INSTALL}"
 
-sdk_do_indexes () {
-        set -ex
-        rootfs_ipk_do_indexes
-        sdk_ipk_do_indexes
-        set +ex
-}
+do_populate_sdk() {
+	set -ex
+	package_update_index_ipk
+	set +ex
 
-do_populate_sdk() {
-        sdk_do_indexes
         echo "Creating host.conf..."
 
 	rm -rf ${SDK_OUTPUT}