summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/angstrom-2006.9.conf5
-rw-r--r--packages/e17/e-modules_20060128.bb17
-rw-r--r--packages/efl/ecore.inc2
-rw-r--r--packages/efl/emotion_20060501.bb (renamed from packages/efl/emotion_0.0.1.004.bb)7
-rw-r--r--packages/efl/engrave_20060128.bb17
-rw-r--r--packages/efl/esmart.inc2
-rw-r--r--packages/efl/evas.inc2
-rw-r--r--packages/efl/ewl/ecore-flags.patch146
-rw-r--r--packages/efl/ewl/fix-ecore.patch11
-rw-r--r--packages/efl/ewl_0.0.4.007.bb19
-rw-r--r--packages/htb-init/htb-init_0.8.5.bb2
-rw-r--r--packages/intltool/intltool-native_0.35.0.bb4
-rw-r--r--packages/intltool/intltool_0.35.0.bb12
-rw-r--r--packages/miau/miau_0.5.3.bb2
-rw-r--r--packages/netcat/netcat_0.7.1.bb3
-rw-r--r--packages/wireless-tools/wireless-tools_26.bb2
-rw-r--r--packages/wireless-tools/wireless-tools_27.bb2
17 files changed, 64 insertions, 191 deletions
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index 9b03d70219..58d6c2ad38 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -25,6 +25,9 @@ FEED_URIS += " \
SRCDATE = "20060425"
SRCDATE_handhelds-pxa-2.6 = "20060506"
+CVS_TARBALL_STASH = "\
+http://ewi546.ewi.utwente.nl/mirror/www.openzaurus.org/official/unstable/3.5.4/sources/ \
+http://www.oesources.org/source/current/"
# Opie
#use 1337 mt version of opie to have a webbrowser
@@ -83,7 +86,7 @@ PREFERRED_VERSION_glibc-intermediate ?= "2.4"
PREFERRED_VERSION_orinoco-modules_h3600 = "0.13e"
PREFERRED_VERSION_orinoco-modules_h3900 = "0.13e"
PREFERRED_VERSION_dbus ?= "0.61"
-PREFERRED_VERSION_gstreamer ?= "0.10.5"
+PREFERRED_VERSION_gstreamer ?= "0.10.6"
PREFERRED_PROVIDER_hostap-conf ?= "hostap-conf"
PREFERRED_PROVIDER_hostap-modules_h2200 ?= "hostap-modules"
diff --git a/packages/e17/e-modules_20060128.bb b/packages/e17/e-modules_20060128.bb
deleted file mode 100644
index 85929a6967..0000000000
--- a/packages/e17/e-modules_20060128.bb
+++ /dev/null
@@ -1,17 +0,0 @@
-DESCRIPTION = "Enlightenment Window Manager Extra Modules"
-DEPENDS = "ecore-x11 evas-x11 esmart-x11 edje eet e"
-LICENSE = "MIT"
-PR = "r1"
-
-inherit e
-
-SRC_URI = "${E_CVS};module=e17/apps/e_modules;date=${PV}"
-S = "${WORKDIR}/e_modules"
-
-EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR}/edje_cc"
-
-FILES_${PN} = "${bindir}/* ${libdir}/* ${datadir}"
-
-do_compile_prepend() {
- find ${S} -name Makefile | xargs sed -i 's:/usr/include:${STAGING_INCDIR}:'
-} \ No newline at end of file
diff --git a/packages/efl/ecore.inc b/packages/efl/ecore.inc
index 3e7b5299ea..cea3114dc7 100644
--- a/packages/efl/ecore.inc
+++ b/packages/efl/ecore.inc
@@ -12,7 +12,7 @@ inherit efl
SRC_URI = "http://enlightenment.freedesktop.org/files/ecore-${PV}.tar.gz \
file://configure.patch;patch=1 \
file://fix-tslib-configure.patch;patch=1 \
- cvs://anonymous@thinktux.net/root;module=e17/libs/ecore/m4;date=20060101"
+ ${E_CVS};module=e17/libs/ecore/m4;date=20060101"
S = "${WORKDIR}/ecore-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/ecore"
diff --git a/packages/efl/emotion_0.0.1.004.bb b/packages/efl/emotion_20060501.bb
index 886f0e8b3f..c6a0b7b8e0 100644
--- a/packages/efl/emotion_0.0.1.004.bb
+++ b/packages/efl/emotion_20060501.bb
@@ -1,13 +1,18 @@
DESCRIPTION = "Emotion is a multimedia library based on libxine"
LICENSE = "MIT"
DEPENDS = "eet virtual/evas edje virtual/ecore embryo virtual/libxine"
-RDEPENDS += "libemotion-themes libemotion-plugins"
+#RPROVIDES += "emotion-themes emotion-plugins"
+RDEPENDS += "emotion-themes emotion-plugins"
+
PR = "r2"
#FIXME: Needs patch not to build the examples when building against ecore-fb, because the examples depend on ecore-x11
inherit efl
+SRC_URI = "${E_CVS};module=e17/libs/emotion;date=${PV}"
+S = "${WORKDIR}/emotion"
+
PACKAGES += "emotion-plugins"
FILES_emotion-plugins = "${libdir}/xine/plugins/1.1.0/*.so ${libdir}/emotion/*.so"
diff --git a/packages/efl/engrave_20060128.bb b/packages/efl/engrave_20060128.bb
new file mode 100644
index 0000000000..63eb24eb1f
--- /dev/null
+++ b/packages/efl/engrave_20060128.bb
@@ -0,0 +1,17 @@
+DESCRIPTION = "Engrave is an Edje Editing Library"
+LICENSE = "MIT"
+# also requires yacc and lex on host
+DEPENDS = "virtual/evas virtual/ecore"
+
+inherit efl
+
+SRC_URI = "${E_CVS};module=e17/libs/engrave;date=${PV}"
+S = "${WORKDIR}/engrave"
+
+do_stage_append() {
+ for i in src/lib/engrave*.h
+ do
+ install -m 0644 $i ${STAGING_INCDIR}
+ done
+}
+
diff --git a/packages/efl/esmart.inc b/packages/efl/esmart.inc
index b1b82d5ed1..9b8114de53 100644
--- a/packages/efl/esmart.inc
+++ b/packages/efl/esmart.inc
@@ -6,7 +6,7 @@ PROVIDES += "virtual/esmart"
inherit efl
SRC_URI = "http://enlightenment.freedesktop.org/files/esmart-${PV}.tar.gz \
- cvs://anonymous@thinktux.net/root;module=e17/libs/esmart/m4;date=20060101"
+ ${E_CVS};module=e17/libs/esmart/m4;date=20060101"
do_configure_prepend() {
install -d "${S}/m4"
diff --git a/packages/efl/evas.inc b/packages/efl/evas.inc
index 07574daa38..e93803982e 100644
--- a/packages/efl/evas.inc
+++ b/packages/efl/evas.inc
@@ -13,7 +13,7 @@ export FREETYPE_CONFIG = "${STAGING_BINDIR}/freetype-config${@binconfig_suffix(
SRC_URI = "http://enlightenment.freedesktop.org/files/evas-${PV}.tar.gz \
file://fix-configure-${PV}.patch;patch=1 \
- cvs://anonymous@thinktux.net/root;module=e17/libs/evas/m4;date=20060101"
+ ${E_CVS};module=e17/libs/evas/m4;date=20060101"
S = "${WORKDIR}/evas-${PV}"
FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/evas"
diff --git a/packages/efl/ewl/ecore-flags.patch b/packages/efl/ewl/ecore-flags.patch
deleted file mode 100644
index 9c4f5afc78..0000000000
--- a/packages/efl/ewl/ecore-flags.patch
+++ /dev/null
@@ -1,146 +0,0 @@
-diff -Nur ewl-0.0.4.004~/src/lib/ewl_config.c ewl-0.0.4.004/src/lib/ewl_config.c
---- ewl-0.0.4.004~/src/lib/ewl_config.c 2005-09-29 18:02:24.000000000 -0700
-+++ ewl-0.0.4.004/src/lib/ewl_config.c 2005-09-29 18:03:10.000000000 -0700
-@@ -210,8 +210,8 @@
-
- cc = ewl_config_int_get("/ewl/theme/color_classes/count");
- prop = ecore_config_get("/ewl/theme/color_classes/count");
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- for (i = 0; i < cc; i++) {
- char *name;
-@@ -221,8 +221,8 @@
- "/ewl/theme/color_classes/%d/name", i);
- name = ewl_config_str_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- if (name) {
- int r, g, b, a;
-@@ -233,85 +233,85 @@
- "/ewl/theme/color_classes/%d/r", i);
- r = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/g", i);
- g = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/b", i);
- b = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/a", i);
- a = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/r2", i);
- r2 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/g2", i);
- g2 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/b2", i);
- b2 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/a2", i);
- a2 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/r3", i);
- r3 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/g3", i);
- g3 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/b3", i);
- b3 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- snprintf(key, PATH_MAX,
- "/ewl/theme/color_classes/%d/a3", i);
- a3 = ewl_config_int_get(key);
- prop = ecore_config_get(key);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
-
- edje_color_class_set(name, r, g, b, a,
- r2, g2, b2, a2,
-@@ -389,8 +389,8 @@
-
- for(i = 0; keys[i] != NULL; i++) {
- prop = ecore_config_get(keys[i]);
-- prop->flags &= ~PF_MODIFIED;
-- prop->flags |= PF_SYSTEM;
-+ prop->flags &= ~ECORE_CONFIG_FLAG_MODIFIED;
-+ prop->flags |= ECORE_CONFIG_FLAG_SYSTEM;
- }
-
- ecore_config_listen("ewl_debug_enable", "/ewl/debug/enable",
diff --git a/packages/efl/ewl/fix-ecore.patch b/packages/efl/ewl/fix-ecore.patch
deleted file mode 100644
index 7a514a1740..0000000000
--- a/packages/efl/ewl/fix-ecore.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -Nur ewl-0.0.4.004~/src/lib/Ewl.h ewl-0.0.4.004/src/lib/Ewl.h
---- ewl-0.0.4.004~/src/lib/Ewl.h.in 2005-09-29 17:44:59.000000000 -0700
-+++ ewl-0.0.4.004/src/lib/Ewl.h.in 2005-09-29 17:46:57.000000000 -0700
-@@ -257,6 +257,7 @@
- #include <Evas.h>
- #include <Edje.h>
- #include <Ecore.h>
-+#include <Ecore_Data.h>
- #include <Edb.h>
-
- #include <stdio.h>
diff --git a/packages/efl/ewl_0.0.4.007.bb b/packages/efl/ewl_0.0.4.007.bb
index 85b85e0c05..e89b668b93 100644
--- a/packages/efl/ewl_0.0.4.007.bb
+++ b/packages/efl/ewl_0.0.4.007.bb
@@ -1,18 +1,26 @@
DESCRIPTION = "The Enlightened Widget Library, \
a simple-to-use general purpose widget library based on the enlightenment foundation libraries."
# as of recent CVS HEAD, ewl no longer needs etox and no longer needs edb
-DEPENDS = "edb virtual/evas virtual/ecore edje emotion"
-RDEPENDS += "libewl-themes"
+DEPENDS = "edb virtual/evas virtual/ecore edje"
+# emotion
+RDEPENDS += "ewl-themes"
LICENSE = "MIT"
PR = "r1"
inherit efl
SRC_URI += "file://ewl-configure.patch;patch=1 \
- file://fix-ecore.patch;patch=1 \
- file://ecore-flags.patch;patch=1 \
file://no-examples.patch;patch=1 \
- file://minmax.patch;patch=1"
+ file://minmax.patch;patch=1 \
+ ${E_CVS};module=e17/libs/evas/m4;date=20060501"
+
+do_configure_prepend() {
+ if [ -e "${WORKDIR}/m4" ]; then
+ install -d "${S}/m4"
+ install "${WORKDIR}/m4/"*.m4 "${S}/m4"
+ aclocal -I m4
+ fi
+}
do_stage_append() {
for i in src/lib/ewl_*.h
@@ -20,4 +28,3 @@ do_stage_append() {
install -m 0644 $i ${STAGING_INCDIR}
done
}
-
diff --git a/packages/htb-init/htb-init_0.8.5.bb b/packages/htb-init/htb-init_0.8.5.bb
index f0f79ba6ed..c7fdbed80f 100644
--- a/packages/htb-init/htb-init_0.8.5.bb
+++ b/packages/htb-init/htb-init_0.8.5.bb
@@ -4,7 +4,7 @@ MAINTAINER = "Bruno Randolf <bruno.randolf@4g-systems.biz>"
LICENSE = "GPL"
PR = "r1"
-SRC_URI = "http://aleron.dl.sourceforge.net/sourceforge/htbinit/htb.init-v${PV} \
+SRC_URI = "${SOURCEFORGE_MIRROR}/htbinit/htb.init-v${PV} \
file://htb.init+ingress+predef+verbose.diff;patch=1;pnum=0 \
file://htb-basic-verbose.diff;patch=1;pnum=0"
RRECOMMENDS = "kernel-module-sch-ingress kernel-module-cls-route kernel-module-cls-u32 kernel-module-cls-fw kernel-module-sch-sfq kernel-module-sch-htb"
diff --git a/packages/intltool/intltool-native_0.35.0.bb b/packages/intltool/intltool-native_0.35.0.bb
new file mode 100644
index 0000000000..f200d26dd1
--- /dev/null
+++ b/packages/intltool/intltool-native_0.35.0.bb
@@ -0,0 +1,4 @@
+SECTION = "devel"
+include intltool_${PV}.bb
+inherit native
+DEPENDS = "libxml-parser-perl-native"
diff --git a/packages/intltool/intltool_0.35.0.bb b/packages/intltool/intltool_0.35.0.bb
new file mode 100644
index 0000000000..7a28fee18a
--- /dev/null
+++ b/packages/intltool/intltool_0.35.0.bb
@@ -0,0 +1,12 @@
+SECTION = "devel"
+DESCRIPTION = "Utility scripts for internationalizing XML"
+LICENSE = "GPL"
+
+SRC_URI = "${GNOME_MIRROR}/intltool/0.35/intltool-${PV}.tar.bz2"
+S = "${WORKDIR}/intltool-${PV}"
+
+inherit autotools pkgconfig
+
+do_stage() {
+ install -m 0644 intltool.m4 ${STAGING_DATADIR}/aclocal/
+}
diff --git a/packages/miau/miau_0.5.3.bb b/packages/miau/miau_0.5.3.bb
index 5644c1141e..4f2b52dfa1 100644
--- a/packages/miau/miau_0.5.3.bb
+++ b/packages/miau/miau_0.5.3.bb
@@ -6,7 +6,7 @@ HOMEPAGE = "http://sf.net/project/miau/"
LICENSE = "GPL"
PR = "r2"
-SRC_URI = "http://aleron.dl.sourceforge.net/sourceforge/miau/miau-${PV}.tar.gz \
+SRC_URI = "${SOURCEFORGE_MIRROR}/miau/miau-${PV}.tar.gz \
file://paths.patch;patch=1 \
file://miau.init"
S = "${WORKDIR}/miau-${PV}"
diff --git a/packages/netcat/netcat_0.7.1.bb b/packages/netcat/netcat_0.7.1.bb
index 65e8785e08..3ed1c3d6c4 100644
--- a/packages/netcat/netcat_0.7.1.bb
+++ b/packages/netcat/netcat_0.7.1.bb
@@ -5,7 +5,6 @@ MAINTAINER = "Justin Patrin <papercrane@reversefold.com>"
SECTION = "console/networking"
PR = "r1"
-# Note: ${SOURCEFORGE_MIRROR} wasn't working
-SRC_URI = "http://osdn.dl.sourceforge.net/sourceforge/netcat/netcat-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/netcat/netcat-${PV}.tar.bz2"
inherit autotools
diff --git a/packages/wireless-tools/wireless-tools_26.bb b/packages/wireless-tools/wireless-tools_26.bb
index f0f29bf608..6dd54a8773 100644
--- a/packages/wireless-tools/wireless-tools_26.bb
+++ b/packages/wireless-tools/wireless-tools_26.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
PR = "r6"
-SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
+SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
file://man.patch;patch=1 \
file://wireless-tools.if-pre-up"
S = "${WORKDIR}/wireless_tools.${PV}"
diff --git a/packages/wireless-tools/wireless-tools_27.bb b/packages/wireless-tools/wireless-tools_27.bb
index e40c788e92..c3d654b0c9 100644
--- a/packages/wireless-tools/wireless-tools_27.bb
+++ b/packages/wireless-tools/wireless-tools_27.bb
@@ -7,7 +7,7 @@ MAINTAINER = "Michael 'Mickey' Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
PR = "r1"
-SRC_URI = "http://pcmcia-cs.sourceforge.net/ftp/contrib/wireless_tools.${PV}.tar.gz \
+SRC_URI = "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.${PV}.tar.gz \
file://man.patch;patch=1 \
file://fixheaders.patch;patch=1 \
file://wireless-tools.if-pre-up"