9:01 p.m.
Author: rathann
Update of /cvs/free/rpms/mplayer/F-11
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5640
Modified Files:
.cvsignore mplayer-x264.patch mplayer.spec sources
Added Files:
mplayer-llrintf.patch
Log Message:
- 20100424 snapshot
- fix debuginfo generation (bug #101)
mplayer-llrintf.patch:
configure | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- NEW FILE mplayer-llrintf.patch ---
--- mplayer.orig/configure
+++ mplayer/configure
@@ -3041,7 +3041,7 @@
fi
echores "$_posix4"
-for func in exp2 exp2f llrint log2 log2f lrint lrintf round roundf truncf; do
+for func in exp2 exp2f llrint llrintf log2 log2f lrint lrintf round roundf truncf; do
echocheck $func
cat > $TMPC << EOF
#include <math.h>
@@ -9167,6 +9167,7 @@
$def_hardcoded_tables
$def_libavcodec_mpegaudio_hp
$def_llrint
+$def_llrintf
$def_local_aligned_8
$def_local_aligned_16
$def_log2
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore 28 Mar 2010 01:48:38 -0000 1.14
+++ .cvsignore 24 Apr 2010 21:01:07 -0000 1.15
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2010-03-27.tar.bz2
+mplayer-export-2010-04-24.tar.bz2
mplayer-x264.patch:
configure | 2 -
libmpcodecs/ve_x264.c | 55 ++++++++++++++++++++++++++++++++++++++------------
2 files changed, 43 insertions(+), 14 deletions(-)
Index: mplayer-x264.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-x264.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-x264.patch 28 Mar 2010 01:48:38 -0000 1.1
+++ mplayer-x264.patch 24 Apr 2010 21:01:07 -0000 1.2
@@ -1,21 +1,19 @@
-diff -up mplayer-export-2010-03-27/configure.x264 mplayer-export-2010-03-27/configure
---- mplayer-export-2010-03-27/configure.x264 2010-03-28 01:43:37.000000000 +0100
-+++ mplayer-export-2010-03-27/configure 2010-03-28 01:47:25.000000000 +0100
-@@ -7479,8 +7479,8 @@ if test "$_x264" = auto ; then
+diff -up mplayer-export-2010-04-24/configure.x264 mplayer-export-2010-04-24/configure
+--- mplayer-export-2010-04-24/configure.x264 2010-04-24 19:00:26.000000000 +0200
++++ mplayer-export-2010-04-24/configure 2010-04-24 19:00:26.000000000 +0200
+@@ -7482,7 +7482,7 @@ if test "$_x264" = auto ; then
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
--#if X264_BUILD < 83
--#error We do not support old versions of x264. Get the latest from git.
+-#if X264_BUILD < 89
+#if X264_BUILD < 65
-+#error We do not support old versions of x264. Get the latest from SVN.
+ #error We do not support old versions of x264. Get the latest from git.
#endif
int main(void) { x264_encoder_open((void*)0); return 0; }
- EOF
-diff -up mplayer-export-2010-03-27/libmpcodecs/ve_x264.c.x264
mplayer-export-2010-03-27/libmpcodecs/ve_x264.c
---- mplayer-export-2010-03-27/libmpcodecs/ve_x264.c.x264 2010-02-28 08:52:34.000000000
+0100
-+++ mplayer-export-2010-03-27/libmpcodecs/ve_x264.c 2010-03-28 01:50:53.000000000 +0100
-@@ -59,6 +59,20 @@ static int turbo = 0;
+diff -up mplayer-export-2010-04-24/libmpcodecs/ve_x264.c.x264
mplayer-export-2010-04-24/libmpcodecs/ve_x264.c
+--- mplayer-export-2010-04-24/libmpcodecs/ve_x264.c.x264 2010-04-20 11:14:54.000000000
+0200
++++ mplayer-export-2010-04-24/libmpcodecs/ve_x264.c 2010-04-24 19:18:51.000000000 +0200
+@@ -60,6 +60,20 @@ static int turbo = 0;
static x264_param_t param;
static int parse_error = 0;
@@ -36,7 +34,15 @@
static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts);
static int encode_frame(struct vf_instance *vf, x264_picture_t *pic_in);
-@@ -175,17 +189,25 @@ static int config(struct vf_instance *vf
+@@ -152,7 +166,6 @@ static int config(struct vf_instance *vf
+ param.i_height = height;
+ param.i_fps_num = mod->mux->h.dwRate;
+ param.i_fps_den = mod->mux->h.dwScale;
+- param.b_vfr_input = 0;
+ param.vui.i_sar_width = d_width*height;
+ param.vui.i_sar_height = d_height*width;
+
+@@ -177,17 +190,25 @@ static int config(struct vf_instance *vf
}
if(!param.b_repeat_headers){
@@ -66,7 +72,7 @@
mod->mux->decoder_delay = 2;
else
mod->mux->decoder_delay = param.i_bframe ? 1 : 0;
-@@ -196,10 +218,12 @@ static int config(struct vf_instance *vf
+@@ -198,10 +219,12 @@ static int config(struct vf_instance *vf
static int control(struct vf_instance *vf, int request, void *data)
{
h264_module_t *mod=(h264_module_t*)vf->priv;
@@ -81,7 +87,7 @@
return CONTROL_TRUE;
default:
return CONTROL_UNKNOWN;
-@@ -249,17 +273,23 @@ static int encode_frame(struct vf_instan
+@@ -251,17 +274,23 @@ static int encode_frame(struct vf_instan
x264_picture_t pic_out;
x264_nal_t *nal;
int i_nal;
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/mplayer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- mplayer.spec 28 Mar 2010 01:48:38 -0000 1.25
+++ mplayer.spec 24 Apr 2010 21:01:07 -0000 1.26
@@ -1,7 +1,7 @@
%define codecdir %{_libdir}/codecs
-%define pre 20100327svn
+%define pre 20100424svn
%define svn 1
-%define svnbuild 2010-03-27
+%define svnbuild 2010-04-24
%define faad2min 1:2.6.1
Name: mplayer
@@ -29,6 +29,7 @@
Patch14: %{name}-nodvdcss.patch
Patch15: %{name}-libgif.patch
Patch16: %{name}-x264.patch
+Patch17: %{name}-llrintf.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -223,6 +224,7 @@
%patch14 -p1 -b .nodvdcss
%patch15 -p1 -b .libgif
%patch16 -p1 -b .x264
+%patch17 -p1 -b .llrintf
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -256,7 +258,7 @@
%install
rm -rf $RPM_BUILD_ROOT doc
-make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
+make install DESTDIR=$RPM_BUILD_ROOT INSTALLSTRIP=
for file in aconvert.sh divx2svcd.sh mencvcd.sh midentify.sh mpconsole.sh qepdvcd.sh
subsearch.sh ; do
install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .sh`
done
@@ -395,8 +397,8 @@
%{_datadir}/mplayer/*.fp
%changelog
-* Sat Mar 27 2010 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.112.20100327svn
-- 20100327 snapshot
+* Sat Apr 24 2010 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.112.20100424svn
+- 20100424 snapshot
- drop unused patch
- fix licence tag when compiled with OpenCore AMR
- fix build --with faac (bug #997)
@@ -405,6 +407,7 @@
- move some files to -common subpackage, adjust dependencies (bug #1037)
- introduce -tools subpackage, move scripts there (bugs #544, #1037)
- support old x264 in F-11
+- fix debuginfo generation (bug #101)
* Thu Oct 29 2009 Dominik Mierzejewski <rpm at greysector.net> -
1.0-0.111.20090923svn
- 20090923 snapshot
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-11/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 28 Mar 2010 01:48:38 -0000 1.15
+++ sources 24 Apr 2010 21:01:07 -0000 1.16
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-2046c98215915a4cc5cf47335a3e23e9 mplayer-export-2010-03-27.tar.bz2
+db1f4d70e2c1dc400e543269a525208b mplayer-export-2010-04-24.tar.bz2