Restructure to make XMMS just one of the patches

28 files changed, 130 insertions, 81 deletions

diff --git a/ReadMe b/ReadMe
index 93308cf..d6697de 100644
--- a/ReadMe
+++ b/ReadMe
@@ -1,10 +1,10 @@
 Prerequisites
 -------------
-    The patched XMMS can be compiled without any additional dependency,
+    The patched applications can be compiled without additional dependency,
     but to get recoding on you will need LibRCC (http://rusxmms.sf.net).
-    The LibRCC (Russian Charset Conversion Library) supports several
-    ways of encoding autodetection. To get this feature on the LibRCD,
-    Enca, db4 libraries should be installed prior to LibRCC compilation.
+    The LibRCC (RusXMMS Charset Conversion Library) supports several
+    ways of encoding autodetection. This depend on LibRCD, Enca, and DB4 
+    libraries which should be installed prior to LibRCC compilation.
     
     Starting from version 0.2.0 LibRCC supports language autodetection using
     aspell and language translation using libtranslate (the internet connection
@@ -22,65 +22,5 @@ Prerequisites
     To get language translation:
 	7. Libtranslate + Internet Connection
 
-Compilation
------------
-1. Copy RusXMMS into the root of xmms source distribution
-    Run 'apply.sh' to get RusXMMS with ID3v2 enabled mpg123 
-	* Patches from Gentoo XMMS Distribution is used to provide ID3v2
-    Custom: Just apply patches you need 
-	* all files from source/*.[ch] should be copied into the 
-	libxmms directory
-2. Run 'aclocal && automake && autoconf' in the root of XMMS source tree in 
-   order to regenerate Makefiles.
-3. configure, compile and install as usual
-
-Patches
--------
-    xmms-ds-rusxmms:		Base RusXMMS patch (required!)
-    xmms-ds-rusxmms-charset:	UTF16/RCC for libxmms/charset.c. 
-				* Required by Id3v2 tag editor.
-    xmms-ds-playlist:		PlayList Recoding (Save/Load/Display)
-				* Recodes file names from playlist files
-				* Recodes titles from playlist files
-				* Recodes titles from plugins if AutoEngine enabled
-    xmms-ds-shade:		Enables font selection for Shade Windows
-				* After applying the non-English titles will be 
-				displayed correctly in the shade window
-    xmms-ds-textbox:		Corrects UTF-8 displaying in xmms 'TextBox'
-    
-    xmms-ds-mpg123:	Recodes mpg123 titles
-	    editor:	Enables editing of ID3 tags (v.1 and v.2)
-	      keys:	Enables fast keys 
-			Esc, Enter: Cancel, Save and Exit
-			Ctrl+Left, Ctrl+Right: Navigate tabs
-    			Ctrl+PgDn, Ctrl+PgUp: Navigate records
-    xmms-ds-vorbis-*:	The same functionalities for vorbis plugin
-			( No recoding patch is required )
-
-Extra Patches
--------------
-    Some extra functionality, which is not included in default "apply.sh" 
-    scripts and could be considered a bad or/and dangerous idea.
-
-    xmms-ds-mpg123-wrongencoding.patch:
-	The ID3 v.2 defines 4 types of encodings: Latin1, UTF16, UTF16BE, UTF8.
-	Original version of XMMS assumes the tag broken if other encoding is
-	specified. This patch, assumes Latin1 for such encodings.
-
-Minimal Configurations:
-    xmms-ds-rusxmms + xmms-ds-playlist:
-	In the case then the autoengine is available, this solution will
-	give completely recoded playlist window. The recoding of plugins
-	will work as well.
-    xmms-ds-rusxmms + xmms-ds-mpg123(no editor and keys):
-	This solution will give completely recoded playlist even if no
-	autoengine is available, but playlists are unsupported.
-
-Notes
------
-    * Edited ID3 tags and playlists will be saved in the corresponded
-    encodings selected using 'RusXMMS' preference page.
-
-
 Project Page: http://rusxmms.sf.net
-Author: Suren A. Chilingaryan <darksoft@dside.dyndns.org>
+Author: Suren A. Chilingaryan <csa@suren.me>
diff --git a/VERSION b/VERSION
new file mode 100644
index 0000000..6093485
--- /dev/null
+++ b/VERSION
@@ -0,0 +1 @@
+csa45
diff --git a/misc/brokentags.c b/misc/brokentags.c
deleted file mode 100644
index e850057..0000000
--- a/misc/brokentags.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* I tried to use it to fix broken tags (call id3_get_text), but
-it really didn't help much (half of title tag, instead of one fourth) */
-void id3_fix_text(struct id3_frame *frame, int offset) {
-    int i, size;
-    char *string;
-    
-    size = frame->fr_size - offset - 1;
-    string = ID3_TEXT_FRAME_PTR(frame) + offset;
-    
-    for (offset=0, i=0;i<size;i++) {
-	if (!string[i]) offset++;
-	else if (offset) string[i-offset] = string[i];
-    }
-
-    for (;offset>0;offset--) string[i-offset]=0;
-}
diff --git a/3rdparty/mpg123/0050_all_libxmms-charset.patch b/patches/xmms/3rdparty/mpg123/0050_all_libxmms-charset.patch
index 94416dd..94416dd 100644
--- a/3rdparty/mpg123/0050_all_libxmms-charset.patch
+++ b/patches/xmms/3rdparty/mpg123/0050_all_libxmms-charset.patch
diff --git a/3rdparty/mpg123/2011_all_mpg123-http-seek.patch b/patches/xmms/3rdparty/mpg123/2011_all_mpg123-http-seek.patch
index 67ab4f5..67ab4f5 100644
--- a/3rdparty/mpg123/2011_all_mpg123-http-seek.patch
+++ b/patches/xmms/3rdparty/mpg123/2011_all_mpg123-http-seek.patch
diff --git a/3rdparty/mpg123/2012_all_mpg123-id3convert.patch b/patches/xmms/3rdparty/mpg123/2012_all_mpg123-id3convert.patch
index 8c1b76b..8c1b76b 100644
--- a/3rdparty/mpg123/2012_all_mpg123-id3convert.patch
+++ b/patches/xmms/3rdparty/mpg123/2012_all_mpg123-id3convert.patch
diff --git a/3rdparty/mpg123/2013_all_mpg123-latin-id3.patch b/patches/xmms/3rdparty/mpg123/2013_all_mpg123-latin-id3.patch
index b1d33cd..b1d33cd 100644
--- a/3rdparty/mpg123/2013_all_mpg123-latin-id3.patch
+++ b/patches/xmms/3rdparty/mpg123/2013_all_mpg123-latin-id3.patch
diff --git a/3rdparty/mpg123/2014_all_mpg123-encode-override.patch b/patches/xmms/3rdparty/mpg123/2014_all_mpg123-encode-override.patch
index 5c27f66..5c27f66 100644
--- a/3rdparty/mpg123/2014_all_mpg123-encode-override.patch
+++ b/patches/xmms/3rdparty/mpg123/2014_all_mpg123-encode-override.patch
diff --git a/3rdparty/mpg123/2015_all_mpg123-id3v2edit.patch b/patches/xmms/3rdparty/mpg123/2015_all_mpg123-id3v2edit.patch
index b1d47a2..b1d47a2 100644
--- a/3rdparty/mpg123/2015_all_mpg123-id3v2edit.patch
+++ b/patches/xmms/3rdparty/mpg123/2015_all_mpg123-id3v2edit.patch
diff --git a/3rdparty/mpg123/2020_all_mpg123-vorbis-ssl.patch b/patches/xmms/3rdparty/mpg123/2020_all_mpg123-vorbis-ssl.patch
index 453c91b..453c91b 100644
--- a/3rdparty/mpg123/2020_all_mpg123-vorbis-ssl.patch
+++ b/patches/xmms/3rdparty/mpg123/2020_all_mpg123-vorbis-ssl.patch
diff --git a/patches/xmms/ReadMe b/patches/xmms/ReadMe
new file mode 100644
index 0000000..ef5082f
--- /dev/null
+++ b/patches/xmms/ReadMe
@@ -0,0 +1,86 @@
+Prerequisites
+-------------
+    The patched XMMS can be compiled without any additional dependency,
+    but to get recoding on you will need LibRCC (http://rusxmms.sf.net).
+    The LibRCC (Russian Charset Conversion Library) supports several
+    ways of encoding autodetection. To get this feature on the LibRCD,
+    Enca, db4 libraries should be installed prior to LibRCC compilation.
+    
+    Starting from version 0.2.0 LibRCC supports language autodetection using
+    aspell and language translation using libtranslate (the internet connection
+    is required).
+
+    So, to get fully functional system, with multi-language playlist recoding,
+    you will need following libraries:
+	1. LibRCD (http://rusxmms.sf.net)
+	2. Enca
+	3. DB4 (Brekley DB)
+	4. LibXML2
+	5. LibRCC
+    To get language auto-detection:
+	6. Aspell with dictionaries
+    To get language translation:
+	7. Libtranslate + Internet Connection
+
+Compilation
+-----------
+1. Copy this folder as RusXMMS2 into the root of xmms source distribution
+    Run 'apply.sh' to get RusXMMS with ID3v2 enabled mpg123 
+	* Patches from Gentoo XMMS Distribution is used to provide ID3v2
+    Custom: Just apply patches you need 
+	* all files from source/*.[ch] should be copied into the 
+	libxmms directory
+2. Run 'aclocal && automake && autoconf' in the root of XMMS source tree in 
+   order to regenerate Makefiles.
+3. configure, compile and install as usual
+
+Patches
+-------
+    xmms-ds-rusxmms:		Base RusXMMS patch (required!)
+    xmms-ds-rusxmms-charset:	UTF16/RCC for libxmms/charset.c. 
+				* Required by Id3v2 tag editor.
+    xmms-ds-playlist:		PlayList Recoding (Save/Load/Display)
+				* Recodes file names from playlist files
+				* Recodes titles from playlist files
+				* Recodes titles from plugins if AutoEngine enabled
+    xmms-ds-shade:		Enables font selection for Shade Windows
+				* After applying the non-English titles will be 
+				displayed correctly in the shade window
+    xmms-ds-textbox:		Corrects UTF-8 displaying in xmms 'TextBox'
+    
+    xmms-ds-mpg123:	Recodes mpg123 titles
+	    editor:	Enables editing of ID3 tags (v.1 and v.2)
+	      keys:	Enables fast keys 
+			Esc, Enter: Cancel, Save and Exit
+			Ctrl+Left, Ctrl+Right: Navigate tabs
+    			Ctrl+PgDn, Ctrl+PgUp: Navigate records
+    xmms-ds-vorbis-*:	The same functionalities for vorbis plugin
+			( No recoding patch is required )
+
+Extra Patches
+-------------
+    Some extra functionality, which is not included in default "apply.sh" 
+    scripts and could be considered a bad or/and dangerous idea.
+
+    xmms-ds-mpg123-wrongencoding.patch:
+	The ID3 v.2 defines 4 types of encodings: Latin1, UTF16, UTF16BE, UTF8.
+	Original version of XMMS assumes the tag broken if other encoding is
+	specified. This patch, assumes Latin1 for such encodings.
+
+Minimal Configurations:
+    xmms-ds-rusxmms + xmms-ds-playlist:
+	In the case then the autoengine is available, this solution will
+	give completely recoded playlist window. The recoding of plugins
+	will work as well.
+    xmms-ds-rusxmms + xmms-ds-mpg123(no editor and keys):
+	This solution will give completely recoded playlist even if no
+	autoengine is available, but playlists are unsupported.
+
+Notes
+-----
+    * Edited ID3 tags and playlists will be saved in the corresponded
+    encodings selected using 'RusXMMS' preference page.
+
+
+Project Page: http://rusxmms.sf.net
+Author: Suren A. Chilingaryan <darksoft@dside.dyndns.org>
diff --git a/apply.sh b/patches/xmms/apply.sh
index 69c4ea4..69c4ea4 100755
--- a/apply.sh
+++ b/patches/xmms/apply.sh
diff --git a/patches/xmms/extra/xmms-ds-mpg123-wrongencoding.patch b/patches/xmms/patches/extra/xmms-ds-mpg123-wrongencoding.patch
index 66a2100..66a2100 100644
--- a/patches/xmms/extra/xmms-ds-mpg123-wrongencoding.patch
+++ b/patches/xmms/patches/extra/xmms-ds-mpg123-wrongencoding.patch
diff --git a/patches/xmms/plugins/xmms-ds-mpg123-editor-keys.patch b/patches/xmms/patches/plugins/xmms-ds-mpg123-editor-keys.patch
index 38a74e2..38a74e2 100644
--- a/patches/xmms/plugins/xmms-ds-mpg123-editor-keys.patch
+++ b/patches/xmms/patches/plugins/xmms-ds-mpg123-editor-keys.patch
diff --git a/patches/xmms/plugins/xmms-ds-mpg123-editor.patch b/patches/xmms/patches/plugins/xmms-ds-mpg123-editor.patch
index a4afb70..a4afb70 100644
--- a/patches/xmms/plugins/xmms-ds-mpg123-editor.patch
+++ b/patches/xmms/patches/plugins/xmms-ds-mpg123-editor.patch
diff --git a/patches/xmms/plugins/xmms-ds-mpg123.patch b/patches/xmms/patches/plugins/xmms-ds-mpg123.patch
index fc9c42e..fc9c42e 100644
--- a/patches/xmms/plugins/xmms-ds-mpg123.patch
+++ b/patches/xmms/patches/plugins/xmms-ds-mpg123.patch
diff --git a/patches/xmms/plugins/xmms-ds-vorbis-editor-keys.patch b/patches/xmms/patches/plugins/xmms-ds-vorbis-editor-keys.patch
index bf59951..bf59951 100644
--- a/patches/xmms/plugins/xmms-ds-vorbis-editor-keys.patch
+++ b/patches/xmms/patches/plugins/xmms-ds-vorbis-editor-keys.patch
diff --git a/patches/xmms/plugins/xmms-ds-vorbis-editor.patch b/patches/xmms/patches/plugins/xmms-ds-vorbis-editor.patch
index 47a7ba9..47a7ba9 100644
--- a/patches/xmms/plugins/xmms-ds-vorbis-editor.patch
+++ b/patches/xmms/patches/plugins/xmms-ds-vorbis-editor.patch
diff --git a/patches/xmms/xmms-ds-playlist.patch b/patches/xmms/patches/xmms-ds-playlist.patch
index b72c8d0..b72c8d0 100644
--- a/patches/xmms/xmms-ds-playlist.patch
+++ b/patches/xmms/patches/xmms-ds-playlist.patch
diff --git a/patches/xmms/xmms-ds-rusxmms-charset.patch b/patches/xmms/patches/xmms-ds-rusxmms-charset.patch
index 670f9e3..670f9e3 100644
--- a/patches/xmms/xmms-ds-rusxmms-charset.patch
+++ b/patches/xmms/patches/xmms-ds-rusxmms-charset.patch
diff --git a/patches/xmms/xmms-ds-rusxmms.patch b/patches/xmms/patches/xmms-ds-rusxmms.patch
index 6b9287f..6b9287f 100644
--- a/patches/xmms/xmms-ds-rusxmms.patch
+++ b/patches/xmms/patches/xmms-ds-rusxmms.patch
diff --git a/patches/xmms/xmms-ds-shade.patch b/patches/xmms/patches/xmms-ds-shade.patch
index 41362df..41362df 100644
--- a/patches/xmms/xmms-ds-shade.patch
+++ b/patches/xmms/patches/xmms-ds-shade.patch
diff --git a/patches/xmms/xmms-ds-textbox.patch b/patches/xmms/patches/xmms-ds-textbox.patch
index 8442606..8442606 100644
--- a/patches/xmms/xmms-ds-textbox.patch
+++ b/patches/xmms/patches/xmms-ds-textbox.patch
diff --git a/patches/xmms-plugins/xmms-wma-csa1.tar.bz2 b/patches/xmms/plugins/xmms-wma-csa1.tar.bz2
index de6968c..de6968c 100644
--- a/patches/xmms-plugins/xmms-wma-csa1.tar.bz2
+++ b/patches/xmms/plugins/xmms-wma-csa1.tar.bz2
diff --git a/source/rcc.c b/patches/xmms/source/rcc.c
index c02f050..c02f050 100644
--- a/source/rcc.c
+++ b/patches/xmms/source/rcc.c
diff --git a/source/rcc.h b/patches/xmms/source/rcc.h
index d5bc9b2..d5bc9b2 100644
--- a/source/rcc.h
+++ b/patches/xmms/source/rcc.h
diff --git a/source/rcc_langs.h b/patches/xmms/source/rcc_langs.h
index 70abebf..70abebf 100644
--- a/source/rcc_langs.h
+++ b/patches/xmms/source/rcc_langs.h
diff --git a/release b/release
new file mode 100755
index 0000000..a0d6915
--- /dev/null
+++ b/release
@@ -0,0 +1,38 @@
+#! /bin/bash
+
+RDIR=~/releases
+NAME=RusXMMS2
+
+if [ ! -d $RDIR ]; then
+    if [ -a $RDIR ]; then
+	echo "Release directory isn't a directory!"
+	exit
+    fi
+    mkdir -p $RDIR
+fi
+
+version=$(cat VERSION)
+rname="$NAME-$version";
+
+if [ -d $RDIR/$rname ]; then
+    rm -rf $RDIR/$rname
+fi
+mkdir -p $RDIR/$rname
+if [ ! -d $RDIR/$rname ]; then
+    echo "Can't create directory!!!"
+    exit
+fi
+cp -a * $RDIR/$rname
+
+(
+    cd $RDIR
+
+    if [ -a $rname.tar.bz2 ]; then
+	rm -f $rname.tar.bz2
+    fi
+    tar cjf $rname.tar.bz2 $rname
+    rm -rf $rname
+
+    scp $rname.tar.bz2 csa@darksoft.org:/home/csa/public_html/files/rusxmms/
+    ssh csa@darksoft.org ln -sf $rname.tar.bz2 /home/csa/public_html/files/rusxmms/$NAME-latest.tar.bz2
+)