Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=b8d689275830455181fd7f1d6e2f3847e29a1d71
commit b8d689275830455181fd7f1d6e2f3847e29a1d71
Author: bouleetbil <bouleet...@frogdev.info>
Date: Mon Dec 28 16:38:32 2009 +0100
x264-20090416-1-ppc
*added ppc build fix
*added gcc patch (patch only ppc branch of x264)
diff --git a/source/xmultimedia/x264/FrugalBuild
b/source/xmultimedia/x264/FrugalBuild
index 3528120..e8a576c 100644
--- a/source/xmultimedia/x264/FrugalBuild
+++ b/source/xmultimedia/x264/FrugalBuild
@@ -12,19 +12,24 @@ makedepends=('gpac' 'yasm')
groups=('xmultimedia')
archs=('i686' 'x86_64' 'ppc')
up2date=$pkgver
-source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2)
-sha1sums=('007bc7917c61e2e815094458865077f9a5b5d19b')
+source=(ftp://ftp.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-$pkgver-2245.tar.bz2
gcc4.2.diff)
+sha1sums=('007bc7917c61e2e815094458865077f9a5b5d19b' \
+ '150dc05f5e26b42a9e61a304bbd3643ad215447f')
+
+Fconfopts="$Fconfopts --enable-pthread \
+ --enable-shared \
+ --enable-mp4-output \
+ --enable-visualize \
+ --enable-pic"
+
+if [ "$CARCH" == "ppc" ]; then
+ export CFLAGS="$CFLAGS -flax-vector-conversions"
+fi
build() {
Fcd $pkgname-snapshot-$pkgver-2245/
- Fbuild \
- --enable-pthread \
- --enable-shared \
- --enable-mp4-output \
- --enable-visualize \
- --enable-pic
-
-Fmakeinstall bindir=/usr/bin libdir=/usr/lib includedir=/usr/include
DESTDIR=$Fdestdir
+ Fbuild
+ Fmakeinstall bindir=/usr/bin libdir=/usr/lib includedir=/usr/include
DESTDIR=$Fdestdir
}
# optimization OK
diff --git a/source/xmultimedia/x264/gcc4.2.diff
b/source/xmultimedia/x264/gcc4.2.diff
new file mode 100644
index 0000000..bbec85c
--- /dev/null
+++ b/source/xmultimedia/x264/gcc4.2.diff
@@ -0,0 +1,45 @@
+From: Guillaume Poirier <gpoir...@mplayerhq.hu>
+Date: Tue, 21 Apr 2009 21:18:44 +0000 (+0000)
+Subject: fix "incompatible types in initialization" compilation issues with
GCC 4.3 (which...
+X-Git-Url:
http://git.videolan.org/?p=x264.git;a=commitdiff_plain;h=d2e1e1c35c43ea9c90c9211be6202143b69b35b9;hp=4fc8c03ad568efe3dd2f57db33b0863d29cb63a0
+
+fix "incompatible types in initialization" compilation issues with GCC 4.3
(which is stricter than previous compiler version)
+---
+
+diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
+index 2f7082a..360e71d 100644
+--- a/common/ppc/pixel.c
++++ b/common/ppc/pixel.c
+@@ -1865,7 +1865,7 @@ static int pixel_sa8d_16x16_altivec( uint8_t *pix1, int
i_pix1,
+
+ #define VEC_LOAD_HIGH( p, num ) \
+ vec_u8_t pix8_##num = vec_ld( stride*num, p ); \
+- vec_s16_t pix16_s##num = vec_perm(pix8_##num, zero_u8v, perm); \
++ vec_s16_t pix16_s##num = (vec_s16_t)vec_perm(pix8_##num, zero_u8v, perm);
\
+ vec_s16_t pix16_d##num;
+
+ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix, int stride, const
vec_u8_t perm )
+X-Git-Url:
http://git.videolan.org/?p=x264.git;a=blobdiff_plain;f=common%2Fppc%2Fpixel.c;h=2f7082a9ccffe533c975e11c2e9e87973ec29de8;hp=51205442d2b9d49540a7ad49712748ff765501ce;hb=4fc8c03ad568efe3dd2f57db33b0863d29cb63a0;hpb=755470584932877c4d5ea1b51c2cc2dbd044b7ca
+
+diff --git a/common/ppc/pixel.c b/common/ppc/pixel.c
+index 5120544..2f7082a 100644
+--- a/common/ppc/pixel.c
++++ b/common/ppc/pixel.c
+@@ -1905,7 +1905,7 @@ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix,
int stride, const vec_u
+ vec_u16_t addabs67 = vec_add( VEC_ABSOLUTE(pix16_d6),
VEC_ABSOLUTE(pix16_d7) );
+
+ vec_u16_t sum4_v = vec_add(vec_add(addabs01, addabs23), vec_add(addabs45,
addabs67));
+- vec_ste(vec_sums(vec_sum4s(sum4_v, zero_s32v), zero_s32v), 12, sum4_tab);
++ vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum4_v, zero_s32v), zero_s32v), 12,
sum4_tab);
+
+ vec_s16_t tmpi0 = vec_add(pix16_d0, pix16_d4);
+ vec_s16_t tmpi4 = vec_sub(pix16_d0, pix16_d4);
+@@ -1933,7 +1933,7 @@ static uint64_t pixel_hadamard_ac_altivec( uint8_t *pix,
int stride, const vec_u
+ VEC_ABSOLUTE( vec_sub(pix16_d3, pix16_d7) )
);
+
+ vec_u16_t sum8_v = vec_add( vec_add(addsum04, addsum15),
vec_add(addsum26, addsum37) );
+- vec_ste(vec_sums( vec_sum4s(sum8_v, zero_s32v), zero_s32v), 12, sum8_tab);
++ vec_ste(vec_sums(vec_sum4s((vec_s16_t)sum8_v, zero_s32v), zero_s32v), 12,
sum8_tab);
+
+ int sum8 = sum8_tab[3];
+
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
