[svn] r4854 - in trunk/rpms: cinelerra ffmpeg kino libquicktime
mplayer mplayer-skins vlc x264
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Tue Oct 24 16:27:04 CEST 2006
Author: thias
Date: 2006-10-24 16:27:03 +0200 (Tue, 24 Oct 2006)
New Revision: 4854
Added:
trunk/rpms/ffmpeg/ffmpeg-20060918-x264.patch
trunk/rpms/libquicktime/libquicktime-0.9.10-x264.patch
Removed:
trunk/rpms/mplayer/MPlayer-1.0pre8-udev.patch
trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch
Modified:
trunk/rpms/cinelerra/cinelerra.spec
trunk/rpms/ffmpeg/ffmpeg.spec
trunk/rpms/kino/kino.spec
trunk/rpms/libquicktime/libquicktime.spec
trunk/rpms/mplayer-skins/mplayer-skins.spec
trunk/rpms/mplayer/mplayer.spec
trunk/rpms/vlc/vlc-0.8.5-x264.patch
trunk/rpms/vlc/vlc.spec
trunk/rpms/x264/x264.spec
Log:
Update mplayer to 1.0rc1, mplayer-skins to all the latest, x264 (required by mplayer 1.0rc1), rebuild all packages requiring x264 and update cinelerra.
Modified: trunk/rpms/cinelerra/cinelerra.spec
===================================================================
--- trunk/rpms/cinelerra/cinelerra.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/cinelerra/cinelerra.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -8,12 +8,12 @@
%{?fc6:%define _with_modxorg 1}
%{?fc5:%define _with_modxorg 1}
-%define prever 20060918
+%define prever 20061024
Summary: Advanced audio and video capturing, compositing, and editing
Name: cinelerra
Version: 2.1
-Release: 0.9%{?prever:.%{prever}}
+Release: 0.10%{?prever:.%{prever}}
License: GPL
Group: Applications/Multimedia
URL: http://cvs.cinelerra.org/
@@ -45,6 +45,7 @@
BuildRequires: libavc1394-devel >= 0.5.0
BuildRequires: x264-devel
BuildRequires: libogg-devel, libvorbis-devel, libtheora-devel
+%{?_with_opengl:BuildRequires: libGL-devel, libGLU-devel}
# Stuff not checked by configure, but still required
BuildRequires: nasm
BuildRequires: libtool
@@ -76,8 +77,7 @@
--enable-altivec \
%endif
--disable-rpath
-# Using %{?_smp_mflags} makes the libmpeg3 part fail (20060317 SVN)
-%{__make}
+%{__make} %{?_smp_mflags}
%install
@@ -85,6 +85,7 @@
%makeinstall \
plugindir=%{buildroot}%{_libdir}/cinelerra
%find_lang %{name}
+
# Remove xpm icon and place png one
%{__rm} -f %{buildroot}%{_datadir}/pixmaps/cinelerra.xpm
%{__install} -m 0644 -p %{SOURCE1} %{buildroot}%{_datadir}/pixmaps/cinelerra.png
@@ -117,6 +118,12 @@
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 2.0-0.10.20061024
+- Update to today's SVN code.
+- Rebuild against new x264.
+- Re-enable _smp_mflags as they work again, yeah!
+- Add --with opengl build conditional, disabled for now, needs testing.
+
* Tue Sep 26 2006 Matthias Saou <http://freshrpms.net/> 2.0-0.9.20060918
- Replace xpm icon with a nicer png one.
- Remove empty AUTHORS file.
Added: trunk/rpms/ffmpeg/ffmpeg-20060918-x264.patch
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg-20060918-x264.patch (rev 0)
+++ trunk/rpms/ffmpeg/ffmpeg-20060918-x264.patch 2006-10-24 14:27:03 UTC (rev 4854)
@@ -0,0 +1,11 @@
+--- libavcodec/x264.c 2006-08-30 23:18:17.000000000 +0200
++++ x264.c 2006-10-24 13:21:09.000000000 +0200
+@@ -144,7 +146,7 @@ X264_init(AVCodecContext *avctx)
+ else{
+ if(avctx->crf){
+ x4->params.rc.i_rc_method = X264_RC_CRF;
+- x4->params.rc.i_rf_constant = avctx->crf;
++ x4->params.rc.f_rf_constant = avctx->crf;
+ }else if(avctx->cqp > -1){
+ x4->params.rc.i_rc_method = X264_RC_CQP;
+ x4->params.rc.i_qp_constant = avctx->cqp;
Modified: trunk/rpms/ffmpeg/ffmpeg.spec
===================================================================
--- trunk/rpms/ffmpeg/ffmpeg.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/ffmpeg/ffmpeg.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -8,51 +8,43 @@
%{?fc2:%define _without_texi2html 1}
%{?fc1:%define _without_texi2html 1}
-%{?fc1:%define _without_theora 1}
%{?fc1:%define _without_x264 1}
%{?el3:%define _without_texi2html 1}
-%{?el3:%define _without_theora 1}
%{?el3:%define _without_x264 1}
%{?rh9:%define _without_texi2html 1}
-%{?rh9:%define _without_theora 1}
%{?rh9:%define _without_x264 1}
%{?rh7:%define _without_faac 1}
%{?rh7:%define _without_texi2html 1}
-%{?rh7:%define _without_theora 1}
%{?rh7:%define _without_x264 1}
%{?el2:%define _without_faac 1}
%{?el2:%define _without_texi2html 1}
-%{?el2:%define _without_theora 1}
%{?el2:%define _without_vorbis 1}
%{?el2:%define _without_x264 1}
%define date 20060918
-Summary: Record, convert and stream audio and video
+Summary: Utilities and libraries to record, convert and stream audio and video
Name: ffmpeg
Version: 0.4.9
-Release: 0.6%{?date:.%{date}}
+Release: 0.7%{?date:.%{date}}
License: GPL
-Group: System Environment/Libraries
-URL: http://ffmpeg.sourceforge.net/
-%if 0%{!?date:1}
-Source: http://dl.sf.net/ffmpeg/ffmpeg-%{version}.tar.gz
-%else
+Group: Applications/Multimedia
+URL: http://ffmpeg.org/
# svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+# find ffmpeg -name .svn | xargs rm -rf
# then rename the directory and compress
Source: ffmpeg-%{date}.tar.bz2
-%endif
Patch0: ffmpeg-20060918-gsm.patch
+Patch1: ffmpeg-20060918-x264.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel
%{!?_without_texi2html:BuildRequires: texi2html}
%{!?_without_lame:BuildRequires: lame-devel}
%{!?_without_vorbis:BuildRequires: libogg-devel, libvorbis-devel}
-#{!?_without_theora:BuildRequires: libogg-devel, libtheora-devel}
%{!?_without_faad:BuildRequires: faad2-devel}
%{!?_without_faac:BuildRequires: faac-devel}
%{!?_without_gsm:BuildRequires: gsm-devel}
@@ -61,7 +53,6 @@
%{!?_without_a52dec:Requires: a52dec}
%{!?_without_a52dec:BuildRequires: a52dec-devel}
%{!?_without_dts:BuildRequires: libdca-devel}
-%{?_with_dc1394:BuildRequires: libdc1394-devel}
%description
FFmpeg is a very fast video and audio converter. It can also grab from a
@@ -74,7 +65,6 @@
Available rpmbuild rebuild options :
--without : lame vorbis faad faac gsm xvid x264 a52dec dts altivec
---with : dc1394
%package devel
@@ -84,7 +74,6 @@
Requires: imlib2-devel, SDL-devel, freetype-devel, zlib-devel, pkgconfig
%{!?_without_lame:Requires: lame-devel}
%{!?_without_vorbis:Requires: libogg-devel, libvorbis-devel}
-#{!?_without_theora:Requires: libogg-devel, libtheora-devel}
%{!?_without_faad:Requires: faad2-devel}
%{!?_without_faac:Requires: faac-devel}
%{!?_without_gsm:Requires: gsm-devel}
@@ -92,7 +81,6 @@
%{!?_without_x264:Requires: x264-devel}
%{!?_without_a52dec:Requires: a52dec-devel}
%{!?_without_dts:Requires: libdca-devel}
-%{?_with_dc1394:Requires: libdc1394-devel}
%description devel
FFmpeg is a very fast video and audio converter. It can also grab from a
@@ -126,8 +114,9 @@
%prep
-%setup -n ffmpeg-%{?date}%{!?date:%{version}}
+%setup -n ffmpeg-%{date}
%patch0 -p1 -b .gsm
+%patch1 -p0 -b .x264
%build
@@ -152,7 +141,6 @@
--enable-pp \
--enable-shared \
--enable-pthreads \
- %{?_with_dc1394: --enable-dc1394} \
--enable-gpl \
--disable-opts \
--disable-strip
@@ -220,7 +208,15 @@
%changelog
-* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.4.9-0.5.20060918
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 0.4.9-0.7.20060918
+- Try to update, but stick with 20060918 as linking "as needed" is causing
+ too much trouble for now (libdca and libmp3lame with libm functions).
+- Include patch to work with latest x264.
+- Update URL and remove non-%%date stuff since there are no more releases.
+- Change group to Applications/Multimedia since ffmpeg is an application.
+- Remove dc1394 support since the lib isn't available anymore anyway.
+
+* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.4.9-0.6.20060918
- Update to today's SVN codebase.
- Remove theora support, it seems to be gone...
- Remove a52 patch as ffmpeg doesn't link against it anyway.
Modified: trunk/rpms/kino/kino.spec
===================================================================
--- trunk/rpms/kino/kino.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/kino/kino.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -14,13 +14,14 @@
Summary: Simple non-linear video editor
Name: kino
Version: 0.9.2
-Release: 1%{?cvs:.%{cvs}}
+Release: 2%{?cvs:.%{cvs}}
License: GPL
Group: Applications/Multimedia
URL: http://www.kinodv.org/
Source: http://dl.sf.net/kino/kino-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: gtk2 >= 2.6
+Requires: mjpegtools
BuildRequires: libdv-devel >= 0.102
BuildRequires: libavc1394-devel, libraw1394-devel, libiec61883-devel
BuildRequires: libogg-devel, libvorbis-devel, a52dec-devel
@@ -95,6 +96,11 @@
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 0.9.2-2
+- Rebuild against new ffmpeg build (for new shared x264).
+- Add explicit mjpegtools requirement, since it doesn't get pulled in and is
+ required to export to mpeg.
+
* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.9.2-1
- Update to 0.9.2.
Added: trunk/rpms/libquicktime/libquicktime-0.9.10-x264.patch
===================================================================
--- trunk/rpms/libquicktime/libquicktime-0.9.10-x264.patch (rev 0)
+++ trunk/rpms/libquicktime/libquicktime-0.9.10-x264.patch 2006-10-24 14:27:03 UTC (rev 4854)
@@ -0,0 +1,30 @@
+diff -Naupr libquicktime-0.9.10.orig/plugins/x264/x264.c libquicktime-0.9.10/plugins/x264/x264.c
+--- libquicktime-0.9.10.orig/plugins/x264/x264.c 2006-07-25 13:35:15.000000000 +0200
++++ libquicktime-0.9.10/plugins/x264/x264.c 2006-10-24 13:40:41.000000000 +0200
+@@ -91,7 +91,7 @@ static void dump_params(x264_param_t * p
+ fprintf(stderr, " i_qp_step: %d\n", params->rc.i_qp_step);
+ fprintf(stderr, " b_cbr: %d\n", params->rc.b_cbr);
+ fprintf(stderr, " i_bitrate: %d\n", params->rc.i_bitrate);
+- fprintf(stderr, " i_rf_constant: %d\n", params->rc.i_rf_constant);
++ fprintf(stderr, " f_rf_constant: %d\n", params->rc.f_rf_constant);
+ fprintf(stderr, " f_rate_tolerance: %f\n", params->rc.f_rate_tolerance);
+ fprintf(stderr, " i_vbv_max_bitrate: %d\n", params->rc.i_vbv_max_bitrate);
+ fprintf(stderr, " i_vbv_buffer_size: %d\n", params->rc.i_vbv_buffer_size);
+@@ -493,7 +493,7 @@ static int encode(quicktime_t *file, uns
+ {
+ /* Force ABR */
+ codec->params.rc.i_rc_method = X264_RC_ABR;
+- codec->params.rc.i_rf_constant = 0;
++ codec->params.rc.f_rf_constant = 0;
+ if(codec->pass == 1)
+ {
+ /* Strings will be made private by x264 */
+@@ -655,7 +655,7 @@ static int set_parameter(quicktime_t *fi
+ INTPARAM("x264_i_bitrate", codec->params.rc.i_bitrate);
+
+ INTPARAM("x264_i_qp_constant", codec->params.rc.i_qp_constant);
+- INTPARAM("x264_i_rf_constant", codec->params.rc.i_rf_constant);
++ INTPARAM("x264_f_rf_constant", codec->params.rc.f_rf_constant);
+ INTPARAM("x264_i_qp_min", codec->params.rc.i_qp_min);
+ INTPARAM("x264_i_qp_max", codec->params.rc.i_qp_max);
+ INTPARAM("x264_i_qp_step", codec->params.rc.i_qp_step);
Modified: trunk/rpms/libquicktime/libquicktime.spec
===================================================================
--- trunk/rpms/libquicktime/libquicktime.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/libquicktime/libquicktime.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -24,12 +24,13 @@
Summary: Library for reading and writing quicktime files
Name: libquicktime
Version: 0.9.10
-Release: 1%{?prever:.%{prever}}
+Release: 2%{?prever:.%{prever}}
License: GPL
Group: System Environment/Libraries
URL: http://libquicktime.sourceforge.net/
Source: http://dl.sf.net/libquicktime/libquicktime-%{version}%{?prever}.tar.gz
Patch0: libquicktime-0.9.8-plugin_dir.patch
+Patch1: libquicktime-0.9.10-x264.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: gtk2-devel, libdv-devel, libvorbis-devel, lame-devel
BuildRequires: libpng-devel >= 1.0.8, libjpeg-devel, gcc-c++
@@ -72,6 +73,7 @@
%prep
%setup -n %{name}-%{version}%{?prever}
%patch0 -p1 -b .plugin_dir
+%patch1 -p1 -b .x264
%build
@@ -123,6 +125,9 @@
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 0.9.10-2
+- Include patch to rebuild against latest x264.
+
* Mon Aug 28 2006 Matthias Saou <http://freshrpms.net/> 0.9.10-1
- Update to 0.9.10.
Deleted: trunk/rpms/mplayer/MPlayer-1.0pre8-udev.patch
===================================================================
--- trunk/rpms/mplayer/MPlayer-1.0pre8-udev.patch 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/mplayer/MPlayer-1.0pre8-udev.patch 2006-10-24 14:27:03 UTC (rev 4854)
@@ -1,12 +0,0 @@
-diff -Naupr MPlayer-20051211.orig/configure MPlayer-20051211/configure
---- MPlayer-20051211.orig/configure 2005-12-11 19:19:05.000000000 +0100
-+++ MPlayer-20051211/configure 2005-12-12 09:20:15.000000000 +0100
-@@ -6962,7 +6962,7 @@ echores "$_joystick"
- echocheck "lirc"
- if test "$_lirc" = auto ; then
- _lirc=no
-- if test -c /dev/lirc -o -c /dev/lirc/0 ; then
-+ if /bin/true ; then
- cat > $TMPC <<EOF
- #include <lirc/lirc_client.h>
- int main(void) { return 0; }
Modified: trunk/rpms/mplayer/mplayer.spec
===================================================================
--- trunk/rpms/mplayer/mplayer.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/mplayer/mplayer.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -59,15 +59,15 @@
%{?yd3:%define _without_theora 1}
# Is this a daily build? If so, put the date like "20020808" otherwise put 0
-%define date 20060919
-#define rcver pre8
+#define date 20060919
+%define rcver rc1
-%define livever 2006.10.12a
+%define livever 2006.10.18a
Summary: MPlayer, the Movie Player for Linux
Name: mplayer
Version: 1.0
-Release: 0.32%{?rcver:.%{rcver}}%{?date:.%{date}}
+Release: 0.33%{?rcver:.%{rcver}}%{?date:.%{date}}
License: GPL
Group: Applications/Multimedia
URL: http://mplayerhq.hu/
@@ -89,7 +89,6 @@
Patch1: MPlayer-0.90-playlist.patch
Patch2: MPlayer-0.90pre10-redhat.patch
Patch10: MPlayer-1.0pre6a-fribidi.patch
-Patch11: MPlayer-1.0pre8-udev.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mplayer-fonts
BuildRequires: gtk2-devel, SDL-devel
@@ -175,11 +174,7 @@
%patch1 -p1 -b .playlist
%patch2 -p0 -b .redhat
%patch10 -p1 -b .fribidi
-%patch11 -p1 -b .udev
-# Clean up the tarball contents (useful for the included docs)
-find . -name "CVS" | xargs %{__rm} -rf
-
# Overwrite some of the details of the provided system menu entry
%{__perl} -pi -e 's|^Exec=gmplayer$|Exec=gmplayer %f|g;
s|^Categories=.*|Categories=Application;AudioVideo;|g;
@@ -199,7 +194,7 @@
popd
%endif
-export CFLAGS="%{optflags}"
+export CFLAGS="%{optflags} -fomit-frame-pointer"
echo | ./configure \
--prefix=%{_prefix} \
--bindir=%{_bindir} \
@@ -222,7 +217,6 @@
%endif
--with-reallibdir=%{_libdir}/codecs \
--language=all \
- --enable-debug \
--enable-dynamic-plugins \
%{?_without_gcccheck:--disable-gcc-checking} \
%{!?_without_live:--with-livelibdir=`pwd`/live}
@@ -268,7 +262,7 @@
%clean
-%{__rm} -rf %{buildroot}
+#{__rm} -rf %{buildroot}
%files
@@ -316,6 +310,15 @@
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.33.rc1
+- Update to 1.0rc1.
+- Update live library to 2006.10.18a.
+- Remove udev patch as lirc is now properly detected (lib, not the /dev entry).
+- Try to add patch for lzo, but it requires lzo1 while we only have lzo2 now.
+- No longer use --enable-debug since all it did was pass -g but it was now
+ forcing CFLAGS to something different from our optflags too.
+- Force use of -fomit-frame-pointer for now, as i386 build fails otherwise.
+
* Tue Oct 17 2006 Matthias Saou <http://freshrpms.net/> 1.0-0.32.20060919
- Revert to 20060919 snapshot since 20061017 doesn't build on i386.
Modified: trunk/rpms/mplayer-skins/mplayer-skins.spec
===================================================================
--- trunk/rpms/mplayer-skins/mplayer-skins.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/mplayer-skins/mplayer-skins.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -6,7 +6,7 @@
Summary: Collection of skins for MPlayer
Name: mplayer-skins
-Version: 1.7
+Version: 1.8
Release: 1
License: GPL
Group: Applications/Multimedia
@@ -14,68 +14,74 @@
# LANG=C i=0; for file in *.bz2; do
# echo "Source${i}: http://www1.mplayerhq.hu/MPlayer/Skin/$file"; i=$(($i+1))
# done
-Source0: http://www1.mplayerhq.hu/MPlayer/Skin/Abyss-1.1.tar.bz2
+# Exclude Blue (our default in the mplayer package) and mplayer_red (1.3MB)
+Source0: http://www1.mplayerhq.hu/MPlayer/Skin/Abyss-1.6.tar.bz2
Source1: http://www1.mplayerhq.hu/MPlayer/Skin/AlienMind-1.2.tar.bz2
-#Source2: http://www1.mplayerhq.hu/MPlayer/Skin/Blue-1.4.tar.bz2
-Source3: http://www1.mplayerhq.hu/MPlayer/Skin/Blue-small-1.2.tar.bz2
-Source4: http://www1.mplayerhq.hu/MPlayer/Skin/BlueHeart-1.5.tar.bz2
-Source5: http://www1.mplayerhq.hu/MPlayer/Skin/Canary-1.2.tar.bz2
-Source6: http://www1.mplayerhq.hu/MPlayer/Skin/Corelian-1.1.tar.bz2
-Source7: http://www1.mplayerhq.hu/MPlayer/Skin/CornerMP-1.2.tar.bz2
-Source8: http://www1.mplayerhq.hu/MPlayer/Skin/CornerMP-aqua-1.4.tar.bz2
-Source9: http://www1.mplayerhq.hu/MPlayer/Skin/CubicPlayer-1.1.tar.bz2
-Source10: http://www1.mplayerhq.hu/MPlayer/Skin/Cyrus-1.2.tar.bz2
-Source11: http://www1.mplayerhq.hu/MPlayer/Skin/DVDPlayer-1.1.tar.bz2
-Source12: http://www1.mplayerhq.hu/MPlayer/Skin/Dushku-1.2.tar.bz2
-Source13: http://www1.mplayerhq.hu/MPlayer/Skin/Industrial-1.0.tar.bz2
-Source14: http://www1.mplayerhq.hu/MPlayer/Skin/JiMPlayer-1.4.tar.bz2
-Source15: http://www1.mplayerhq.hu/MPlayer/Skin/KDE-0.3.tar.bz2
-Source16: http://www1.mplayerhq.hu/MPlayer/Skin/MidnightLove-1.6.tar.bz2
-Source17: http://www1.mplayerhq.hu/MPlayer/Skin/OSX-Brushed-2.3.tar.bz2
-Source18: http://www1.mplayerhq.hu/MPlayer/Skin/OSX-Mod-1.1.tar.bz2
-Source19: http://www1.mplayerhq.hu/MPlayer/Skin/OpenDoh-1.1.tar.bz2
-Source20: http://www1.mplayerhq.hu/MPlayer/Skin/Orange-1.3.tar.bz2
-Source21: http://www1.mplayerhq.hu/MPlayer/Skin/PowerPlayer-1.1.tar.bz2
-Source22: http://www1.mplayerhq.hu/MPlayer/Skin/QPlayer-1.2.tar.bz2
-Source23: http://www1.mplayerhq.hu/MPlayer/Skin/QuickSilver-1.0.tar.bz2
-Source24: http://www1.mplayerhq.hu/MPlayer/Skin/Terminator3-1.1.tar.bz2
-Source25: http://www1.mplayerhq.hu/MPlayer/Skin/WMP6-2.2.tar.bz2
-Source26: http://www1.mplayerhq.hu/MPlayer/Skin/XFce4-1.0.tar.bz2
-Source27: http://www1.mplayerhq.hu/MPlayer/Skin/avifile-1.6.tar.bz2
-Source28: http://www1.mplayerhq.hu/MPlayer/Skin/bluecurve-1.3.tar.bz2
-Source29: http://www1.mplayerhq.hu/MPlayer/Skin/changuito-0.2.tar.bz2
-Source30: http://www1.mplayerhq.hu/MPlayer/Skin/disappearer-1.1.tar.bz2
-Source31: http://www1.mplayerhq.hu/MPlayer/Skin/divxplayer-1.3.tar.bz2
-Source32: http://www1.mplayerhq.hu/MPlayer/Skin/gnome-1.1.tar.bz2
-Source33: http://www1.mplayerhq.hu/MPlayer/Skin/handheld-1.0.tar.bz2
-Source34: http://www1.mplayerhq.hu/MPlayer/Skin/hayraphon-1.0.tar.bz2
-Source35: http://www1.mplayerhq.hu/MPlayer/Skin/hwswskin-1.1.tar.bz2
-Source36: http://www1.mplayerhq.hu/MPlayer/Skin/iTunes-1.1.tar.bz2
-Source37: http://www1.mplayerhq.hu/MPlayer/Skin/iTunes-mini-1.1.tar.bz2
-Source38: http://www1.mplayerhq.hu/MPlayer/Skin/krystal-1.1.tar.bz2
-Source39: http://www1.mplayerhq.hu/MPlayer/Skin/mentalic-1.2.tar.bz2
-Source40: http://www1.mplayerhq.hu/MPlayer/Skin/mini-0.1.tar.bz2
-Source41: http://www1.mplayerhq.hu/MPlayer/Skin/moonphase-1.0.tar.bz2
-#Source42: http://www1.mplayerhq.hu/MPlayer/Skin/mplayer_red-1.0.tar.bz2
-Source43: http://www1.mplayerhq.hu/MPlayer/Skin/netscape4-1.0.tar.bz2
-Source44: http://www1.mplayerhq.hu/MPlayer/Skin/neutron-1.5.tar.bz2
-Source45: http://www1.mplayerhq.hu/MPlayer/Skin/new-age-1.0.tar.bz2
-Source46: http://www1.mplayerhq.hu/MPlayer/Skin/phony-1.1.tar.bz2
-Source47: http://www1.mplayerhq.hu/MPlayer/Skin/plastic-1.2.tar.bz2
-Source48: http://www1.mplayerhq.hu/MPlayer/Skin/plastik-2.0.tar.bz2
-Source49: http://www1.mplayerhq.hu/MPlayer/Skin/proton-1.2.tar.bz2
-Source50: http://www1.mplayerhq.hu/MPlayer/Skin/sessene-1.0.tar.bz2
-Source51: http://www1.mplayerhq.hu/MPlayer/Skin/slim-1.2.tar.bz2
-Source52: http://www1.mplayerhq.hu/MPlayer/Skin/smoothwebby-1.0.tar.bz2
-Source53: http://www1.mplayerhq.hu/MPlayer/Skin/softgrip-1.1.tar.bz2
-Source54: http://www1.mplayerhq.hu/MPlayer/Skin/standard-1.9.tar.bz2
-Source55: http://www1.mplayerhq.hu/MPlayer/Skin/trium-1.3.tar.bz2
-Source56: http://www1.mplayerhq.hu/MPlayer/Skin/tvisor-1.1.tar.bz2
-Source57: http://www1.mplayerhq.hu/MPlayer/Skin/ultrafina-1.1.tar.bz2
-Source58: http://www1.mplayerhq.hu/MPlayer/Skin/webby-1.2.tar.bz2
-Source59: http://www1.mplayerhq.hu/MPlayer/Skin/xanim-1.6.tar.bz2
-Source60: http://www1.mplayerhq.hu/MPlayer/Skin/xine-lcd-1.2.tar.bz2
-Source61: http://www1.mplayerhq.hu/MPlayer/Skin/xmmplayer-1.5.tar.bz2
+Source2: http://www1.mplayerhq.hu/MPlayer/Skin/Ater-1.2.tar.bz2
+#Source3: http://www1.mplayerhq.hu/MPlayer/Skin/Blue-1.6.tar.bz2
+Source4: http://www1.mplayerhq.hu/MPlayer/Skin/Blue-small-1.3.tar.bz2
+Source5: http://www1.mplayerhq.hu/MPlayer/Skin/BlueHeart-1.5.tar.bz2
+Source6: http://www1.mplayerhq.hu/MPlayer/Skin/Canary-1.2.tar.bz2
+Source7: http://www1.mplayerhq.hu/MPlayer/Skin/Corelian-1.1.tar.bz2
+Source8: http://www1.mplayerhq.hu/MPlayer/Skin/CornerMP-1.2.tar.bz2
+Source9: http://www1.mplayerhq.hu/MPlayer/Skin/CornerMP-aqua-1.4.tar.bz2
+Source10: http://www1.mplayerhq.hu/MPlayer/Skin/CubicPlayer-1.1.tar.bz2
+Source11: http://www1.mplayerhq.hu/MPlayer/Skin/Cyrus-1.2.tar.bz2
+Source12: http://www1.mplayerhq.hu/MPlayer/Skin/DVDPlayer-1.1.tar.bz2
+Source13: http://www1.mplayerhq.hu/MPlayer/Skin/Dushku-1.2.tar.bz2
+Source14: http://www1.mplayerhq.hu/MPlayer/Skin/Industrial-1.0.tar.bz2
+Source15: http://www1.mplayerhq.hu/MPlayer/Skin/JiMPlayer-1.4.tar.bz2
+Source16: http://www1.mplayerhq.hu/MPlayer/Skin/KDE-0.3.tar.bz2
+Source17: http://www1.mplayerhq.hu/MPlayer/Skin/Linea-1.0.tar.bz2
+Source18: http://www1.mplayerhq.hu/MPlayer/Skin/MidnightLove-1.6.tar.bz2
+Source19: http://www1.mplayerhq.hu/MPlayer/Skin/OSX-Brushed-2.3.tar.bz2
+Source20: http://www1.mplayerhq.hu/MPlayer/Skin/OSX-Mod-1.1.tar.bz2
+Source21: http://www1.mplayerhq.hu/MPlayer/Skin/OpenDoh-1.1.tar.bz2
+Source22: http://www1.mplayerhq.hu/MPlayer/Skin/Orange-1.3.tar.bz2
+Source23: http://www1.mplayerhq.hu/MPlayer/Skin/PowerPlayer-1.1.tar.bz2
+Source24: http://www1.mplayerhq.hu/MPlayer/Skin/QPlayer-1.2.tar.bz2
+Source25: http://www1.mplayerhq.hu/MPlayer/Skin/QuickSilver-1.0.tar.bz2
+Source26: http://www1.mplayerhq.hu/MPlayer/Skin/Terminator3-1.1.tar.bz2
+Source27: http://www1.mplayerhq.hu/MPlayer/Skin/WMP6-2.2.tar.bz2
+Source28: http://www1.mplayerhq.hu/MPlayer/Skin/XFce4-1.0.tar.bz2
+Source29: http://www1.mplayerhq.hu/MPlayer/Skin/avifile-1.6.tar.bz2
+Source30: http://www1.mplayerhq.hu/MPlayer/Skin/bluecurve-1.3.tar.bz2
+Source31: http://www1.mplayerhq.hu/MPlayer/Skin/brushedGnome-1.0.tar.bz2
+Source32: http://www1.mplayerhq.hu/MPlayer/Skin/changuito-0.2.tar.bz2
+Source33: http://www1.mplayerhq.hu/MPlayer/Skin/clearplayer-0.8.tar.bz2
+Source34: http://www1.mplayerhq.hu/MPlayer/Skin/disappearer-1.1.tar.bz2
+Source35: http://www1.mplayerhq.hu/MPlayer/Skin/divxplayer-1.3.tar.bz2
+Source36: http://www1.mplayerhq.hu/MPlayer/Skin/gnome-1.1.tar.bz2
+Source37: http://www1.mplayerhq.hu/MPlayer/Skin/handheld-1.0.tar.bz2
+Source38: http://www1.mplayerhq.hu/MPlayer/Skin/hayraphon-1.0.tar.bz2
+Source39: http://www1.mplayerhq.hu/MPlayer/Skin/hwswskin-1.1.tar.bz2
+Source40: http://www1.mplayerhq.hu/MPlayer/Skin/iTunes-1.1.tar.bz2
+Source41: http://www1.mplayerhq.hu/MPlayer/Skin/iTunes-mini-1.1.tar.bz2
+Source42: http://www1.mplayerhq.hu/MPlayer/Skin/krystal-1.1.tar.bz2
+Source43: http://www1.mplayerhq.hu/MPlayer/Skin/mentalic-1.2.tar.bz2
+Source44: http://www1.mplayerhq.hu/MPlayer/Skin/mini-0.1.tar.bz2
+Source45: http://www1.mplayerhq.hu/MPlayer/Skin/moonphase-1.0.tar.bz2
+#Source46: http://www1.mplayerhq.hu/MPlayer/Skin/mplayer_red-1.0.tar.bz2
+Source47: http://www1.mplayerhq.hu/MPlayer/Skin/netscape4-1.0.tar.bz2
+Source48: http://www1.mplayerhq.hu/MPlayer/Skin/neutron-1.5.tar.bz2
+Source49: http://www1.mplayerhq.hu/MPlayer/Skin/new-age-1.0.tar.bz2
+Source50: http://www1.mplayerhq.hu/MPlayer/Skin/phony-1.1.tar.bz2
+Source51: http://www1.mplayerhq.hu/MPlayer/Skin/plastic-1.2.tar.bz2
+Source52: http://www1.mplayerhq.hu/MPlayer/Skin/plastik-2.0.tar.bz2
+Source53: http://www1.mplayerhq.hu/MPlayer/Skin/productive-1.0.tar.bz2
+Source54: http://www1.mplayerhq.hu/MPlayer/Skin/proton-1.2.tar.bz2
+Source55: http://www1.mplayerhq.hu/MPlayer/Skin/sessene-1.0.tar.bz2
+Source56: http://www1.mplayerhq.hu/MPlayer/Skin/slim-1.2.tar.bz2
+Source57: http://www1.mplayerhq.hu/MPlayer/Skin/smoothwebby-1.1.tar.bz2
+Source58: http://www1.mplayerhq.hu/MPlayer/Skin/softgrip-1.1.tar.bz2
+Source59: http://www1.mplayerhq.hu/MPlayer/Skin/standard-1.9.tar.bz2
+Source60: http://www1.mplayerhq.hu/MPlayer/Skin/trium-1.3.tar.bz2
+Source61: http://www1.mplayerhq.hu/MPlayer/Skin/tvisor-1.1.tar.bz2
+Source62: http://www1.mplayerhq.hu/MPlayer/Skin/ultrafina-1.1.tar.bz2
+Source63: http://www1.mplayerhq.hu/MPlayer/Skin/webby-1.3.tar.bz2
+Source64: http://www1.mplayerhq.hu/MPlayer/Skin/xanim-1.6.tar.bz2
+Source65: http://www1.mplayerhq.hu/MPlayer/Skin/xine-lcd-1.2.tar.bz2
+Source66: http://www1.mplayerhq.hu/MPlayer/Skin/xmmplayer-1.5.tar.bz2
URL: http://mplayerhq.hu/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
Requires: mplayer >= 1.0
@@ -89,7 +95,7 @@
%prep
-%setup -c %{name}-%{version} -a0 -a1 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -a32 -a33 -a34 -a35 -a36 -a37 -a38 -a39 -a40 -a41 -a43 -a44 -a45 -a46 -a47 -a48 -a49 -a50 -a51 -a52 -a53 -a54 -a55 -a56 -a57 -a58 -a59 -a60 -a61
+%setup -c %{name}-%{version} -a0 -a1 -a2 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23 -a24 -a25 -a26 -a27 -a28 -a29 -a30 -a31 -a32 -a33 -a34 -a35 -a36 -a37 -a38 -a39 -a40 -a41 -a42 -a43 -a44 -a45 -a47 -a48 -a49 -a50 -a51 -a52 -a53 -a54 -a55 -a56 -a57 -a58 -a59 -a60 -a61 -a62 -a63 -a64 -a65 -a66
%build
@@ -111,6 +117,10 @@
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 1.8-1
+- Updated all skins : Abyss, Blue-small, smoothwebby and webby.
+- Added new skins : Ater, brushedGnome, clearplayer, Linea and productive.
+
* Sun Apr 17 2005 Matthias Saou <http://freshrpms.net/> 1.7-1
- Updated all skins, 6 new ones too.
Modified: trunk/rpms/vlc/vlc-0.8.5-x264.patch
===================================================================
--- trunk/rpms/vlc/vlc-0.8.5-x264.patch 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/vlc/vlc-0.8.5-x264.patch 2006-10-24 14:27:03 UTC (rev 4854)
@@ -1,6 +1,7 @@
---- modules/codec/x264.c 2006-05-06 18:52:19.000000000 +0300
-+++ x264-yeni.c 2006-09-17 00:45:52.000000000 +0300
-@@ -545,9 +545,13 @@
+diff -Naupr vlc-0.8.5.orig/modules/codec/x264.c vlc-0.8.5/modules/codec/x264.c
+--- vlc-0.8.5.orig/modules/codec/x264.c 2006-05-06 17:52:19.000000000 +0200
++++ vlc-0.8.5/modules/codec/x264.c 2006-10-24 14:10:05.000000000 +0200
+@@ -545,9 +545,13 @@ static int Open ( vlc_object_t *p_this
/* average bitrate specified by transcode vb */
p_sys->param.rc.i_bitrate = p_enc->fmt_out.i_bitrate / 1000;
@@ -14,3 +15,12 @@
var_Get( p_enc, SOUT_CFG_PREFIX "qpstep", &val );
if( val.i_int >= 0 && val.i_int <= 51 ) p_sys->param.rc.i_qp_step = val.i_int;
+@@ -737,7 +741,7 @@ static int Open ( vlc_object_t *p_this
+ #if X264_BUILD >= 37
+ var_Get( p_enc, SOUT_CFG_PREFIX "crf", &val );
+ if( val.i_int >= 0 && val.i_int <= 51 ) /* crf != 0 overrides qp */
+- p_sys->param.rc.i_rf_constant = val.i_int;
++ p_sys->param.rc.f_rf_constant = val.i_int;
+ #endif
+
+ #if X264_BUILD >= 39
Modified: trunk/rpms/vlc/vlc.spec
===================================================================
--- trunk/rpms/vlc/vlc.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/vlc/vlc.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -66,12 +66,12 @@
%define desktop_vendor rpmforge
%define ffmpeg_date 20051207
-%define live_date 2006.09.20
+%define live_date 2006.10.18a
Summary: The VideoLAN client, also a very good standalone video player
Name: vlc
Version: 0.8.5
-Release: 4
+Release: 5
License: GPL
Group: Applications/Multimedia
URL: http://www.videolan.org/
@@ -165,7 +165,7 @@
%prep
%setup -a 1 -a 2
-%patch0 -p0 -b .x264
+%patch0 -p1 -b .x264
# Fix PLUGIN_PATH path for lib64
%{__perl} -pi -e 's|/lib/vlc|/%{_lib}/vlc|g' vlc-config.in.in configure*
@@ -313,6 +313,11 @@
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 0.8.5-5
+- Update live lib to 2006.10.18a.
+- Try to update fffmpeg... but... nope, way too hard :-(
+- Update x264 patch for it to work with latest x264.
+
* Mon Sep 25 2006 Matthias Saou <http://freshrpms.net/> 0.8.5-4
- Rename videolan-client to vlc to match upstream and what Ville asked before.
- Rebuild against new libcdio.
Deleted: trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch
===================================================================
--- trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/x264/x264-snapshot-20060731-2245-gtk.patch 2006-10-24 14:27:03 UTC (rev 4854)
@@ -1,52 +0,0 @@
-diff -Naupr x264-snapshot-20060731-2245.orig/gtk/Makefile x264-snapshot-20060731-2245/gtk/Makefile
---- x264-snapshot-20060731-2245.orig/gtk/Makefile 2006-07-31 22:45:02.000000000 +0200
-+++ x264-snapshot-20060731-2245/gtk/Makefile 2006-08-01 12:43:29.000000000 +0200
-@@ -99,7 +99,7 @@ $(SONAMEGTK): $(OBJECTS_LIB)
- $(TEST_BIN): $(OBJECTS_LIB) $(OBJECTS_TEST)
- @echo " B: $(@F)"
- #Needs iconv/intl
-- @$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB) -lintl
-+ @$(CC) -o $(TEST_BIN) $(OBJECTS_LIB) $(OBJECTS_TEST) $(LDFLAGS) $(ICONV_LIB)
-
- # Program : x264_gtk_encode
- $(ENCODE_BIN): x264_icon.h libx264gtk.a $(SONAMEGTK) $(OBJECTS_ENCODE) $(EXTERNAL_DEPS) $(X264GTK_O)
-@@ -132,20 +132,26 @@ distclean:
-
- # Install rule
- install: x264_gtk_encode
-+ @echo " D: $(DESTDIR)$(includedir)"
-+ @install -d "$(DESTDIR)$(includedir)"
- @echo " I: $(DESTDIR)$(includedir)/x264_gtk.h"
- @install -m 644 x264_gtk.h "$(DESTDIR)$(includedir)"
- @echo " I: $(DESTDIR)$(includedir)/x264_gtk_enum.h"
- @install -m 644 x264_gtk_enum.h "$(DESTDIR)$(includedir)"
-+ @echo " D: $(DESTDIR)$(libdir)"
-+ @install -d "$(DESTDIR)$(libdir)"
- @echo " I: $(DESTDIR)$(libdir)/libx264gtk.a"
- @install -m 644 libx264gtk.a "$(DESTDIR)$(libdir)"
- @echo " I: $(DESTDIR)$(libdir)/libx264gtk.so"
- @$(if $(SONAMEGTK), ln -sf $(SONAMEGTK) $(DESTDIR)$(libdir)/libx264gtk.so)
- @$(if $(SONAMEGTK), install -m 755 $(SONAMEGTK) $(DESTDIR)$(libdir))
-+ @echo " D: $(DESTDIR)$(bindir)"
-+ @install -d "$(DESTDIR)$(bindir)"
- @echo " I: $(DESTDIR)$(bindir)/x264_gtk_encode"
- @install x264_gtk_encode "$(DESTDIR)$(bindir)"
-- @echo " D: ${prefix}/share/x264"
-+ @echo " D: $(DESTDIR)${prefix}/share/x264"
- @install -d "$(DESTDIR)${prefix}/share/x264"
-- @echo " I: ${prefix}/share/x264.png"
-+ @echo " I: $(DESTDIR)${prefix}/share/x264.png"
- @install -m 644 x264.png "$(DESTDIR)${prefix}/share/x264"
- @for L in $(ALL_LINGUAS); do \
- echo " D: $(DESTDIR)${prefix}/share/locale/$$L/LC_MESSAGES"; \
-@@ -153,7 +159,9 @@ install: x264_gtk_encode
- echo " I: $(DESTDIR)${prefix}/share/locale/$$L/LC_MESSAGES/x264_gtk.mo"; \
- install -m 644 $$L.mo "$(DESTDIR)${prefix}/share/locale/$$L/LC_MESSAGES/x264_gtk.mo"; \
- done
-- @echo " I: ${libdir}/pkgconfig/$(X264GTK_PC)"
-+ @echo " D: $(DESTDIR)${libdir}/pkgconfig"
-+ @install -d "$(DESTDIR)${libdir}/pkgconfig"
-+ @echo " I: $(DESTDIR)${libdir}/pkgconfig/$(X264GTK_PC)"
- @install -m 644 $(X264GTK_PC) "$(DESTDIR)${libdir}/pkgconfig"
-
- # Uninstall rule
Modified: trunk/rpms/x264/x264.spec
===================================================================
--- trunk/rpms/x264/x264.spec 2006-10-24 14:25:32 UTC (rev 4853)
+++ trunk/rpms/x264/x264.spec 2006-10-24 14:27:03 UTC (rev 4854)
@@ -17,17 +17,16 @@
%{?rh7:%define _without_gtk26 1}
%{?el2:%define _without_gtk26 1}
-%define date 20060917
+%define date 20061023
Summary: Library for encoding and decoding H264/AVC video streams
Name: x264
Version: 0.0.0
-Release: 0.2.%{date}
+Release: 0.3.%{date}
License: GPL
Group: System Environment/Libraries
URL: http://developers.videolan.org/x264.html
Source: http://downloads.videolan.org/pub/videolan/x264/snapshots/x264-snapshot-%{date}-2245.tar.bz2
-Patch0: x264-snapshot-20060731-2245-gtk.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: nasm, yasm, gettext
%{?!_without_gtk26:BuildRequires: gtk2-devel >= 2.6}
@@ -70,7 +69,6 @@
%prep
%setup -n %{name}-snapshot-%{date}-2245
-%patch0 -p1 -b .gtk
# configure hardcodes X11 lib path
%{__perl} -pi -e 's|/usr/X11R6/lib |/usr/X11R6/%{_lib} |g' configure
@@ -140,6 +138,10 @@
%endif
%changelog
+* Tue Oct 24 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.3.20061023
+- Update to 20061023 snapshot, the last was too old for MPlayer 1.0rc1.
+- Remove no longer needed gtk patch.
+
* Mon Sep 18 2006 Matthias Saou <http://freshrpms.net/> 0.0.0-0.2.20060731
- Update to 20060917 snapshot.
More information about the svn-commits
mailing list