rpms/mplayer/F-12 mplayer-libgif.patch, NONE, 1.1 mplayer-llrintf.patch, NONE, 1.1 mplayer-x264.patch, NONE, 1.1 .cvsignore, 1.14, 1.15 mplayer-nodvdcss.patch, 1.6, 1.7 mplayer.spec, 1.24, 1.25 sources, 1.15, 1.16 mplayer-qcelp.patch, 1.2, NONE

Dominik Mierzejewski rathann at rpmfusion.org
Sun Apr 25 00:01:06 CEST 2010 

Author: rathann

Update of /cvs/free/rpms/mplayer/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv11438

Modified Files:
	.cvsignore mplayer-nodvdcss.patch mplayer.spec sources 
Added Files:
	mplayer-libgif.patch mplayer-llrintf.patch mplayer-x264.patch 
Removed Files:
	mplayer-qcelp.patch 
Log Message:
* 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)
- enable radio support (bug #634)
- openal-devel is now openal-soft-devel (bug #935)
- 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)


mplayer-libgif.patch:
 configure |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE mplayer-libgif.patch ---
diff -up mplayer-export-2010-03-27/configure.libgif mplayer-export-2010-03-27/configure
--- mplayer-export-2010-03-27/configure.libgif	2010-03-27 22:56:17.000000000 +0100
+++ mplayer-export-2010-03-27/configure	2010-03-28 00:37:40.000000000 +0100
@@ -5246,7 +5246,7 @@ cat > $TMPC << EOF
 #include <gif_lib.h>
 int main(void) { return 0; }
 EOF
-  for _ld_gif in "-lungif" "-lgif" ; do
+  for _ld_gif in "-lgif" "-lungif" ; do
     cc_check $_ld_gif && _gif=yes && break
   done
 fi

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

mplayer-x264.patch:
 configure             |    2 +-
 libmpcodecs/ve_x264.c |    6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

--- NEW FILE mplayer-x264.patch ---
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 < 89
+#if X264_BUILD < 78
 #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; }
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
@@ -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;
 
@@ -258,7 +258,10 @@
         return -1;
     }
     if(i_size>0) {
+        int keyframe = (pic_out.i_type == X264_TYPE_IDR) ||
+                       (pic_out.i_type == X264_TYPE_I
+                        && param.i_frame_reference == 1
+                        && !param.i_bframe);
-        int keyframe = pic_out.b_keyframe;
         memcpy(mod->mux->buffer, nal->p_payload, i_size);
         muxer_write_chunk(mod->mux, i_size, keyframe?AVIIF_KEYFRAME:0, MP_NOPTS_VALUE, MP_NOPTS_VALUE);
     }


Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	30 Oct 2009 01:10:22 -0000	1.14
+++ .cvsignore	24 Apr 2010 22:01:05 -0000	1.15
@@ -1,2 +1,2 @@
 Blue-1.7.tar.bz2
-mplayer-export-2009-10-29.tar.bz2
+mplayer-export-2010-04-24.tar.bz2

mplayer-nodvdcss.patch:
 Makefile  |    7 -------
 configure |    2 +-
 2 files changed, 1 insertion(+), 8 deletions(-)

Index: mplayer-nodvdcss.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/mplayer-nodvdcss.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mplayer-nodvdcss.patch	30 Oct 2009 01:10:22 -0000	1.6
+++ mplayer-nodvdcss.patch	24 Apr 2010 22:01:05 -0000	1.7
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2009-10-29/configure.nodvdcss mplayer-export-2009-10-29/configure
---- mplayer-export-2009-10-29/configure.nodvdcss	2009-10-28 14:55:18.000000000 +0100
-+++ mplayer-export-2009-10-29/configure	2009-10-30 00:36:25.000000000 +0100
-@@ -639,7 +639,7 @@ _dvdnavconfig=dvdnav-config
+diff -up mplayer-export-2010-03-27/configure.nodvdcss mplayer-export-2010-03-27/configure
+--- mplayer-export-2010-03-27/configure.nodvdcss	2010-03-25 20:53:05.000000000 +0100
++++ mplayer-export-2010-03-27/configure	2010-03-27 22:54:31.000000000 +0100
+@@ -648,7 +648,7 @@ _dvdnavconfig=dvdnav-config
  _dvdreadconfig=dvdread-config
  _dvdread=auto
  _dvdread_internal=auto
@@ -10,10 +10,10 @@
  _xanim=auto
  _real=auto
  _live=auto
-diff -up mplayer-export-2009-10-29/Makefile.nodvdcss mplayer-export-2009-10-29/Makefile
---- mplayer-export-2009-10-29/Makefile.nodvdcss	2009-10-19 11:56:18.000000000 +0200
-+++ mplayer-export-2009-10-29/Makefile	2009-10-30 00:37:10.000000000 +0100
-@@ -150,11 +150,6 @@ SRCS_COMMON-$(LIBDCA)                += 
+diff -up mplayer-export-2010-03-27/Makefile.nodvdcss mplayer-export-2010-03-27/Makefile
+--- mplayer-export-2010-03-27/Makefile.nodvdcss	2010-03-27 22:54:31.000000000 +0100
++++ mplayer-export-2010-03-27/Makefile	2010-03-27 22:55:40.000000000 +0100
+@@ -158,11 +158,6 @@ SRCS_COMMON-$(LIBDCA)                += 
  SRCS_COMMON-$(LIBDV)                 += libmpcodecs/ad_libdv.c \
                                          libmpcodecs/vd_libdv.c \
                                          libmpdemux/demux_rawdv.c
