move window-managers to own directory and create own submenu "window manager" for...
authorMirko Vogt <mirko@openwrt.org>
Tue, 9 Dec 2008 22:45:05 +0000 (22:45 +0000)
committerMirko Vogt <mirko@openwrt.org>
Tue, 9 Dec 2008 22:45:05 +0000 (22:45 +0000)
SVN-Revision: 13568

16 files changed:
Xorg/app/enlightenment/Config.in [deleted file]
Xorg/app/enlightenment/Makefile [deleted file]
Xorg/app/fluxbox/Makefile [deleted file]
Xorg/app/fluxbox/files/init [deleted file]
Xorg/app/fluxbox/files/menu [deleted file]
Xorg/app/fluxbox/patches/100-fbrun-compile.patch [deleted file]
Xorg/app/fluxbox/patches/120-fbsetroot-compile.patch [deleted file]
Xorg/app/matchbox/Makefile [deleted file]
Xorg/wm/enlightenment/Config.in [new file with mode: 0644]
Xorg/wm/enlightenment/Makefile [new file with mode: 0644]
Xorg/wm/fluxbox/Makefile [new file with mode: 0644]
Xorg/wm/fluxbox/files/init [new file with mode: 0644]
Xorg/wm/fluxbox/files/menu [new file with mode: 0644]
Xorg/wm/fluxbox/patches/100-fbrun-compile.patch [new file with mode: 0644]
Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch [new file with mode: 0644]
Xorg/wm/matchbox/Makefile [new file with mode: 0644]

