rpms/mame/F-15 .cvsignore, 1.31, 1.32 mame.spec, 1.37, 1.38 sources, 1.31, 1.32
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/F-15
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20075
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Fri Jul 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143u1-1
- Updated to 0.143u1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 29 Jun 2011 16:26:21 -0000 1.31
+++ .cvsignore 15 Jul 2011 15:13:59 -0000 1.32
@@ -1 +1,2 @@
mame0143s.exe
+0143u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/mame.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mame.spec 29 Jun 2011 16:26:21 -0000 1.37
+++ mame.spec 15 Jul 2011 15:13:59 -0000 1.38
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 143
-#global sourceupdate 6
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
Source0: http://www.aarongiles.com/mirror/releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -251,6 +251,9 @@
%changelog
+* Fri Jul 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143u1-1
+- Updated to 0.143u1
+
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143-1
- Updated to 0.143
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/F-15/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 29 Jun 2011 16:26:21 -0000 1.31
+++ sources 15 Jul 2011 15:13:59 -0000 1.32
@@ -1 +1,2 @@
bd4340940e35e3f19a89aaa949c3dd3c mame0143s.exe
+aa65ea6cde4226b5a9dee89de89bfe19 0143u1_diff.zip
12 years, 10 months
rpms/mame/devel .cvsignore, 1.31, 1.32 mame.spec, 1.37, 1.38 sources, 1.31, 1.32
by Julian Sikorski
Author: belegdol
Update of /cvs/nonfree/rpms/mame/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv19963
Modified Files:
.cvsignore mame.spec sources
Log Message:
* Fri Jul 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143u1-1
- Updated to 0.143u1
Index: .cvsignore
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 29 Jun 2011 16:26:11 -0000 1.31
+++ .cvsignore 15 Jul 2011 15:13:47 -0000 1.32
@@ -1 +1,2 @@
mame0143s.exe
+0143u1_diff.zip
Index: mame.spec
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/mame.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- mame.spec 29 Jun 2011 16:26:11 -0000 1.37
+++ mame.spec 15 Jul 2011 15:13:47 -0000 1.38
@@ -5,7 +5,7 @@
%bcond_with debug
%global baseversion 143
-#global sourceupdate 6
+%global sourceupdate 1
Name: mame
%if 0%{?sourceupdate}
@@ -23,7 +23,7 @@
Source0: http://www.aarongiles.com/mirror/releases/%{name}0%{baseversion}s.exe
%if 0%{?sourceupdate}
#Source updates
-#Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
+Source1: http://mamedev.org/updates/0%{baseversion}u1_diff.zip
#Source2: http://mamedev.org/updates/0%{baseversion}u2_diff.zip
#Source3: http://mamedev.org/updates/0%{baseversion}u3_diff.zip
#Source4: http://mamedev.org/updates/0%{baseversion}u4_diff.zip
@@ -251,6 +251,9 @@
%changelog
+* Fri Jul 15 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143u1-1
+- Updated to 0.143u1
+
* Wed Jun 29 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 0.143-1
- Updated to 0.143
Index: sources
===================================================================
RCS file: /cvs/nonfree/rpms/mame/devel/sources,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- sources 29 Jun 2011 16:26:11 -0000 1.31
+++ sources 15 Jul 2011 15:13:47 -0000 1.32
@@ -1 +1,2 @@
bd4340940e35e3f19a89aaa949c3dd3c mame0143s.exe
+aa65ea6cde4226b5a9dee89de89bfe19 0143u1_diff.zip
12 years, 10 months
rpms/avidemux/devel avidemux.spec,1.49,1.50
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16828
Modified Files:
avidemux.spec
Log Message:
Rebuilt for x264 ABI 115
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- avidemux.spec 27 Jun 2011 14:09:09 -0000 1.49
+++ avidemux.spec 14 Jul 2011 22:06:46 -0000 1.50
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.5
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -321,6 +321,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 2.5.5-2
+- Rebuilt for x264 ABI 115
+
* Sun Jun 05 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.5-1
- New release: 2.5.5
- FFMpeg based AAC encoding is broken (BZ#1825) and
12 years, 10 months
rpms/mplayer/devel mplayer.spec,1.38,1.39
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16716
Modified Files:
mplayer.spec
Log Message:
Rebuilt for x264 ABI 115
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- mplayer.spec 29 Jun 2011 19:38:28 -0000 1.38
+++ mplayer.spec 14 Jul 2011 22:05:35 -0000 1.39
@@ -6,7 +6,7 @@
Name: mplayer
Version: 1.0
-Release: 0.124.%{pre}%{?dist}
+Release: 0.125.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -405,6 +405,9 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.0-0.125.20110412svn
+- Rebuilt for x264 ABI 115
+
* Thu Jun 16 2011 Ricky Zhou <ricky(a)rzhou.org> - 1.0-0.124.20110412svn
- Add upstream patch for pause crash.
12 years, 10 months
rpms/vlc/devel vlc.spec,1.125,1.126
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16608
Modified Files:
vlc.spec
Log Message:
Rebuilt for x264 ABI 115
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -r1.125 -r1.126
--- vlc.spec 7 Jun 2011 09:33:37 -0000 1.125
+++ vlc.spec 14 Jul 2011 22:04:57 -0000 1.126
@@ -26,7 +26,7 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
Version: 1.1.10
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -563,6 +563,9 @@
%changelog
+* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.10-2
+- Rebuilt for x264 ABI 115
+
* Mon Jun 06 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.10-1
- Update to 1.1.10
- backport from 1.1-bugfix
12 years, 10 months
rpms/gstreamer-plugins-ugly/devel gstreamer-plugins-ugly.spec, 1.32, 1.33
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gstreamer-plugins-ugly/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16499
Modified Files:
gstreamer-plugins-ugly.spec
Log Message:
Rebuilt for x264 ABI 115
Index: gstreamer-plugins-ugly.spec
===================================================================
RCS file: /cvs/free/rpms/gstreamer-plugins-ugly/devel/gstreamer-plugins-ugly.spec,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- gstreamer-plugins-ugly.spec 17 May 2011 09:11:50 -0000 1.32
+++ gstreamer-plugins-ugly.spec 14 Jul 2011 22:04:23 -0000 1.33
@@ -11,7 +11,7 @@
Summary: GStreamer streaming media framework "ugly" plug-ins
Name: gstreamer-plugins-ugly
Version: 0.10.18
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: Applications/Multimedia
URL: http://gstreamer.freedesktop.org/
@@ -131,6 +131,9 @@
%changelog
+* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.10.18-2
+- Rebuilt for x264 ABI 115
+
* Tue May 17 2011 Hans de Goede <j.w.r.degoede(a)gmail.com> - 0.10.18-1
- New upstream release 0.10.18
12 years, 10 months
rpms/libquicktime/devel libquicktime.spec,1.22,1.23
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/libquicktime/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15941
Modified Files:
libquicktime.spec
Log Message:
- Rebuilt for x264 ABI 115
Index: libquicktime.spec
===================================================================
RCS file: /cvs/free/rpms/libquicktime/devel/libquicktime.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- libquicktime.spec 11 Jul 2011 20:34:23 -0000 1.22
+++ libquicktime.spec 14 Jul 2011 22:02:26 -0000 1.23
@@ -1,7 +1,7 @@
Summary: Library for reading and writing Quicktime files
Name: libquicktime
Version: 1.2.3
-Release: 1%{?dist}
+Release: 2%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
@@ -129,6 +129,9 @@
# --------------------------------------------------------------------
%changelog
+* Fri Jul 15 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.3-2
+- Rebuilt for x264 ABI 115
+
* Mon Jul 11 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.2.3-1
- Update to 1.2.3
12 years, 10 months
rpms/ffmpeg/devel sources, 1.24, 1.25 .cvsignore, 1.24, 1.25 ffmpeg.spec, 1.44, 1.45
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/ffmpeg/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv15737
Modified Files:
sources .cvsignore ffmpeg.spec
Log Message:
Update to 0.7.1
Index: sources
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/sources,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- sources 12 Jun 2011 21:29:58 -0000 1.24
+++ sources 14 Jul 2011 21:59:50 -0000 1.25
@@ -1 +1 @@
-881aca23a4e13a7eb3207d98a1e38643 ffmpeg-oldabi-20110612.tar.bz2
+8615815985a17ef6498620c715e63f5e ffmpeg-0.7.1.tar.bz2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/.cvsignore,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- .cvsignore 12 Jun 2011 21:29:58 -0000 1.24
+++ .cvsignore 14 Jul 2011 21:59:50 -0000 1.25
@@ -1 +1 @@
-ffmpeg-oldabi-20110612.tar.bz2
+ffmpeg-0.7.1.tar.bz2
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/devel/ffmpeg.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- ffmpeg.spec 12 Jun 2011 21:29:58 -0000 1.44
+++ ffmpeg.spec 14 Jul 2011 21:59:50 -0000 1.45
@@ -1,13 +1,13 @@
# TODO: add make test to %%check section
%global branch oldabi-
-%global date 20110612
+#global date 20110612
#global rel rc1
Summary: Digital VCR and streaming server
Name: ffmpeg
-Version: 0.7
-Release: 0.2.%{?date}%{?date:git}%{?rel}%{?dist}
+Version: 0.7.1
+Release: 1%{?date}%{?date:git}%{?rel}%{?dist}
%if 0%{?_with_amr:1}
License: GPLv3+
%else
@@ -18,7 +18,7 @@
%if 0%{?date}
Source0: ffmpeg-%{?branch}%{date}.tar.bz2
%else
-Source0: http://ffmpeg.org/releases/ffmpeg-%{version}-%{rel}.tar.bz2
+Source0: http://ffmpeg.org/releases/ffmpeg-%{version}.tar.bz2
%endif
Source1: ffmpeg-snapshot-oldabi.sh
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +35,9 @@
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
BuildRequires: libvpx-devel >= 0.9.1
+%ifarch %{ix86} x86_64
+BuildRequires: libXvMC-devel
+%endif
%{?_with_amr:BuildRequires: opencore-amr-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
@@ -42,7 +45,7 @@
BuildRequires: speex-devel
BuildRequires: subversion
BuildRequires: texi2html
-%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.29}
+%{!?_without_x264:BuildRequires: x264-devel >= 0.0.0-0.30}
BuildRequires: xvidcore-devel
BuildRequires: zlib-devel
%ifarch %{ix86} x86_64
@@ -121,7 +124,7 @@
%setup -q -n ffmpeg-%{?branch}%{date}
echo "git-snapshot-%{?branch}%{date}-RPMFusion" > VERSION
%else
-%setup -q -n ffmpeg-%{version}-%{rel}
+%setup -q -n ffmpeg-%{version}
%endif
%build
@@ -202,7 +205,7 @@
%if 0%{!?ffmpegsuffix:1}
%files
%defattr(-,root,root,-)
-%doc COPYING.* CREDITS Changelog README doc/ffserver.conf
+%doc COPYING.* CREDITS README doc/ffserver.conf
%{_bindir}/ffmpeg
%{_bindir}/ffplay
%{_bindir}/ffprobe
@@ -238,6 +241,12 @@
%changelog
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7.1-1
+- Update to 0.7.1
+
+* Fri Jul 01 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.3.20110612git
+- Add XvMC in ffmpeg
+
* Sun Jun 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.7-0.2.20110612git
- Update to 20110612git from oldabi branch
12 years, 10 months
rpms/gpac/devel gpac.spec,1.26,1.27
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/gpac/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv12013
Modified Files:
gpac.spec
Log Message:
Rebuild
Index: gpac.spec
===================================================================
RCS file: /cvs/free/rpms/gpac/devel/gpac.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- gpac.spec 5 Jun 2011 12:15:24 -0000 1.26
+++ gpac.spec 14 Jul 2011 21:22:48 -0000 1.27
@@ -17,7 +17,7 @@
Name: gpac
Summary: MPEG-4 multimedia framework
Version: 0.4.6
-Release: 0.13.cvs%{?cvs}%{?dist}
+Release: 0.14.cvs%{?cvs}%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://gpac.sourceforge.net/
@@ -336,6 +336,9 @@
%changelog
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.14.cvs20100527
+- Rebuild
+
* Sun Jun 05 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.4.6-0.13.cvs20100527
- Rebuild for js update
12 years, 10 months
rpms/x264/devel .cvsignore, 1.16, 1.17 sources, 1.16, 1.17 x264-nover.patch, 1.3, 1.4 x264-snapshot.sh, 1.2, 1.3 x264.spec, 1.25, 1.26 x264-nostrip.patch, 1.1, NONE x264-shared.patch, 1.5, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/x264/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26699/devel
Modified Files:
.cvsignore sources x264-nover.patch x264-snapshot.sh x264.spec
Removed Files:
x264-nostrip.patch x264-shared.patch
Log Message:
Update to today's snapshot from stable branch (ABI 115)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/x264/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 27 Feb 2011 22:52:17 -0000 1.16
+++ .cvsignore 14 Jul 2011 18:11:35 -0000 1.17
@@ -1 +1 @@
-x264-20110227.tar.bz2
+x264-stable-20110714.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/x264/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 27 Feb 2011 22:52:17 -0000 1.16
+++ sources 14 Jul 2011 18:11:35 -0000 1.17
@@ -1 +1 @@
-784318733e4301d7c49c1317cdfe6baf x264-20110227.tar.bz2
+80191c61a9480435ef3b3219203a214b x264-stable-20110714.tar.bz2
x264-nover.patch:
configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: x264-nover.patch
===================================================================
RCS file: /cvs/free/rpms/x264/devel/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 Jul 2011 18:11:35 -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-20110714/configure.nover x264-stable-20110714/configure
+--- x264-stable-20110714/configure.nover 2011-07-14 19:40:29.000000000 +0200
++++ x264-stable-20110714/configure 2011-07-14 19:42:02.213802421 +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/devel/x264-snapshot.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- x264-snapshot.sh 27 Feb 2011 22:52:17 -0000 1.2
+++ x264-snapshot.sh 14 Jul 2011 18:11:35 -0000 1.3
@@ -12,13 +12,15 @@
unset CDPATH
pwd=$(pwd)
-git=$(date +%Y%m%d)
+date=$(date +%Y%m%d)
+package=x264
+branch=stable
pushd "$tmp"
-git clone git://git.videolan.org/x264.git x264-$git
-pushd x264-$git
+git clone git://git.videolan.org/${package}.git -b ${branch}
+cd ${package}
./version.sh > version.h
-find . -type d -name .git -print0 | xargs -0r rm -rf
-popd
-tar jcf "$pwd"/x264-$git.tar.bz2 x264-$git
+git add version.h
+git commit version.h
+git archive --prefix="${package}-${branch}-${date}/" --format=tar ${branch} | bzip2 > "$pwd"/${package}-${branch}-${date}.tar.bz2
popd >/dev/null
Index: x264.spec
===================================================================
RCS file: /cvs/free/rpms/x264/devel/x264.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- x264.spec 10 Mar 2011 22:34:46 -0000 1.25
+++ x264.spec 14 Jul 2011 18:11:35 -0000 1.26
@@ -1,22 +1,21 @@
-%global snapshot 20110227
+%global snapshot 20110714
+%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,16 @@
--includedir=%{_includedir} \\\
--extra-cflags="$RPM_OPT_FLAGS" \\\
%{?_with_visualize:--enable-visualize} \\\
+ %{!?_with_libavformat:--disable-lavf} \\\
+ %{!?_with_ffmpegsource:--disable-ffms} \\\
--enable-debug \\\
--enable-shared \\\
--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 +100,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 +121,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 +135,13 @@
%endif
%changelog
+* Thu Jul 14 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 0.0.0-0.30.20110714
+- Update to 20110714 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
+
* Mon Jan 10 2011 Dominik Mierzejewski <rpm(a)greysector.net> 0.0.0-0.29.20110227
- 20110227 snapshot (ABI bump)
--- x264-nostrip.patch DELETED ---
--- x264-shared.patch DELETED ---
12 years, 10 months