@@ -25,17 +25,17 @@
  
  SRCS_COMMON-$(LIBMAD)                += libmpcodecs/ad_libmad.c
  
-@@ -752,7 +747,6 @@ DIRS =  . \
-         libavutil/ppc \
+@@ -778,7 +773,6 @@ DIRS =  . \
          libavutil/sh4 \
+         libavutil/tomi \
          libavutil/x86 \
 -        libdvdcss \
          libdvdnav \
          libdvdnav/vm \
          libdvdread4 \
-@@ -871,7 +865,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
+@@ -907,7 +901,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h
  $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h
- $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h
+ $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui osdep/mplayer.rc): version.h
  
 -libdvdcss/%:   CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS)
  libdvdnav/%:   CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS)


Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/mplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- mplayer.spec	30 Oct 2009 01:10:22 -0000	1.24
+++ mplayer.spec	24 Apr 2010 22:01:06 -0000	1.25
@@ -1,16 +1,20 @@
 %define         codecdir %{_libdir}/codecs
-%define         pre 20091029svn
+%define         pre 20100424svn
 %define         svn 1
-%define         svnbuild 2009-10-29
+%define         svnbuild 2010-04-24
 %define         faad2min 1:2.6.1
 
 Name:           mplayer
 Version:        1.0
-Release:        0.111.%{pre}%{?dist}
+Release:        0.112.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 Group:          Applications/Multimedia
+%if 0%{!?_without_amr:1}
+License:        GPLv3+
+%else
 License:        GPLv2+
+%endif
 URL:            http://www.mplayerhq.hu/
 %if %{svn}
 # run ./mplayer-snapshot.sh to get this
@@ -22,8 +26,10 @@
 Source10:       mplayer-snapshot.sh
 Patch2:         %{name}-config.patch
 Patch8:         %{name}-manlinks.patch
-Patch10:        %{name}-qcelp.patch
 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
@@ -34,7 +40,6 @@
 BuildRequires:  desktop-file-utils
 BuildRequires:  em8300-devel
 BuildRequires:  enca-devel
-%{?_with_faac: BuildRequires:  faac-devel}
 BuildRequires:  faad2-devel >= %{faad2min}
 BuildRequires:  fontconfig-devel
 BuildRequires:  freetype-devel >= 2.0.9
@@ -66,17 +71,18 @@
 BuildRequires:  schroedinger-devel
 BuildRequires:  speex-devel >= 1.1
 BuildRequires:  twolame-devel
-BuildRequires:  x264-devel >= 0.0.0-0.26.20091026
+BuildRequires:  x264-devel >= 0.0.0-0.14.20080613
 BuildRequires:  xvidcore-devel >= 0.9.2
 BuildRequires:  yasm
 %{?_with_arts:BuildRequires: arts-devel}
 %{!?_without_amr:BuildRequires: opencore-amr-devel}
 %{?_with_directfb:BuildRequires: directfb-devel}
 %{?_with_esound:BuildRequires: esound-devel}
+%{?_with_faac:BuildRequires:  faac-devel}
 %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel}
 %{?_with_libmad:BuildRequires:  libmad-devel}
 %{?_with_nemesi:BuildRequires:  libnemesi-devel >= 0.6.3}
-%{?_with_openal:BuildRequires: openal-devel}
+%{?_with_openal:BuildRequires: openal-soft-devel}
 %{?_with_samba:BuildRequires: libsmbclient-devel}
 %{?_with_svgalib:BuildRequires: svgalib-devel}
 %{?_with_xmms:BuildRequires: xmms-devel}
@@ -89,6 +95,7 @@
 %endif
 Obsoletes:      mplayer-fonts
 Requires:       faad2-libs >= %{faad2min}
+Requires:       mplayer-common = %{version}-%{release}
 
 %description
 MPlayer is a movie player that plays most MPEG, VOB, AVI, OGG/OGM,
