1
0
forked from ports/contrib

Merge branch '2.4' into 2.5

This commit is contained in:
Bartlomiej Palmowski 2008-11-01 18:41:51 +01:00
commit 9b40a3e411
32 changed files with 380 additions and 569 deletions

View File

@ -3,13 +3,11 @@ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/FTGL/ drwxr-xr-x root/root usr/include/FTGL/
-rw-r--r-- root/root usr/include/FTGL/FTBBox.h -rw-r--r-- root/root usr/include/FTGL/FTBBox.h
-rw-r--r-- root/root usr/include/FTGL/FTBitmapGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTBitmapGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTCharToGlyphIndexMap.h -rw-r--r-- root/root usr/include/FTGL/FTBuffer.h
-rw-r--r-- root/root usr/include/FTGL/FTCharmap.h -rw-r--r-- root/root usr/include/FTGL/FTBufferFont.h
-rw-r--r-- root/root usr/include/FTGL/FTContour.h -rw-r--r-- root/root usr/include/FTGL/FTBufferGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTExtrdGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTExtrdGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTFace.h
-rw-r--r-- root/root usr/include/FTGL/FTFont.h -rw-r--r-- root/root usr/include/FTGL/FTFont.h
-rw-r--r-- root/root usr/include/FTGL/FTGL.h
-rw-r--r-- root/root usr/include/FTGL/FTGLBitmapFont.h -rw-r--r-- root/root usr/include/FTGL/FTGLBitmapFont.h
-rw-r--r-- root/root usr/include/FTGL/FTGLExtrdFont.h -rw-r--r-- root/root usr/include/FTGL/FTGLExtrdFont.h
-rw-r--r-- root/root usr/include/FTGL/FTGLOutlineFont.h -rw-r--r-- root/root usr/include/FTGL/FTGLOutlineFont.h
@ -17,19 +15,18 @@ drwxr-xr-x root/root usr/include/FTGL/
-rw-r--r-- root/root usr/include/FTGL/FTGLPolygonFont.h -rw-r--r-- root/root usr/include/FTGL/FTGLPolygonFont.h
-rw-r--r-- root/root usr/include/FTGL/FTGLTextureFont.h -rw-r--r-- root/root usr/include/FTGL/FTGLTextureFont.h
-rw-r--r-- root/root usr/include/FTGL/FTGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTGlyphContainer.h -rw-r--r-- root/root usr/include/FTGL/FTLayout.h
-rw-r--r-- root/root usr/include/FTGL/FTLibrary.h
-rw-r--r-- root/root usr/include/FTGL/FTList.h
-rw-r--r-- root/root usr/include/FTGL/FTOutlineGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTOutlineGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTPixmapGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTPixmapGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTPoint.h -rw-r--r-- root/root usr/include/FTGL/FTPoint.h
-rw-r--r-- root/root usr/include/FTGL/FTPolyGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTPolyGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTSize.h -rw-r--r-- root/root usr/include/FTGL/FTSimpleLayout.h
-rw-r--r-- root/root usr/include/FTGL/FTTextureGlyph.h -rw-r--r-- root/root usr/include/FTGL/FTTextureGlyph.h
-rw-r--r-- root/root usr/include/FTGL/FTVector.h -rw-r--r-- root/root usr/include/FTGL/ftgl.h
-rw-r--r-- root/root usr/include/FTGL/FTVectoriser.h
drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/
-rw-r--r-- root/root usr/lib/libftgl.a -rwxr-xr-x root/root usr/lib/libftgl.la
-rw-r--r-- root/root usr/lib/libftgl.la lrwxrwxrwx root/root usr/lib/libftgl.so -> libftgl.so.2.1.3
lrwxrwxrwx root/root usr/lib/libftgl.so.2 -> libftgl.so.2.1.3
-rwxr-xr-x root/root usr/lib/libftgl.so.2.1.3
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/ftgl.pc -rw-r--r-- root/root usr/lib/pkgconfig/ftgl.pc

View File

@ -1,2 +1 @@
522cd2e1e818d657e3e56f2ad3ab67c9 ftgl-2.1.2-gcc41.patch c7879018cde844059495b3029b0b6503 ftgl-2.1.3-rc5.tar.bz2
e0736841ce273eddbdb64617621b75f4 ftgl-2.1.2.tar.bz2

View File

