X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=recipes%2Ftasks%2Ftask-pandora-xfce.bb;h=e892f8cf8391a041ff565472032158987898ddd1;hb=ed652dcc533aee328e891255f8f19e258de0e8d5;hp=bcca6fcb646298b71bc20e1e81449b2dd9fc7914;hpb=86ae4721cf7b2df7cfad4655e39d48919e126a2d;p=openpandora.oe.git

diff --git a/recipes/tasks/task-pandora-xfce.bb b/recipes/tasks/task-pandora-xfce.bb
index bcca6fc..e892f8c 100755
--- a/recipes/tasks/task-pandora-xfce.bb
+++ b/recipes/tasks/task-pandora-xfce.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Task file for the XFCE Pandora image"
 
 # Don't forget to bump the PR if you change it.
 
-PR = "r6.1"
+PR = "r32"
 
 inherit task
 
@@ -11,17 +11,22 @@ ANGSTROM_EXTRA_INSTALL ?= ""
 APPS = " \
   avahi-ui \
   abiword \
+  evince \
   claws-mail \
   swfdec swfdec-gnome swfdec-mozilla \
-  firefox \
+#  firefox \
   gnumeric \   
-  gimp \
+#  gimp \
   networkmanager network-manager-applet \ 
-  synergy \
-  vnc \
-  x11vnc angstrom-x11vnc-xinit \
-  xmms \
-  xterm \
+#  synergy \
+  vnc x11vnc angstrom-x11vnc-xinit \
+  xchat \
+#  xournal \
+  arora \
+"
+
+BLUETOOTH_GUI = " \
+  gnome-bluetooth \
 "
 
 IM_CLIENT = " \
@@ -34,6 +39,7 @@ IM_CLIENT = " \
 
 DISPMAN = " \
   slim \
+  slim-op-themes \
 "
 
 FONTS = " \
@@ -50,35 +56,59 @@ FONTS = " \
   xorg-minimal-fonts \
 "  
 
+# Any default games we want to ship.
+GAMES = " \
+#  scummvm \
+#  frozen-bubble \
+#  gnome-games \  
+#  numptyphysics \
+"
+
 GNOME_APPS = " \
-#  epiphany epiphany-extensions \
-#  evince \  
-  gnome-games \
-  gnome-mplayer \
-  gcalctool \ 
-  gnome-bluetooth \	
+#  gnome-mplayer \
+#  gcalctool \ 
   gnome-keyring gnome-keyring-pam-plugin \
+  gksu \
 "
 
 GNOME_GTK = " \
-#  hicolor-icon-theme \
 #  gnome-icon-theme \
 #  angstrom-gnome-icon-theme-enable \
 "
 
 GSTREAMER = " \
+#  gstreamer-ti \
   gst-ffmpeg \
   gst-omapfb \
-  gst-plugin-pulse \
+#  gst-plugin-pulse \
+  gst-plugin-xvimagesink \
   gst-plugins-base-meta \
 #  gst-plugins-good-meta \
-  gst-plugins-bad-meta \
+#  gst-plugins-bad-meta \
 #  gst-plugins-ugly-meta \
+  gst-plugin-gles \
 "
 
 ICON_THEME = " \
-  tango-icon-theme \
-  tango-icon-theme-enable \
+  hicolor-icon-theme \
+  elementary-icon-theme \
+  elementary-icon-theme-enable \
+"
+
+LAUNCHERS = " \
+#  netbook-launcher-efl \
+  pandora-libpnd-minimenu \
+  pandora-pmenu \
+"
+
+PANDORA = " \
+  pandora-first-run-wizard hsetroot \
+  pandora-scripts \
+  pandora-wallpaper-official pandora-wallpaper-community \
+  pandora-xfce-defaults \
+  pandora-midori-defaults midori \
+  libgles2d \
+  pandora-misc \
 "
 
 PERL = " \
@@ -90,31 +120,57 @@ PERL = " \
 "
 
 PULSEAUDIO = " \
-  pulseaudio-alsa-wrapper \
-  pulseaudio-esd-wrapper \
-  pulseaudio-module-gconf \
-  libasound-module-ctl-pulse \
-  libasound-module-pcm-pulse \
+#  pulseaudio-alsa-wrapper \
+#  pulseaudio-esd-wrapper \
+#  pulseaudio-module-gconf \
+#  libasound-module-ctl-pulse \
+#  libasound-module-pcm-pulse \
+"
+
+PYTHON_LIBS = " \
+  python-shell \
+  python-pygtk \
+  python-pycairo \
+  gnome-vfs-plugin-http \
+  gnome-vfs-plugin-ftp \
+"
+
+QT_SELECTED = " qt4-x11-free \
+"
+# qt4-x11-free"
+# qt4-x11-free-gles"
+
+#PREFERRED_PROVIDER_qt4-x11-free = "${QT_SELECTED}"
+
+QT_SUPPORT = " \
+  ${QT_SELECTED} \
+  qt4-plugin-imageformat-jpeg \
+  qt4-plugin-imageformat-gif \
+"
+
+# We want all of the Qt metapackage (for dev use) without the demos/examples.
+BAD_RRECOMMENDS += " \
+  ${QT_SELECTED}-demos \
+  ${QT_SELECTED}-examples \
 "
 
 TOTEM = " \
-  totem \
-  totem-browser-plugin \
-  totem-plugin-bemused \
-  totem-plugin-gromit \
-  totem-plugin-media-player-keys \
-  totem-plugin-ontop \
-  totem-plugin-properties \
-  totem-plugin-screensaver \
-  totem-plugin-skipto \
-  totem-plugin-thumbnail \
+#  totem \
+#  totem-browser-plugin \
+#  totem-plugin-bemused \
+#  totem-plugin-gromit \
+#  totem-plugin-media-player-keys \
+#  totem-plugin-ontop \
+#  totem-plugin-properties \
+#  totem-plugin-screensaver \
+#  totem-plugin-skipto \
+#  totem-plugin-thumbnail \
 "
 
 TOUCHSCREEN = " \
-#  xf86-input-evtouch \
-  xf86-input-tslib \
   gtk-touchscreen-mode-enable \
   libgtkstylus \
+#  xinput-calibrator \
 "
 
 XFCE46_BASE = " \
@@ -126,6 +182,7 @@ XFCE46_BASE = " \
   xfconf \
   xfdesktop \
   xfce4-panel \
