diff options
| author | Michał Masłowski <mtjm@mtjm.eu> | 2013-06-02 10:37:52 +0200 |
|---|---|---|
| committer | Michał Masłowski <mtjm@mtjm.eu> | 2013-06-02 10:37:52 +0200 |
| commit | 7d3ad95be857670e9930b5aa90b474fae27d9f42 (patch) | |
| tree | a5b4231d0729c9e6ca501328e7101ce2eee8900f | |
| parent | 972fee03646b0f7a3398b80ea6dc35ab03645ab8 (diff) | |
Fix xine-lib build.
| -rw-r--r-- | extra/xine-lib/0001-fix-non-x86-build.patch | 43 | ||||
| -rw-r--r-- | extra/xine-lib/PKGBUILD | 9 |
2 files changed, 2 insertions, 50 deletions
diff --git a/extra/xine-lib/0001-fix-non-x86-build.patch b/extra/xine-lib/0001-fix-non-x86-build.patch deleted file mode 100644 index 73cdf2c8d..000000000 --- a/extra/xine-lib/0001-fix-non-x86-build.patch +++ /dev/null @@ -1,43 +0,0 @@ -# HG changeset patch -# User Petri Hintukainen <phintuka@users.sourceforge.net> -# Date 1339310702 -10800 -# Node ID b0df4b6003ad2b7454059c2d82ef7f8f29e48e9e -# Parent 52a99e60c2c9aa7e03be894b4396f229f881025c -Fix building on non-x86 systems - -diff --git a/src/post/deinterlace/plugins/greedy2frame_template.c b/src/post/deinterlace/plugins/greedy2frame_template.c ---- a/src/post/deinterlace/plugins/greedy2frame_template.c -+++ b/src/post/deinterlace/plugins/greedy2frame_template.c -@@ -85,6 +85,7 @@ - */ - - -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - #if !defined(MASKS_DEFINED) - #define MASKS_DEFINED - static const mmx_t Mask = { uq: 0x7f7f7f7f7f7f7f7fll }; -@@ -92,6 +93,7 @@ static const mmx_t Mask = { uq: 0x7f7f7f - static const mmx_t GreedyTwoFrameThreshold = { ub: {TP, TP, TP, TP} }; - #undef TP - #endif -+#endif - - #if defined(IS_MMXEXT) - static void DeinterlaceGreedy2Frame_MMXEXT(uint8_t *output, int outstride, -diff --git a/src/post/deinterlace/plugins/greedy2frame_template_sse2.c b/src/post/deinterlace/plugins/greedy2frame_template_sse2.c ---- a/src/post/deinterlace/plugins/greedy2frame_template_sse2.c -+++ b/src/post/deinterlace/plugins/greedy2frame_template_sse2.c -@@ -84,11 +84,12 @@ - ** B0 | | B1 | | - */ - -- -+#if defined(ARCH_X86) || defined(ARCH_X86_64) - static const sse_t Mask128 = { uq: { 0x7f7f7f7f7f7f7f7fll, 0x7f7f7f7f7f7f7f7fll} }; - #define TP GREEDYTWOFRAMETHRESHOLD, GREEDYTWOFRAMETHRESHOLD2 - static const sse_t GreedyTwoFrameThreshold128 = { ub: {TP, TP, TP, TP, TP, TP, TP, TP} }; - #undef TP -+#endif - - static void DeinterlaceGreedy2Frame_SSE2(uint8_t *output, int outstride, - deinterlace_frame_data_t *data, diff --git a/extra/xine-lib/PKGBUILD b/extra/xine-lib/PKGBUILD index 9b32a7176..46c21bb73 100644 --- a/extra/xine-lib/PKGBUILD +++ b/extra/xine-lib/PKGBUILD @@ -31,17 +31,12 @@ optdepends+=('wavpack: for using the wavpack plugin' \ 'gnome-vfs: for using the gnome-vfs plugin') [ "$CARCH" = "mips64el" ] || optdepends+=('libvdpau: for using the VDPAU plugin') options=('!libtool') -source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h - 0001-fix-non-x86-build.patch) +source=(http://downloads.sourceforge.net/sourceforge/xine/${pkgname}-${pkgver}.tar.xz accel_vaapi.h) sha1sums=('6f9ef4ba75688659052d21448d46527db2b77e57' - '08ed9947ef919c71c87151baa8fc0ce7d8f72050' - '5f1a34c7bafa7ea96c0e4e14fbf6e31e53fe41e0') + '08ed9947ef919c71c87151baa8fc0ce7d8f72050') prepare() { cp accel_vaapi.h ${pkgname}-${pkgver}/src/xine-engine/ - - cd ${pkgname}-${pkgver} - patch -Np1 -i ${srcdir}/0001-fix-non-x86-build.patch } build() { |