@ -2,17 +2,15 @@
# URL: http://homepages.paradise.net.nz/henryj/code/ # URL: http://homepages.paradise.net.nz/henryj/code/
# Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net # Maintainer: Jose V Beneyto, sepen at users dot sourceforge dot net
# Packager: Jose V Beneyto, sepen at users dot sourceforge dot net # Packager: Jose V Beneyto, sepen at users dot sourceforge dot net
# Depends on: mesa3d,freetype,freeglut # Depends on: freetype, freeglut
name=ftgl name=ftgl
version=2.1.2 version=2.1.3-rc5
release=2 release=1
source=(http://dl.sourceforge.net/sourceforge/${name}/${name}-${version}.tar.bz2 \ source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)
${name}-2.1.2-gcc41.patch)
build() { build() {
patch -p0 < ${SRC}/${name}-2.1.2-gcc41.patch cd $name-2.1.3~rc5
cd FTGL/unix
./configure --prefix=/usr \ ./configure --prefix=/usr \
--with-x \ --with-x \
--disable-nls \ --disable-nls \
@ -20,9 +18,6 @@ build() {
--disable-static \ --disable-static \
--disable-freetypetest --disable-freetypetest
make make
install -d ${PKG}/usr/include/FTGL make DESTDIR=$PKG install
install -m 0644 ../include/*.h ${PKG}/usr/include/FTGL rm -rf $PKG/usr/share
install -D -m 0644 ${name}.pc ${PKG}/usr/lib/pkgconfig/${name}.pc
install -D -m 0644 src/lib${name}.la ${PKG}/usr/lib/lib${name}.la
install -D -m 0644 src/.libs/lib${name}.a ${PKG}/usr/lib/lib${name}.a
} }

View File

@ -1,11 +0,0 @@
--- FTGL/include/FTTextureGlyph.h.old 2006-01-29 11:08:54.000000000 -0700
+++ FTGL/include/FTTextureGlyph.h 2006-01-29 11:09:06.000000000 -0700
@@ -52,7 +52,7 @@
* Reset the currently active texture to zero to get into a known state before
* drawing a string. This is to get round possible threading issues.
*/
- static void FTTextureGlyph::ResetActiveTexture(){ activeTextureID = 0;}
+ static void ResetActiveTexture(){ activeTextureID = 0;}
private:
/**

View File

@ -1 +1,3 @@
592d600ce50f0a107ecd5b348d434f9f libdv-0.99-2.6.patch
332c325bdd6224da9bd675d5d9a8ef7c libdv-1.0.0-pic.patch.bz2
f895162161cfa4bb4a94c070a7caa6c7 libdv-1.0.0.tar.gz f895162161cfa4bb4a94c070a7caa6c7 libdv-1.0.0.tar.gz

View File

@ -6,11 +6,17 @@
name=libdv name=libdv
version=1.0.0 version=1.0.0
release=1 release=2
source=(http://dl.sourceforge.net/sourceforge/libdv/libdv-$version.tar.gz) source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.gz
http://www.dcaf-security.org/distfiles/$name-1.0.0-pic.patch.bz2
$name-0.99-2.6.patch)
build() { build() {
cd libdv-$version cd $name-$version
bzcat $SRC/$name-1.0.0-pic.patch.bz2 |patch -p 1
patch -p 1 -i $SRC/$name-0.99-2.6.patch
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \
--mandir=/usr/man \ --mandir=/usr/man \

View File

@ -0,0 +1,17 @@
--- libdv-0.99/libdv/enc_input.c 2002-12-31 23:04:02.000000000 +0000
+++ libdv-0.99/libdv/enc_input.c.plasmaroo 2003-12-30 16:42:19.000000000 +0000
@@ -48,13 +48,13 @@
#if HAVE_DEV_VIDEO
#include <sys/types.h>
-#include <linux/videodev.h>
#include <sys/time.h>
#include <unistd.h>
#include <fcntl.h>
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <sys/mman.h>
+#include <linux/videodev.h>
#endif
// #define ARCH_X86 0

View File

@ -11,9 +11,9 @@ drwxr-xr-x root/root usr/include/
-rw-r--r-- root/root usr/include/tld.h -rw-r--r-- root/root usr/include/tld.h
drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libidn.la -rwxr-xr-x root/root usr/lib/libidn.la
lrwxrwxrwx root/root usr/lib/libidn.so -> libidn.so.11.5.39 lrwxrwxrwx root/root usr/lib/libidn.so -> libidn.so.11.5.40
lrwxrwxrwx root/root usr/lib/libidn.so.11 -> libidn.so.11.5.39 lrwxrwxrwx root/root usr/lib/libidn.so.11 -> libidn.so.11.5.40
-rwxr-xr-x root/root usr/lib/libidn.so.11.5.39 -rwxr-xr-x root/root usr/lib/libidn.so.11.5.40
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/libidn.pc -rw-r--r-- root/root usr/lib/pkgconfig/libidn.pc
drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/

View File

@ -1 +1 @@
142c21f2bd922c84c4a3c3d469bbc596 libidn-1.10.tar.gz 8859b17928f84b899b19e72bfa1c6dbf libidn-1.11.tar.gz

View File

@ -4,7 +4,7 @@
# Packager: Daniel Mueller, daniel at danm dot de # Packager: Daniel Mueller, daniel at danm dot de
name=libidn name=libidn
version=1.10 version=1.11
release=1 release=1
source=(ftp://alpha.gnu.org/pub/gnu/libidn/libidn-$version.tar.gz) source=(ftp://alpha.gnu.org/pub/gnu/libidn/libidn-$version.tar.gz)

View File

@ -7,17 +7,17 @@ drwxr-xr-x root/root usr/include/theora/
-rw-r--r-- root/root usr/include/theora/theoraenc.h -rw-r--r-- root/root usr/include/theora/theoraenc.h
drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libtheora.la -rwxr-xr-x root/root usr/lib/libtheora.la
lrwxrwxrwx root/root usr/lib/libtheora.so -> libtheora.so.0.3.3 lrwxrwxrwx root/root usr/lib/libtheora.so -> libtheora.so.0.3.4
lrwxrwxrwx root/root usr/lib/libtheora.so.0 -> libtheora.so.0.3.3 lrwxrwxrwx root/root usr/lib/libtheora.so.0 -> libtheora.so.0.3.4
-rwxr-xr-x root/root usr/lib/libtheora.so.0.3.3 -rwxr-xr-x root/root usr/lib/libtheora.so.0.3.4
-rwxr-xr-x root/root usr/lib/libtheoradec.la -rwxr-xr-x root/root usr/lib/libtheoradec.la
lrwxrwxrwx root/root usr/lib/libtheoradec.so -> libtheoradec.so.1.0.0 lrwxrwxrwx root/root usr/lib/libtheoradec.so -> libtheoradec.so.1.0.1
lrwxrwxrwx root/root usr/lib/libtheoradec.so.1 -> libtheoradec.so.1.0.0 lrwxrwxrwx root/root usr/lib/libtheoradec.so.1 -> libtheoradec.so.1.0.1
-rwxr-xr-x root/root usr/lib/libtheoradec.so.1.0.0 -rwxr-xr-x root/root usr/lib/libtheoradec.so.1.0.1
-rwxr-xr-x root/root usr/lib/libtheoraenc.la -rwxr-xr-x root/root usr/lib/libtheoraenc.la
lrwxrwxrwx root/root usr/lib/libtheoraenc.so -> libtheoraenc.so.1.0.0 lrwxrwxrwx root/root usr/lib/libtheoraenc.so -> libtheoraenc.so.1.0.1
lrwxrwxrwx root/root usr/lib/libtheoraenc.so.1 -> libtheoraenc.so.1.0.0 lrwxrwxrwx root/root usr/lib/libtheoraenc.so.1 -> libtheoraenc.so.1.0.1
-rwxr-xr-x root/root usr/lib/libtheoraenc.so.1.0.0 -rwxr-xr-x root/root usr/lib/libtheoraenc.so.1.0.1
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/theora.pc -rw-r--r-- root/root usr/lib/pkgconfig/theora.pc
-rw-r--r-- root/root usr/lib/pkgconfig/theoradec.pc -rw-r--r-- root/root usr/lib/pkgconfig/theoradec.pc

View File

@ -1,2 +1 @@
f095a6447c6c22c6d8518dda4c6ca05c libtheora-1.0RC1-x86_64-missing-file.patch e72ea433eb5be8480d458738927c137d libtheora-1.0RC2.tar.bz2
93fc6783b263a6576b488f7b1821df10 libtheora-1.0RC1.tar.bz2

View File

@ -5,16 +5,12 @@
# Depends on: libvorbis # Depends on: libvorbis
name=libtheora name=libtheora
version=1.0RC1 version=1.0RC2
release=2 release=2
source=(http://downloads.xiph.org/releases/theora/libtheora-$version.tar.bz2 source=(http://downloads.xiph.org/releases/theora/libtheora-$version.tar.bz2)
libtheora-1.0RC1-x86_64-missing-file.patch)
build() { build() {
cd libtheora-$version cd $name-1.0
patch -p 1 -i $SRC/libtheora-1.0RC1-x86_64-missing-file.patch
automake
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \

View File

@ -1,424 +0,0 @@
diff -pruN libtheora-1.0RC1.orig/lib/enc/x86_64/dct_decode_mmx.c libtheora-1.0RC1/lib/enc/x86_64/dct_decode_mmx.c
--- libtheora-1.0RC1.orig/lib/enc/x86_64/dct_decode_mmx.c 1970-01-01 10:00:00.000000000 +1000
+++ libtheora-1.0RC1/lib/enc/x86_64/dct_decode_mmx.c 2008-10-08 06:29:14.763300154 +1100
@@ -0,0 +1,409 @@
+/********************************************************************
+ * *
+ * THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE. *
+ * USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS *
+ * GOVERNED BY A BSD-STYLE SOURCE LICENSE INCLUDED WITH THIS SOURCE *
+ * IN 'COPYING'. PLEASE READ THESE TERMS BEFORE DISTRIBUTING. *
+ * *
+ * THE Theora SOURCE CODE IS COPYRIGHT (C) 2002-2008 *
+ * by the Xiph.Org Foundation http://www.xiph.org/ *
+ * *
+ ********************************************************************
+
+ function:
+ last mod: $Id$
+
+ ********************************************************************/
+
+#include <stdlib.h>
+
+#include "codec_internal.h"
+
+#if defined(USE_ASM)
+
+static const __attribute__((aligned(8),used)) ogg_int64_t OC_V3=
+ 0x0003000300030003LL;
+static const __attribute__((aligned(8),used)) ogg_int64_t OC_V4=
+ 0x0004000400040004LL;
+
+static void loop_filter_v(unsigned char *_pix,int _ystride,
+ const ogg_int16_t *_ll){
+ long esi;
+ _pix-=_ystride*2;
+ __asm__ __volatile__(
+ /*mm0=0*/
+ "pxor %%mm0,%%mm0\n\t"
+ /*esi=_ystride*3*/
+ "lea (%[ystride],%[ystride],2),%[s]\n\t"
+ /*mm7=_pix[0...8]*/
+ "movq (%[pix]),%%mm7\n\t"
+ /*mm4=_pix[0...8+_ystride*3]*/
+ "movq (%[pix],%[s]),%%mm4\n\t"
+ /*mm6=_pix[0...8]*/
+ "movq %%mm7,%%mm6\n\t"
+ /*Expand unsigned _pix[0...3] to 16 bits.*/
+ "punpcklbw %%mm0,%%mm6\n\t"
+ "movq %%mm4,%%mm5\n\t"
+ /*Expand unsigned _pix[4...8] to 16 bits.*/
+ "punpckhbw %%mm0,%%mm7\n\t"
+ /*Expand other arrays too.*/
+ "punpcklbw %%mm0,%%mm4\n\t"
+ "punpckhbw %%mm0,%%mm5\n\t"
+ /*mm7:mm6=_p[0...8]-_p[0...8+_ystride*3]:*/
+ "psubw %%mm4,%%mm6\n\t"
+ "psubw %%mm5,%%mm7\n\t"
+ /*mm5=mm4=_pix[0...8+_ystride]*/
+ "movq (%[pix],%[ystride]),%%mm4\n\t"
+ /*mm1=mm3=mm2=_pix[0..8]+_ystride*2]*/
+ "movq (%[pix],%[ystride],2),%%mm2\n\t"
+ "movq %%mm4,%%mm5\n\t"
+ "movq %%mm2,%%mm3\n\t"
+ "movq %%mm2,%%mm1\n\t"
+ /*Expand these arrays.*/
+ "punpckhbw %%mm0,%%mm5\n\t"
+ "punpcklbw %%mm0,%%mm4\n\t"
+ "punpckhbw %%mm0,%%mm3\n\t"
+ "punpcklbw %%mm0,%%mm2\n\t"
+ /*Preload...*/
+ "movq %[OC_V3],%%mm0\n\t"
+ /*mm3:mm2=_pix[0...8+_ystride*2]-_pix[0...8+_ystride]*/
+ "psubw %%mm5,%%mm3\n\t"
+ "psubw %%mm4,%%mm2\n\t"
+ /*Scale by 3.*/
+ "pmullw %%mm0,%%mm3\n\t"
+ "pmullw %%mm0,%%mm2\n\t"
+ /*Preload...*/
+ "movq %[OC_V4],%%mm0\n\t"
+ /*f=mm3:mm2==_pix[0...8]-_pix[0...8+_ystride*3]+
+ 3*(_pix[0...8+_ystride*2]-_pix[0...8+_ystride])*/
+ "paddw %%mm7,%%mm3\n\t"
+ "paddw %%mm6,%%mm2\n\t"
+ /*Add 4.*/
+ "paddw %%mm0,%%mm3\n\t"
+ "paddw %%mm0,%%mm2\n\t"
+ /*"Divide" by 8.*/
+ "psraw $3,%%mm3\n\t"
+ "psraw $3,%%mm2\n\t"
+ /*Now compute lflim of mm3:mm2 cf. Section 7.10 of the sepc.*/
+ /*Free up mm5.*/
+ "packuswb %%mm5,%%mm4\n\t"
+ /*mm0=L L L L*/
+ "movq (%[ll]),%%mm0\n\t"
+ /*if(R_i<-2L||R_i>2L)R_i=0:*/
+ "movq %%mm2,%%mm5\n\t"
+ "pxor %%mm6,%%mm6\n\t"
+ "movq %%mm0,%%mm7\n\t"
+ "psubw %%mm0,%%mm6\n\t"
+ "psllw $1,%%mm7\n\t"
+ "psllw $1,%%mm6\n\t"
+ /*mm2==R_3 R_2 R_1 R_0*/
+ /*mm5==R_3 R_2 R_1 R_0*/
+ /*mm6==-2L -2L -2L -2L*/
+ /*mm7==2L 2L 2L 2L*/
+ "pcmpgtw %%mm2,%%mm7\n\t"
+ "pcmpgtw %%mm6,%%mm5\n\t"
+ "pand %%mm7,%%mm2\n\t"
+ "movq %%mm0,%%mm7\n\t"
+ "pand %%mm5,%%mm2\n\t"
+ "psllw $1,%%mm7\n\t"
+ "movq %%mm3,%%mm5\n\t"
+ /*mm3==R_7 R_6 R_5 R_4*/
+ /*mm5==R_7 R_6 R_5 R_4*/
+ /*mm6==-2L -2L -2L -2L*/
+ /*mm7==2L 2L 2L 2L*/
+ "pcmpgtw %%mm3,%%mm7\n\t"
+ "pcmpgtw %%mm6,%%mm5\n\t"
+ "pand %%mm7,%%mm3\n\t"
+ "movq %%mm0,%%mm7\n\t"
+ "pand %%mm5,%%mm3\n\t"
+ /*if(R_i<-L)R_i'=R_i+2L;
+ if(R_i>L)R_i'=R_i-2L;
+ if(R_i<-L||R_i>L)R_i=-R_i':*/
+ "psraw $1,%%mm6\n\t"
+ "movq %%mm2,%%mm5\n\t"
+ "psllw $1,%%mm7\n\t"
+ /*mm2==R_3 R_2 R_1 R_0*/
+ /*mm5==R_3 R_2 R_1 R_0*/
+ /*mm6==-L -L -L -L*/
+ /*mm0==L L L L*/
+ /*mm5=R_i>L?FF:00*/
+ "pcmpgtw %%mm0,%%mm5\n\t"
+ /*mm6=-L>R_i?FF:00*/
+ "pcmpgtw %%mm2,%%mm6\n\t"
+ /*mm7=R_i>L?2L:0*/
+ "pand %%mm5,%%mm7\n\t"
+ /*mm2=R_i>L?R_i-2L:R_i*/
+ "psubw %%mm7,%%mm2\n\t"
+ "movq %%mm0,%%mm7\n\t"
+ /*mm5=-L>R_i||R_i>L*/
+ "por %%mm6,%%mm5\n\t"
+ "psllw $1,%%mm7\n\t"
+ /*mm7=-L>R_i?2L:0*/
+ "pand %%mm6,%%mm7\n\t"
+ "pxor %%mm6,%%mm6\n\t"
+ /*mm2=-L>R_i?R_i+2L:R_i*/
+ "paddw %%mm7,%%mm2\n\t"
+ "psubw %%mm0,%%mm6\n\t"
+ /*mm5=-L>R_i||R_i>L?-R_i':0*/
+ "pand %%mm2,%%mm5\n\t"
+ "movq %%mm0,%%mm7\n\t"
+ /*mm2=-L>R_i||R_i>L?0:R_i*/
+ "psubw %%mm5,%%mm2\n\t"
+ "psllw $1,%%mm7\n\t"
+ /*mm2=-L>R_i||R_i>L?-R_i':R_i*/
+ "psubw %%mm5,%%mm2\n\t"
+ "movq %%mm3,%%mm5\n\t"
+ /*mm3==R_7 R_6 R_5 R_4*/
+ /*mm5==R_7 R_6 R_5 R_4*/
+ /*mm6==-L -L -L -L*/
+ /*mm0==L L L L*/
+ /*mm6=-L>R_i?FF:00*/
+ "pcmpgtw %%mm3,%%mm6\n\t"
+ /*mm5=R_i>L?FF:00*/
+ "pcmpgtw %%mm0,%%mm5\n\t"
+ /*mm7=R_i>L?2L:0*/
+ "pand %%mm5,%%mm7\n\t"
+ /*mm2=R_i>L?R_i-2L:R_i*/
+ "psubw %%mm7,%%mm3\n\t"
+ "psllw $1,%%mm0\n\t"
+ /*mm5=-L>R_i||R_i>L*/
+ "por %%mm6,%%mm5\n\t"
+ /*mm0=-L>R_i?2L:0*/
+ "pand %%mm6,%%mm0\n\t"
+ /*mm3=-L>R_i?R_i+2L:R_i*/
+ "paddw %%mm0,%%mm3\n\t"
+ /*mm5=-L>R_i||R_i>L?-R_i':0*/
+ "pand %%mm3,%%mm5\n\t"
+ /*mm2=-L>R_i||R_i>L?0:R_i*/
+ "psubw %%mm5,%%mm3\n\t"
+ /*mm2=-L>R_i||R_i>L?-R_i':R_i*/
+ "psubw %%mm5,%%mm3\n\t"
+ /*Unfortunately, there's no unsigned byte+signed byte with unsigned
+ saturation op code, so we have to promote things back 16 bits.*/
+ "pxor %%mm0,%%mm0\n\t"
+ "movq %%mm4,%%mm5\n\t"
+ "punpcklbw %%mm0,%%mm4\n\t"
+ "punpckhbw %%mm0,%%mm5\n\t"
+ "movq %%mm1,%%mm6\n\t"
+ "punpcklbw %%mm0,%%mm1\n\t"
+ "punpckhbw %%mm0,%%mm6\n\t"
+ /*_pix[0...8+_ystride]+=R_i*/
+ "paddw %%mm2,%%mm4\n\t"
+ "paddw %%mm3,%%mm5\n\t"
+ /*_pix[0...8+_ystride*2]-=R_i*/
+ "psubw %%mm2,%%mm1\n\t"
+ "psubw %%mm3,%%mm6\n\t"
+ "packuswb %%mm5,%%mm4\n\t"
+ "packuswb %%mm6,%%mm1\n\t"
+ /*Write it back out.*/
+ "movq %%mm4,(%[pix],%[ystride])\n\t"
+ "movq %%mm1,(%[pix],%[ystride],2)\n\t"
+ :[s]"=&S"(esi)
+ :[pix]"r"(_pix),[ystride]"r"((long)_ystride),[ll]"r"(_ll),
+ [OC_V3]"m"(OC_V3),[OC_V4]"m"(OC_V4)
+ :"memory"
+ );
+}
+
+/*This code implements the bulk of loop_filter_h().
+ Data are striped p0 p1 p2 p3 ... p0 p1 p2 p3 ..., so in order to load all
+ four p0's to one register we must transpose the values in four mmx regs.
+ When half is done we repeat this for the rest.*/
+static void loop_filter_h4(unsigned char *_pix,long _ystride,
+ const ogg_int16_t *_ll){
+ long esi;
+ long edi;
+ __asm__ __volatile__(
+ /*x x x x 3 2 1 0*/
+ "movd (%[pix]),%%mm0\n\t"
+ /*esi=_ystride*3*/
+ "lea (%[ystride],%[ystride],2),%[s]\n\t"
+ /*x x x x 7 6 5 4*/
+ "movd (%[pix],%[ystride]),%%mm1\n\t"
+ /*x x x x B A 9 8*/
+ "movd (%[pix],%[ystride],2),%%mm2\n\t"
+ /*x x x x F E D C*/
+ "movd (%[pix],%[s]),%%mm3\n\t"
+ /*mm0=7 3 6 2 5 1 4 0*/
+ "punpcklbw %%mm1,%%mm0\n\t"
+ /*mm2=F B E A D 9 C 8*/
+ "punpcklbw %%mm3,%%mm2\n\t"
+ /*mm1=7 3 6 2 5 1 4 0*/
+ "movq %%mm0,%%mm1\n\t"
+ /*mm0=F B 7 3 E A 6 2*/
+ "punpckhwd %%mm2,%%mm0\n\t"
+ /*mm1=D 9 5 1 C 8 4 0*/
+ "punpcklwd %%mm2,%%mm1\n\t"
+ "pxor %%mm7,%%mm7\n\t"
+ /*mm5=D 9 5 1 C 8 4 0*/
+ "movq %%mm1,%%mm5\n\t"
+ /*mm1=x C x 8 x 4 x 0==pix[0]*/
+ "punpcklbw %%mm7,%%mm1\n\t"
+ /*mm5=x D x 9 x 5 x 1==pix[1]*/
+ "punpckhbw %%mm7,%%mm5\n\t"
+ /*mm3=F B 7 3 E A 6 2*/
+ "movq %%mm0,%%mm3\n\t"
+ /*mm0=x E x A x 6 x 2==pix[2]*/
+ "punpcklbw %%mm7,%%mm0\n\t"
+ /*mm3=x F x B x 7 x 3==pix[3]*/
+ "punpckhbw %%mm7,%%mm3\n\t"
+ /*mm1=mm1-mm3==pix[0]-pix[3]*/
+ "psubw %%mm3,%%mm1\n\t"
+ /*Save a copy of pix[2] for later.*/
+ "movq %%mm0,%%mm4\n\t"
+ /*mm0=mm0-mm5==pix[2]-pix[1]*/
+ "psubw %%mm5,%%mm0\n\t"
+ /*Scale by 3.*/
+ "pmullw %[OC_V3],%%mm0\n\t"
+ /*f=mm1==_pix[0]-_pix[3]+ 3*(_pix[2]-_pix[1])*/
+ "paddw %%mm1,%%mm0\n\t"
+ /*Add 4.*/
+ "paddw %[OC_V4],%%mm0\n\t"
+ /*"Divide" by 8, producing the residuals R_i.*/
+ "psraw $3,%%mm0\n\t"
+ /*Now compute lflim of mm0 cf. Section 7.10 of the sepc.*/
+ /*mm6=L L L L*/
+ "movq (%[ll]),%%mm6\n\t"
+ /*if(R_i<-2L||R_i>2L)R_i=0:*/
+ "movq %%mm0,%%mm1\n\t"
+ "pxor %%mm2,%%mm2\n\t"
+ "movq %%mm6,%%mm3\n\t"
+ "psubw %%mm6,%%mm2\n\t"
+ "psllw $1,%%mm3\n\t"
+ "psllw $1,%%mm2\n\t"
+ /*mm0==R_3 R_2 R_1 R_0*/
+ /*mm1==R_3 R_2 R_1 R_0*/
+ /*mm2==-2L -2L -2L -2L*/
+ /*mm3==2L 2L 2L 2L*/
+ "pcmpgtw %%mm0,%%mm3\n\t"
+ "pcmpgtw %%mm2,%%mm1\n\t"
+ "pand %%mm3,%%mm0\n\t"
+ "pand %%mm1,%%mm0\n\t"
+ /*if(R_i<-L)R_i'=R_i+2L;
+ if(R_i>L)R_i'=R_i-2L;
+ if(R_i<-L||R_i>L)R_i=-R_i':*/
+ "psraw $1,%%mm2\n\t"
+ "movq %%mm0,%%mm1\n\t"
+ "movq %%mm6,%%mm3\n\t"
+ /*mm0==R_3 R_2 R_1 R_0*/
+ /*mm1==R_3 R_2 R_1 R_0*/
+ /*mm2==-L -L -L -L*/
+ /*mm6==L L L L*/
+ /*mm2=-L>R_i?FF:00*/
+ "pcmpgtw %%mm0,%%mm2\n\t"
+ /*mm1=R_i>L?FF:00*/
+ "pcmpgtw %%mm6,%%mm1\n\t"
+ /*mm3=2L 2L 2L 2L*/
+ "psllw $1,%%mm3\n\t"
+ /*mm6=2L 2L 2L 2L*/
+ "psllw $1,%%mm6\n\t"
+ /*mm3=R_i>L?2L:0*/
+ "pand %%mm1,%%mm3\n\t"
+ /*mm6=-L>R_i?2L:0*/
+ "pand %%mm2,%%mm6\n\t"
+ /*mm0=R_i>L?R_i-2L:R_i*/
+ "psubw %%mm3,%%mm0\n\t"
+ /*mm1=-L>R_i||R_i>L*/
+ "por %%mm2,%%mm1\n\t"
+ /*mm0=-L>R_i?R_i+2L:R_i*/
+ "paddw %%mm6,%%mm0\n\t"
+ /*mm1=-L>R_i||R_i>L?R_i':0*/
+ "pand %%mm0,%%mm1\n\t"
+ /*mm0=-L>R_i||R_i>L?0:R_i*/
+ "psubw %%mm1,%%mm0\n\t"
+ /*mm0=-L>R_i||R_i>L?-R_i':R_i*/
+ "psubw %%mm1,%%mm0\n\t"
+ /*_pix[1]+=R_i;*/
+ "paddw %%mm0,%%mm5\n\t"
+ /*_pix[2]-=R_i;*/
+ "psubw %%mm0,%%mm4\n\t"
+ /*mm5=x x x x D 9 5 1*/
+ "packuswb %%mm7,%%mm5\n\t"
+ /*mm4=x x x x E A 6 2*/
+ "packuswb %%mm7,%%mm4\n\t"
+ /*mm5=E D A 9 6 5 2 1*/
+ "punpcklbw %%mm4,%%mm5\n\t"
+ /*edi=6 5 2 1*/
+ "movd %%mm5,%%edi\n\t"
+ "movw %%di,1(%[pix])\n\t"
+ /*Why is there such a big stall here?*/
+ "psrlq $32,%%mm5\n\t"
+ "shrl $16,%%edi\n\t"
+ "movw %%di,1(%[pix],%[ystride])\n\t"
+ /*edi=E D A 9*/
+ "movd %%mm5,%%edi\n\t"
+ "movw %%di,1(%[pix],%[ystride],2)\n\t"
+ "shrl $16,%%edi\n\t"
+ "movw %%di,1(%[pix],%[s])\n\t"
+ :[s]"=&S"(esi),[d]"=&D"(edi),
+ [pix]"+r"(_pix),[ystride]"+r"(_ystride),[ll]"+r"(_ll)
+ :[OC_V3]"m"(OC_V3),[OC_V4]"m"(OC_V4)
+ :"memory"
+ );
+}
+
+static void loop_filter_h(unsigned char *_pix,int _ystride,
+ const ogg_int16_t *_ll){
+ _pix-=2;
+ loop_filter_h4(_pix,_ystride,_ll);
+ loop_filter_h4(_pix+(_ystride<<2),_ystride,_ll);
+}
+
+static void loop_filter_mmx(PB_INSTANCE *pbi, int FLimit){
+ int j;
+ ogg_int16_t __attribute__((aligned(8))) ll[4];
+ unsigned char *cp = pbi->display_fragments;
+ ogg_uint32_t *bp = pbi->recon_pixel_index_table;
+
+ if ( FLimit == 0 ) return;
+ ll[0]=ll[1]=ll[2]=ll[3]=FLimit;
+
+ for ( j = 0; j < 3 ; j++){
+ ogg_uint32_t *bp_begin = bp;
+ ogg_uint32_t *bp_end;
+ int stride;
+ int h;
+
+ switch(j) {
+ case 0: /* y */
+ bp_end = bp + pbi->YPlaneFragments;
+ h = pbi->HFragments;
+ stride = pbi->YStride;
+ break;
+ default: /* u,v, 4:20 specific */
+ bp_end = bp + pbi->UVPlaneFragments;
+ h = pbi->HFragments >> 1;
+ stride = pbi->UVStride;
+ break;
+ }
+
+ while(bp<bp_end){
+ ogg_uint32_t *bp_left = bp;
+ ogg_uint32_t *bp_right = bp + h;
+ while(bp<bp_right){
+ if(cp[0]){
+ if(bp>bp_left)
+ loop_filter_h(&pbi->LastFrameRecon[bp[0]],stride,ll);
+ if(bp_left>bp_begin)
+ loop_filter_v(&pbi->LastFrameRecon[bp[0]],stride,ll);
+ if(bp+1<bp_right && !cp[1])
+ loop_filter_h(&pbi->LastFrameRecon[bp[0]]+8,stride,ll);
+ if(bp+h<bp_end && !cp[h])
+ loop_filter_v(&pbi->LastFrameRecon[bp[h]],stride,ll);
+ }
+ bp++;
+ cp++;
+ }
+ }
+ }
+
+ __asm__ __volatile__("emms\n\t");
+}
+
+/* install our implementation in the function table */
+void dsp_mmx_dct_decode_init(DspFunctions *funcs)
+{
+ funcs->LoopFilter = loop_filter_mmx;
+}
+
+#endif /* USE_ASM */
diff -pruN libtheora-1.0RC1.orig/lib/Makefile.am libtheora-1.0RC1/lib/Makefile.am
--- libtheora-1.0RC1.orig/lib/Makefile.am 2008-10-08 06:26:45.501344934 +1100
+++ libtheora-1.0RC1/lib/Makefile.am 2008-10-08 06:31:19.331094106 +1100
@@ -8,6 +8,7 @@ EXTRA_DIST = \
enc/x86_32/recon_mmx.c \
enc/x86_32/fdct_mmx.c \
enc/x86_32/idct_mmx.c \
+ enc/x86_64/dct_decode_mmx.c \
enc/x86_64/dsp_mmx.c \
enc/x86_64/dsp_mmxext.c \
enc/x86_64/recon_mmx.c \

View File

@ -256,6 +256,7 @@ drwxr-xr-x root/root usr/share/lmms/presets/AudioFileProcessor/
-rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/Erazor.xpf -rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/Erazor.xpf
-rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/Fat-Reversed-Kick.xpf -rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/Fat-Reversed-Kick.xpf
-rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/Kick-4-your-Subwoofer.xpf -rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/Kick-4-your-Subwoofer.xpf
-rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/SString.xpf
-rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/orion.xpf -rw-r--r-- root/root usr/share/lmms/presets/AudioFileProcessor/orion.xpf
drwxr-xr-x root/root usr/share/lmms/presets/BitInvader/ drwxr-xr-x root/root usr/share/lmms/presets/BitInvader/
-rw-r--r-- root/root usr/share/lmms/presets/BitInvader/alien_strings.xpf -rw-r--r-- root/root usr/share/lmms/presets/BitInvader/alien_strings.xpf
@ -274,6 +275,7 @@ drwxr-xr-x root/root usr/share/lmms/presets/BitInvader/
drwxr-xr-x root/root usr/share/lmms/presets/LB302/ drwxr-xr-x root/root usr/share/lmms/presets/LB302/
-rw-r--r-- root/root usr/share/lmms/presets/LB302/GoodOldTimes.xpf -rw-r--r-- root/root usr/share/lmms/presets/LB302/GoodOldTimes.xpf
-rw-r--r-- root/root usr/share/lmms/presets/LB302/Oh Synth.xpf -rw-r--r-- root/root usr/share/lmms/presets/LB302/Oh Synth.xpf
-rw-r--r-- root/root usr/share/lmms/presets/LB302/STrash.xpf
drwxr-xr-x root/root usr/share/lmms/presets/Organic/ drwxr-xr-x root/root usr/share/lmms/presets/Organic/
-rw-r--r-- root/root usr/share/lmms/presets/Organic/organ_blues.xpf -rw-r--r-- root/root usr/share/lmms/presets/Organic/organ_blues.xpf
-rw-r--r-- root/root usr/share/lmms/presets/Organic/organ_risingsun.xpf -rw-r--r-- root/root usr/share/lmms/presets/Organic/organ_risingsun.xpf
@ -330,6 +332,9 @@ drwxr-xr-x root/root usr/share/lmms/presets/TripleOscillator/
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/ResonantPad.xpf -rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/ResonantPad.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/RockOrgan.xpf -rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/RockOrgan.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/Rough!.xpf -rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/Rough!.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SBass.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SBass2.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SEGuitar.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SawLead.xpf -rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SawLead.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SawReso.xpf -rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/SawReso.xpf
-rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/Short1.xpf -rw-r--r-- root/root usr/share/lmms/presets/TripleOscillator/Short1.xpf

View File

@ -1 +1 @@
88264d185725f0f35b50227b92630b7b lmms-0.4.0-rc3.tar.bz2 d7737e614522c661b28f68527946e8d2 lmms-0.4.0.tar.bz2

View File

@ -6,7 +6,7 @@
# Nice to have: libsamplerate fluidsynth # Nice to have: libsamplerate fluidsynth
name=lmms name=lmms
version=0.4.0-rc3 version=0.4.0
release=1 release=1
source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2) source=(http://dl.sourceforge.net/sourceforge/$name/$name-$version.tar.bz2)

View File

@ -1 +1,2 @@
f66eafc046d8d4b52983f78dd934d0f1 moc-2.4.3-ffmpeg_headers.patch
8808082848e90eeec5415baaec7e98ad moc-2.4.3.tar.bz2 8808082848e90eeec5415baaec7e98ad moc-2.4.3.tar.bz2

View File

@ -7,11 +7,14 @@
name=moc name=moc
version=2.4.3 version=2.4.3
release=2 release=3
source=(ftp://ftp.daper.net/pub/soft/moc/stable/moc-$version.tar.bz2) source=(ftp://ftp.daper.net/pub/soft/$name/stable/$name-$version.tar.bz2
$name-2.4.3-ffmpeg_headers.patch)
build() { build() {
cd moc-$version cd $name-$version
patch -p 1 -i $SRC/$name-2.4.3-ffmpeg_headers.patch
./configure \ ./configure \
--prefix=/usr \ --prefix=/usr \

View File

@ -0,0 +1,12 @@
diff -pruN moc-2.4.3.orig/decoder_plugins/ffmpeg/ffmpeg.c moc-2.4.3/decoder_plugins/ffmpeg/ffmpeg.c
--- moc-2.4.3.orig/decoder_plugins/ffmpeg/ffmpeg.c 2008-10-30 07:42:38.000000000 +0100
+++ moc-2.4.3/decoder_plugins/ffmpeg/ffmpeg.c 2008-10-30 07:44:12.000000000 +0100
@@ -22,7 +22,7 @@
#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
-#include <ffmpeg/avformat.h>
+#include <libavformat/avformat.h>
/* FFmpeg also likes common names, without that, our common.h and log.h would
* not be included. */

View File

@ -1,2 +1,3 @@
61e4511d1bbb2962ca139091210b61ea NVIDIA-Linux-x86-71.86.06-pkg0.run 61e4511d1bbb2962ca139091210b61ea NVIDIA-Linux-x86-71.86.06-pkg0.run
cd4a68b5a88be6976b90cd0df6bfe89e kernel-2.6.27.patch
544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch 544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch

View File

@ -6,16 +6,20 @@
name=nvidia-legacy-71xx name=nvidia-legacy-71xx
version=71.86.06 version=71.86.06
release=2 release=3
source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \ source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run
nvidia-makefile.patch) nvidia-makefile.patch
kernel-2.6.27.patch)
build() { build() {
sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only
cd NVIDIA-Linux-x86-$version-pkg0 cd NVIDIA-Linux-x86-$version-pkg0
# patch Makefile.kbuild for normal users and no load during build # patch Makefile.kbuild for normal users and no load during build
patch -p0 -i $SRC/nvidia-makefile.patch usr/src/nv/Makefile.kbuild patch -p 0 -i $SRC/nvidia-makefile.patch usr/src/nv/Makefile.kbuild
# kernel patch
patch -p 1 -i $SRC/kernel-2.6.27.patch
# create directories the Makefile expects # create directories the Makefile expects
mkdir -p $PKG/usr/lib \ mkdir -p $PKG/usr/lib \

View File

@ -0,0 +1,87 @@
diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c
--- usr/src/nv/nv.c 2008-07-18 03:42:50.000000000 +0200
+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c 2008-08-12 00:35:45.000000000 +0200
@@ -1296,14 +1296,22 @@
if (get_cpu() == cpu)
__nv_setup_pat_entries(NULL);
else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ smp_call_function(__nv_setup_pat_entries, hcpu, 1);
+ #else
smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);
+ #endif
put_cpu();
break;
case CPU_DOWN_PREPARE:
if (get_cpu() == cpu)
__nv_restore_pat_entries(NULL);
else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ smp_call_function(__nv_restore_pat_entries, hcpu, 1);
+ #else
smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);
+ #endif
put_cpu();
break;
}
diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h
--- usr/src/nv/nv-linux.h 2008-07-18 03:42:51.000000000 +0200
+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h 2008-08-12 00:44:27.000000000 +0200
@@ -104,7 +104,10 @@
#endif
#include <linux/spinlock.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#else
#include <asm/semaphore.h>
+#endif
#include <linux/completion.h>
#include <linux/highmem.h>
@@ -665,13 +668,21 @@
#if defined(preempt_disable)
preempt_disable();
#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ ret = smp_call_function(func, info, 1);
+ #else
ret = smp_call_function(func, info, 1, 1);
+ #endif
func(info);
#if defined(preempt_enable)
preempt_enable();
#endif
#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ ret = on_each_cpu(func, info, 1);
+ #else
ret = on_each_cpu(func, info, 1, 1);
+ #endif
#endif
return ret;
}
diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/os-interface.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c
--- usr/src/nv/os-interface.c 2008-07-18 03:42:50.000000000 +0200
+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c 2008-08-12 00:48:07.000000000 +0200
@@ -48,7 +48,11 @@
#endif
local_bh_disable();
atomic_set(&os_smp_barrier, 1);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ ret = smp_call_function(ipi_handler, NULL, 0);
+ #else
ret = smp_call_function(ipi_handler, NULL, 1, 0);
+ #endif
#endif
return (ret == 0) ? RM_OK : RM_ERROR;
}
@@ -704,7 +708,9 @@
U032 sig
)
{
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK;
+ #endif
}
/*******************************************************************************/

