Author: richard
Date: Mon Mar 23 06:06:33 2009
New Revision: 4895
URL: http://svn.slimdevices.com/jive?rev=4895&view=rev
Log:
r4...@harrypotter (orig r4878): ayoung | 2009-03-20 10:26:20 +0000
Add -fPIC; needed for x86_64 build
r4...@harrypotter (orig r4882): tom | 2009-03-20 15:09:45 +0000
Bug: N/A
Description:
Support luamd5
r4...@harrypotter (orig r4887): felix | 2009-03-20 17:11:05 +0000
Bug: 11211
Description: Change alpha comparator to be case insensitve.
r4...@harrypotter (orig r4891): tom | 2009-03-20 21:32:10 +0000
Added additional Ignored files/dirs
r4...@harrypotter (orig r4893): tom | 2009-03-20 21:40:18 +0000
Added additional Ignored files/dirs (more, should be all)
r4...@harrypotter (orig r4894): tom | 2009-03-20 23:43:33 +0000
Bug: 11417
Description:
left trim lines
Modified:
7.4/branches/pango/ (props changed)
7.4/branches/pango/squeezeplay/src/ (props changed)
7.4/branches/pango/squeezeplay/src/Makefile.osx
7.4/branches/pango/squeezeplay/src/SDL-1.2.13/ (props changed)
7.4/branches/pango/squeezeplay/src/SDL_gfx-2.0.15/ (props changed)
7.4/branches/pango/squeezeplay/src/SDL_image-1.2.5/ (props changed)
7.4/branches/pango/squeezeplay/src/SDL_ttf-2.0.8/ (props changed)
7.4/branches/pango/squeezeplay/src/Tremor/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/build/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/images/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/images/hw/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/ru/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/decode/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/decode/file/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/encode/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/encode/file/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/decode/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/decode/file/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/encode/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/FLAC/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/FLAC++/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/share/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/share/grabbag/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/test_libs_common/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/m4/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/man/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/debug/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/debug/bin/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/debug/lib/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/release/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/release/bin/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/release/lib/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/flac/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC++/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ia32/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/include/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/include/private/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/include/protected/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ppc/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ppc/as/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ppc/gas/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/metaflac/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/monkeys_audio_utilities/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/monkeys_audio_utilities/flac_mac/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/monkeys_audio_utilities/flac_ren/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_common/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_winamp2/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_winamp2/include/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_winamp2/include/winamp2/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_xmms/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/getopt/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/grabbag/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_analysis/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_synthesis/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_synthesis/include/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_synthesis/include/private/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/utf8/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_grabbag/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_grabbag/cuesheet/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_grabbag/picture/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_libFLAC/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_libFLAC++/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_libs_common/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_seeking/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_streams/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/ (props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/cuesheets/ (props
changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/flac-to-flac-metadata-test-files/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/metaflac-test-files/
(props changed)
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/pictures/ (props
changed)
7.4/branches/pango/squeezeplay/src/freetype-2.1.10/ (props changed)
7.4/branches/pango/squeezeplay/src/freetype-2.1.10/builds/unix/ (props
changed)
7.4/branches/pango/squeezeplay/src/jpeg-6b/ (props changed)
7.4/branches/pango/squeezeplay/src/libmad-0.15.1b/ (props changed)
7.4/branches/pango/squeezeplay/src/libmad-0.15.1b/msvc++/ (props changed)
7.4/branches/pango/squeezeplay/src/libpng-1.2.32/ (props changed)
7.4/branches/pango/squeezeplay/src/lua-5.1.1/src/ (props changed)
7.4/branches/pango/squeezeplay/src/luaexpat-1.0.2/src/ (props changed)
7.4/branches/pango/squeezeplay/src/luafilesystem-1.2/ (props changed)
7.4/branches/pango/squeezeplay/src/luafilesystem-1.2/src/ (props changed)
7.4/branches/pango/squeezeplay/src/luajson/ (props changed)
7.4/branches/pango/squeezeplay/src/luajson/src/ (props changed)
7.4/branches/pango/squeezeplay/src/luamd5/ (props changed)
7.4/branches/pango/squeezeplay/src/luamd5/Makefile
7.4/branches/pango/squeezeplay/src/luaprofiler-2.0/ (props changed)
7.4/branches/pango/squeezeplay/src/luasocket-2.0.1/src/ (props changed)
7.4/branches/pango/squeezeplay/src/luazipfilter/ (props changed)
7.4/branches/pango/squeezeplay/src/luazipfilter/src/ (props changed)
7.4/branches/pango/squeezeplay/src/portaudio_v19_1360/ (props changed)
7.4/branches/pango/squeezeplay/src/portaudio_v19_1360/src/os/ (props
changed)
7.4/branches/pango/squeezeplay/src/slnunicode-1.1/src/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/SimpleMenu.lua
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ (props changed)
7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_textarea.c
7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/ (props changed)
7.4/branches/pango/squeezeplay/src/tolua++-1.0.92/src/lib/ (props changed)
Propchange: 7.4/branches/pango/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Mon Mar 23 06:06:33 2009
@@ -4,7 +4,7 @@
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.2/trunk:2921
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/private-branches/jive-refresh:3653
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.3/trunk:4842
-bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4850
+bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/7.4/trunk:4894
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/7.0:2013
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/SN:1083
bbe22326-0783-4b3a-ac2b-7ab96b24c8d9:/branches/scrolling:1378
Propchange: 7.4/branches/pango/squeezeplay/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -8,3 +8,4 @@
Jive.ncb
Jive.suo
version.txt
+Makefile
Modified: 7.4/branches/pango/squeezeplay/src/Makefile.osx
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/Makefile.osx?rev=4895&r1=4894&r2=4895&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/Makefile.osx (original)
+++ 7.4/branches/pango/squeezeplay/src/Makefile.osx Mon Mar 23 06:06:33 2009
@@ -247,9 +247,9 @@
# lua
#####
-.PHONY: lua-all tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler luazipfilter
-
-lua-all: lua tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler luazipfilter
+.PHONY: lua-all tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler luazipfilter luamd5
+
+lua-all: lua tolua++ luasocket slnunicode luajson loop lualogging luaexpat
luafilesystem luaprofiler luazipfilter luamd5
# lua (requires readline ncurses)
lua:
@@ -274,6 +274,12 @@
luazipfilter: luazipfilter/Makefile
cd luazipfilter; make && cp .libs/zipfilter.so
${PREFIX}/lib/lua/5.1/zipfilter.so
+
+luamd5:
+ cd luamd5; make LUA=${PREFIX} MYNAME=sha1 MYLDFLAGS="-undefined
dynamic_lookup" CC="${CC}"
+ cd luamd5; make LUA=${PREFIX} MYNAME=md5 MYLDFLAGS="-undefined
dynamic_lookup" CC="${CC}"
+ cp luamd5/md5.so ${PREFIX}/lib/lua/5.1/md5.so
+ cp luamd5/sha1.so ${PREFIX}/lib/lua/5.1/sha1.so
loop:
-mkdir ${PREFIX}/share/lua/5.1/loop
@@ -465,5 +471,9 @@
@echo "Cleaning: tolua++"
-cd tolua++-1.0.92/src/lib; rm libtolua++.a; rm *.o ; rm -rf x86; rm
-rf ppc
@echo "----------------------------------------------------------"
+ @echo "Cleaning: tolua++"
+ -cd luamd5; make MYNAME=sha1 clean
+ -cd luamd5; make MYNAME=md5 clean; rm -rf x86; rm -rf ppc
+ @echo "----------------------------------------------------------"
@echo "Cleaning: Build dir"
-cd $(BASE_DIR)/build; rm -rf osx
Propchange: 7.4/branches/pango/squeezeplay/src/SDL-1.2.13/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+build
Propchange: 7.4/branches/pango/squeezeplay/src/SDL_gfx-2.0.15/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,10 @@
.deps
.libs
a.out.dSYM
+autom4te.cache
+ppc
+x86
+config.log
+config.status
+libtool
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/SDL_image-1.2.5/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,12 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.log
+config.status
+libtool
+Makefile
+SDL_image.qpg
+SDL_image.spec
+showimage
Propchange: 7.4/branches/pango/squeezeplay/src/SDL_ttf-2.0.8/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,11 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.log
+config.status
+glfont
+libtool
+Makefile
+showfont
Propchange: 7.4/branches/pango/squeezeplay/src/Tremor/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,13 @@
.deps
.libs
a.out.dSYM
+autom4te.cache
+ppc
+x86
+config.h
+config.log
+config.status
+libtool
+Makefile
+stamp-h1
+Version_script
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,12 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.h
+config.log
+config.status
+libtool
+libtool-disable-static
+Makefile
+stamp-h1
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/build/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/images/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/images/hw/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/doc/html/ru/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/decode/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/decode/file/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/encode/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/c/encode/file/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/decode/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/decode/file/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/encode/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/examples/cpp/encode/file/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/FLAC/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/FLAC++/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/share/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/share/grabbag/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/include/test_libs_common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/m4/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/man/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/debug/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/debug/bin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/debug/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/release/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/release/bin/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/obj/release/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/flac/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -6,3 +6,6 @@
a.out.dSYM
Release_dynamic
Debug_dynamic
+flac.pc
+Makefile
+x86
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC++/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,5 @@
.deps
.libs
a.out.dSYM
+flac++.pc
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ia32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/include/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/include/private/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/include/protected/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ppc/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ppc/as/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/libFLAC/ppc/gas/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/metaflac/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/monkeys_audio_utilities/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/monkeys_audio_utilities/flac_mac/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/monkeys_audio_utilities/flac_ren/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_winamp2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_winamp2/include/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_winamp2/include/winamp2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/plugin_xmms/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/getopt/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/grabbag/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_analysis/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_synthesis/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_synthesis/include/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/replaygain_synthesis/include/private/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/share/utf8/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_grabbag/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_grabbag/cuesheet/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_grabbag/picture/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_libFLAC/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_libFLAC++/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_libs_common/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_seeking/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/src/test_streams/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/cuesheets/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/flac-to-flac-metadata-test-files/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange:
7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/metaflac-test-files/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/flac-1.2.1/test/pictures/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/freetype-2.1.10/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,6 @@
.deps
.libs
a.out.dSYM
+x86
+ppc
+config.mk
Propchange: 7.4/branches/pango/squeezeplay/src/freetype-2.1.10/builds/unix/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,13 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.log
+config.status
+freetype-config
+freetype2.pc
+ftconfig.h
+libtool
+unix-cc.mk
+unix-def.mk
Propchange: 7.4/branches/pango/squeezeplay/src/jpeg-6b/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,15 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+cjpeg
+config.log
+config.status
+djpeg
+jconfig.h
+jpegtran
+libtool
+Makefile
+rdjpgcom
+wrjpgcom
Propchange: 7.4/branches/pango/squeezeplay/src/libmad-0.15.1b/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,12 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.h
+config.log
+config.status
+libmad.list
+libtool
+Makefile
+stamp-h1
Propchange: 7.4/branches/pango/squeezeplay/src/libmad-0.15.1b/msvc++/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/libpng-1.2.32/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,17 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+a.out
+config.h
+config.log
+config.status
+libpng-config
+libpng.pc
+libpng.sym
+libpng12-config
+libpng12.pc
+libtool
+Makefile
+stamp-h1
Propchange: 7.4/branches/pango/squeezeplay/src/lua-5.1.1/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,8 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+liblua.a
+lua
+luac
Propchange: 7.4/branches/pango/squeezeplay/src/luaexpat-1.0.2/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+*.so.1.0.2
Propchange: 7.4/branches/pango/squeezeplay/src/luafilesystem-1.2/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,5 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
Propchange: 7.4/branches/pango/squeezeplay/src/luafilesystem-1.2/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+*.so.1.2
Propchange: 7.4/branches/pango/squeezeplay/src/luajson/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,9 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.log
+config.status
+libtool
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/luajson/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,5 @@
.deps
.libs
a.out.dSYM
+config.h
+stamp-h1
Propchange: 7.4/branches/pango/squeezeplay/src/luamd5/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -1,0 +1,4 @@
+ppc
+x86
+md5.so
+sha1.so
Modified: 7.4/branches/pango/squeezeplay/src/luamd5/Makefile
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/luamd5/Makefile?rev=4895&r1=4894&r2=4895&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/luamd5/Makefile (original)
+++ 7.4/branches/pango/squeezeplay/src/luamd5/Makefile Mon Mar 23 06:06:33 2009
@@ -74,7 +74,7 @@
# probably no need to change anything below here
CC= gcc
-CFLAGS= $(INCS) $(DEFS) $(WARN) -O2 $G
+CFLAGS= $(INCS) $(DEFS) $(WARN) -O2 $G -fPIC
WARN= #-ansi -pedantic -Wall
INCS= -I$(LUAINC) $(MD5INC)
@@ -93,7 +93,7 @@
so: $T
$T: $(OBJS) $(MD5OBJ)
- $(CC) -o $@ -shared $(OBJS) $(MD5LIB)
+ $(CC) $(MYLDFLAGS) -o $@ -shared $(OBJS) $(MD5LIB)
clean:
rm -f $(OBJS) $T core core.* $(MD5OBJ)
Propchange: 7.4/branches/pango/squeezeplay/src/luaprofiler-2.0/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,6 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+profiler.so
Propchange: 7.4/branches/pango/squeezeplay/src/luasocket-2.0.1/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,7 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+mime.so.1.0.1
+socket.so.2.0.1
Propchange: 7.4/branches/pango/squeezeplay/src/luazipfilter/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,9 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+config.log
+config.status
+libtool
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/luazipfilter/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,5 @@
.deps
.libs
a.out.dSYM
+config.h
+stamp-h1
Propchange: 7.4/branches/pango/squeezeplay/src/portaudio_v19_1360/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,12 @@
.deps
.libs
a.out.dSYM
+lib
+bin-stamp
+config.log
+config.status
+lib-stamp
+libtool
+Makefile
+portaudio-2.0.pc
+bin
Propchange: 7.4/branches/pango/squeezeplay/src/portaudio_v19_1360/src/os/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+mac_osx
Propchange: 7.4/branches/pango/squeezeplay/src/slnunicode-1.1/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,6 @@
.deps
.libs
a.out.dSYM
+ppc
+x86
+slnunico.so.1.1
Propchange: 7.4/branches/pango/squeezeplay/src/squeezeplay/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,14 @@
.deps
.libs
a.out.dSYM
+autom4te.cache
+ppc
+x86
+SqueezePlay.app
+config.log
+config.status
+jive
+libtool
+Makefile
+SqueezePlay
+SqueezePlay.dmg
Modified:
7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/SimpleMenu.lua
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/SimpleMenu.lua?rev=4895&r1=4894&r2=4895&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/SimpleMenu.lua
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/share/jive/ui/SimpleMenu.lua
Mon Mar 23 06:06:33 2009
@@ -205,7 +205,7 @@
=cut
--]]
function itemComparatorAlpha(a, b)
- return tostring(a.text) < tostring(b.text)
+ return string.lower(tostring(a.text)) < string.lower(tostring(b.text))
end
@@ -222,7 +222,7 @@
local w = a.weight - b.weight
if w == 0 then
- return tostring(a.text) < tostring(b.text)
+ return string.lower(tostring(a.text)) <
string.lower(tostring(b.text))
end
return (w < 0)
end
@@ -244,7 +244,7 @@
local w = a.weight - b.weight
if w == 0 then
- return tostring(a.text) < tostring(b.text)
+ return string.lower(tostring(a.text)) <
string.lower(tostring(b.text))
end
return (w < 0)
else
@@ -290,7 +290,7 @@
if (not a.weights[i+1] or not b.weights[i+1]) and w == 0 then
-- end of the road, weights are the same
if not a.weights[i+1] and not b.weights[i+1] then
- return tostring(a.text) < tostring(b.text)
+ return string.lower(tostring(a.text)) <
string.lower(tostring(b.text))
-- a is the node
elseif not a.weights[i+1] then
return true
@@ -303,7 +303,7 @@
return (w < 0)
-- end of the road, weight is the same
elseif i==x then
- return tostring(a.text) < tostring(b.text)
+ return string.lower(tostring(a.text)) <
string.lower(tostring(b.text))
end
-- if we get here, it's time to examine the next i in the
weights table
end
Propchange: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,6 @@
.deps
.libs
a.out.dSYM
+config.h
+stamp-h1
+version.h
Modified: 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_textarea.c
URL:
http://svn.slimdevices.com/jive/7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_textarea.c?rev=4895&r1=4894&r2=4895&view=diff
==============================================================================
--- 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_textarea.c
(original)
+++ 7.4/branches/pango/squeezeplay/src/squeezeplay/src/ui/jive_textarea.c Mon
Mar 23 06:06:33 2009
@@ -355,6 +355,12 @@
}
}
+char *trim_left_whitespace(char *str)
+{
+ // Trim leading space
+ while(isspace(*str)) str++;
+ return str;
+}
int jiveL_textarea_scroll(lua_State *L) {
/* stack is:
@@ -425,8 +431,6 @@
return 0;
}
-
-
int jiveL_textarea_draw(lua_State *L) {
Uint16 x, y;
// int i;
@@ -510,6 +514,42 @@
//
// y += peer->line_height;
// }
+ char * trimmed;
+
+ int line = peer->lines[i];
+ int next = peer->lines[i+1];
+
+ unsigned char b = text[(next - 1)];
+ unsigned char c = text[next];
+ text[next] = '\0';
+ if (b == '\n') {
+ text[(next - 1)] = '\0';
+ }
+
+ trimmed = trim_left_whitespace(&text[line]);
+ x = peer->w.bounds.x + peer->w.padding.left;
+ if (peer->align != JIVE_ALIGN_LEFT) {
+ Uint16 line_width = jive_font_width(peer->font,
trimmed);
+ x = jive_widget_halign((JiveWidget *)peer, peer->align,
line_width);
+ }
+
+ /* shadow text */
+ if (peer->is_sh) {
+ tsrf = jive_font_draw_text(peer->font, peer->sh,
trimmed);
+ jive_surface_blit(tsrf, srf, x + 1, y + 1);
+ jive_surface_free(tsrf);
+ }
+
+ /* foreground text */
+ tsrf = jive_font_draw_text(peer->font, peer->fg, trimmed);
+ jive_surface_blit(tsrf, srf, x, y);
+ jive_surface_free(tsrf);
+
+ text[next] = c;
+ text[(next - 1)] = b;
+
+ y += peer->line_height;
+ }
/* draw scrollbar */
if (peer->has_scrollbar) {
Propchange: 7.4/branches/pango/squeezeplay/src/squeezeplay_desktop/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,6 @@
.deps
.libs
a.out.dSYM
+config.log
+config.status
+Makefile
Propchange: 7.4/branches/pango/squeezeplay/src/tolua++-1.0.92/src/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Mar 23 06:06:33 2009
@@ -4,3 +4,4 @@
.deps
.libs
a.out.dSYM
+libtolua++.a
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/mailman/listinfo/jive-checkins
