rev 16983 - in krap/mlt/trunk/debian: . patches
Patrick Matthäi
pmatthaei at alioth.debian.org
Wed Feb 17 17:49:15 UTC 2010
Author: pmatthaei
Date: 2010-02-17 17:49:14 +0000 (Wed, 17 Feb 2010)
New Revision: 16983
Added:
krap/mlt/trunk/debian/patches/01-deinterlace-no-mmx-sse.diff
Removed:
krap/mlt/trunk/debian/patches/01-dont_hardcode_x86.diff
Modified:
krap/mlt/trunk/debian/changelog
krap/mlt/trunk/debian/patches/series
Log:
* Replace last patch with 01-deinterlace-no-mmx-sse.diff from upstream.
Closes: #570145
Modified: krap/mlt/trunk/debian/changelog
===================================================================
--- krap/mlt/trunk/debian/changelog 2010-02-17 17:07:21 UTC (rev 16982)
+++ krap/mlt/trunk/debian/changelog 2010-02-17 17:49:14 UTC (rev 16983)
@@ -1,3 +1,10 @@
+mlt (0.5.0-3) unstable; urgency=low
+
+ * Replace last patch with 01-deinterlace-no-mmx-sse.diff from upstream.
+ Closes: #570145
+
+ -- Patrick Matthäi <pmatthaei at debian.org> Wed, 17 Feb 2010 18:47:35 +0100
+
mlt (0.5.0-2) unstable; urgency=low
* Fix FTBFS on all non-x86 architectures, because there was a hardcoded
Added: krap/mlt/trunk/debian/patches/01-deinterlace-no-mmx-sse.diff
===================================================================
--- krap/mlt/trunk/debian/patches/01-deinterlace-no-mmx-sse.diff (rev 0)
+++ krap/mlt/trunk/debian/patches/01-deinterlace-no-mmx-sse.diff 2010-02-17 17:49:14 UTC (rev 16983)
@@ -0,0 +1,133 @@
+# Upstream patch: Don't build with mmx and sse, if it is disabled.
+
+diff --git a/src/modules/xine/Makefile b/src/modules/xine/Makefile
+index f18419f..cebf392 100644
+--- a/src/modules/xine/Makefile
++++ b/src/modules/xine/Makefile
+@@ -1,4 +1,4 @@
+-CFLAGS += -I../../ -DARCH_X86
++CFLAGS += -I../../
+
+ LDFLAGS += -L../../framework -lmlt
+
+@@ -12,6 +12,7 @@ OBJS = factory.o \
+ filter_deinterlace.o
+
+ ifdef MMX_FLAGS
++CFLAGS += -DARCH_X86
+ OBJS += cpu_accel.o
+ endif
+
+diff --git a/src/modules/xine/yadif.c b/src/modules/xine/yadif.c
+index f1c759d..0c2dad4 100644
+--- a/src/modules/xine/yadif.c
++++ b/src/modules/xine/yadif.c
+@@ -34,7 +34,8 @@
+
+ static void (*filter_line)(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity);
+
+-#ifdef __GNUC__
++#if defined(__GNUC__) && defined(USE_SSE)
++
+ #define LOAD4(mem,dst) \
+ "movd "mem", "#dst" \n\t"\
+ "punpcklbw %%mm7, "#dst" \n\t"
+@@ -264,6 +265,7 @@ static void filter_line_mmx2(int mode, uint8_t *dst, const uint8_t *prev, const
+ #endif
+
+ // ================= SSE2 =================
++#ifdef USE_SSE2
+ #define PABS(tmp,dst) \
+ "pxor "#tmp", "#tmp" \n\t"\
+ "psubw "#dst", "#tmp" \n\t"\
+@@ -271,17 +273,19 @@ static void filter_line_mmx2(int mode, uint8_t *dst, const uint8_t *prev, const
+
+ #define FILTER_LINE_FUNC_NAME filter_line_sse2
+ #include "vf_yadif_template.h"
++#endif
+
+ // ================ SSSE3 =================
++#ifdef USE_SSE3
+ #define PABS(tmp,dst) \
+ "pabsw "#dst", "#dst" \n\t"
+
+ #define FILTER_LINE_FUNC_NAME filter_line_ssse3
+ #include "vf_yadif_template.h"
+-
+ #endif
+
+-#endif
++#endif // GCC 4.2+
++#endif // GNUC, USE_SSE
+
+ static void filter_line_c(int mode, uint8_t *dst, const uint8_t *prev, const uint8_t *cur, const uint8_t *next, int w, int refs, int parity){
+ int x;
+@@ -356,15 +360,22 @@ void filter_plane(int mode, uint8_t *dst, int dst_stride, const uint8_t *prev0,
+ filter_line = filter_line_c;
+ #ifdef __GNUC__
+ #if (__GNUC__ > 4 || __GNUC__ == 4 && __GNUC_MINOR__>1)
++#ifdef USE_SSE3
+ if (cpu & AVS_CPU_SSSE3)
+ filter_line = filter_line_ssse3;
+- else if (cpu & AVS_CPU_SSE2)
++ else
++#endif
++#ifdef USE_SSE2
++ if (cpu & AVS_CPU_SSE2)
+ filter_line = filter_line_sse2;
+ else
+ #endif
++#endif // GCC 4.2+
++#ifdef USE_SSE
+ if (cpu & AVS_CPU_INTEGER_SSE)
+ filter_line = filter_line_mmx2;
+ #endif
++#endif // GNUC
+ y=0;
+ if(((y ^ parity) & 1)){
+ memcpy(dst, cur0 + refs, w);// duplicate 1
+@@ -401,14 +412,13 @@ void filter_plane(int mode, uint8_t *dst, int dst_stride, const uint8_t *prev0,
+ memcpy(dst + (h-1)*dst_stride, cur0 + (h-1)*refs, w); // copy original
+ }
+
+-#ifdef __GNUC__
++#if defined(__GNUC__) && defined(USE_SSE)
+ if (cpu >= AVS_CPU_INTEGER_SSE)
+ asm volatile("emms");
+ #endif
+ }
+
+-#ifdef __GNUC__
+-#ifndef PIC
++#if defined(__GNUC__) && defined(USE_SSE) && !defined(PIC)
+ static attribute_align_arg void YUY2ToPlanes_mmx(const unsigned char *srcYUY2, int pitch_yuy2, int width, int height,
+ unsigned char *py, int pitch_y,
+ unsigned char *pu, unsigned char *pv, int pitch_uv)
+@@ -486,8 +496,7 @@ static attribute_align_arg void YUY2FromPlanes_mmx(unsigned char *dstYUY2, int p
+ }
+ asm ("sfence \n\t emms");
+ }
+-#endif
+-#endif
++#endif // GNUC, USE_SSE, !PIC
+
+ //----------------------------------------------------------------------------------------------
+
+@@ -498,7 +507,7 @@ void YUY2ToPlanes(const unsigned char *pSrcYUY2, int nSrcPitchYUY2, int nWidth,
+
+ int h,w;
+ int w0 = 0;
+-#if defined(__GNUC__) && !defined(PIC)
++#if defined(__GNUC__) && defined(USE_SSE) && !defined(PIC)
+ if (cpu & AVS_CPU_INTEGER_SSE) {
+ w0 = (nWidth/8)*8;
+ YUY2ToPlanes_mmx(pSrcYUY2, nSrcPitchYUY2, w0, nHeight, pSrcY, srcPitchY, pSrcU, pSrcV, srcPitchUV);
+@@ -529,7 +538,7 @@ void YUY2FromPlanes(unsigned char *pSrcYUY2, int nSrcPitchYUY2, int nWidth, int
+ {
+ int h,w;
+ int w0 = 0;
+-#if defined(__GNUC__) && !defined(PIC)
++#if defined(__GNUC__) && defined(USE_SSE) && !defined(PIC)
+ if (cpu & AVS_CPU_INTEGER_SSE) {
+ w0 = (nWidth/8)*8;
+ YUY2FromPlanes_mmx(pSrcYUY2, nSrcPitchYUY2, w0, nHeight, pSrcY, srcPitchY, pSrcU, pSrcV, srcPitchUV);
Modified: krap/mlt/trunk/debian/patches/series
===================================================================
--- krap/mlt/trunk/debian/patches/series 2010-02-17 17:07:21 UTC (rev 16982)
+++ krap/mlt/trunk/debian/patches/series 2010-02-17 17:49:14 UTC (rev 16983)
@@ -1 +1 @@
-01-dont_hardcode_x86.diff
+01-deinterlace-no-mmx-sse.diff
More information about the pkg-kde-commits
mailing list