qi-hardware/openwrt-packages
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-packages.git synced 2024-11-22 11:52:48 +02:00
Code

gmu: update to 0.7.2, it's need lib speedx

Browse Source
This commit is contained in:
Xiangfu Liu 2011-01-06 13:50:25 +08:00
parent 134dbbbe2e
commit 7fbb60a782
2 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gmu/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=gmu
PKG_VERSION:=0.7.1
PKG_VERSION:=0.7.2
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://wejp.k.vu/files/
PKG_MD5SUM:=62653037d2046d992626eaf6d0a365e3
PKG_MD5SUM:=dea481ab0f8f9f10b38aa21605dbb18d
include $(INCLUDE_DIR)/package.mk
@ -23,7 +23,7 @@ define Package/gmu
TITLE:=Gmu Music Player
URL:=http://wejp.k.vu/projects/gmu/
MENU:=1
DEPENDS:=+libsdl +libsdl-image +libsdl-gfx +libmpcdec +libmikmod +libvorbisidec
DEPENDS:=+libsdl +libsdl-image +libsdl-gfx +libmpcdec +libmikmod +libvorbisidec @BROKEN #need speedx lib
endef
define Package/gmu/description
@ -34,6 +34,9 @@ endef
MAKE_VARS += TARGET=nanonote
TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/SDL
TARGET_LDFLAGS+= \
-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
-L$(STAGING_DIR)/usr/lib/SDL \
define Package/gmu/install
$(INSTALL_DIR) \

22
gmu/patches/000-do-not-override.patch
View File

@ -1,18 +1,18 @@
--- gmu-0.7.0.orig/nanonote.mk 2010-03-25 19:32:41.000000000 +0100
+++ gmu-0.7.0/nanonote.mk 2010-04-01 21:36:10.000000000 +0200
@@ -19,13 +19,6 @@
diff --git a/nanonote.mk b/nanonote.mk
index 52ba352..52bc34c 100644
--- a/nanonote.mk
+++ b/nanonote.mk
@@ -19,11 +19,7 @@ DECODERS_TO_BUILD=decoders/vorbis.so decoders/musepack.so decoders/wavpack.so de
FRONTENDS_TO_BUILD=frontends/sdl.so frontends/log.so
DEVICE=NANONOTE
CONFIG=-D_$(DEVICE)
-SDL_LIB=-lSDL -lpthread -ldirectfb -ldirect -lfusion -lz -lSDL_image -lSDL_gfx
-SDL_CFLAGS=-D_GNU_SOURCE=1 -D_REENTRANT
SDL_LIB=-lSDL -lpthread -ldirectfb -ldirect -lfusion -lz -lSDL_image -lSDL_gfx
SDL_CFLAGS=-D_GNU_SOURCE=1 -D_REENTRANT
-CXX=mipsel-openwrt-linux-g++
-CC=mipsel-openwrt-linux-gcc
-STRIP=mipsel-openwrt-linux-strip
-TOOLCHAIN_ROOT_PATH=$(shell which $(CC)|sed 's/toolchain-mipsel_gcc-4.3.3+cs_uClibc-0.9.30.1\/usr\/bin\/$(CC)//')
-COPTS?=-O2 -s
-CFLAGS=-msoft-float -I$(TOOLCHAIN_ROOT_PATH)/target-mipsel_uClibc-0.9.30.1/usr/include/SDL -I$(TOOLCHAIN_ROOT_PATH)/target-mipsel_uClibc-0.9.30.1/usr/include -ffast-math -fomit-frame-pointer $(SDL_CFLAGS) $(CONFIG)
+CFLAGS+=$(CONFIG)
COPTS?=-O2 -s
-CFLAGS=-msoft-float -I$(TOOLCHAIN_ROOT_PATH)/target-mipsel_uClibc-0.9.30.1/usr/include/SDL -I$(TOOLCHAIN_ROOT_PATH)/target-mipsel_uClibc-0.9.30.1/usr/include -ffast-math -fomit-frame-pointer $(SDL_CFLAGS) -DFILE_HW_H="\"hw_$(TARGET).h\""
-LFLAGS=-s $(SDL_LIB) -L$(TOOLCHAIN_ROOT_PATH)/target-mipsel_uClibc-0.9.30.1/usr/lib -L$(TOOLCHAIN_ROOT_PATH)/target-mipsel_uClibc-0.9.30.1/root-xburst/usr/lib -lpthread -lm -ldl -lgcc -Wl,-export-dynamic
+LFLAGS=$(LDFLAGS) -lSDL -lpthread -ldirectfb -ldirect -lfusion -lz -lSDL_image -lSDL_gfx -lm -ldl -lgcc -Wl,-export-dynamic
+CFLAGS+=-msoft-float -ffast-math -fomit-frame-pointer $(SDL_CFLAGS) -DFILE_HW_H="\"hw_$(TARGET).h\""
+LFLAGS=$(LDFLAGS) -s $(SDL_LIB) -lpthread -lm -ldl -lgcc -Wl,-export-dynamic
DISTFILES=$(BINARY) frontends decoders themes gmu.png README.txt libs.nanonote gmu.nn COPYING gmuinput.nanonote.conf