Merge branch '2.2' into 2.3

This commit is contained in:
Simone Rota 2007-01-30 13:31:51 +01:00
commit fc2ac16f42
15 changed files with 36 additions and 20 deletions

View File

@ -5,9 +5,9 @@ drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/sfddiff
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libgdraw.la
lrwxrwxrwx root/root usr/lib/libgdraw.so -> libgdraw.so.1.0.12
lrwxrwxrwx root/root usr/lib/libgdraw.so.1 -> libgdraw.so.1.0.12
-rwxr-xr-x root/root usr/lib/libgdraw.so.1.0.12
lrwxrwxrwx root/root usr/lib/libgdraw.so -> libgdraw.so.1.0.13
lrwxrwxrwx root/root usr/lib/libgdraw.so.1 -> libgdraw.so.1.0.13
-rwxr-xr-x root/root usr/lib/libgdraw.so.1.0.13
-rwxr-xr-x root/root usr/lib/libgunicode.la
lrwxrwxrwx root/root usr/lib/libgunicode.so -> libgunicode.so.2.0.3
lrwxrwxrwx root/root usr/lib/libgunicode.so.2 -> libgunicode.so.2.0.3

View File

@ -1 +1 @@
5fcfa3497d237bf68d1d388254f78448 fontforge_full-20061025.tar.bz2
0f2354b885676fc8092a74aa9b9cb662 fontforge_full-20061220.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on: freetype, libpng, libtiff, libungif, libxml2
name=fontforge
version=20061025
version=20061220
release=1
source=(http://dl.sourceforge.net/sourceforge/$name/${name}_full-$version.tar.bz2)

View File

@ -31,14 +31,15 @@ drwxr-xr-x root/root usr/include/libxslt/
drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libexslt.a
-rwxr-xr-x root/root usr/lib/libexslt.la
lrwxrwxrwx root/root usr/lib/libexslt.so -> libexslt.so.0.8.12
lrwxrwxrwx root/root usr/lib/libexslt.so.0 -> libexslt.so.0.8.12
-rwxr-xr-x root/root usr/lib/libexslt.so.0.8.12
lrwxrwxrwx root/root usr/lib/libexslt.so -> libexslt.so.0.8.13
lrwxrwxrwx root/root usr/lib/libexslt.so.0 -> libexslt.so.0.8.13
-rwxr-xr-x root/root usr/lib/libexslt.so.0.8.13
drwxr-xr-x root/root usr/lib/libxslt-plugins/
-rw-r--r-- root/root usr/lib/libxslt.a
-rwxr-xr-x root/root usr/lib/libxslt.la
lrwxrwxrwx root/root usr/lib/libxslt.so -> libxslt.so.1.1.15
lrwxrwxrwx root/root usr/lib/libxslt.so.1 -> libxslt.so.1.1.15
-rwxr-xr-x root/root usr/lib/libxslt.so.1.1.15
lrwxrwxrwx root/root usr/lib/libxslt.so -> libxslt.so.1.1.20
lrwxrwxrwx root/root usr/lib/libxslt.so.1 -> libxslt.so.1.1.20
-rwxr-xr-x root/root usr/lib/libxslt.so.1.1.20
drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libexslt.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libxslt.pc

View File

@ -1 +1 @@
238de9eda71b570ff7b78aaf65308fc6 libxslt-1.1.15.tar.gz
4ea2dc22a23bf2aa570f868aa86357f8 libxslt-1.1.20.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: libxml2
name=libxslt
version=1.1.15
version=1.1.20
release=1
source=(ftp://xmlsoft.org/libxml2/$name-$version.tar.gz)

View File

@ -5,4 +5,3 @@ drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/nano.1.gz
drwxr-xr-x root/root usr/man/man5/
-rw-r--r-- root/root usr/man/man5/nanorc.5.gz

View File

@ -1 +1 @@
38046476096530e19a7e805513c64108 nano-2.0.2.tar.gz
b8e2c1450b36d21f9a82509da3e4d9b1 nano-2.0.3.tar.gz

View File

@ -5,7 +5,7 @@
# Depends on:
name=nano
version=2.0.2
version=2.0.3
release=1
source=(http://www.nano-editor.org/dist/v2.0/$name-$version.tar.gz)

View File

@ -3,4 +3,3 @@ drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/pinentry -> pinentry-gtk-2
-rwxr-xr-x root/root usr/bin/pinentry-curses
-rwxr-xr-x root/root usr/bin/pinentry-gtk-2
-rwxr-xr-x root/root usr/bin/pinentry-qt

View File

@ -1,2 +1,2 @@
f5eeff17dd7117175794459f7097ad1a postgresql
490cb3a614545cbd3ce9b1c75c1d2b2e postgresql-8.2.0.tar.bz2
5cf003dfdbcab69974c091c3a0aa85eb postgresql-8.2.1.tar.bz2

View File

@ -5,7 +5,7 @@
# Depends on:
name=postgresql
version=8.2.0
version=8.2.1
release=1
source=(ftp://ftp7.de.postgresql.org/pub/ftp.postgresql.org/source/v$version/$name-$version.tar.bz2 postgresql)

View File

@ -1 +1,2 @@
59c76ac704088ef5539210190c4e1fe3 smpeg-0.4.4.tar.gz
514632fb38e5ad33970854b3baa873f2 smpeg-mpegaudiosdl.patch

View File

@ -6,10 +6,12 @@
name=smpeg
version=0.4.4
release=1
source=(ftp://sunsite.dk/pub/os/linux/loki/open-source/$name/$name-$version.tar.gz)
source=(http://gentoo.osuosl.org/distfiles/$name-$version.tar.gz \
$name-mpegaudiosdl.patch)
build() {
cd $name-$version
patch -p1 -i $SRC/$name-mpegaudiosdl.patch
./configure --prefix=/usr
sed -i -e 's|\(libsmpeg_la_LDFLAGS = .*\)|\1 -lstdc++|' Makefile
make

View File

@ -0,0 +1,14 @@
--- smpeg-0.4.4/MPEGaudio.h.orig 2006-01-15 16:17:56.356444000 +0100
+++ smpeg-0.4.4/MPEGaudio.h 2006-01-15 16:18:36.686965250 +0100
@@ -148,6 +148,11 @@
char buffer[2*WINDOWSIZE];
};
+void Play_MPEGaudioSDL(void *udata, Uint8 *stream, int len);
+#ifdef THREADED_AUDIO
+int Decode_MPEGaudio(void *udata);
+#endif
+
/* The actual MPEG audio class */
class MPEGaudio : public MPEGerror, public MPEGaudioaction {