View File

@ -1,2 +1,3 @@
8fa2b7c5e4629850d4bd33033ec46166 NVIDIA-Linux-x86-96.43.07-pkg0.run 8fa2b7c5e4629850d4bd33033ec46166 NVIDIA-Linux-x86-96.43.07-pkg0.run
cd4a68b5a88be6976b90cd0df6bfe89e kernel-2.6.27.patch
544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch 544ac021f572c0aca5025dcca9d01510 nvidia-makefile.patch

View File

@ -6,16 +6,20 @@
name=nvidia-legacy-96xx name=nvidia-legacy-96xx
version=96.43.07 version=96.43.07
release=1 release=2
source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \ source=(http://us.download.nvidia.com/XFree86/Linux-x86/$version/NVIDIA-Linux-x86-$version-pkg0.run \
nvidia-makefile.patch) nvidia-makefile.patch
kernel-2.6.27.patch)
build() { build() {
sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only sh NVIDIA-Linux-x86-$version-pkg0.run --extract-only
cd NVIDIA-Linux-x86-$version-pkg0 cd NVIDIA-Linux-x86-$version-pkg0
# patch Makefile.kbuild for normal users and no load during build # patch Makefile.kbuild for normal users and no load during build
patch -p0 -i $SRC/nvidia-makefile.patch usr/src/nv/Makefile.kbuild patch -p 0 -i $SRC/nvidia-makefile.patch usr/src/nv/Makefile.kbuild
# kernel patch
patch -p 1 -i $SRC/kernel-2.6.27.patch
# create directories the Makefile expects # create directories the Makefile expects
mkdir -p $PKG/usr/lib \ mkdir -p $PKG/usr/lib \

View File

@ -0,0 +1,87 @@
diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c
--- usr/src/nv/nv.c 2008-07-18 03:42:50.000000000 +0200
+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv.c 2008-08-12 00:35:45.000000000 +0200
@@ -1296,14 +1296,22 @@
if (get_cpu() == cpu)
__nv_setup_pat_entries(NULL);
else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ smp_call_function(__nv_setup_pat_entries, hcpu, 1);
+ #else
smp_call_function(__nv_setup_pat_entries, hcpu, 1, 1);
+ #endif
put_cpu();
break;
case CPU_DOWN_PREPARE:
if (get_cpu() == cpu)
__nv_restore_pat_entries(NULL);
else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ smp_call_function(__nv_restore_pat_entries, hcpu, 1);
+ #else
smp_call_function(__nv_restore_pat_entries, hcpu, 1, 1);
+ #endif
put_cpu();
break;
}
diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/nv-linux.h NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h
--- usr/src/nv/nv-linux.h 2008-07-18 03:42:51.000000000 +0200
+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/nv-linux.h 2008-08-12 00:44:27.000000000 +0200
@@ -104,7 +104,10 @@
#endif
#include <linux/spinlock.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+#else
#include <asm/semaphore.h>
+#endif
#include <linux/completion.h>
#include <linux/highmem.h>
@@ -665,13 +668,21 @@
#if defined(preempt_disable)
preempt_disable();
#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ ret = smp_call_function(func, info, 1);
+ #else
ret = smp_call_function(func, info, 1, 1);
+ #endif
func(info);
#if defined(preempt_enable)
preempt_enable();
#endif
#else
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ ret = on_each_cpu(func, info, 1);
+ #else
ret = on_each_cpu(func, info, 1, 1);
+ #endif
#endif
return ret;
}
diff -Nru NVIDIA-Linux-x86-173.14.12-pkg0.orig/usr/src/nv/os-interface.c NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c
--- usr/src/nv/os-interface.c 2008-07-18 03:42:50.000000000 +0200
+++ NVIDIA-Linux-x86-173.14.12-pkg0/usr/src/nv/os-interface.c 2008-08-12 00:48:07.000000000 +0200
@@ -48,7 +48,11 @@
#endif
local_bh_disable();
atomic_set(&os_smp_barrier, 1);
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 27)
+ ret = smp_call_function(ipi_handler, NULL, 0);
+ #else
ret = smp_call_function(ipi_handler, NULL, 1, 0);
+ #endif
#endif
return (ret == 0) ? RM_OK : RM_ERROR;
}
@@ -704,7 +708,9 @@
U032 sig
)
{
+ #if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 26)
return kill_proc(pid, sig, 1) ? RM_ERR_OPERATING_SYSTEM : RM_OK;
+ #endif
}
/*******************************************************************************/

View File

@ -1,68 +1,50 @@
drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/include/ drwxr-xr-x root/root usr/include/
drwxr-xr-x root/root usr/include/swfdec-0.6/ drwxr-xr-x root/root usr/include/swfdec-0.8/
drwxr-xr-x root/root usr/include/swfdec-0.6/swfdec-gtk/ drwxr-xr-x root/root usr/include/swfdec-0.8/swfdec-gtk/
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec-gtk.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec-gtk.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec_gtk_keys.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec_gtk_keys.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec_gtk_loader.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec_gtk_loader.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec_gtk_player.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec_gtk_player.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec_gtk_socket.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec_gtk_socket.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec_gtk_system.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec_gtk_system.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec-gtk/swfdec_gtk_widget.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec-gtk/swfdec_gtk_widget.h
drwxr-xr-x root/root usr/include/swfdec-0.6/swfdec/ drwxr-xr-x root/root usr/include/swfdec-0.8/swfdec/
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_array.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_array.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_context.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_context.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_debugger.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_debugger.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_frame.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_frame.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_function.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_function.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_native_function.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_native_function.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_object.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_object.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_as_types.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_as_types.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_audio.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_audio.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_buffer.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_buffer.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_enums.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_enums.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_file_loader.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_file_loader.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_keys.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_gc_object.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_loader.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_keys.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_player.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_loader.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_player_scripting.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_player.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_rectangle.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_player_scripting.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_script.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_rectangle.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_socket.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_renderer.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_stream.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_script.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_system.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_socket.h
-rw-r--r-- root/root usr/include/swfdec-0.6/swfdec/swfdec_url.h -rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_stream.h
-rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_system.h
-rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_url.h
-rw-r--r-- root/root usr/include/swfdec-0.8/swfdec/swfdec_version.h
drwxr-xr-x root/root usr/lib/ drwxr-xr-x root/root usr/lib/
-rwxr-xr-x root/root usr/lib/libswfdec-0.6.la -rwxr-xr-x root/root usr/lib/libswfdec-0.8.la
lrwxrwxrwx root/root usr/lib/libswfdec-0.6.so -> libswfdec-0.6.so.90.0.0 lrwxrwxrwx root/root usr/lib/libswfdec-0.8.so -> libswfdec-0.8.so.0.0.0
lrwxrwxrwx root/root usr/lib/libswfdec-0.6.so.90 -> libswfdec-0.6.so.90.0.0 lrwxrwxrwx root/root usr/lib/libswfdec-0.8.so.0 -> libswfdec-0.8.so.0.0.0
-rw-r--r-- root/root usr/lib/libswfdec-0.6.so.90.0.0 -rw-r--r-- root/root usr/lib/libswfdec-0.8.so.0.0.0
-rwxr-xr-x root/root usr/lib/libswfdec-gtk-0.6.la -rwxr-xr-x root/root usr/lib/libswfdec-gtk-0.8.la
lrwxrwxrwx root/root usr/lib/libswfdec-gtk-0.6.so -> libswfdec-gtk-0.6.so.90.0.0 lrwxrwxrwx root/root usr/lib/libswfdec-gtk-0.8.so -> libswfdec-gtk-0.8.so.0.0.0
lrwxrwxrwx root/root usr/lib/libswfdec-gtk-0.6.so.90 -> libswfdec-gtk-0.6.so.90.0.0 lrwxrwxrwx root/root usr/lib/libswfdec-gtk-0.8.so.0 -> libswfdec-gtk-0.8.so.0.0.0
-rw-r--r-- root/root usr/lib/libswfdec-gtk-0.6.so.90.0.0 -rw-r--r-- root/root usr/lib/libswfdec-gtk-0.8.so.0.0.0
drwxr-xr-x root/root usr/lib/pkgconfig/ drwxr-xr-x root/root usr/lib/pkgconfig/
-rw-r--r-- root/root usr/lib/pkgconfig/swfdec-0.6.pc -rw-r--r-- root/root usr/lib/pkgconfig/swfdec-0.8.pc
-rw-r--r-- root/root usr/lib/pkgconfig/swfdec-gtk-0.6.pc -rw-r--r-- root/root usr/lib/pkgconfig/swfdec-gtk-0.8.pc
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/icons/
drwxr-xr-x root/root usr/share/icons/hicolor/
drwxr-xr-x root/root usr/share/icons/hicolor/16x16/
drwxr-xr-x root/root usr/share/icons/hicolor/16x16/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/16x16/apps/swfdec.png
drwxr-xr-x root/root usr/share/icons/hicolor/22x22/
drwxr-xr-x root/root usr/share/icons/hicolor/22x22/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/22x22/apps/swfdec.png
drwxr-xr-x root/root usr/share/icons/hicolor/24x24/
drwxr-xr-x root/root usr/share/icons/hicolor/24x24/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/24x24/apps/swfdec.png
drwxr-xr-x root/root usr/share/icons/hicolor/32x32/
drwxr-xr-x root/root usr/share/icons/hicolor/32x32/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/32x32/apps/swfdec.png
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/
drwxr-xr-x root/root usr/share/icons/hicolor/48x48/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/48x48/apps/swfdec.png
drwxr-xr-x root/root usr/share/icons/hicolor/scalable/
drwxr-xr-x root/root usr/share/icons/hicolor/scalable/apps/
-rw-r--r-- root/root usr/share/icons/hicolor/scalable/apps/swfdec.svg