+  xfce4-power-manager \
   \
   gtk-xfce-engine \
   \
@@ -148,8 +205,8 @@ XFCE46_EXTRAS = " \
   xfce4-notifyd \
   xfce4-mixer \
   xfce4-appfinder \
+  xfce4-battery-plugin \
   xfprint \    
-  midori \
   orage \
   squeeze \
   ristretto \
@@ -160,16 +217,9 @@ XFCE46_EXTRAS = " \
 XFCE_THEMES = " \
   xfwm4-theme-daloa \
   xfwm4-theme-moheli \
-  xfwm4-theme-default-4.0 \
-  xfwm4-theme-default-4.2 \
-  xfwm4-theme-default-4.4 \
   xfwm4-theme-kokodi \
-  xfwm4-theme-moheli \
   xfwm4-theme-sassandra \
-  xfwm4-theme-stoneage \
-  xfwm4-theme-therapy \
-  xfwm4-theme-tyrex \
-  xfwm4-theme-wallis \  
+  xfwm4-themes \
 "
 
 XSERVER_BASE = " \
@@ -189,6 +239,10 @@ XSERVER_BASE = " \
   xrefresh \
   xset \
   xvinfo \
+  devilspie \
+  encodings \
+  xterm \
+  xmodmap \
 "
 
 RDEPENDS_${PN} = " \
@@ -196,15 +250,21 @@ RDEPENDS_${PN} = " \
   angstrom-x11-base-depends \
   ${ANGSTROM_EXTRA_INSTALL} \
   ${APPS} \
+  ${BLUETOOTH_GUI} \
   ${IM_CLIENT} \
   ${DISPMAN} \
   ${FONTS} \
+  ${GAMES} \  
   ${GNOME_GTK} \
   ${GNOME_APPS} \
   ${GSTREAMER} \
   ${ICON_THEME} \
+  ${LAUNCHERS} \
+  ${PANDORA} \
   ${PERL} \
   ${PULSEAUDIO} \
+  ${PYTHON_LIBS} \
+  ${QT_SUPPORT} \
   ${TOTEM} \
   ${TOUCHSCREEN} \
   ${XSERVER_BASE} \
@@ -212,21 +272,17 @@ RDEPENDS_${PN} = " \
   ${XFCE46_EXTRAS} \
   ${XFCE_THEMES} \
   \
-#	pandora-auto-startx \
-  pandora-first-run-wizard \
-  \
   rxvt-unicode \
-  xst \
-  suspend-desktop \
-  teleport \
+#  xst \
+#  suspend-desktop \
+#  teleport \
   gdk-pixbuf-loader-png \
   gdk-pixbuf-loader-xpm \
   gdk-pixbuf-loader-jpeg \
   pango-module-basic-x \
   pango-module-basic-fc \
   xcursor-transparent-theme \	
-  mime-support \
-  xterm xmms \
-  jaaa nmap iperf gnuplot \
-  x11vnc angstrom-x11vnc-xinit \
+  xterm \
+  jaaa nmap iperf \
+#  gnuplot \
 "