@@ -101,7 +108,8 @@
 Non-default rpmbuild options:
 --with samba:   Enable Samba (smb://) support
 --with xmms:    Enable XMMS input plugin support
---with amr:     Enable AMR support
+--without amr:  Disable AMR support
+--with faac:    Enable FAAC support
 --with libmad:  Enable libmad support
 --with openal:  Enable OpenAL support
 --with jack:    Enable JACK support
@@ -111,10 +119,17 @@
 --with svgalib: Enable SVGAlib support
 --with nemesi:  Enable libnemesi RTSP support
 
+%package        common
+Summary:        MPlayer common files
+Group:          Applications/Multimedia
+
+%description    common
+This package contains common files for MPlayer packages.
+
 %package        gui
 Summary:        GUI for MPlayer
 Group:          Applications/Multimedia
-Requires:       mplayer = %{version}-%{release}
+Requires:       mplayer-common = %{version}-%{release}
 Requires:       hicolor-icon-theme
 
 %description    gui
@@ -123,7 +138,7 @@
 %package     -n mencoder
 Summary:        MPlayer movie encoder
 Group:          Applications/Multimedia
-Requires:       mplayer = %{version}-%{release}
+Requires:       mplayer-common = %{version}-%{release}
 
 %description -n mencoder
 This package contains the MPlayer movie encoder. 
@@ -135,6 +150,15 @@
 %description    doc
 MPlayer documentation in various languages.
 
+%package        tools
+Summary:        Useful scripts for MPlayer
+Group:          Applications/Multimedia
+Requires:       mencoder = %{version}-%{release}
+Requires:       mplayer = %{version}-%{release}
+
+%description    tools
+This package contains various scripts from MPlayer TOOLS directory.
+
 %define mp_configure \
 ./configure \\\
     --prefix=%{_prefix} \\\
@@ -152,6 +176,8 @@
     --enable-largefiles \\\
     --enable-lirc \\\
     --enable-menu \\\
+    --enable-radio \\\
+    --enable-radio-capture \\\
     --enable-runtime-cpudetection \\\
     --enable-unrarexec \\\
     \\\
@@ -166,6 +192,7 @@
     \\\
     --disable-liba52-internal \\\
     %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
+    %{!?_with_faac:--disable-faac} \\\
     --disable-faad-internal \\\
     %{!?_with_libmad:--disable-mad} \\\
     --disable-tremor-internal \\\
@@ -193,11 +220,12 @@
 %setup -q -n MPlayer-%{version}%{pre}
 %endif
 %patch2 -p1 -b .config
-
-
 %patch8 -p1 -b .manlinks
-%patch10 -p1 -b .qcelp
 %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 && \
     mv DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1
@@ -230,11 +258,22 @@
 %install
 rm -rf $RPM_BUILD_ROOT doc
 
-make install DESTDIR=$RPM_BUILD_ROOT STRIPBINARIES=no
-for file in aconvert.sh midentify.sh ; do
+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
 
+for file in calcbpp.pl countquant.pl dvd2divxscript.pl ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .pl`
+done
+
+for file in vobshift.py ; do
+install -pm 755 TOOLS/$file $RPM_BUILD_ROOT%{_bindir}/`basename $file .py`
+done
+
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/mplayer
+install -pm 644 TOOLS/*.fp $RPM_BUILD_ROOT%{_datadir}/mplayer/
+
 # Clean up documentation
 mkdir doc
 cp -pR DOCS/* doc/
@@ -287,13 +326,15 @@
 
 %files
 %defattr(-, root, root, -)
+%{_bindir}/mplayer
+
+%files common
+%defattr(-, root, root, -)
 %doc AUTHORS Changelog Copyright LICENSE README
 %dir %{_sysconfdir}/mplayer
 %config(noreplace) %{_sysconfdir}/mplayer/mplayer.conf
 %config(noreplace) %{_sysconfdir}/mplayer/input.conf
 %config(noreplace) %{_sysconfdir}/mplayer/menu.conf
-%{_bindir}/midentify
-%{_bindir}/mplayer
 %dir %{codecdir}/
 %dir %{_datadir}/mplayer/
 %{_mandir}/man1/mplayer.1*
@@ -316,7 +357,6 @@
 
 %files -n mencoder
 %defattr(-, root, root, -)
-%{_bindir}/aconvert
 %{_bindir}/mencoder
 %{_mandir}/man1/mencoder.1*
 %lang(cs) %{_mandir}/cs/man1/mencoder.1*
@@ -341,8 +381,34 @@
 %lang(ru) %doc doc/ru/
 %lang(zh_CN) %doc doc/zh_CN/
 
+%files tools
+%defattr(-, root, root, -)
+%{_bindir}/aconvert
+%{_bindir}/calcbpp
+%{_bindir}/countquant
+%{_bindir}/divx2svcd
+%{_bindir}/dvd2divxscript
+%{_bindir}/mencvcd
+%{_bindir}/midentify
+%{_bindir}/mpconsole
+%{_bindir}/qepdvcd
+%{_bindir}/subsearch
+%{_bindir}/vobshift
+%{_datadir}/mplayer/*.fp
 
 %changelog
+* 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)
+- enable radio support (bug #634)
+- openal-devel is now openal-soft-devel (bug #935)
+- 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.20091029svn
 - 20091029 snapshot
 - rebuild against current x264


Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources	30 Oct 2009 01:10:22 -0000	1.15
+++ sources	24 Apr 2010 22:01:06 -0000	1.16
@@ -1,2 +1,2 @@
 e4e2020d11b681aac898103b3ba723c4  Blue-1.7.tar.bz2
-101e633734544dfc735ea27d218342eb  mplayer-export-2009-10-29.tar.bz2
+db1f4d70e2c1dc400e543269a525208b  mplayer-export-2010-04-24.tar.bz2


--- mplayer-qcelp.patch DELETED ---

More information about the rpmfusion-commits mailing list