From ed16950f42b5fcaeea648d4d5b1faa906ba3c525 Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Fri, 19 Feb 2010 07:49:02 +0100 Subject: [PATCH 1/6] fix typo --- dgclock/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgclock/Makefile b/dgclock/Makefile index a2ff037..a75631b 100644 --- a/dgclock/Makefile +++ b/dgclock/Makefile @@ -63,7 +63,7 @@ define Package/dgclock/install $(1)/usr/share/icons/ $(INSTALL_DATA) \ - ./files/dglock.desktop \ + ./files/dgclock.desktop \ $(1)/usr/share/applications/ endef From 4f6e75dcf56f872428553dec1a8e7d2a3499b82f Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Sat, 20 Feb 2010 10:35:44 +0100 Subject: [PATCH 2/6] remove X11-dependency and therefore need for GL --- libsdl-ttf/Makefile | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/libsdl-ttf/Makefile b/libsdl-ttf/Makefile index 78308b8..24095b7 100644 --- a/libsdl-ttf/Makefile +++ b/libsdl-ttf/Makefile @@ -16,6 +16,8 @@ PKG_SOURCE_URL:=http://www.libsdl.org/projects/SDL_ttf/release/ PKG_MD5SUM:=6dd5a85e4924689a35a5fb1cb3336156 PKG_BUILD_DIR:=$(BUILD_DIR)/SDL_ttf-$(PKG_VERSION) +PKG_INSTALL:=1 + include $(INCLUDE_DIR)/package.mk define Package/libsdl-ttf @@ -30,34 +32,29 @@ define Package/libsdl-ttf/description SDL_ttf is a TrueType font rendering library that is used with the SDL library, and almost as portable. It depends on freetype2 to handle the TrueType font data. It allows a programmer to use multiple TrueType fonts without having to code a font rendering routine themselves. With the power of outline fonts and antialiasing, high quality text output can be obtained without much effort. endef -TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL - -CONFIGURE_ARGS += \ - --with-sdl-exec-prefix=$(STAGING_DIR) - -CONFIGURE_VARS += \ - LIBS="-lSDL -ldirect -ldirectfb -lfusion" - -define Build/Compile - rm -rf $(PKG_INSTALL_DIR) - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef +CONFIGURE_ARGS += --without-x define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/SDL $(1)/usr/lib + $(INSTALL_DIR) \ + $(1)/usr/include/SDL \ + $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/include/SDL/SDL_ttf.h \ $(1)/usr/include/SDL/ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libSDL_ttf*.{a,so*} \ $(1)/usr/lib/ endef define Package/libsdl-ttf/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL_ttf*.so* $(1)/usr/lib/ + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libSDL_ttf*.so* \ + $(1)/usr/lib/ endef $(eval $(call BuildPackage,libsdl-ttf)) From 76981017a41722b4ecec06b24367aa5fb1487c9e Mon Sep 17 00:00:00 2001 From: Mirko Vogt Date: Mon, 22 Feb 2010 01:07:05 +0100 Subject: [PATCH 3/6] there should be no need dgclock depends on gl-support --- dgclock/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dgclock/Makefile b/dgclock/Makefile index a75631b..8f868fb 100644 --- a/dgclock/Makefile +++ b/dgclock/Makefile @@ -35,7 +35,7 @@ define Package/dgclock CATEGORY:=Xorg TITLE:=dgclock - sdl based date and time URL:=http://clogging.web.fc2.com/dingoo/ - DEPENDS:=+libsdl +libsdl-image +libsdl-ttf +libgl-mesa +dejavu-fonts-ttf + DEPENDS:=+libsdl +libsdl-image +libsdl-ttf +dejavu-fonts-ttf endef define Package/dgclock/description From c2bf47064b8065d34d019610b6bcc9691f009de1 Mon Sep 17 00:00:00 2001 From: Mirko Lindner Date: Mon, 22 Feb 2010 10:17:19 +0100 Subject: [PATCH 4/6] fixing gmenu2x file - ugly but works, clean if you are up to it :D Signed-off-by: Mirko Lindner --- gmenu2x/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gmenu2x/Makefile b/gmenu2x/Makefile index 9932ff1..7d806d5 100644 --- a/gmenu2x/Makefile +++ b/gmenu2x/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gmenu2x -PKG_VERSION:=20100215-2 -PKG_REV:=630fdd5de9bc4c6f601d0aea1b6ccbc22f9d8bdf +PKG_VERSION:=20100222 +PKG_REV:= e2f5df5a43e509d2af23198aeb451d8a723e8153 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -26,6 +26,7 @@ TARGET_CFLAGS+= \ -I$(STAGING_DIR)/usr/include/SDL \ -I$(STAGING_DIR)/usr/include/google/sparsehash \ -I$(PKG_BUILD_DIR)/src/tinyxml \ + -DTIXML_USE_STL -DTARGET_GP2X -O3 -msoft-float -fomit-frame-pointer -ffast-math -funroll-loops -Wall -Wno-unknown-pragmas -Wno-format \ TARGET_CPPFLAGS+= \ -I$(STAGING_DIR)/usr/include/SDL \ @@ -45,7 +46,7 @@ define Package/gmenu2x SUBMENU:=app TITLE:=Gmenu2x URL:=http://projects.qi-hardware.com/index.php/p/gmenu2x/ - DEPENDS:=+libsdl +libsdl-image +libsdl-gfx +sparsehash + DEPENDS:=+libsdl +libsdl-image +libsdl-ttf +libstdcpp +libsdl-gfx +sparsehash endef define Build/Configure From aeb98ab8ad0530747d4ec3e61e5b66f9b827af71 Mon Sep 17 00:00:00 2001 From: Mirko Lindner Date: Mon, 22 Feb 2010 10:23:41 +0100 Subject: [PATCH 5/6] adapt gmenu2x git rev Signed-off-by: Mirko Lindner --- gmenu2x/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gmenu2x/Makefile b/gmenu2x/Makefile index 7d806d5..dbac61a 100644 --- a/gmenu2x/Makefile +++ b/gmenu2x/Makefile @@ -9,8 +9,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gmenu2x PKG_VERSION:=20100222 -PKG_REV:= e2f5df5a43e509d2af23198aeb451d8a723e8153 -PKG_RELEASE:=1 +PKG_REV:= 745321edf9101688ac1ffe3a0bff5773f08b36db +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=git://projects.qi-hardware.com/gmenu2x.git From dc1aeeccfcc03503dd79160ddc77726c09548e8e Mon Sep 17 00:00:00 2001 From: Mirko Lindner Date: Mon, 22 Feb 2010 11:59:22 +0100 Subject: [PATCH 6/6] update vido rev --- vido/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vido/Makefile b/vido/Makefile index 7917199..9fd5c40 100644 --- a/vido/Makefile +++ b/vido/Makefile @@ -8,8 +8,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vido -PKG_VERSION:=20100124 -PKG_REV:=5d30ead071fc7f5f38e439824e97aa5d9ccea67a +PKG_VERSION:=20100222 +PKG_REV:=7a95279f5e36778faf6d2ef9b01136e054bb8660 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz