From e481e887db23d634c8c2dfcec1594eec0646a63d Mon Sep 17 00:00:00 2001 From: Mohamed Tarek Date: Mon, 21 Jun 2010 12:38:08 +0000 Subject: Add a patch file in libwmapro to make it easier to add the library and the decoder to the main build and modify README.rockbox accordingly. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27012 a1c6a512-1295-4272-9138-f99709370657 --- apps/codecs/libwmapro/README.rockbox | 17 +++++------- apps/codecs/libwmapro/wmapro_mainbuild.patch | 41 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 10 deletions(-) create mode 100644 apps/codecs/libwmapro/wmapro_mainbuild.patch (limited to 'apps/codecs/libwmapro') diff --git a/apps/codecs/libwmapro/README.rockbox b/apps/codecs/libwmapro/README.rockbox index c33440f203..09c54b48c6 100644 --- a/apps/codecs/libwmapro/README.rockbox +++ b/apps/codecs/libwmapro/README.rockbox @@ -17,17 +17,14 @@ Based on ffmpeg svn r22886 dated 15 April 2010. Currently, the files contain minimal changes from their original state in order to be able to compile cleanly. -The file wmaprodec.c contains a main function that is just a stub to make sure -linking is done properly and without errors. - COMPILING -A make file is included that would compile and link the files when the "make" -command is executed without arguments in any Unix-like environment. +At the time of this writing (21 June 2010) the decoder isn't still included in +the main build since it still only works in the simulator. -The file porduces an output binary called "test" that, as of now (30 April 2010) -, is still useless. +A patch is included that would enable building the library and the codec for +testing and development purposes. -To clean the compiler output and retain just the source code, the following -command should be executed: -make clean +To apply the patch, you should cd to libwmapro directory and then execute the +following command : +patch -p 0 < wmapro_mainbuild.patch diff --git a/apps/codecs/libwmapro/wmapro_mainbuild.patch b/apps/codecs/libwmapro/wmapro_mainbuild.patch new file mode 100644 index 0000000000..79623df9a4 --- /dev/null +++ b/apps/codecs/libwmapro/wmapro_mainbuild.patch @@ -0,0 +1,41 @@ +Index: ../codecs.make +=================================================================== +--- ../codecs.make (revision 27008) ++++ ../codecs.make (working copy) +@@ -37,6 +37,7 @@ + include $(APPSDIR)/codecs/libtremor/libtremor.make + include $(APPSDIR)/codecs/libwavpack/libwavpack.make + include $(APPSDIR)/codecs/libwma/libwma.make ++include $(APPSDIR)/codecs/libwmapro/libwmapro.make + include $(APPSDIR)/codecs/libcook/libcook.make + include $(APPSDIR)/codecs/librm/librm.make + include $(APPSDIR)/codecs/libatrac/libatrac.make +@@ -58,7 +59,7 @@ + CODECLIBS := $(DEMACLIB) $(A52LIB) $(ALACLIB) $(ASAPLIB) \ + $(FAADLIB) $(FFMPEGFLACLIB) $(M4ALIB) $(MADLIB) $(MUSEPACKLIB) \ + $(SPCLIB) $(SPEEXLIB) $(TREMORLIB) $(WAVPACKLIB) $(WMALIB) $(COOKLIB) \ +- $(ATRACLIB) \ ++ $(ATRACLIB) $(WMAPROLIB) \ + $(CODECLIB) + + $(CODECS): $(CODEC_CRT0) $(CODECLINK_LDS) +@@ -83,6 +84,7 @@ + $(CODECDIR)/ape-pre.map : $(CODECDIR)/libdemac-pre.a + $(CODECDIR)/ape.codec : $(CODECDIR)/libdemac.a + $(CODECDIR)/wma.codec : $(CODECDIR)/libwma.a $(CODECDIR)/libasf.a ++$(CODECDIR)/wmapro.codec : $(CODECDIR)/libwmapro.a $(CODECDIR)/libasf.a + $(CODECDIR)/wavpack_enc.codec: $(CODECDIR)/libwavpack.a + $(CODECDIR)/asap.codec : $(CODECDIR)/libasap.a + $(CODECDIR)/cook.codec : $(CODECDIR)/libcook.a $(CODECDIR)/librm.a +Index: ../SOURCES +=================================================================== +--- ../SOURCES (revision 27008) ++++ ../SOURCES (working copy) +@@ -16,6 +16,7 @@ + atrac3_oma.c + mpc.c + wma.c ++wmapro.c + sid.c + ape.c + nsf.c -- cgit v1.2.3