diff --git a/Xorg/app/enlightenment/Config.in b/Xorg/app/enlightenment/Config.in
deleted file mode 100644 (file)
index 989b572..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-choice
-       prompt "default enlightenment profile"
-       default E17_STANDARD
-
-config E17_ILLUME
-       bool
-       prompt "illume"
-
-config E17_MINIMALIST
-       bool
-       prompt "minimalist"
-
-config E17_NETBOOK
-       bool
-       prompt "netbook"
-
-config E17_SCALEABLE
-       bool
-       prompt "scalable"
-
-config E17_STANDARD
-       bool
-       prompt "standard"
-
-endchoice
diff --git a/Xorg/app/enlightenment/Makefile b/Xorg/app/enlightenment/Makefile
deleted file mode 100644 (file)
index ee3d603..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-# 
-# Copyright (C) 2006-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=enlightenment
-PKG_REV:=37860
-PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=svn
-PKG_SOURCE_VERSION:=$(PKG_REV)
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/e
-PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
-
-PKG_FIXUP = libtool
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/enlightenment
-  SECTION:=xorg-wm
-  CATEGORY:=Xorg
-  TITLE:=Enlightenment e17 window manager
-  URL:=http://enlightenment.org
-  DEPENDS:=+libintl +libpthread +eet +evas +ecore +edje +efreet +edbus +dbus-utils +dejavu-fonts-ttf
-endef
-
-define Package/enlightenment/config
-       menu "Configuration"
-       depends on PACKAGE_enlightenment
-       source "$(SOURCE)/Config.in"
-       endmenu
-endef
-
-define Package/enlightenment/description
-   Enlightenment is a window manager. Enlightenment is a desktop shell. Enlightenment is the building blocks to create beautiful applications. Enlightenment, or simply e, is a group of people trying to make a new generation of software.
-endef
-
-EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
-EXTRA_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
-       $(call Build/Configure/Default, --with-edje-cc=$(STAGING_DIR_HOST)/usr/bin/edje_cc  --with-eet-eet=$(STAGING_DIR_HOST)/usr/bin/eet)
-endef
-
-define Build/Compile
-       mkdir -p $(STAGING_DIR_HOST)/usr/bin
-       # let's see who is workarounding the edje[_cc]/eet-issue most dirrty ^^
-       ln -sf `which edje_cc` $(STAGING_DIR_HOST)/usr/bin/
-       ln -sf `which eet` $(STAGING_DIR_HOST)/usr/bin/
-       DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
-       rm -f $(STAGING_DIR_HOST)/usr/bin/{edje_cc,eet}
-endef
-
-define Build/InstallDev
-       mkdir -p $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(1)/usr/share
-       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
-endef
-
-define Package/enlightenment/install
-       $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(1)/usr/share
-       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
-       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
-       echo "#!/bin/sh" > $(1)/usr/bin/WM
-       echo -n "test -d ~/.e || /usr/bin/enlightenment_start -profile " >> $(1)/usr/bin/WM
-       $(if $(CONFIG_E17_ILLUME),echo "illume" >> $(1)/usr/bin/WM)
-       $(if $(CONFIG_E17_MINIMALIST),echo "minimalist" >> $(1)/usr/bin/WM)
-       $(if $(CONFIG_E17_NETBOOK),echo "netbook" >> $(1)/usr/bin/WM)
-       $(if $(CONFIG_E17_SCALEABLE),echo "scaleable" >> $(1)/usr/bin/WM)
-       $(if $(CONFIG_E17_STANDARD),echo "standard" >> $(1)/usr/bin/WM)
-       chmod +x $(1)/usr/bin/WM
-       find $(1)/ -name *.la | xargs rm -f
-       find $(1)/ -name *.a | xargs rm -f
-endef
-
-$(eval $(call BuildPackage,enlightenment))
-$(eval $(call RequireCommand,edje_cc, \
-       Command <edje_cc> not found - please install edje with edje-cc enabled \
-))
-$(eval $(call RequireCommand,eet, \
-       Command <eet> not found - please install eet \
-))
diff --git a/Xorg/app/fluxbox/Makefile b/Xorg/app/fluxbox/Makefile
deleted file mode 100644 (file)
index b85cefc..0000000
+++ /dev/null
@@ -1,91 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fluxbox
-PKG_VERSION:=1.0rc3
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/
-
-EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
-
-include $(INCLUDE_DIR)/package.mk
-
-CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
-               CXXLD="$(TARGET_CC)" 
-
-CONFIGURE_ARGS+=--disable-xmb
-
-define Package/fluxbox/Default
-  SECTION:=xorg-wm
-  CATEGORY:=Xorg
-endef
-
-define Package/fluxbox
-$(call Package/fluxbox/Default)
-  DEPENDS:=+uclibcxx +libXt
-  TITLE:=fluxbox window manager
-  MENU:=1
-endef
-
-define Package/fbrun
-$(call Package/fluxbox/Default)
-  DEPENDS:=fluxbox
-  TITLE:=fluxbox tool to run applications
-endef
-
-define Build/Configure
-       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
-               if [ -x $(CONFIGURE_CMD) ]; then \
-                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
-                       $(CONFIGURE_VARS) \
-                       $(CONFIGURE_CMD) \
-                       $(CONFIGURE_ARGS_XTRA) \
-                       $(CONFIGURE_ARGS) ;\
-               fi \
-       )
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) 
-       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install 
-endef
-
-define Package/fluxbox/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/
-       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/
-       $(CP) files/init $(1)/usr/share/fluxbox/
-       $(CP) files/menu $(1)/usr/share/fluxbox/
-       echo "#!/bin/sh" > $(1)/usr/bin/WM
-       echo "/usr/bin/fluxbox" >> $(1)/usr/bin/WM
-       chmod +x $(1)/usr/bin/WM
-endef
-
-define Package/fbsetbg/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
-endef
-
-define Package/fbsetroot/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
-endef
-
-define Package/fbrun/install
-       $(INSTALL_DIR) $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,fbrun))
-$(eval $(call BuildPackage,fluxbox))
diff --git a/Xorg/app/fluxbox/files/init b/Xorg/app/fluxbox/files/init
deleted file mode 100644 (file)
index 74926d5..0000000
+++ /dev/null
@@ -1,99 +0,0 @@
-session.screen0.titlebar.left: Stick 
-session.screen0.titlebar.right:        Minimize Maximize Close 
-session.screen0.tab.width:     64
-session.screen0.tab.alignment: Left
-session.screen0.tab.rotatevertical:    True
-session.screen0.tab.placement: TopLeft
-session.screen0.tab.height:    16
-session.screen0.menu.alpha:    158
-session.screen0.tabs.intitlebar:       false
-session.screen0.toolbar.onTop: False
-session.screen0.toolbar.visible:       true
-session.screen0.toolbar.layer: Desktop
-session.screen0.toolbar.height:        0
-session.screen0.toolbar.autoHide:      false
-session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
-session.screen0.toolbar.maxOver:       false
-session.screen0.toolbar.placement:     TopCenter
-session.screen0.toolbar.alpha: 255
-session.screen0.toolbar.widthPercent:  100
-session.screen0.toolbar.onhead:        0
-session.screen0.window.focus.alpha:    255
-session.screen0.window.unfocus.alpha:  34
-session.screen0.iconbar.iconTextPadding:       10l
-session.screen0.iconbar.wheelMode:     Screen
-session.screen0.iconbar.alignment:     Relative
-session.screen0.iconbar.usePixmap:     true
-session.screen0.iconbar.deiconifyMode: Follow
-session.screen0.iconbar.mode:  Workspace
-session.screen0.iconbar.iconWidth:     70
-session.screen0.slit.direction:        Vertical
-session.screen0.slit.autoHide: false
-session.screen0.slit.onTop:    False
-session.screen0.slit.layer:    Dock
-session.screen0.slit.alpha:    255
-session.screen0.slit.maxOver:  false
-session.screen0.slit.placement:        BottomRight
-session.screen0.slit.onhead:   0
-session.screen0.overlay.lineWidth:     1
-session.screen0.overlay.lineStyle:     LineSolid
-session.screen0.overlay.joinStyle:     JoinMiter
-session.screen0.overlay.capStyle:      CapNotLast
-session.screen0.edgeSnapThreshold:     0
-session.screen0.workspaceNames:        one,two,three,
-session.screen0.windowPlacement:       RowSmartPlacement
-session.screen0.windowScrollAction:    
-session.screen0.focusModel:    ClickFocus
-session.screen0.focusLastWindow:       true
-session.screen0.clickRaises:   true
-session.screen0.menuMode:      Delay
-session.screen0.desktopwheeling:       true
-session.screen0.imageDither:   false
-session.screen0.colPlacementDirection: TopToBottom
-session.screen0.rowPlacementDirection: LeftToRight
-session.screen0.resizeMode:    Bottom
-session.screen0.windowMenu:    
-session.screen0.followModel:   Ignore
-session.screen0.decorateTransient:     false
-session.screen0.strftimeFormat:        %a %d %H:%M
-session.screen0.workspacewarping:      true
-session.screen0.menuDelay:     0
-session.screen0.windowScrollReverse:   false
-session.screen0.workspaces:    3
-session.screen0.autoRaise:     false
-session.screen0.sloppywindowgrouping:  true
-session.screen0.reversewheeling:       false
-session.screen0.rootCommand:   ~/.xsession     
-session.screen0.menuDelayClose:        0
-session.screen0.fullMaximization:      false
-session.screen0.tabFocusModel: ClickToTabFocus
-session.screen0.focusNewWindows:       true
-session.screen0.antialias:     true
-session.screen0.showwindowposition:    true
-session.screen0.opaqueMove:    false
-session.titlebar.left: Stick 
-session.titlebar.right:        Minimize Maximize Close 
-session.cacheLife:     5l
-session.ignoreBorder:  false
-session.tabs:  true
-session.doubleClickInterval:   250
-session.tabsAttachArea:        Window
-session.iconbar:       true
-session.imageDither:   True
-session.focusTabMinWidth:      0
-session.modKey:        Mod1
-session.forcePseudoTransparency:       false
-session.autoRaiseDelay:        250
-session.styleFile:     /usr/share/fluxbox/styles/BlueNight
-session.cacheMax:      200l
-session.useMod1:       true
-session.keyFile:       ~/.fluxbox/keys
-session.menuFile:      ~/.fluxbox/menu
-session.tabPadding:    0
-session.groupFile:     ~/.fluxbox/groups
-session.colorsPerChannel:      4
-session.appsFile:      ~/.fluxbox/apps
-session.slitlistFile:  ~/.fluxbox/slitlist
-session.numLayers:     13
-session.opaqueMove:    False
-session.styleOverlay:  ~/.fluxbox/overlay
diff --git a/Xorg/app/fluxbox/files/menu b/Xorg/app/fluxbox/files/menu
deleted file mode 100644 (file)
index 3357552..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-[begin] (Fluxbox-OpenWrt)
-      [exec] (xterm) {xterm}
-      [exec]   (vi) {xterm -e vi}
-      [exec]   (xmms) {xmms}
-      [exec]   (alsamixer) {xterm -e alsamixer}
-      [exec]   (vlc) {vlc}
-      [exec]   (xclock) {xclock}
-      [exec]   (xmag) {xmag}
-      [exec]   (xclock) {xclock}
-      [exec]   (xcalc) {xcalc}
-      [exec]   (xpdf) {xpdf}
-      [exec]   (top) {xterm -e top}
-[submenu] (fluxbox menu)
-      [config] (Configure)
-[submenu] (System Styles) {Choose a style...}
-      [stylesdir] (/usr/share/fluxbox/styles)
-[end]
-      [workspaces] (Workspace List)
-[submenu] (Tools)
-      [exec]   (fluxconf) {fluxconf}
-      [exec]   (fluxkeys) {fluxkeys}
-      [exec]   (fluxmenu) {fluxmenu}
-[end]
-      [commanddialog] (Fluxbox Command)
-      [reconfig] (Reload config)
-      [restart] (Restart)
-      [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}
-      [separator]
-      [exit] (Exit)
-[end]
-[end]
diff --git a/Xorg/app/fluxbox/patches/100-fbrun-compile.patch b/Xorg/app/fluxbox/patches/100-fbrun-compile.patch
deleted file mode 100644 (file)
index 4033423..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
---- fluxbox-1.0rc3/util/fbrun/Makefile.in.orig 2007-09-17 19:52:52.000000000 +0200
-+++ fluxbox-1.0rc3/util/fbrun/Makefile.in      2007-09-17 19:53:09.000000000 +0200
-@@ -268,7 +268,7 @@
-       done
- fbrun$(EXEEXT): $(fbrun_OBJECTS) $(fbrun_DEPENDENCIES) 
-       @rm -f fbrun$(EXEEXT)
--      $(CXXLINK) $(fbrun_OBJECTS) $(fbrun_LDADD) $(LIBS)
-+      $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbrun_OBJECTS) $(fbrun_LDADD) $(LDFLAGS) $(LIBS)
- mostlyclean-compile:
-       -rm -f *.$(OBJEXT)
diff --git a/Xorg/app/fluxbox/patches/120-fbsetroot-compile.patch b/Xorg/app/fluxbox/patches/120-fbsetroot-compile.patch
deleted file mode 100644 (file)
index e56ac84..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in
---- fluxbox-1.0rc3.orig/util/Makefile.in       2007-09-17 19:56:45.000000000 +0200
-+++ fluxbox-1.0rc3/util/Makefile.in    2007-09-17 19:58:11.000000000 +0200
-@@ -301,7 +301,7 @@
-       done
- fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES) 
-       @rm -f fbsetroot$(EXEEXT)
--      $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS)
-+      $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS)
- fluxbox-update_configs$(EXEEXT): $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_DEPENDENCIES) 
-       @rm -f fluxbox-update_configs$(EXEEXT)
-       $(CXXLINK) $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_LDADD) $(LIBS)
diff --git a/Xorg/app/matchbox/Makefile b/Xorg/app/matchbox/Makefile
deleted file mode 100644 (file)
index d40046d..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-#
-# Copyright (C) 2007-2008 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-# blogic@openwrt.org
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=matchbox-window-manager
-PKG_VERSION:=1.2
-PKG_RELEASE:=1
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://matchbox-project.org/sources/matchbox-window-manager/$(PKG_VERSION)
-
-PKG_FIXUP = libtool
-
-TARGET_LDFLAGS+= \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libiconv/lib \
-       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libintl/lib
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/matchbox
-  TITLE:=matchbox window manager
-  SECTION:=xorg-wm
-  CATEGORY:=Xorg
-  DEPENDS:=+libX11 +zlib +libfreetype +fontconfig +libmatchbox
-endef
-
-define Build/Compile
-       $(MAKE) -C $(PKG_BUILD_DIR) \
-               DESTDIR="$(PKG_INSTALL_DIR)" \
-               LIBMB_LIBS="-L$(STAGING_DIR)/usr/lib -lfontconfig -lXrender -lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp -lpng12" \
-               all install 
-endef
-
-define Package/matchbox/install
-       $(INSTALL_DIR) $(1)/
-       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
-endef
-
-$(eval $(call BuildPackage,matchbox))
diff --git a/Xorg/wm/enlightenment/Config.in b/Xorg/wm/enlightenment/Config.in
new file mode 100644 (file)
index 0000000..989b572
--- /dev/null
@@ -0,0 +1,25 @@
+choice
+       prompt "default enlightenment profile"
+       default E17_STANDARD
+
+config E17_ILLUME
+       bool
+       prompt "illume"
+
+config E17_MINIMALIST
+       bool
+       prompt "minimalist"
+
+config E17_NETBOOK
+       bool
+       prompt "netbook"
+
+config E17_SCALEABLE
+       bool
+       prompt "scalable"
+
+config E17_STANDARD
+       bool
+       prompt "standard"
+
+endchoice
diff --git a/Xorg/wm/enlightenment/Makefile b/Xorg/wm/enlightenment/Makefile
new file mode 100644 (file)
index 0000000..00b26cd
--- /dev/null
@@ -0,0 +1,95 @@
+# 
+# Copyright (C) 2006-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# $Id: Makefile 12228 2008-08-06 22:43:15Z nbd $
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=enlightenment
+PKG_REV:=37860
+PKG_VERSION:=r$(PKG_REV)
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=svn
+PKG_SOURCE_VERSION:=$(PKG_REV)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=http://svn.enlightenment.org/svn/e/trunk/e
+PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/
+
+PKG_FIXUP = libtool
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/enlightenment
+  SECTION:=xorg-wm
+  CATEGORY:=Xorg
+  SUBMENU:=window manager
+  TITLE:=Enlightenment e17 window manager
+  URL:=http://enlightenment.org
+  DEPENDS:=+libintl +libpthread +eet +evas +ecore +edje +efreet +edbus +dbus-utils +dejavu-fonts-ttf
+endef
+
+define Package/enlightenment/config
+       menu "Configuration"
+       depends on PACKAGE_enlightenment
+       source "$(SOURCE)/Config.in"
+       endmenu
+endef
+
+define Package/enlightenment/description
+   Enlightenment is a window manager. Enlightenment is a desktop shell. Enlightenment is the building blocks to create beautiful applications. Enlightenment, or simply e, is a group of people trying to make a new generation of software.
+endef
+
+EXTRA_CFLAGS+=-I$(STAGING_DIR)/usr/lib/libintl/include
+EXTRA_LDFLAGS+=-lintl -L$(STAGING_DIR)/usr/lib/libintl/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib 
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR); NOCONFIGURE=YES ./autogen.sh );
+       $(call Build/Configure/Default, --with-edje-cc=$(STAGING_DIR_HOST)/usr/bin/edje_cc  --with-eet-eet=$(STAGING_DIR_HOST)/usr/bin/eet)
+endef
+
+define Build/Compile
+       mkdir -p $(STAGING_DIR_HOST)/usr/bin
+       # let's see who is workarounding the edje[_cc]/eet-issue most dirrty ^^
+       ln -sf `which edje_cc` $(STAGING_DIR_HOST)/usr/bin/
+       ln -sf `which eet` $(STAGING_DIR_HOST)/usr/bin/
+       DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) all install
+       rm -f $(STAGING_DIR_HOST)/usr/bin/{edje_cc,eet}
+endef
+
+define Build/InstallDev
+       mkdir -p $(1)/usr/include $(1)/usr/lib $(1)/usr/bin $(1)/usr/share
+       $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
+endef
+
+define Package/enlightenment/install
+       $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(1)/usr/share
+       $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/
+       $(CP) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/
+       echo "#!/bin/sh" > $(1)/usr/bin/WM
+       echo -n "/usr/bin/enlightenment_start -profile " >> $(1)/usr/bin/WM
+       $(if $(CONFIG_E17_ILLUME),echo "illume" >> $(1)/usr/bin/WM)
+       $(if $(CONFIG_E17_MINIMALIST),echo "minimalist" >> $(1)/usr/bin/WM)
+       $(if $(CONFIG_E17_NETBOOK),echo "netbook" >> $(1)/usr/bin/WM)
+       $(if $(CONFIG_E17_SCALEABLE),echo "scaleable" >> $(1)/usr/bin/WM)
+       $(if $(CONFIG_E17_STANDARD),echo "standard" >> $(1)/usr/bin/WM)
+       chmod +x $(1)/usr/bin/WM
+       find $(1)/ -name *.la | xargs rm -f
+       find $(1)/ -name *.a | xargs rm -f
+endef
+
+$(eval $(call BuildPackage,enlightenment))
+$(eval $(call RequireCommand,edje_cc, \
+       Command <edje_cc> not found - please install edje with edje-cc enabled \
+))
+$(eval $(call RequireCommand,eet, \
+       Command <eet> not found - please install eet \
+))
diff --git a/Xorg/wm/fluxbox/Makefile b/Xorg/wm/fluxbox/Makefile
new file mode 100644 (file)
index 0000000..ba799ce
--- /dev/null
@@ -0,0 +1,92 @@
+#
+# Copyright (C) 2007-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# blogic@openwrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fluxbox
+PKG_VERSION:=1.0rc3
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/fluxbox/
+
+EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib"
+
+include $(INCLUDE_DIR)/package.mk
+
+CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
+               CXXLD="$(TARGET_CC)" 
+
+CONFIGURE_ARGS+=--disable-xmb
+
+define Package/fluxbox/Default
+  SECTION:=xorg-wm
+  CATEGORY:=Xorg
+  SUBMENU:=window manager
+endef
+
+define Package/fluxbox
+$(call Package/fluxbox/Default)
+  DEPENDS:=+uclibcxx +libXt
+  TITLE:=fluxbox window manager
+  MENU:=1
+endef
+
+define Package/fbrun
+$(call Package/fluxbox/Default)
+  DEPENDS:=fluxbox
+  TITLE:=fluxbox tool to run applications
+endef
+
+define Build/Configure
+       (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \
+               if [ -x $(CONFIGURE_CMD) ]; then \
+                       $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \
+                       $(CONFIGURE_VARS) \
+                       $(CONFIGURE_CMD) \
+                       $(CONFIGURE_ARGS_XTRA) \
+                       $(CONFIGURE_ARGS) ;\
+               fi \
+       )
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) 
+       $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install 
+endef
+
+define Package/fluxbox/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/
+       $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/
+       $(CP) files/init $(1)/usr/share/fluxbox/
+       $(CP) files/menu $(1)/usr/share/fluxbox/
+       echo "#!/bin/sh" > $(1)/usr/bin/WM
+       echo "/usr/bin/fluxbox" >> $(1)/usr/bin/WM
+       chmod +x $(1)/usr/bin/WM
+endef
+
+define Package/fbsetbg/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/
+endef
+
+define Package/fbsetroot/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/
+endef
+
+define Package/fbrun/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,fbrun))
+$(eval $(call BuildPackage,fluxbox))
diff --git a/Xorg/wm/fluxbox/files/init b/Xorg/wm/fluxbox/files/init
new file mode 100644 (file)
index 0000000..74926d5
--- /dev/null
@@ -0,0 +1,99 @@
+session.screen0.titlebar.left: Stick 
+session.screen0.titlebar.right:        Minimize Maximize Close 
+session.screen0.tab.width:     64
+session.screen0.tab.alignment: Left
+session.screen0.tab.rotatevertical:    True
+session.screen0.tab.placement: TopLeft
+session.screen0.tab.height:    16
+session.screen0.menu.alpha:    158
+session.screen0.tabs.intitlebar:       false
+session.screen0.toolbar.onTop: False
+session.screen0.toolbar.visible:       true
+session.screen0.toolbar.layer: Desktop
+session.screen0.toolbar.height:        0
+session.screen0.toolbar.autoHide:      false
+session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock
+session.screen0.toolbar.maxOver:       false
+session.screen0.toolbar.placement:     TopCenter
+session.screen0.toolbar.alpha: 255
+session.screen0.toolbar.widthPercent:  100
+session.screen0.toolbar.onhead:        0
+session.screen0.window.focus.alpha:    255
+session.screen0.window.unfocus.alpha:  34
+session.screen0.iconbar.iconTextPadding:       10l
+session.screen0.iconbar.wheelMode:     Screen
+session.screen0.iconbar.alignment:     Relative
+session.screen0.iconbar.usePixmap:     true
+session.screen0.iconbar.deiconifyMode: Follow
+session.screen0.iconbar.mode:  Workspace
+session.screen0.iconbar.iconWidth:     70
+session.screen0.slit.direction:        Vertical
+session.screen0.slit.autoHide: false
+session.screen0.slit.onTop:    False
+session.screen0.slit.layer:    Dock
+session.screen0.slit.alpha:    255
+session.screen0.slit.maxOver:  false
+session.screen0.slit.placement:        BottomRight
+session.screen0.slit.onhead:   0
+session.screen0.overlay.lineWidth:     1
+session.screen0.overlay.lineStyle:     LineSolid
+session.screen0.overlay.joinStyle:     JoinMiter
+session.screen0.overlay.capStyle:      CapNotLast
+session.screen0.edgeSnapThreshold:     0
+session.screen0.workspaceNames:        one,two,three,
+session.screen0.windowPlacement:       RowSmartPlacement
+session.screen0.windowScrollAction:    
+session.screen0.focusModel:    ClickFocus
+session.screen0.focusLastWindow:       true
+session.screen0.clickRaises:   true
+session.screen0.menuMode:      Delay
+session.screen0.desktopwheeling:       true
+session.screen0.imageDither:   false
+session.screen0.colPlacementDirection: TopToBottom
+session.screen0.rowPlacementDirection: LeftToRight
+session.screen0.resizeMode:    Bottom
+session.screen0.windowMenu:    
+session.screen0.followModel:   Ignore
+session.screen0.decorateTransient:     false
+session.screen0.strftimeFormat:        %a %d %H:%M
+session.screen0.workspacewarping:      true
+session.screen0.menuDelay:     0
+session.screen0.windowScrollReverse:   false
+session.screen0.workspaces:    3
+session.screen0.autoRaise:     false
+session.screen0.sloppywindowgrouping:  true
+session.screen0.reversewheeling:       false
+session.screen0.rootCommand:   ~/.xsession     
+session.screen0.menuDelayClose:        0
+session.screen0.fullMaximization:      false
+session.screen0.tabFocusModel: ClickToTabFocus
+session.screen0.focusNewWindows:       true
+session.screen0.antialias:     true
+session.screen0.showwindowposition:    true
+session.screen0.opaqueMove:    false
+session.titlebar.left: Stick 
+session.titlebar.right:        Minimize Maximize Close 
+session.cacheLife:     5l
+session.ignoreBorder:  false
+session.tabs:  true
+session.doubleClickInterval:   250
+session.tabsAttachArea:        Window
+session.iconbar:       true
+session.imageDither:   True
+session.focusTabMinWidth:      0
+session.modKey:        Mod1
+session.forcePseudoTransparency:       false
+session.autoRaiseDelay:        250
+session.styleFile:     /usr/share/fluxbox/styles/BlueNight
+session.cacheMax:      200l
+session.useMod1:       true
+session.keyFile:       ~/.fluxbox/keys
+session.menuFile:      ~/.fluxbox/menu
+session.tabPadding:    0
+session.groupFile:     ~/.fluxbox/groups
+session.colorsPerChannel:      4
+session.appsFile:      ~/.fluxbox/apps
+session.slitlistFile:  ~/.fluxbox/slitlist
+session.numLayers:     13
+session.opaqueMove:    False
+session.styleOverlay:  ~/.fluxbox/overlay
diff --git a/Xorg/wm/fluxbox/files/menu b/Xorg/wm/fluxbox/files/menu
new file mode 100644 (file)
index 0000000..3357552
--- /dev/null
@@ -0,0 +1,31 @@
+[begin] (Fluxbox-OpenWrt)
+      [exec] (xterm) {xterm}
+      [exec]   (vi) {xterm -e vi}
+      [exec]   (xmms) {xmms}
+      [exec]   (alsamixer) {xterm -e alsamixer}
+      [exec]   (vlc) {vlc}
+      [exec]   (xclock) {xclock}
+      [exec]   (xmag) {xmag}
+      [exec]   (xclock) {xclock}
+      [exec]   (xcalc) {xcalc}
+      [exec]   (xpdf) {xpdf}
+      [exec]   (top) {xterm -e top}
+[submenu] (fluxbox menu)
+      [config] (Configure)
+[submenu] (System Styles) {Choose a style...}
+      [stylesdir] (/usr/share/fluxbox/styles)
+[end]
+      [workspaces] (Workspace List)
+[submenu] (Tools)
+      [exec]   (fluxconf) {fluxconf}
+      [exec]   (fluxkeys) {fluxkeys}
+      [exec]   (fluxmenu) {fluxmenu}
+[end]
+      [commanddialog] (Fluxbox Command)
+      [reconfig] (Reload config)
+      [restart] (Restart)
+      [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center}
+      [separator]
+      [exit] (Exit)
+[end]
+[end]
diff --git a/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch b/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch
new file mode 100644 (file)
index 0000000..4033423
--- /dev/null
@@ -0,0 +1,11 @@
+--- fluxbox-1.0rc3/util/fbrun/Makefile.in.orig 2007-09-17 19:52:52.000000000 +0200
++++ fluxbox-1.0rc3/util/fbrun/Makefile.in      2007-09-17 19:53:09.000000000 +0200
+@@ -268,7 +268,7 @@
+       done
+ fbrun$(EXEEXT): $(fbrun_OBJECTS) $(fbrun_DEPENDENCIES) 
+       @rm -f fbrun$(EXEEXT)
+-      $(CXXLINK) $(fbrun_OBJECTS) $(fbrun_LDADD) $(LIBS)
++      $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbrun_OBJECTS) $(fbrun_LDADD) $(LDFLAGS) $(LIBS)
+ mostlyclean-compile:
+       -rm -f *.$(OBJEXT)
diff --git a/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch b/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch
new file mode 100644 (file)
index 0000000..e56ac84
--- /dev/null
@@ -0,0 +1,12 @@
+diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in
+--- fluxbox-1.0rc3.orig/util/Makefile.in       2007-09-17 19:56:45.000000000 +0200
++++ fluxbox-1.0rc3/util/Makefile.in    2007-09-17 19:58:11.000000000 +0200
+@@ -301,7 +301,7 @@
+       done
+ fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES) 
+       @rm -f fbsetroot$(EXEEXT)
+-      $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS)
++      $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS)
+ fluxbox-update_configs$(EXEEXT): $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_DEPENDENCIES) 
+       @rm -f fluxbox-update_configs$(EXEEXT)
+       $(CXXLINK) $(fluxbox_update_configs_OBJECTS) $(fluxbox_update_configs_LDADD) $(LIBS)
diff --git a/Xorg/wm/matchbox/Makefile b/Xorg/wm/matchbox/Makefile
new file mode 100644 (file)
index 0000000..1149517
--- /dev/null
@@ -0,0 +1,47 @@
+#
+# Copyright (C) 2007-2008 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+# blogic@openwrt.org
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=matchbox-window-manager
+PKG_VERSION:=1.2
+PKG_RELEASE:=1
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
+PKG_SOURCE_URL:=http://matchbox-project.org/sources/matchbox-window-manager/$(PKG_VERSION)
+
+PKG_FIXUP = libtool
+
+TARGET_LDFLAGS+= \
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libiconv/lib \
+       -Wl,-rpath-link=$(STAGING_DIR)/usr/lib/libintl/lib
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/matchbox
+  TITLE:=matchbox window manager
+  SECTION:=xorg-wm
+  CATEGORY:=Xorg
+  SUBMENU:=window manager
+  DEPENDS:=+libX11 +zlib +libfreetype +fontconfig +libmatchbox
+endef
+
+define Build/Compile
+       $(MAKE) -C $(PKG_BUILD_DIR) \
+               DESTDIR="$(PKG_INSTALL_DIR)" \
+               LIBMB_LIBS="-L$(STAGING_DIR)/usr/lib -lfontconfig -lXrender -lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp -lpng12" \
+               all install 
+endef
+
+define Package/matchbox/install
+       $(INSTALL_DIR) $(1)/
+       $(CP) $(PKG_INSTALL_DIR)/* $(1)/
+endef
+
+$(eval $(call BuildPackage,matchbox))