diff options
| author | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
|---|---|---|
| committer | Andrew Manison <amanison@anselsystems.com> | 2011-02-16 19:14:26 +0000 |
| commit | 71e39ce025e46b17e9634cb8fdeec7af04f2f0fa (patch) | |
| tree | ab6569d59ab7f79ae8cb7c677658f9ba12854069 /main/ffmpeg/pic.patch | |
| parent | 01fd4f6611dd2b61cd8ceee01b4a454d74bbbc51 (diff) | |
| parent | 692f71db5a7621fe29b255de3ef9ae973b74eacb (diff) | |
| download | aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.bz2 aports-71e39ce025e46b17e9634cb8fdeec7af04f2f0fa.tar.xz | |
Merge branch 'master' of ssh://git.alpinelinux.org/gitroot/aports-amanison
Conflicts:
main/iaxmodem/APKBUILD
Diffstat (limited to 'main/ffmpeg/pic.patch')
| -rw-r--r-- | main/ffmpeg/pic.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/main/ffmpeg/pic.patch b/main/ffmpeg/pic.patch index 9651f31ef1..737e30ddeb 100644 --- a/main/ffmpeg/pic.patch +++ b/main/ffmpeg/pic.patch @@ -1,11 +1,11 @@ ---- a/libswscale/rgb2rgb.c 2009-07-10 14:27:39.000000000 +0000 -+++ b/libswscale/rgb2rgb.c 2009-07-10 14:53:45.000000000 +0000 -@@ -149,7 +149,7 @@ +--- ./libswscale/rgb2rgb.c.orig ++++ ./libswscale/rgb2rgb.c +@@ -159,7 +159,7 @@ #define RENAME(a) a ## _C #include "rgb2rgb_template.c" --#if ARCH_X86 && CONFIG_GPL -+#if ARCH_X86 && CONFIG_GPL && !defined(PIC) +-#if ARCH_X86 ++#if ARCH_X86 && !defined(PIC) //MMX versions #undef RENAME |