Skip to content

V
vlc
Commit d477afd9 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

contribs: updated freetype, libpng, theora, FAAD, FAAC, lame, gcrypt, gnutls and ffmpeg

parent 64a409c9
Hide whitespace changes
Inline Side-by-side
Showing with 46 additions and 83 deletions
extras/contrib/src/Makefile
View file @ d477afd9
......@@ -132,7 +132,7 @@ endif
FFMPEGCONF+= --enable-small --disable-debug --disable-mpegaudio-hp
FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
else
FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-swscale
FFMPEGCONF+= --enable-libmp3lame --enable-libfaac
endif
ifdef HAVE_BEOS
......@@ -1056,7 +1056,7 @@ DISTCLEAN_PKG += amrwb-$(LIBAMR_WB_VERSION).tar.bz2
ifdef SVN
ffmpeg:
$(SVN) co $(FFMPEG_SVN) ffmpeg -r 15594
$(SVN) co $(FFMPEG_SVN) ffmpeg -r 18254
ifeq ($(HOST),i586-pc-beos)
(cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
endif
......@@ -1101,7 +1101,7 @@ else
endif
endif
(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-postproc --disable-vhook --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-shared --enable-static && make && make install-libs install-headers)
(cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-postproc --disable-ffserver --disable-ffmpeg --disable-ffplay --disable-devices --disable-protocols --disable-shared --enable-static && make && make install-libs install-headers)
touch $@
ifdef SVN
......
extras/contrib/src/Patches/ffmpeg-macosx-intel-mmx.patch
View file @ d477afd9
Index: libavcodec/i386/motion_est_mmx.c
Index: libavcodec/x86/motion_est_mmx.c
===================================================================
--- libavcodec/i386/motion_est_mmx.c (revision 11270)
+++ libavcodec/i386/motion_est_mmx.c (working copy)
@@ -167,7 +167,7 @@
static inline void sad8_4_mmx2(uint8_t *blk1, uint8_t *blk2, int stride, int h)
{
asm volatile(
- "movq "MANGLE(bone)", %%mm5 \n\t"
+ "movq %4, %%mm5 \n\t"
"movq (%1), %%mm0 \n\t"
"pavgb 1(%1), %%mm0 \n\t"
"add %3, %1 \n\t"
@@ -190,7 +190,7 @@
--- libavcodec/x86/motion_est_mmx.c (revision 18254)
+++ libavcodec/x86/motion_est_mmx.c (working copy)
@@ -191,7 +191,7 @@
"sub $2, %0 \n\t"
" jg 1b \n\t"
: "+r" (h), "+r" (blk1), "+r" (blk2)
......@@ -20,7 +11,7 @@ Index: libavcodec/i386/motion_est_mmx.c
);
}
@@ -258,7 +258,7 @@
@@ -259,7 +259,7 @@
"punpckhbw %%mm7, %%mm5 \n\t"
"paddw %%mm4, %%mm2 \n\t"
"paddw %%mm5, %%mm3 \n\t"
......@@ -29,7 +20,7 @@ Index: libavcodec/i386/motion_est_mmx.c
"paddw %%mm2, %%mm0 \n\t"
"paddw %%mm3, %%mm1 \n\t"
"paddw %%mm5, %%mm0 \n\t"
@@ -281,7 +281,7 @@
@@ -282,7 +282,7 @@
"add %4, %%"REG_a" \n\t"
" js 1b \n\t"
: "+a" (len)
......@@ -37,12 +28,12 @@ Index: libavcodec/i386/motion_est_mmx.c
+ : "r" (blk1 - len), "r" (blk1 -len + stride), "r" (blk2 - len), "r" ((x86_reg)stride), "m" (round_tab[0])
);
}
Index: libavcodec/i386/simple_idct_mmx.c
Index: libavcodec/x86/simple_idct_mmx.c
===================================================================
--- libavcodec/i386/simple_idct_mmx.c (revision 11270)
+++ libavcodec/i386/simple_idct_mmx.c (working copy)
@@ -363,7 +363,7 @@
--- libavcodec/x86/simple_idct_mmx.c (revision 18254)
+++ libavcodec/x86/simple_idct_mmx.c (working copy)
@@ -364,7 +364,7 @@
"movq " #src4 ", %%mm1 \n\t" /* R6 R2 r6 r2 */\
"movq " #src1 ", %%mm2 \n\t" /* R3 R1 r3 r1 */\
"movq " #src5 ", %%mm3 \n\t" /* R7 R5 r7 r5 */\
......@@ -51,7 +42,7 @@ Index: libavcodec/i386/simple_idct_mmx.c
"pand %%mm0, %%mm4 \n\t"\
"por %%mm1, %%mm4 \n\t"\
"por %%mm2, %%mm4 \n\t"\
@@ -437,7 +437,7 @@
@@ -438,7 +438,7 @@
"jmp 2f \n\t"\
"1: \n\t"\
"pslld $16, %%mm0 \n\t"\
......@@ -60,7 +51,7 @@ Index: libavcodec/i386/simple_idct_mmx.c
"psrad $13, %%mm0 \n\t"\
"packssdw %%mm0, %%mm0 \n\t"\
"movq %%mm0, " #dst " \n\t"\
@@ -471,7 +471,7 @@
@@ -472,7 +472,7 @@
"movq " #src4 ", %%mm1 \n\t" /* R6 R2 r6 r2 */\
"movq " #src1 ", %%mm2 \n\t" /* R3 R1 r3 r1 */\
"movq " #src5 ", %%mm3 \n\t" /* R7 R5 r7 r5 */\
......@@ -69,7 +60,7 @@ Index: libavcodec/i386/simple_idct_mmx.c
"pand %%mm0, %%mm4 \n\t"\
"por %%mm1, %%mm4 \n\t"\
"por %%mm2, %%mm4 \n\t"\
@@ -545,7 +545,7 @@
@@ -546,7 +546,7 @@
"jmp 2f \n\t"\
"1: \n\t"\
"pslld $16, %%mm0 \n\t"\
......@@ -78,7 +69,7 @@ Index: libavcodec/i386/simple_idct_mmx.c
"psrad $13, %%mm0 \n\t"\
"packssdw %%mm0, %%mm0 \n\t"\
"movq %%mm0, " #dst " \n\t"\
@@ -1270,7 +1270,7 @@
@@ -1271,7 +1271,7 @@
*/
"9: \n\t"
......@@ -87,15 +78,13 @@ Index: libavcodec/i386/simple_idct_mmx.c
: "%eax"
);
}
Index: libavcodec/i386/cavsdsp_mmx.c
Index: libavcodec/x86/cavsdsp_mmx.c
===================================================================
--- libavcodec/i386/cavsdsp_mmx.c (revision 13752)
+++ libavcodec/i386/cavsdsp_mmx.c (working copy)
@@ -25,8 +25,30 @@
#include "libavutil/common.h"
#include "libavutil/x86_cpu.h"
--- libavcodec/x86/cavsdsp_mmx.c (revision 18254)
+++ libavcodec/x86/cavsdsp_mmx.c (working copy)
@@ -27,6 +27,22 @@
#include "libavcodec/dsputil.h"
-#include "dsputil_mmx.h"
#include "dsputil_mmx.h"
+#define SUMSUB_BA( a, b ) \
+"paddw "#b", "#a" \n\t"\
......@@ -112,30 +101,23 @@ Index: libavcodec/i386/cavsdsp_mmx.c
+SBUTTERFLY(c,d,b,wd,q) /* c=imjn b=kolp */\
+SBUTTERFLY(a,c,d,dq,q) /* a=aeim d=bfjn */\
+SBUTTERFLY(t,b,c,dq,q) /* t=cgko c=dhlp */
+
+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_4 ) = 0x0004000400040004ULL;
+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_5 ) = 0x0005000500050005ULL;
+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_7 ) = 0x0007000700070007ULL;
+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_42) = 0x002A002A002A002AULL;
+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_64) = 0x0040004000400040ULL;
+DECLARE_ALIGNED_8(static const uint64_t,ff_pw_96) = 0x0060006000600060ULL;
+
/*****************************************************************************
*
* inverse transform
Index: libavcodec/i386/flacdsp_mmx.c
Index: libavcodec/x86/flacdsp_mmx.c
===================================================================
--- libavcodec/i386/flacdsp_mmx.c (revision 11888)
+++ libavcodec/i386/flacdsp_mmx.c (working copy)
@@ -26,7 +26,6 @@
--- libavcodec/x86/flacdsp_mmx.c (revision 18254)
+++ libavcodec/x86/flacdsp_mmx.c (working copy)
@@ -27,7 +27,6 @@
double c = 2.0 / (len-1.0);
int n2 = len>>1;
x86_reg i = -n2*sizeof(int32_t);
- x86_reg j = n2*sizeof(int32_t);
asm volatile(
"movsd %0, %%xmm7 \n\t"
"movapd %1, %%xmm6 \n\t"
@@ -54,7 +53,7 @@
__asm__ volatile(
"movsd %0, %%xmm7 \n\t"
"movapd "MANGLE(ff_pd_1)", %%xmm6 \n\t"
@@ -55,7 +54,7 @@
"sub $8, %1 \n\t"\
"add $8, %0 \n\t"\
"jl 1b \n\t"\
......@@ -144,21 +126,3 @@ Index: libavcodec/i386/flacdsp_mmx.c
:"r"(w_data+n2), "r"(data+n2)\
);
if(len&1)
@@ -84,6 +83,8 @@
"movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
"movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t"
"movsd "MANGLE(ff_pd_1)", %%xmm2 \n\t"
+ :: "m"(*ff_pd_1) );
+ asm volatile(
"1: \n\t"
"movapd (%4,%0), %%xmm3 \n\t"
"movupd -8(%5,%0), %%xmm4 \n\t"
@@ -115,6 +116,8 @@
asm volatile(
"movsd "MANGLE(ff_pd_1)", %%xmm0 \n\t"
"movsd "MANGLE(ff_pd_1)", %%xmm1 \n\t"
+ :: "m"(*ff_pd_1) );
+ asm volatile(
"1: \n\t"
"movapd (%3,%0), %%xmm3 \n\t"
"movupd -8(%4,%0), %%xmm4 \n\t"
extras/contrib/src/Patches/gcrypt.patch
View file @ d477afd9
diff -urN libgcrypt/Makefile.am libgcrypt.patched/Makefile.am
--- libgcrypt/Makefile.am 2008-04-02 00:27:11.000000000 +0400
+++ libgcrypt.patched/Makefile.am 2008-04-02 00:34:34.000000000 +0400
--- libgcrypt/Makefile.am.orig 2008-08-19 17:20:08.000000000 +0200
+++ libgcrypt/Makefile.am 2008-10-21 09:57:33.000000000 +0200
@@ -23,7 +23,7 @@
--enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia
DIST_SUBDIRS = m4 mpi cipher src doc tests
-SUBDIRS = mpi cipher src doc tests
+SUBDIRS = mpi cipher src
EXTRA_DIST = BUGS autogen.sh README.SVN
DIST_SUBDIRS = m4 mpi cipher random src doc tests
-SUBDIRS = mpi cipher random src doc tests
+SUBDIRS = mpi cipher random src
EXTRA_DIST = autogen.sh README.SVN
DISTCLEANFILES =
extras/contrib/src/packages.mak
View file @ d477afd9
......@@ -55,7 +55,7 @@ GETTEXT_VERSION=0.17
GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
FONTCONFIG_VERSION=2.6.0
FONTCONFIG_URL=http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
FREETYPE2_VERSION=2.3.7
FREETYPE2_VERSION=2.3.9
FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
FRIBIDI_VERSION=0.19.1
FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
......@@ -75,7 +75,7 @@ OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
VORBIS_VERSION=1.2.0
VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
#VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
THEORA_VERSION=1.0beta3
THEORA_VERSION=1.0
THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
#THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
FLAC_VERSION=1.2.1
......@@ -84,13 +84,13 @@ SPEEX_VERSION=1.2rc1
SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
SHOUT_VERSION=2.2.2
SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
FAAD2_VERSION=2.6.1
FAAD2_VERSION=2.7
FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
FAAC_VERSION=1.26
FAAC_VERSION=1.28
FAAC_URL=$(SF)/faac/faac-$(FAAC_VERSION).tar.gz
LAME_VERSION=3.98b8
LAME_VERSION=398-2
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.7.8
LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
......@@ -139,15 +139,15 @@ VCDIMAGER_VERSION=0.7.23
VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
CDIO_VERSION=0.80
CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
PNG_VERSION=1.2.32
PNG_VERSION=1.2.35
PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.6
GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2
#GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
GCRYPT_VERSION=1.4.1
GCRYPT_VERSION=1.4.3
#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GNUTLS_VERSION=2.4.2
GNUTLS_VERSION=2.4.3
GNUTLS_URL=http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
OPENCDK_VERSION=0.6.6
OPENCDK_URL=http://www.gnu.org/software/gnutls/releases/opencdk/opencdk-$(OPENCDK_VERSION).tar.bz2
......@@ -174,7 +174,7 @@ TIFF_VERSION=3.8.2
TIFF_URL=http://dl.maptools.org/dl/libtiff/tiff-$(TIFF_VERSION).tar.gz
SDL_VERSION=1.2.13
SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
SDL_IMAGE_VERSION=1.2.6
SDL_IMAGE_VERSION=1.2.7
SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
MUSE_VERSION=1.2.6
MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment