Merge branch 'master' of git@projects.qi-hardware.com:openwrt-packages

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
@@ -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
 

gmenu2x/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=gmenu2x
-PKG_VERSION:=20100215-2
+PKG_VERSION:=20100222
-PKG_REV:=630fdd5de9bc4c6f601d0aea1b6ccbc22f9d8bdf
+PKG_REV:= 745321edf9101688ac1ffe3a0bff5773f08b36db
-PKG_RELEASE:=1
+PKG_RELEASE:=4
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=git://projects.qi-hardware.com/gmenu2x.git
@@ -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

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 += --without-x
-
-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
 
 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
+	$(INSTALL_DIR) \
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libSDL_ttf*.so* $(1)/usr/lib/
+		$(1)/usr/lib
+
+	$(CP) \
+		$(PKG_INSTALL_DIR)/usr/lib/libSDL_ttf*.so* \
+		$(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libsdl-ttf))

vido/Makefile

@@ -8,8 +8,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vido
-PKG_VERSION:=20100124
+PKG_VERSION:=20100222
-PKG_REV:=5d30ead071fc7f5f38e439824e97aa5d9ccea67a
+PKG_REV:=7a95279f5e36778faf6d2ef9b01136e054bb8660
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz