[oe-commits] org.oe.dev merge of '1881f1e08c19772afb57e141b8e9cfe8a3308a4a'
oe commit
oe at amethyst.openembedded.net
Wed Jun 11 16:20:13 UTC 2008
merge of '1881f1e08c19772afb57e141b8e9cfe8a3308a4a'
and '72c0842d7283ea3030501853bf33285caffa427c'
Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 374794f574689cc1c361cad389b3b85f1ab2132d
ViewMTN: http://monotone.openembedded.org/revision/info/374794f574689cc1c361cad389b3b85f1ab2132d
Files:
1
packages/libmikmod/libmikmod/m4.patch
packages/alsa/alsa-plugins_1.0.14.bb
packages/alsa/alsa-plugins_1.0.15.bb
packages/alsa/alsa-state/asoundrc
packages/alsa/alsa-state/asound.conf
packages/libmikmod/libmikmod_3.1.11.bb
packages/libmikmod/libmikmod_3.1.12.bb
classes/rootfs_ipk.bbclass
packages/alsa/alsa-state.bb
packages/images/fso-image.bb
packages/libmikmod/libmikmod_3.2.0-beta2.bb
packages/lighttpd/lighttpd/mod_redirect.c.patch
packages/lighttpd/lighttpd_1.4.18.bb
Diffs:
#
# mt diff -r1881f1e08c19772afb57e141b8e9cfe8a3308a4a -r374794f574689cc1c361cad389b3b85f1ab2132d
#
#
#
# delete "packages/libmikmod/libmikmod/m4.patch"
#
# rename "packages/alsa/alsa-plugins_1.0.14.bb"
# to "packages/alsa/alsa-plugins_1.0.15.bb"
#
# rename "packages/alsa/alsa-state/asoundrc"
# to "packages/alsa/alsa-state/asound.conf"
#
# rename "packages/libmikmod/libmikmod_3.1.11.bb"
# to "packages/libmikmod/libmikmod_3.1.12.bb"
#
# patch "classes/rootfs_ipk.bbclass"
# from [fec211c8f0426463d8bddc084d993099b5bbb2ab]
# to [4868c7b07ffba4569e4140bfb7aa1cb3a238ff74]
#
# patch "packages/alsa/alsa-state/asound.conf"
# from [b43d47be2ff32313c7616db36eb8999e6702492f]
# to [096a5068f2cc45933f48651dbb834ca257a1e6b5]
#
# patch "packages/alsa/alsa-state.bb"
# from [2755260387b08e7fe9dcbb5fd5df106573c7610b]
# to [ba66bef30867fc1131961bc8ae661a9b7e60a504]
#
# patch "packages/images/fso-image.bb"
# from [c50cf7e4a4572279319d5017d5a9a292a317f127]
# to [7304d85db54babe5e9aeb520c3921e41e709de5f]
#
# patch "packages/libmikmod/libmikmod_3.1.12.bb"
# from [22ac0240bd125319780edce8de6522b9186fda28]
# to [84c2cad4907c0ad00df3cf3695aa07c81df6a53e]
#
# patch "packages/libmikmod/libmikmod_3.2.0-beta2.bb"
# from [766583e471cc2d1e9aca9ffd5ce309a420caac56]
# to [785a395fb21c7f6de5c196403abbeed7ae694159]
#
============================================================
--- classes/rootfs_ipk.bbclass fec211c8f0426463d8bddc084d993099b5bbb2ab
+++ classes/rootfs_ipk.bbclass 4868c7b07ffba4569e4140bfb7aa1cb3a238ff74
@@ -20,7 +20,7 @@ fakeroot rootfs_ipk_do_rootfs () {
package_generate_ipkg_conf
mkdir -p ${T}
-
+ mkdir -p ${IMAGE_ROOTFS}${libdir}/opkg/
opkg-cl ${IPKG_ARGS} update
# Uclibc builds don't provide this stuff...
============================================================
--- packages/alsa/alsa-state/asoundrc b43d47be2ff32313c7616db36eb8999e6702492f
+++ packages/alsa/alsa-state/asound.conf 096a5068f2cc45933f48651dbb834ca257a1e6b5
@@ -1,7 +1,6 @@
-#
-# simple dmix configuration
-#
-pcm.dsp0 {
+# default dmix configuration
+
+pcm.!default {
type plug
slave.pcm "dmix"
}
@@ -10,3 +9,4 @@ ctl.mixer0 {
type hw
card 0
}
+
============================================================
--- packages/alsa/alsa-state.bb 2755260387b08e7fe9dcbb5fd5df106573c7610b
+++ packages/alsa/alsa-state.bb ba66bef30867fc1131961bc8ae661a9b7e60a504
@@ -6,18 +6,15 @@ LICENSE = "GPL"
DESCRIPTION = "Default ALSA configuration"
LICENSE = "GPL"
-RRECOMMENDS_alsa-state = "alsa-states"
-RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"
-RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"
PV = "0.1.0"
-PR = "r17"
+PR = "r18"
-SRC_URI = " \
- file://asoundrc \
+SRC_URI = "\
+ file://asound.conf \
file://asound.state \
- file://alsa-state "
+ file://alsa-state \
+"
-
inherit update-rc.d
INITSCRIPT_NAME = "alsa-state"
@@ -27,13 +24,21 @@ 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}/asound.conf ${D}${sysconfdir}
install -m 0644 ${WORKDIR}/*.state ${D}${sysconfdir}
}
PACKAGES += "alsa-states"
-FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asoundrc"
+
+RRECOMMENDS_alsa-state = "alsa-states"
+RRECOMMENDS_${PN}_om-gta01 = "openmoko-alsa-scenarios"
+RRECOMMENDS_${PN}_om-gta02 = "openmoko-alsa-scenarios"
+
+FILES_${PN} = "${sysconfdir}/init.d ${sysconfdir}/asound.conf"
+CONFFILES_${PN} = "${sysconfdir}/asound.conf"
+
FILES_alsa-states = "${sysconfdir}/*.state"
+
PACKAGE_ARCH_${PN} = "all"
PACKAGE_ARCH_alsa-states = "${MACHINE_ARCH}"
@@ -46,4 +51,3 @@ pkg_postinst_${PN}() {
fi
fi
}
-
============================================================
--- packages/images/fso-image.bb c50cf7e4a4572279319d5017d5a9a292a317f127
+++ packages/images/fso-image.bb 7304d85db54babe5e9aeb520c3921e41e709de5f
@@ -37,7 +37,6 @@ TOOLS_INSTALL = "\
# useful command line tools
TOOLS_INSTALL = "\
- alsa-utils-aplay \
# bash \
htop \
mickeyterm \
@@ -49,9 +48,14 @@ AUDIO_INSTALL = "\
# audio
AUDIO_INSTALL = "\
- pulseaudio-meta \
+ alsa-oss \
+ alsa-state \
+ alsa-utils-aplay \
+ gst-meta-audio \
+ gst-plugin-mad \
+ gst-plugin-modplug \
+ gst-plugin-sid \
openmoko-sound-theme-standard2 \
- gst-meta-audio \
"
AUDIO_INSTALL_append_om-gta01 = "\
============================================================
--- packages/libmikmod/libmikmod_3.1.11.bb 22ac0240bd125319780edce8de6522b9186fda28
+++ packages/libmikmod/libmikmod_3.1.12.bb 84c2cad4907c0ad00df3cf3695aa07c81df6a53e
@@ -2,16 +2,26 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \
- file://m4.patch;patch=1 \
- file://autofoo.patch;patch=1"
+PR = "r0"
-inherit autotools
+SRC_URI = "\
+ ${SOURCEFORGE_MIRROR}/mikmod/libmikmod-${PV}.tar.gz \
+ file://autofoo.patch;patch=1 \
+"
-EXTRA_OECONF = "--disable-af --disable-alsa --disable-esd \
---enable-oss --disable-sam9407 --disable-ultra \
---disable-esdtest --enable-threads"
+inherit autotools binconfig
+EXTRA_OECONF = "\
+ --disable-af \
+ --enable-alsa \
+ --disable-esd \
+ --enable-oss \
+ --disable-sam9407 \
+ --disable-ultra \
+ --disable-esdtest \
+ --enable-threads \
+"
+
do_stage() {
oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
install -m 0644 ${S}/include/mikmod.h ${STAGING_INCDIR}/
============================================================
--- packages/libmikmod/libmikmod_3.2.0-beta2.bb 766583e471cc2d1e9aca9ffd5ce309a420caac56
+++ packages/libmikmod/libmikmod_3.2.0-beta2.bb 785a395fb21c7f6de5c196403abbeed7ae694159
@@ -2,20 +2,27 @@ LICENSE = "LGPL"
SECTION = "libs"
PRIORITY = "optional"
LICENSE = "LGPL"
-SRC_URI = "http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \
-file://m4.patch;patch=1 \
-file://autofoo.patch;patch=1"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "\
+ http://mikmod.raphnet.net/files/libmikmod-${PV}.tar.gz \
+ file://m4.patch;patch=1 \
+ file://autofoo.patch;patch=1 \
+"
+
inherit autotools binconfig
-EXTRA_OECONF = "--disable-af \
- --disable-alsa \
- --disable-esd \
- --enable-oss \
- --disable-sam9407 \
- --disable-ultra \
- --disable-esdtest \
- --enable-threads"
+EXTRA_OECONF = "\
+ --disable-af \
+ --enable-alsa \
+ --disable-esd \
+ --enable-oss \
+ --disable-sam9407 \
+ --disable-ultra \
+ --disable-esdtest \
+ --enable-threads \
+"
do_stage() {
oe_libinstall -a -so -C libmikmod libmikmod ${STAGING_LIBDIR}
#
# mt diff -r72c0842d7283ea3030501853bf33285caffa427c -r374794f574689cc1c361cad389b3b85f1ab2132d
#
#
#
# add_file "packages/lighttpd/lighttpd/mod_redirect.c.patch"
# content [72125cb3f78b258d8cc10312b081efda99dc6566]
#
# patch "packages/lighttpd/lighttpd_1.4.18.bb"
# from [632e100a9bf487c1c13ab8a725b547925ad9d3b4]
# to [87bdba70a8b53a9b74d557c0e814401db916a0b8]
#
============================================================
--- packages/lighttpd/lighttpd/mod_redirect.c.patch 72125cb3f78b258d8cc10312b081efda99dc6566
+++ packages/lighttpd/lighttpd/mod_redirect.c.patch 72125cb3f78b258d8cc10312b081efda99dc6566
@@ -0,0 +1,56 @@
+Backport support for url.redirect-code directive from 1.5 branch.
+
+diff -urN lighttpd-1.4.18.orig/src/mod_redirect.c lighttpd-1.4.18/src/mod_redirect.c
+--- lighttpd-1.4.18.orig/src/mod_redirect.c 2007-04-10 09:52:58.000000000 +0200
++++ lighttpd-1.4.18/src/mod_redirect.c 2008-06-11 17:38:50.000000000 +0200
+@@ -16,6 +16,8 @@
+ typedef struct {
+ pcre_keyvalue_buffer *redirect;
+ data_config *context; /* to which apply me */
++
++ unsigned short redirect_code;
+ } plugin_config;
+
+ typedef struct {
+@@ -72,6 +74,7 @@
+
+ config_values_t cv[] = {
+ { "url.redirect", NULL, T_CONFIG_LOCAL, T_CONFIG_SCOPE_CONNECTION }, /* 0 */
++ { "url.redirect-code", NULL, T_CONFIG_SHORT, T_CONFIG_SCOPE_CONNECTION }, /* 1 */
+ { NULL, NULL, T_CONFIG_UNSET, T_CONFIG_SCOPE_UNSET }
+ };
+
+@@ -90,6 +93,7 @@
+ s->redirect = pcre_keyvalue_buffer_init();
+
+ cv[0].destination = s->redirect;
++ cv[1].destination = &(s->redirect_code);
+
+ p->config_storage[i] = s;
+ ca = ((data_config *)srv->config_context->data[i])->value;
+@@ -140,6 +144,7 @@
+ plugin_config *s = p->config_storage[0];
+
+ p->conf.redirect = s->redirect;
++ p->conf.redirect_code = s->redirect_code;
+ p->conf.context = NULL;
+
+ /* skip the first, the global context */
+@@ -157,6 +162,8 @@
+ if (0 == strcmp(du->key->ptr, "url.redirect")) {
+ p->conf.redirect = s->redirect;
+ p->conf.context = dc;
++ } else if (0 == strcmp(du->key->ptr, "url.redirect-code")) {
++ p->conf.redirect_code = s->redirect_code;
+ }
+ }
+ }
+@@ -250,7 +257,7 @@
+
+ response_header_insert(srv, con, CONST_STR_LEN("Location"), CONST_BUF_LEN(p->location));
+
+- con->http_status = 301;
++ con->http_status = p->conf.redirect_code > 99 && p->conf.redirect_code < 1000 ? p->conf.redirect_code : 301;
+ con->file_finished = 1;
+
+ return HANDLER_FINISHED;
============================================================
--- packages/lighttpd/lighttpd_1.4.18.bb 632e100a9bf487c1c13ab8a725b547925ad9d3b4
+++ packages/lighttpd/lighttpd_1.4.18.bb 87bdba70a8b53a9b74d557c0e814401db916a0b8
@@ -2,10 +2,11 @@ DEPENDS = "libpcre"
SECTION = "net"
LICENSE = "BSD"
DEPENDS = "libpcre"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.lighttpd.net/download/lighttpd-${PV}.tar.gz \
file://configure.in.patch;patch=1 \
+ file://mod_redirect.c.patch;patch=1 \
file://src-server.c.patch;patch=1 \
file://index.html \
file://lighttpd.conf \
More information about the Openembedded-commits
mailing list