From 9c24554dfc71deddf450a7f828b564510fe3e606 Mon Sep 17 00:00:00 2001 From: risci_atom Date: Thu, 17 Feb 2011 03:22:25 +0000 Subject: [PATCH] git-svn-id: http://svn.librewrt.org/librewrt@120 d459f2a8-9e7c-4474-95e1-7f88c49cc8e2 --- packages/multimedia/gmu/Makefile | 9 ++++++-- .../gmu/patches/000-do-not-override.patch | 22 +++++++++---------- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/packages/multimedia/gmu/Makefile b/packages/multimedia/gmu/Makefile index 039cdb1..67928af 100644 --- a/packages/multimedia/gmu/Makefile +++ b/packages/multimedia/gmu/Makefile @@ -13,6 +13,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://wejp.k.vu/files/ +PKG_MD5SUM:=dea481ab0f8f9f10b38aa21605dbb18d include $(INCLUDE_DIR)/package.mk @@ -22,7 +23,8 @@ 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 +libspeex +libflac +libogg endef define Package/gmu/description @@ -33,6 +35,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) \ @@ -42,7 +47,7 @@ define Package/gmu/install $(1)/usr/share/gmu/decoders \ $(1)/usr/share/gmu/frontends \ $(1)/usr/share/gmu/themes/default-modern - + $(INSTALL_BIN) \ $(PKG_BUILD_DIR)/gmu \ $(1)/usr/bin/gmu.bin diff --git a/packages/multimedia/gmu/patches/000-do-not-override.patch b/packages/multimedia/gmu/patches/000-do-not-override.patch index 7c6a94d..bd2eabf 100644 --- a/packages/multimedia/gmu/patches/000-do-not-override.patch +++ b/packages/multimedia/gmu/patches/000-do-not-override.patch @@ -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 -- 2.35.1