X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=openpandora.oe.git;a=blobdiff_plain;f=recipes%2Ftasks%2Ftask-pandora-gui.bb;h=10a03c20e82927c43a9a2fbc1e8ef45a7d3482de;hp=8467c5843bf1f3d240c086991ee41f56a62629a3;hb=127854ce519ad19b99c4c2f27d49c786ab38d721;hpb=4b605e2fc31a9f8c418088150ea4c32b8f0470b0

diff --git a/recipes/tasks/task-pandora-gui.bb b/recipes/tasks/task-pandora-gui.bb
index 8467c58..10a03c2 100755
--- a/recipes/tasks/task-pandora-gui.bb
+++ b/recipes/tasks/task-pandora-gui.bb
@@ -1,41 +1,126 @@
-DESCRIPTION = "Task file for default GUI apps in the Pandora image"
+rDESCRIPTION = "Task file for default GUI apps in the Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r1.10"
+PR = "r1"
 
 inherit task
 
-RDEPENDS_${PN} = "\
-        task-pandora-core \
-        entrance \
+ANGSTROM_EXTRA_INSTALL ?= ""
+
+APPS = " \
+  abiword \
+  cheese \
+  claws-mail \
+  epiphany epiphany-extensions \
+  swfdec swfdec-gnome swfdec-mozilla \
+  evince \
+  gcalctool \
+  gedit \
+  gimp \
+  gnome-games \
+  gnome-mplayer \
+  gnumeric \
+  gphoto2 \
+  gthumb \
+  pidgin \
+  synergy \
+  vnc \
+  x11vnc angstrom-x11vnc-xinit \
+  xmms \
+  xterm \
+"
+
+FONTS = " \
+  font-adobe-75dpi \
+  fontconfig fontconfig-utils font-util \
+  ttf-arphic-uming \
+  ttf-dejavu-common \
+  ttf-dejavu-sans \
+  ttf-dejavu-serif \
+  ttf-dejavu-sans-mono \
+  ttf-liberation-sans \
+  ttf-liberation-serif \
+  ttf-liberation-mono \
+  xorg-minimal-fonts \
+"  
+
+GSTREAMER = " \
+  gst-ffmpeg \
+  gst-omapfb \
+  gst-plugin-pulse \
+  gst-plugins-base-meta \
+  gst-plugins-good-meta \
+  gst-plugins-bad-meta \
+#  gst-plugins-ugly-meta \
+"
+
+PERL = " \
+  perl \
+#  task-perl-module-all \
+#  libnet-dbus-perl \
+  libxml-parser-perl \
+  libxml-twig-perl \
+"
+
+PULSEAUDIO = " \
+  pulseaudio-alsa-wrapper \
+  pulseaudio-esd-wrapper \
+  pulseaudio-module-gconf \
+  libasound-module-ctl-pulse \
+  libasound-module-pcm-pulse \
+"
+
+XSERVER_BASE = " \
+  ${XSERVER} \
+  dbus-x11 \
+  desktop-file-utils \
+  iso-codes \
+  mime-support \
+  notification-daemon inotify-tools \
+  xauth \
+#  xdg-utils \
+  xhost \
+  xinetd \
+  xinit \
+  xlsfonts \
+  xrdb \
+  xrefresh \
+  xset \
+  xvinfo \
+"
+
+RDEPENDS_${PN} = " \
+  task-pandora-core \
+  ${ANGSTROM_EXTRA_INSTALL} \
+  ${APPS} \
+  ${FONTS} \
+  ${GSTREAMER} \
+  ${PERL} \
+  ${PULSEAUDIO} \
+  ${XSERVER_BASE} \
         angstrom-x11-base-depends \
-        angstrom-gpe-task-base angstrom-gpe-task-game angstrom-ohand-task-pim angstrom-gpe-task-apps angstrom-gpe-task-settings \
+        angstrom-gpe-task-base angstrom-gpe-task-game angstrom-gpe-task-apps angstrom-gpe-task-settings \
         angstrom-zeroconf-audio \
         angstrom-led-config \ 
         angstrom-gnome-icon-theme-enable \
         gpe-scap \
         xterm xmms \
-        firefox midori \
+        firefox \
         swfdec-mozilla \
         abiword \
         claws-mail \
         evince \
-        exhibit \
         pidgin \
         gnome-games \
         synergy \
-        vnc \
-        x11vnc \
+	x11vnc angstrom-x11vnc-xinit \
         xmms \
         xterm \
         xtscal \
-        matchbox-wm \
-        matchbox-desktop matchbox-panel matchbox-panel-manager matchbox-panel-hacks \
-        matchbox-keyboard matchbox-keyboard-applet matchbox-keyboard-im \
-        matchbox-common matchbox-config-gtk \
+        matchbox2 \
         matchbox-terminal \
-        matchbox-themes-gtk \
+        matchbox-themes-gtk pandora-matchbox-gtk-theme \
         pcmanfm \
         ttf-liberation-sans ttf-liberation-serif ttf-liberation-mono \
         xauth xhost xset xrandr \
@@ -45,8 +130,8 @@ RDEPENDS_${PN} = "\
         matchbox-applet-inputmanager \
         matchbox-applet-volume \
         matchbox-applet-startup-monitor \
-#	networkmanager-applet \
-	connman-gnome \
+#	connman-gnome \
+	networkmanager \
         scummvm \
-        pandora-matchbox-gtk-theme \
+	gnome-bluetooth \
 "