Merge branch '2.2' into 2.3

This commit is contained in:
Simone Rota 2006-11-18 17:00:18 +01:00
commit 192ded21ff
16 changed files with 61 additions and 34 deletions

View File

@ -6,7 +6,7 @@
name=centericq
version=4.21.0
release=3
release=4
source=(http://thekonst.net/download/$name-$version.tar.bz2)
build() {
@ -15,21 +15,14 @@ build() {
for dir in \
connwrap-0.1 firetalk-0.1 kkconsui-0.1 \
kkstrtext-0.1 kksystr-0.1 libgadu-0.1 \
libjabber-0.1 libyahoo2-0.1
libjabber-0.1 libyahoo2-0.1 libicq2000-0.1 \
libmsn-0.1
do
cd $dir
autoconf
cd ..
done
for dir in \
libicq2000-0.1 libmsn-0.1
do
cd $dir
autoreconf --install --force
cd ..
done
./configure --prefix=/usr --disable-nls --mandir=/usr/man
make
make DESTDIR=$PKG install

View File

@ -12,13 +12,13 @@ drwxr-xr-x root/root usr/lib/
lrwxrwxrwx root/root usr/lib/libpng.a -> libpng12.a
lrwxrwxrwx root/root usr/lib/libpng.la -> libpng12.la
lrwxrwxrwx root/root usr/lib/libpng.so -> libpng12.so
lrwxrwxrwx root/root usr/lib/libpng.so.3 -> libpng.so.3.12.0
-rwxr-xr-x root/root usr/lib/libpng.so.3.12.0
lrwxrwxrwx root/root usr/lib/libpng.so.3 -> libpng.so.3.13.0
-rwxr-xr-x root/root usr/lib/libpng.so.3.13.0
-rw-r--r-- root/root usr/lib/libpng12.a
-rwxr-xr-x root/root usr/lib/libpng12.la
lrwxrwxrwx root/root usr/lib/libpng12.so -> libpng12.so.0.12.0
lrwxrwxrwx root/root usr/lib/libpng12.so.0 -> libpng12.so.0.12.0
-rwxr-xr-x root/root usr/lib/libpng12.so.0.12.0
lrwxrwxrwx root/root usr/lib/libpng12.so -> libpng12.so.0.13.0
lrwxrwxrwx root/root usr/lib/libpng12.so.0 -> libpng12.so.0.13.0
-rwxr-xr-x root/root usr/lib/libpng12.so.0.13.0
drwxr-xr-x root/root usr/lib/pkgconfig/
lrwxrwxrwx root/root usr/lib/pkgconfig/libpng.pc -> libpng12.pc
-rw-r--r-- root/root usr/lib/pkgconfig/libpng12.pc

View File

@ -1 +1 @@
2287cfaad53a714acdf6eb75a7c1d15f libpng-1.2.12.tar.bz2
e9ed9879008fa978d4c07cf4afd2bfcf libpng-1.2.13.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: zlib
name=libpng
version=1.2.12
version=1.2.13
release=1
source=(ftp://ftp.simplesystems.org/pub/$name/png/src/$name-$version.tar.bz2)

View File

@ -9,13 +9,12 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/X11R6/
drwxr-xr-x root/root usr/X11R6/lib/
-r--r--r-- root/root usr/X11R6/lib/libXvMCNVIDIA.a
-rwxr-xr-x root/root usr/X11R6/lib/libXvMCNVIDIA.so.1.0.8776
-rwxr-xr-x root/root usr/X11R6/lib/libXvMCNVIDIA.so.1.0.9629
drwxr-xr-x root/root usr/X11R6/lib/modules/
drwxr-xr-x root/root usr/X11R6/lib/modules/drivers/
-rwxr-xr-x root/root usr/X11R6/lib/modules/drivers/nvidia_drv.o
-rwxr-xr-x root/root usr/X11R6/lib/modules/drivers/nvidia_drv.so
drwxr-xr-x root/root usr/X11R6/lib/modules/extensions/
-rwxr-xr-x root/root usr/X11R6/lib/modules/extensions/libglx.so.1.0.8776
-rwxr-xr-x root/root usr/X11R6/lib/modules/extensions/libglx.so.1.0.9629
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/nvidia-settings
-rwxr-xr-x root/root usr/bin/nvidia-xconfig
@ -28,12 +27,12 @@ drwxr-xr-x root/root usr/include/nvidia/GL/
-r--r--r-- root/root usr/include/nvidia/GL/glxext.h
drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libGL.la
-rwxr-xr-x root/root usr/lib/libGL.so.1.0.8776
-rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.8776
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.8776
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.8776
-rwxr-xr-x root/root usr/lib/libGL.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libGLcore.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libnvidia-cfg.so.1.0.9629
-rwxr-xr-x root/root usr/lib/libnvidia-tls.so.1.0.9629
drwxr-xr-x root/root usr/lib/tls/
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.8776
-rwxr-xr-x root/root usr/lib/tls/libnvidia-tls.so.1.0.9629
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/nvidia-settings.1.gz

View File

@ -1,2 +1,2 @@
93ad45fe7b974a5a80348e1890f9b7c9 NVIDIA-Linux-x86-1.0-8776-pkg0.run
f3a4129e1d5e9b06828627da56ca149d NVIDIA-Linux-x86-1.0-9629-pkg0.run
544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch

View File

@ -6,7 +6,7 @@
# Nice to have: gl-select
name=nvidia
version=1.0-8776
version=1.0-9629
release=1
source=(http://download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
$name-makefile.patch)

View File

@ -2,6 +2,13 @@
README for nvidia 1.0-8178+
***** NOTE for users of NV2X chipsets!!! *****
1.0-9629 is confirmed broken for cards with NV2X chipsets, see:
http://www.nvnews.net/vbulletin/showthread.php?t=79703. Until a new version
is released, use 1.0-9626 or 1.0-8776.
**********************************************
*** NOTE for nvidia with udev ***
If using udev, add your user to the "video" group to be able to

View File

@ -1,2 +1,2 @@
448caca4745aef1a842f4fdb1aa62e1e samba
9e06d5e10f4ae84f7fafad75d1b4184c samba-3.0.23c.tar.gz
afe6923d05fed5b5ccab593c7a407cd1 samba-3.0.23d.tar.gz

View File

@ -4,7 +4,7 @@
# Depends on: ncurses, readline
name=samba
version=3.0.23c
version=3.0.23d
release=1
source=(http://us1.samba.org/samba/ftp/stable/$name-$version.tar.gz \
samba)

View File

@ -1,3 +1,8 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
-rwxr-xr-x root/root usr/bin/sylpheed
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/applications/
-rw-r--r-- root/root usr/share/applications/sylpheed.desktop
drwxr-xr-x root/root usr/share/pixmaps/
-rw-r--r-- root/root usr/share/pixmaps/sylpheed.png

View File

@ -1 +1 @@
45e9e89775613b0afb732fbc11c73d26 sylpheed-2.2.9.tar.bz2
68709cd07d2416c7aaeacf2c6921b1a2 sylpheed-2.2.10.tar.bz2

View File

@ -4,7 +4,7 @@
# Depends on: gtk, openssl
name=sylpheed
version=2.2.9
version=2.2.10
release=1
source=(http://sylpheed.sraoss.jp/sylpheed/v2.2/$name-$version.tar.bz2)
@ -17,5 +17,10 @@ build () {
--enable-gpgme
make
make DESTDIR=$PKG install
rm -r $PKG/usr/share
install -d $PKG/usr/share/{applications,pixmaps}
install -m 0644 sylpheed.desktop $PKG/usr/share/applications
install -m 0644 sylpheed.png $PKG/usr/share/pixmaps
rm -r $PKG/usr/share/{locale,sylpheed}
}

View File

@ -1 +1,2 @@
47845fd76f5f2354a3619c4097575487 vorbis-tools-1.1.1.tar.gz
dc5a45112202819cef1870ebb8d44929 vorbis-tools.diff

View File

@ -6,11 +6,15 @@
name=vorbis-tools
version=1.1.1
release=1
source=(http://downloads.xiph.org/releases/vorbis/$name-$version.tar.gz)
release=2
source=(http://downloads.xiph.org/releases/vorbis/$name-$version.tar.gz \
$name.diff)
build() {
cd $name-$version
patch -p0 -i $SRC/$name.diff
./configure --prefix=/usr --disable-nls --enable-vcut
make
make DESTDIR=$PKG install

View File

@ -0,0 +1,13 @@
Fix compilation with latest curl.
Patch stolen from NetBSD.
--- ogg123/http_transport.c.orig 2005-06-13 13:11:44.000000000 +0000
+++ ogg123/http_transport.c
@@ -116,7 +116,6 @@ void set_curl_opts (http_private_t *priv
if (inputOpts.ProxyTunnel)
curl_easy_setopt (handle, CURLOPT_HTTPPROXYTUNNEL, inputOpts.ProxyTunnel);
*/
- curl_easy_setopt(handle, CURLOPT_MUTE, 1);
curl_easy_setopt(handle, CURLOPT_ERRORBUFFER, private->error);
curl_easy_setopt(handle, CURLOPT_PROGRESSFUNCTION, progress_callback);
curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, private);