summaryrefslogtreecommitdiff
path: root/packages/meta
diff options
context:
space:
mode:
Diffstat (limited to 'packages/meta')
-rw-r--r--packages/meta/e-image-core.bb18
-rw-r--r--packages/meta/e-image.bb19
-rw-r--r--packages/meta/meta-e-x11.bb22
-rw-r--r--packages/meta/meta-sdk.bb28
-rw-r--r--packages/meta/openslug-packages.bb1
-rw-r--r--packages/meta/opie-collections.inc19
6 files changed, 64 insertions, 43 deletions
diff --git a/packages/meta/e-image-core.bb b/packages/meta/e-image-core.bb
new file mode 100644
index 0000000000..c7a7630da4
--- /dev/null
+++ b/packages/meta/e-image-core.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager"
+LICENSE = "MIT"
+PR = "r0"
+
+export IMAGE_BASENAME = "e-image-core"
+export IMAGE_LINGUAS = ""
+
+DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/evas = "evas-x11"
+PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
+PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
+PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+
+export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11-core xserver-kdrive-fbdev"
+
+inherit image_ipk
diff --git a/packages/meta/e-image.bb b/packages/meta/e-image.bb
index d58215d3a7..2183674b6f 100644
--- a/packages/meta/e-image.bb
+++ b/packages/meta/e-image.bb
@@ -1,18 +1,7 @@
DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
-LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
-export IMAGE_BASENAME = "e-image"
-export IMAGE_LINGUAS = ""
-
-DEPENDS = "task-bootstrap meta-e-x11 xserver-kdrive"
-
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-PREFERRED_PROVIDER_virtual/evas = "evas-x11"
-PREFERRED_PROVIDER_virtual/ecore = "ecore-x11"
-PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
-PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
+include e-image-core.bb
-export IPKG_INSTALL = "task-bootstrap task-enlightenment-x11 xserver-kdrive-fbdev"
-
-inherit image_ipk
+export IMAGE_BASENAME = "e-image"
+export IPKG_INSTALL += "task-enlightenment-x11" \ No newline at end of file
diff --git a/packages/meta/meta-e-x11.bb b/packages/meta/meta-e-x11.bb
index 4ff955e06b..47bec68cac 100644
--- a/packages/meta/meta-e-x11.bb
+++ b/packages/meta/meta-e-x11.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Meta-package for Enlightenment/X11"
LICENSE = "MIT"
-PACKAGES = "task-enlightenment-x11"
-PR = "r4"
+PACKAGES = "task-enlightenment-x11 task-enlightenment-x11-core"
+PR = "r5"
FEED_URIS += "x11##http://openzaurus.org/official/unstable/3.5.2/feed/x11 \
e##http://openzaurus.org/official/unstable/3.5.2/feed/e"
@@ -11,14 +11,20 @@ ALLOW_EMPTY = 1
#
# X
#
-DEPENDS += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
- ttf-bitstream-vera bash chkhinge"
-RDEPENDS += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
- ttf-bitstream-vera chkhinge"
+DEPENDS_task-enlightenment-x11-core += "diet-x11 rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo fontconfig \
+ ttf-bitstream-vera chkhinge"
+RDEPENDS_task-enlightenment-x11-core += " rxvt-unicode xstroke xtscal xrandr xmodmap xdpyinfo \
+ ttf-bitstream-vera chkhinge"
+
+#
+# E-core
+#
+DEPENDS_task-enlightenment-x11-core += "entrance e-wm"
+RDEPENDS_task-enlightenment-x11-core += "entrance e-wm"
#
# E
#
-DEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
-RDEPENDS += "entrance e-wm entice eclair examine evidence e-modules e-utils elitaire"
+DEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
+RDEPENDS_task-enlightenment-x11 += "task-enlightenment-x11-core entice eclair examine evidence e-modules e-utils elitaire"
diff --git a/packages/meta/meta-sdk.bb b/packages/meta/meta-sdk.bb
index 9be1e321bd..d28b6cebc8 100644
--- a/packages/meta/meta-sdk.bb
+++ b/packages/meta/meta-sdk.bb
@@ -3,9 +3,9 @@ LICENSE = MIT
DEPENDS = "ipkg-native ipkg-utils-native fakeroot-native \
binutils-cross-sdk gcc-cross-sdk gdb-cross \
libidl libsvg-cairo sed-native \
- meta-gpe \
+ meta-gpe gstreamer\
opie-mail"
-PR = "r5"
+PR = "r8"
PACKAGES = ""
@@ -51,24 +51,14 @@ libice-dev \
libidl-2-dev \
libipkg-dev \
libjpeg-dev \
-libmailwrapper-dev \
libmb-dev \
libmimedir-dev \
libopenobex-1.0-dev \
-libopiebluez2-dev \
-libopiedb2-dev \
-libopiecore2-dev \
-libopienet2-dev \
-libopiepim2-dev \
-libopieui2-dev \
libpcap-dev \
libpixman-dev \
libpng-dev \
libpng12-dev \
libpopt-dev \
-libqpe1-dev \
-libqte2-dev \
-libqtaux2-dev \
libreadline-dev \
libschedule-dev \
libsm-dev \
@@ -95,7 +85,6 @@ libxpm-dev \
libxrandr-dev \
libxrender-dev \
libxsettings-client-dev \
-libxsettings-dev \
libxss-dev \
libxt-dev \
libxtst-dev \
@@ -113,8 +102,21 @@ xextensions-dev \
libxmu-dev \
xproto-dev \
xtrans-dev \
+gstreamer-dev \
"
+#libopiebluez2-dev \
+#libopiedb2-dev \
+#libopiecore2-dev \
+#libopienet2-dev \
+#libopiepim2-dev \
+#libopieui2-dev \
+#libqpe1-dev \
+#libqte2-dev \
+#libqtaux2-dev \
+#libmailwrapper-dev \
+
+
do_populate_sdk() {
touch ${DEPLOY_DIR_IPK}/Packages
ipkg-make-index -r ${DEPLOY_DIR_IPK}/Packages -p ${DEPLOY_DIR_IPK}/Packages -l ${DEPLOY_DIR_IPK}/Packages.filelist -m ${DEPLOY_DIR_IPK}
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index 2febd8d2b3..80c0a5be09 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -97,6 +97,7 @@ OPENSLUG_PACKAGES = "\
puppy \
pwc \
python \
+ qc-usb-messenger \
quilt \
reiserfsprogs reiser4progs \
rsync \
diff --git a/packages/meta/opie-collections.inc b/packages/meta/opie-collections.inc
index 052ddac474..f45f5916e4 100644
--- a/packages/meta/opie-collections.inc
+++ b/packages/meta/opie-collections.inc
@@ -33,17 +33,22 @@ OPIE_BASE_DECOS = "opie-deco-flat opie-deco-liquid opie-deco-polished"
OPIE_BASE_STYLES = "opie-style-flat opie-style-liquid opie-style-fresh \
opie-style-metal opie-style-web opie-style-phase"
-OPIE_BASE_DEPENDS = "ipkg timezones ntp bluez-utils-nodbus irda-utils \
- openobex-apps libopieobex0 wireless-tools usbutils"
-OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset \
- bluez-utils-nodbus openobex-apps libopieobex0 wireless-tools "
+OPIE_BLUETOOTH_DEPENDS = "bluez-utils-nodbus openobex obexftp openobex-apps obexpush \
+ libopieobex0 libopietooth1 \
+ opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+OPIE_BLUETOOTH_RDEPENDS = "bluez-utils-nodbus obexftp openobex-apps obexpush \
+ opie-bluepin opie-bluetoothapplet opie-bluetoothmanager"
+
+OPIE_BASE_DEPENDS = "ipkg timezones ntp irda-utils wireless-tools usbutils ${OPIE_BLUETOOTH_DEPENDS}"
+OPIE_BASE_RDEPENDS = "timezones ntpdate opie-handwriting-classicset wireless-tools ${OPIE_BLUETOOTH_RDEPENDS}"
#
# Clamshell models can benefit from the autorotate applet
#
-OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
-OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_c7x0 = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_spitz = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_akita = " opie-autorotateapplet"
+OPIE_BASE_DEPENDS_append_borzoi = " opie-autorotateapplet"
# Keyboard models can benefit from the VT and logout applets
OPIE_BASE_APPLETS_append_openzaurus = " opie-vtapplet opie-logoutapplet"