rpms/x264/devel x264-vectors.patch, NONE, 1.1 x264-rpm.patch, 1.4, 1.5 x264.spec, 1.5, 1.6
Author: rathann
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv30834
Modified Files:
x264-rpm.patch x264.spec
Added Files:
x264-vectors.patch
Log Message:
* Thu Dec 04 2008 Dominik Mierzejewski <rpm(a)greysector.net>
0.0.0-0.19.20081202git71d34b4.1
- fix compilation on ppc
x264-vectors.patch:
--- NEW FILE x264-vectors.patch ---
diff -up x264-20081202/common/ppc/ppccommon.h.v x264-20081202/common/ppc/ppccommon.h
--- x264-20081202/common/ppc/ppccommon.h.v 2008-12-02 23:26:25.000000000 +0100
+++ x264-20081202/common/ppc/ppccommon.h 2008-12-04 01:50:27.000000000 +0100
@@ -251,7 +251,7 @@ typedef union {
* and i2
**********************************************************************/
#define VEC_DIFF_HL(p1,i1,p2,i2,dh,dl) \
- pix1v = vec_ld(0, p1); \
+ pix1v = (vec_s16_t)vec_ld(0, p1); \
temp0v = vec_u8_to_s16_h( pix1v ); \
temp1v = vec_u8_to_s16_l( pix1v ); \
VEC_LOAD( p2, pix2v, 16, vec_s16_t, p2); \
x264-rpm.patch:
Index: x264-rpm.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264-rpm.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- x264-rpm.patch 3 Dec 2008 00:23:13 -0000 1.4
+++ x264-rpm.patch 4 Dec 2008 00:54:53 -0000 1.5
@@ -42,14 +42,6 @@
diff -up x264-20081202/Makefile.r x264-20081202/Makefile
--- x264-20081202/Makefile.r 2008-12-02 23:26:25.000000000 +0100
+++ x264-20081202/Makefile 2008-12-03 01:21:24.000000000 +0100
-@@ -53,6 +53,7 @@ ALTIVECSRC += common/ppc/mc.c common/ppc
- common/ppc/predict.c
- SRCS += $(ALTIVECSRC)
- $(ALTIVECSRC:%.c=%.o): CFLAGS += $(ALTIVECFLAGS)
-+common/ppc/pixel.c: CFLAGS += -flax-vector-conversions
- endif
-
- # VIS optims
@@ -77,14 +78,25 @@ libx264.a: .depend $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
ranlib libx264.a
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- x264.spec 2 Dec 2008 23:33:45 -0000 1.5
+++ x264.spec 4 Dec 2008 00:54:53 -0000 1.6
@@ -4,13 +4,14 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.19.%{snapshot}git%{git}%{?dist}
+Release: 0.19.%{snapshot}git%{git}%{?dist}.1
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
Source0: http://rpm.greysector.net/livna/%{name}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
Patch0: %{name}-rpm.patch
+Patch1: %{name}-vectors.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
BuildRequires: gpac-devel
%ifarch x86_64 %{ix86}
@@ -65,6 +66,7 @@
%prep
%setup -q -n %{name}-%{snapshot}
%patch0 -p1 -b .r
+%patch1 -p1 -b .v
# AUTHORS file is in iso-8859-1
iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
mv -f AUTHORS.utf8 AUTHORS
@@ -130,6 +132,9 @@
%endif
%changelog
+* Thu Dec 04 2008 Dominik Mierzejewski <rpm(a)greysector.net>
0.0.0-0.19.20081202git71d34b4.1
+- fix compilation on ppc
+
* Tue Dec 02 2008 Dominik Mierzejewski <rpm(a)greysector.net>
0.0.0-0.19.20081202git71d34b4
- 20081202 snapshot
- bring back asm optimized/unoptimized libs split