11:30 a.m.
Author: rathann
Update of /cvs/free/rpms/x264/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv21167
Modified Files:
.cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec
Removed Files:
x264-nostrip.patch x264-shared.patch
Log Message:
* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
- Update to 20110620 stable branch (ABI 115)
- Convert x264-snapshot to git (based on ffmpeg script).
- New Build Conditionals --with ffmpegsource libavformat
- Remove shared and strip patches - undeeded anymore
- Remove uneeded convertion of AUTHORS
- fix snapshot script to include version.h properly
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 6 Jul 2010 17:36:13 -0000 1.14
+++ .cvsignore 14 Aug 2011 11:30:07 -0000 1.15
@@ -1 +1 @@
-x264-20100706.tar.bz2
+x264-stable-20110620.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 10 Jan 2011 21:56:26 -0000 1.15
+++ sources 14 Aug 2011 11:30:07 -0000 1.16
@@ -1 +1 @@
-f34cfcf47656cb6bfe7052a113b0db8d x264-20110110.tar.bz2
+b048113f0148b2325fd35b9cd4d32674 x264-stable-20110620.tar.bz2
x264-nover.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x264-nover.patch
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264-nover.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- x264-nover.patch 19 Jun 2010 22:17:30 -0000 1.3
+++ x264-nover.patch 14 Aug 2011 11:30:07 -0000 1.4
@@ -1,9 +1,9 @@
-diff -up x264-20100620/configure.nover x264-20100620/configure
---- x264-20100620/configure.nover 2010-06-20 00:07:41.000000000 +0200
-+++ x264-20100620/configure 2010-06-20 00:11:53.000000000 +0200
-@@ -689,7 +689,7 @@ if [ "$shared" = "yes" ]; then
- echo 'default: $(SONAME)' >> config.mak
- fi
+diff -up x264-stable-20110620/configure.nover x264-stable-20110620/configure
+--- x264-stable-20110620/configure.nover 2011-08-12 02:04:14.000000000 +0200
++++ x264-stable-20110620/configure 2011-08-12 02:07:28.000000000 +0200
+@@ -1038,7 +1038,7 @@ fi
+ echo "LDFLAGSCLI = $LDFLAGSCLI" >> config.mak
+ echo "CLI_LIBX264 = $CLI_LIBX264" >> config.mak
-./version.sh >> config.h
+cat version.h >> config.h
Index: x264-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264-snapshot.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-snapshot.sh 3 Aug 2008 17:53:20 -0000 1.1
+++ x264-snapshot.sh 14 Aug 2011 11:30:07 -0000 1.2
@@ -12,13 +12,18 @@
unset CDPATH
pwd=$(pwd)
-git=$(date +%Y%m%d)
+date=20110620
+package=x264
+branch=stable
+commit=2809cb6ce63817a58c5639642fe05bc50747e126
pushd "$tmp"
-git clone git://git.videolan.org/x264.git x264-$git
-pushd x264-$git
-./version.sh .
-find . -type d -name .git -print0 | xargs -0r rm -rf
-popd
-tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git
+git clone git://git.videolan.org/${package}.git -b ${branch}
+cd ${package}
+git checkout ${commit}
+git checkout -b rpmfusion
+./version.sh > version.h
+git add version.h
+git commit -m "generated version.h" version.h
+git archive --prefix="${package}-${branch}-${date}/" --format=tar rpmfusion |
bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2
popd >/dev/null
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/F-14/x264.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- x264.spec 10 Jan 2011 21:56:26 -0000 1.22
+++ x264.spec 14 Aug 2011 11:30:07 -0000 1.23
@@ -1,22 +1,21 @@
-%global snapshot 20110110
+%global snapshot 20110620
+%global branch stable
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.0.0
-Release: 0.29.%{snapshot}%{?dist}
+Release: 0.30.%{snapshot}%{?dist}
License: GPLv2+
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
-Source0: %{name}-%{snapshot}.tar.bz2
+Source0: %{name}-%{branch}-%{snapshot}.tar.bz2
Source1: x264-snapshot.sh
# don't remove config.h and don't re-run version.sh
Patch0: x264-nover.patch
-# link with shared libx264
-Patch1: x264-shared.patch
-# don't strip if configured with --enable-debug
-Patch2: x264-nostrip.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(id -u -n)
%{!?_without_gpac:BuildRequires: gpac-devel-static}
+%{?_with_libavformat:BuildRequires: ffmpeg-devel}
+%{?_with_ffmpegsource:BuildRequires: ffmpegsource-devel}
%{?_with_visualize:BuildRequires: libX11-devel}
%ifarch x86_64 i686
BuildRequires: yasm
@@ -57,19 +56,17 @@
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_visualize:--enable-visualize} \\\
+ %{!?_with_libavformat:--disable-lavf} \\\
+ %{!?_with_ffmpegsource:--disable-ffms} \\\
--enable-debug \\\
--enable-shared \\\
+ --system-libx264 \\\
--enable-pic
%prep
-%setup -q -n %{name}-%{snapshot}
+%setup -q -n %{name}-%{branch}-%{snapshot}
%patch0 -p1 -b .nover
-%patch1 -p1 -b .shared
-%patch2 -p1 -b .nostrip
-# AUTHORS file is in iso-8859-1
-iconv -f iso-8859-1 -t utf-8 -o AUTHORS.utf8 AUTHORS
-mv -f AUTHORS.utf8 AUTHORS
%ifarch i686
mkdir simd
cp -a `ls -1|grep -v simd` simd/
@@ -104,6 +101,10 @@
popd
%endif
+#Fix timestamp on x264 generated headers
+touch -r version.h %{buildroot}%{_includedir}/x264.h
%{buildroot}%{_includedir}/x264_config.h
+
+
%clean
%{__rm} -rf %{buildroot}
@@ -121,9 +122,7 @@
%{_libdir}/libx264.so.*
%ifarch i686
%{_libdir}/sse2/libx264.so.*
-%exclude %{_libdir}/sse2/libx264.a
%endif
-%exclude %{_libdir}/libx264.a
%files devel
%defattr(644, root, root, 0755)
@@ -137,6 +136,14 @@
%endif
%changelog
+* Fri Aug 12 2011 Dominik Mierzejewski <rpm(a)greysector.net> - 0.0.0-0.30.20110620
+- Update to 20110620 stable branch (ABI 115)
+- Convert x264-snapshot to git (based on ffmpeg script).
+- New Build Conditionals --with ffmpegsource libavformat
+- Remove shared and strip patches - undeeded anymore
+- Remove uneeded convertion of AUTHORS
+- fix snapshot script to include version.h properly
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110110
- 20110110 snapshot (ABI bump)
--- x264-nostrip.patch DELETED ---
--- x264-shared.patch DELETED ---