View File

@ -1 +1 @@
740caf52068556ffe151703342fb634b swfdec-0.6.8.tar.gz 2fb20b04c0e426a1e894a4c4bf22cf87 swfdec-0.8.2.tar.gz

View File

@ -2,16 +2,16 @@
# URL: http://swfdec.freedesktop.org/wiki/ # URL: http://swfdec.freedesktop.org/wiki/
# Maintainer: Danny Rawlins, monster dot romster at gmail dot com # Maintainer: Danny Rawlins, monster dot romster at gmail dot com
# Packager: Stefan Lohmaier, noneus at noneus dot de # Packager: Stefan Lohmaier, noneus at noneus dot de
# Depends on: ffmpeg gtk libdca libmad libsoup gst-plugins-base # Depends on: gtk libdca libmad libsoup gst-plugins-base gst-ffmpeg
# Optional: gthread freetype libxml2 libpng gnutls # Optional: gthread freetype libxml2 libpng gnutls
name=swfdec name=swfdec
version=0.6.8 version=0.8.2
release=1 release=1
source=(http://swfdec.freedesktop.org/download/swfdec/${version%.*}/swfdec-$version.tar.gz) source=(http://swfdec.freedesktop.org/download/$name/${version%.*}/$name-$version.tar.gz)
build() { build() {
cd swfdec-$version cd $name-$version
# yet another program that --disable-gtk-doc dosn't work # yet another program that --disable-gtk-doc dosn't work
sed -i Makefile.in -e '/^@WITH_GTK_TRUE@ doc \\/d' sed -i Makefile.in -e '/^@WITH_GTK_TRUE@ doc \\/d'

27
tscreen/.footprint Normal file
View File

@ -0,0 +1,27 @@
drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/bin/
lrwxrwxrwx root/root usr/bin/tscreen -> tscreen-0.4.8
-rwxr-xr-x root/root usr/bin/tscreen-0.4.8
drwxr-xr-x root/root usr/man/
drwxr-xr-x root/root usr/man/man1/
-rw-r--r-- root/root usr/man/man1/rscreen.1.gz
drwxr-xr-x root/root usr/share/
drwxr-xr-x root/root usr/share/tscreen/
drwxr-xr-x root/root usr/share/tscreen/utf8encodings/
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/01
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/02
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/03
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/04
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/18
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/19
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/a1
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/bf
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/c2
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/c3
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/c4
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/c6
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/c7
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/c8
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/cc
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/cd
-rw-r--r-- root/root usr/share/tscreen/utf8encodings/d6

1
tscreen/.md5sum Normal file
View File

@ -0,0 +1 @@
caf063663625b68f104392d3ba62aaf8 tscreen-0.4.8.tar.gz

20
tscreen/Pkgfile Normal file
View File

@ -0,0 +1,20 @@
# Description: A for of GNU screen terminal manager
# URL: http://www.steve.org.uk/Software/tscreen
# Maintainer: Thomas Penteker, tek at serverop dot de
# Depends on: ncurses
name=tscreen
version=0.4.8
release=1
source=(http://www.steve.org.uk/Software/tscreen/dist/$name-$version.tar.gz)
build () {
cd $name-$version
./configure --prefix=/usr \
--enable-colors256 \
--mandir=/usr/man
make
make DESTDIR=$PKG install
rm -rf $PKG/usr/share/info
chmod -s $PKG/usr/bin/$name-$version
}