rpms/mplayer/F-13 .cvsignore,1.17,1.18 sources,1.18,1.19
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv29010
Modified Files:
.cvsignore sources
Log Message:
Update source files.
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-13/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- .cvsignore 24 Apr 2010 22:56:26 -0000 1.17
+++ .cvsignore 3 Jul 2010 23:56:58 -0000 1.18
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2010-04-24.tar.bz2
+mplayer-export-2010-07-03.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-13/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- sources 24 Apr 2010 22:56:27 -0000 1.18
+++ sources 3 Jul 2010 23:56:58 -0000 1.19
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-db1f4d70e2c1dc400e543269a525208b mplayer-export-2010-04-24.tar.bz2
+6169cad296bd67c399fd3dc18cca71aa mplayer-export-2010-07-03.tar.bz2
14 years, 6 months
rpms/mplayer/F-12 .cvsignore, 1.15, 1.16 mplayer-nodvdcss.patch, 1.7, 1.8 mplayer-x264.patch, 1.1, 1.2 mplayer.spec, 1.26, 1.27 sources, 1.16, 1.17 mplayer-libgif.patch, 1.1, NONE mplayer-llrintf.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28855
Modified Files:
.cvsignore mplayer-nodvdcss.patch mplayer-x264.patch
mplayer.spec sources
Removed Files:
mplayer-libgif.patch mplayer-llrintf.patch
Log Message:
* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.113.20100703svn
- 20100703 snapshot
- rebased patches
- dropped obsolete libgif patch
- enabled libvpx support
- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 24 Apr 2010 22:01:05 -0000 1.15
+++ .cvsignore 3 Jul 2010 23:54:21 -0000 1.16
@@ -1,2 +1,2 @@
Blue-1.7.tar.bz2
-mplayer-export-2010-04-24.tar.bz2
+mplayer-export-2010-07-03.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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-nodvdcss.patch 24 Apr 2010 22:01:05 -0000 1.7
+++ mplayer-nodvdcss.patch 3 Jul 2010 23:54:21 -0000 1.8
@@ -1,7 +1,7 @@
-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
+diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure
+--- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200
++++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200
+@@ -677,7 +677,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-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) +=
+diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile
+--- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200
++++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200
+@@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
@@ -25,7 +25,7 @@
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
-@@ -778,7 +773,6 @@ DIRS = . \
+@@ -764,7 +759,6 @@ DIRS = . \
libavutil/sh4 \
libavutil/tomi \
libavutil/x86 \
@@ -33,9 +33,9 @@
libdvdnav \
libdvdnav/vm \
libdvdread4 \
-@@ -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 osdep/mplayer.rc): version.h
+@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/
+
+ gui/%: CFLAGS += -Wno-strict-prototypes
-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)
mplayer-x264.patch:
configure | 2
libmpcodecs/ve_x264.c | 120 ++++++++++++++++++++++++--------------------------
2 files changed, 60 insertions(+), 62 deletions(-)
Index: mplayer-x264.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/mplayer-x264.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-x264.patch 24 Apr 2010 22:01:06 -0000 1.1
+++ mplayer-x264.patch 3 Jul 2010 23:54:21 -0000 1.2
@@ -1,19 +1,161 @@
-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
+diff -up mplayer-export-2010-07-03/configure.x264 mplayer-export-2010-07-03/configure
+--- mplayer-export-2010-07-03/configure.x264 2010-07-03 20:09:43.000000000 +0200
++++ mplayer-export-2010-07-03/configure 2010-07-03 20:09:43.000000000 +0200
+@@ -7485,7 +7485,7 @@ if test "$_x264" = auto ; then
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
--#if X264_BUILD < 89
+-#if X264_BUILD < 98
+#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
+diff -up mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 mplayer-export-2010-07-03/libmpcodecs/ve_x264.c
+--- mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 2010-06-10 23:58:03.000000000 +0200
++++ mplayer-export-2010-07-03/libmpcodecs/ve_x264.c 2010-07-03 20:12:10.000000000 +0200
+@@ -56,6 +56,7 @@ typedef struct h264_module_t {
+ } h264_module_t;
+
+ extern char* passtmpfile;
++static int turbo = 0;
+ static x264_param_t param;
+ static int parse_error = 0;
+
+@@ -64,79 +65,74 @@ static int encode_frame(struct vf_instan
+
+ void x264enc_set_param(const m_option_t* opt, char* arg)
+ {
+- static int initialized = 0;
+- int slow_firstpass = 0;
+- char *preset = NULL, *tune = NULL, *profile = NULL;
+- char *p, *copy, *name;
+-
+- if (!initialized) {
++ static int initted = 0;
++ if(!initted) {
+ x264_param_default(¶m);
+- initialized = 1;
++ x264_param_parse(¶m, "psnr", "no");
++ x264_param_parse(¶m, "ssim", "no");
++ initted = 1;
+ }
+- if (!arg) {
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: no options provided\n");
+- parse_error = 1;
+- return;
+- } else if (!*arg)
+- /* Empty arguments, just doing initialization of default parameters. */
+- return;
+
+- /* Step 1: look for initial preset/tune. */
+- copy = p = strdup(arg);
+- while ((name = strsep(©, ":"))) {
+- char *value = strpbrk(name, "=:");
+- if (!value)
+- continue;
+- *value++ = 0;
+- if (!strcasecmp(name, "preset"))
+- preset = value;
+- else if (!strcasecmp(name, "tune"))
+- tune = value;
+- }
+- if (x264_param_default_preset(¶m, preset, tune) < 0) {
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Invalid preset or tune.\n");
++ if(!arg) {
+ parse_error = 1;
++ return;
+ }
+- free(p);
+
+- /* Step 2: explicit user overrides */
+- while ((name = strsep(&arg, ":")) && *name) {
+- int ret = 0;
+- char *value = strpbrk(name, "=:");
+-
+- if (value)
+- *value++ = 0;
+- if (!strcasecmp(name, "profile"))
+- profile = value;
+- else if (!strcasecmp(name, "turbo")) {
+- mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option x264encopts: turbo option is deprecated; "
+- "use slow_firstpass to disable turbo\n");
+- if (value && *value == '0')
+- slow_firstpass = 1;
+- } else if (!strcasecmp(name, "slow_firstpass"))
+- slow_firstpass = 1;
+- else if (strcasecmp(name, "preset") && strcasecmp(name, "tune")) {
+- ret = x264_param_parse(¶m, name, value);
+- if (ret == X264_PARAM_BAD_NAME)
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name);
+- if (ret == X264_PARAM_BAD_VALUE)
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n",
+- name, value ? value : "(null)");
++ while(*arg) {
++ char *name = arg;
++ char *value;
++ int ret;
++
++ arg += strcspn(arg, ":");
++ if(*arg) {
++ *arg = 0;
++ arg++;
++ }
++
++ value = strchr( name, '=' );
++ if(value) {
++ *value = 0;
++ value++;
++ }
+
++ if(!strcmp(name, "turbo")) {
++ turbo = value ? atoi(value) : 1;
++ continue;
+ }
++
++ ret = x264_param_parse(¶m, name, value);
++ if(ret == X264_PARAM_BAD_NAME)
++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name);
++ if(ret == X264_PARAM_BAD_VALUE)
++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n", name, value ? value : "(null)");
++
+ /* mark this option as done, so it's not reparsed if there's another -x264encopts */
+ *name = 0;
+
+ parse_error |= ret;
+ }
+
+- /* Step 3: Apply fast first pass (turbo) options. */
+- if (!slow_firstpass)
+- x264_param_apply_fastfirstpass(¶m);
+-
+- /* Step 4: enforce profile */
+- if (profile && x264_param_apply_profile(¶m, profile) < 0)
+- parse_error = 1;
++ if(param.rc.b_stat_write && !param.rc.b_stat_read) {
++ /* Adjust or disable some flags to gain speed in the first pass */
++ if(turbo == 1)
++ {
++ param.i_frame_reference = ( param.i_frame_reference + 1 ) >> 1;
++ param.analyse.i_subpel_refine = FFMAX( FFMIN( 3, param.analyse.i_subpel_refine - 1 ), 1 );
++ param.analyse.inter &= ( ~X264_ANALYSE_PSUB8x8 );
++ param.analyse.inter &= ( ~X264_ANALYSE_BSUB16x16 );
++ param.analyse.i_trellis = 0;
++ }
++ else if(turbo >= 2)
++ {
++ param.i_frame_reference = 1;
++ param.analyse.i_subpel_refine = 1;
++ param.analyse.i_me_method = X264_ME_DIA;
++ param.analyse.inter = 0;
++ param.analyse.b_transform_8x8 = 0;
++ param.analyse.b_weighted_bipred = 0;
++ param.analyse.i_trellis = 0;
++ }
++ }
+ }
+
+ static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
+@@ -156,7 +152,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;
@@ -21,15 +163,15 @@
param.vui.i_sar_width = d_width*height;
param.vui.i_sar_height = d_height*width;
-@@ -258,7 +258,10 @@
+@@ -264,7 +259,10 @@ static int encode_frame(struct vf_instan
return -1;
}
if(i_size>0) {
+- int keyframe = pic_out.b_keyframe;
+ 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: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/mplayer.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- mplayer.spec 24 Apr 2010 22:12:03 -0000 1.26
+++ mplayer.spec 3 Jul 2010 23:54:21 -0000 1.27
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20100424svn
+%define pre 20100703svn
%define svn 1
-%define svnbuild 2010-04-24
+%define svnbuild 2010-07-03
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.112.%{pre}%{?dist}
+Release: 0.113.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -27,9 +27,7 @@
Patch2: %{name}-config.patch
Patch8: %{name}-manlinks.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
@@ -61,9 +59,11 @@
BuildRequires: libdvdnav-devel >= 4.1.3-1
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libmpeg2-devel
BuildRequires: libtheora-devel
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 0.9.1
BuildRequires: lirc-devel
BuildRequires: live555-devel
BuildRequires: lzo-devel >= 2
@@ -190,18 +190,17 @@
--disable-mp3lame-lavc \\\
--disable-x264-lavc \\\
\\\
- --disable-liba52-internal \\\
%{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
%{!?_with_faac:--disable-faac} \\\
--disable-faad-internal \\\
%{!?_with_libmad:--disable-mad} \\\
+ --disable-libmpeg2-internal \\\
--disable-tremor-internal \\\
%{?_with_xmms:--enable-xmms} \\\
%{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\
\\\
--disable-bitmap-font \\\
--%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
- --with-fribidi-config="pkg-config fribidi" \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -222,9 +221,7 @@
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%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 && \
@@ -397,6 +394,13 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.113.20100703svn
+- 20100703 snapshot
+- rebased patches
+- dropped obsolete libgif patch
+- enabled libvpx support
+- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream)
+
* Sat Apr 24 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.112.20100424svn
- 20100424 snapshot
- drop unused patch
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 24 Apr 2010 22:01:06 -0000 1.16
+++ sources 3 Jul 2010 23:54:21 -0000 1.17
@@ -1,2 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-db1f4d70e2c1dc400e543269a525208b mplayer-export-2010-04-24.tar.bz2
+6169cad296bd67c399fd3dc18cca71aa mplayer-export-2010-07-03.tar.bz2
--- mplayer-libgif.patch DELETED ---
--- mplayer-llrintf.patch DELETED ---
14 years, 6 months
rpms/mplayer/F-13 mplayer-nodvdcss.patch, 1.7, 1.8 mplayer-x264.patch, 1.1, 1.2 mplayer.spec, 1.30, 1.31 mplayer-libgif.patch, 1.1, NONE mplayer-llrintf.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27305
Modified Files:
mplayer-nodvdcss.patch mplayer-x264.patch mplayer.spec
Removed Files:
mplayer-libgif.patch mplayer-llrintf.patch
Log Message:
* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.117.20100703svn
- 20100703 snapshot
- rebased patches
- dropped obsolete libgif patch
- enabled libvpx support
- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream)
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-13/mplayer-nodvdcss.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-nodvdcss.patch 24 Apr 2010 22:56:26 -0000 1.7
+++ mplayer-nodvdcss.patch 3 Jul 2010 23:37:27 -0000 1.8
@@ -1,7 +1,7 @@
-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
+diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure
+--- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200
++++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200
+@@ -677,7 +677,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-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) +=
+diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile
+--- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200
++++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200
+@@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
@@ -25,7 +25,7 @@
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
-@@ -778,7 +773,6 @@ DIRS = . \
+@@ -764,7 +759,6 @@ DIRS = . \
libavutil/sh4 \
libavutil/tomi \
libavutil/x86 \
@@ -33,9 +33,9 @@
libdvdnav \
libdvdnav/vm \
libdvdread4 \
-@@ -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 osdep/mplayer.rc): version.h
+@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/
+
+ gui/%: CFLAGS += -Wno-strict-prototypes
-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)
mplayer-x264.patch:
configure | 2
libmpcodecs/ve_x264.c | 114 ++++++++++++++++++++++++--------------------------
2 files changed, 56 insertions(+), 60 deletions(-)
Index: mplayer-x264.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-13/mplayer-x264.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mplayer-x264.patch 24 Apr 2010 22:56:26 -0000 1.1
+++ mplayer-x264.patch 3 Jul 2010 23:37:27 -0000 1.2
@@ -1,12 +1,157 @@
-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
+diff -up mplayer-export-2010-07-03/configure.x264 mplayer-export-2010-07-03/configure
+--- mplayer-export-2010-07-03/configure.x264 2010-07-03 23:24:14.000000000 +0200
++++ mplayer-export-2010-07-03/configure 2010-07-03 23:24:36.000000000 +0200
+@@ -7485,7 +7485,7 @@ if test "$_x264" = auto ; then
cat > $TMPC << EOF
#include <inttypes.h>
#include <x264.h>
--#if X264_BUILD < 89
+-#if X264_BUILD < 98
+#if X264_BUILD < 83
#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-07-03/libmpcodecs/ve_x264.c.x264 mplayer-export-2010-07-03/libmpcodecs/ve_x264.c
+--- mplayer-export-2010-07-03/libmpcodecs/ve_x264.c.x264 2010-06-10 23:58:03.000000000 +0200
++++ mplayer-export-2010-07-03/libmpcodecs/ve_x264.c 2010-07-03 23:24:43.000000000 +0200
+@@ -56,6 +56,7 @@ typedef struct h264_module_t {
+ } h264_module_t;
+
+ extern char* passtmpfile;
++static int turbo = 0;
+ static x264_param_t param;
+ static int parse_error = 0;
+
+@@ -64,79 +65,74 @@ static int encode_frame(struct vf_instan
+
+ void x264enc_set_param(const m_option_t* opt, char* arg)
+ {
+- static int initialized = 0;
+- int slow_firstpass = 0;
+- char *preset = NULL, *tune = NULL, *profile = NULL;
+- char *p, *copy, *name;
+-
+- if (!initialized) {
++ static int initted = 0;
++ if(!initted) {
+ x264_param_default(¶m);
+- initialized = 1;
++ x264_param_parse(¶m, "psnr", "no");
++ x264_param_parse(¶m, "ssim", "no");
++ initted = 1;
+ }
+- if (!arg) {
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: no options provided\n");
+- parse_error = 1;
+- return;
+- } else if (!*arg)
+- /* Empty arguments, just doing initialization of default parameters. */
+- return;
+
+- /* Step 1: look for initial preset/tune. */
+- copy = p = strdup(arg);
+- while ((name = strsep(©, ":"))) {
+- char *value = strpbrk(name, "=:");
+- if (!value)
+- continue;
+- *value++ = 0;
+- if (!strcasecmp(name, "preset"))
+- preset = value;
+- else if (!strcasecmp(name, "tune"))
+- tune = value;
+- }
+- if (x264_param_default_preset(¶m, preset, tune) < 0) {
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Invalid preset or tune.\n");
++ if(!arg) {
+ parse_error = 1;
++ return;
+ }
+- free(p);
+
+- /* Step 2: explicit user overrides */
+- while ((name = strsep(&arg, ":")) && *name) {
+- int ret = 0;
+- char *value = strpbrk(name, "=:");
+-
+- if (value)
+- *value++ = 0;
+- if (!strcasecmp(name, "profile"))
+- profile = value;
+- else if (!strcasecmp(name, "turbo")) {
+- mp_msg(MSGT_CFGPARSER, MSGL_WARN, "Option x264encopts: turbo option is deprecated; "
+- "use slow_firstpass to disable turbo\n");
+- if (value && *value == '0')
+- slow_firstpass = 1;
+- } else if (!strcasecmp(name, "slow_firstpass"))
+- slow_firstpass = 1;
+- else if (strcasecmp(name, "preset") && strcasecmp(name, "tune")) {
+- ret = x264_param_parse(¶m, name, value);
+- if (ret == X264_PARAM_BAD_NAME)
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name);
+- if (ret == X264_PARAM_BAD_VALUE)
+- mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n",
+- name, value ? value : "(null)");
++ while(*arg) {
++ char *name = arg;
++ char *value;
++ int ret;
++
++ arg += strcspn(arg, ":");
++ if(*arg) {
++ *arg = 0;
++ arg++;
++ }
++
++ value = strchr( name, '=' );
++ if(value) {
++ *value = 0;
++ value++;
++ }
+
++ if(!strcmp(name, "turbo")) {
++ turbo = value ? atoi(value) : 1;
++ continue;
+ }
++
++ ret = x264_param_parse(¶m, name, value);
++ if(ret == X264_PARAM_BAD_NAME)
++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Unknown suboption %s\n", name);
++ if(ret == X264_PARAM_BAD_VALUE)
++ mp_msg(MSGT_CFGPARSER, MSGL_ERR, "Option x264encopts: Bad argument %s=%s\n", name, value ? value : "(null)");
++
+ /* mark this option as done, so it's not reparsed if there's another -x264encopts */
+ *name = 0;
+
+ parse_error |= ret;
+ }
+
+- /* Step 3: Apply fast first pass (turbo) options. */
+- if (!slow_firstpass)
+- x264_param_apply_fastfirstpass(¶m);
+-
+- /* Step 4: enforce profile */
+- if (profile && x264_param_apply_profile(¶m, profile) < 0)
+- parse_error = 1;
++ if(param.rc.b_stat_write && !param.rc.b_stat_read) {
++ /* Adjust or disable some flags to gain speed in the first pass */
++ if(turbo == 1)
++ {
++ param.i_frame_reference = ( param.i_frame_reference + 1 ) >> 1;
++ param.analyse.i_subpel_refine = FFMAX( FFMIN( 3, param.analyse.i_subpel_refine - 1 ), 1 );
++ param.analyse.inter &= ( ~X264_ANALYSE_PSUB8x8 );
++ param.analyse.inter &= ( ~X264_ANALYSE_BSUB16x16 );
++ param.analyse.i_trellis = 0;
++ }
++ else if(turbo >= 2)
++ {
++ param.i_frame_reference = 1;
++ param.analyse.i_subpel_refine = 1;
++ param.analyse.i_me_method = X264_ME_DIA;
++ param.analyse.inter = 0;
++ param.analyse.b_transform_8x8 = 0;
++ param.analyse.b_weighted_bipred = 0;
++ param.analyse.i_trellis = 0;
++ }
++ }
+ }
+
+ static int config(struct vf_instance *vf, int width, int height, int d_width, int d_height, unsigned int flags, unsigned int outfmt) {
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/F-13/mplayer.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- mplayer.spec 6 May 2010 20:53:39 -0000 1.30
+++ mplayer.spec 3 Jul 2010 23:37:27 -0000 1.31
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20100424svn
+%define pre 20100703svn
%define svn 1
-%define svnbuild 2010-04-24
+%define svnbuild 2010-07-03
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.116.%{pre}%{?dist}
+Release: 0.117.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -27,9 +27,7 @@
Patch2: %{name}-config.patch
Patch8: %{name}-manlinks.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
@@ -61,9 +59,11 @@
BuildRequires: libdvdnav-devel >= 4.1.3-1
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libmpeg2-devel
BuildRequires: libtheora-devel
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 0.9.1
BuildRequires: lirc-devel
BuildRequires: live555-devel
BuildRequires: lzo-devel >= 2
@@ -190,18 +190,17 @@
--disable-mp3lame-lavc \\\
--disable-x264-lavc \\\
\\\
- --disable-liba52-internal \\\
%{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
%{!?_with_faac:--disable-faac} \\\
--disable-faad-internal \\\
%{!?_with_libmad:--disable-mad} \\\
+ --disable-libmpeg2-internal \\\
--disable-tremor-internal \\\
%{?_with_xmms:--enable-xmms} \\\
%{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\
\\\
--disable-bitmap-font \\\
--%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
- --with-fribidi-config="pkg-config fribidi" \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -222,9 +221,7 @@
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%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 && \
@@ -397,6 +394,13 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.117.20100703svn
+- 20100703 snapshot
+- rebased patches
+- dropped obsolete libgif patch
+- enabled libvpx support
+- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream)
+
* Thu May 06 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-0.116.20100424svn
- Rebuilt for live555
--- mplayer-libgif.patch DELETED ---
--- mplayer-llrintf.patch DELETED ---
14 years, 6 months
rpms/mplayer/devel .cvsignore, 1.18, 1.19 mplayer-nodvdcss.patch, 1.7, 1.8 mplayer.spec, 1.31, 1.32 sources, 1.19, 1.20 mplayer-libgif.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32231
Modified Files:
.cvsignore mplayer-nodvdcss.patch mplayer.spec sources
Removed Files:
mplayer-libgif.patch
Log Message:
* Thu Apr 29 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.116.20100429svn
- 20100429 snapshot
- drop unnecessary patches
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- .cvsignore 29 Apr 2010 21:56:52 -0000 1.18
+++ .cvsignore 3 Jul 2010 17:06:10 -0000 1.19
@@ -1,2 +1,3 @@
Blue-1.7.tar.bz2
mplayer-export-2010-04-29.tar.bz2
+mplayer-export-2010-07-03.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/devel/mplayer-nodvdcss.patch,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- mplayer-nodvdcss.patch 25 Apr 2010 19:27:43 -0000 1.7
+++ mplayer-nodvdcss.patch 3 Jul 2010 17:06:10 -0000 1.8
@@ -1,7 +1,7 @@
-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
+diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure
+--- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200
++++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200
+@@ -677,7 +677,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-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) +=
+diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile
+--- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200
++++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200
+@@ -146,11 +146,6 @@ SRCS_COMMON-$(LIBDCA) +=
SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
libmpcodecs/vd_libdv.c \
libmpdemux/demux_rawdv.c
@@ -25,7 +25,7 @@
SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
-@@ -778,7 +773,6 @@ DIRS = . \
+@@ -764,7 +759,6 @@ DIRS = . \
libavutil/sh4 \
libavutil/tomi \
libavutil/x86 \
@@ -33,9 +33,9 @@
libdvdnav \
libdvdnav/vm \
libdvdread4 \
-@@ -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 osdep/mplayer.rc): version.h
+@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/
+
+ gui/%: CFLAGS += -Wno-strict-prototypes
-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/devel/mplayer.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- mplayer.spec 6 May 2010 20:51:35 -0000 1.31
+++ mplayer.spec 3 Jul 2010 17:06:10 -0000 1.32
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20100429svn
+%define pre 20100703svn
%define svn 1
-%define svnbuild 2010-04-29
+%define svnbuild 2010-07-03
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.117.%{pre}%{?dist}
+Release: 0.118.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -27,7 +27,6 @@
Patch2: %{name}-config.patch
Patch8: %{name}-manlinks.patch
Patch14: %{name}-nodvdcss.patch
-Patch15: %{name}-libgif.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
@@ -59,9 +58,11 @@
BuildRequires: libdvdnav-devel >= 4.1.3-1
BuildRequires: libjpeg-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libmpeg2-devel
BuildRequires: libtheora-devel
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 0.9.1
BuildRequires: lirc-devel
BuildRequires: live555-devel
BuildRequires: lzo-devel >= 2
@@ -188,18 +189,17 @@
--disable-mp3lame-lavc \\\
--disable-x264-lavc \\\
\\\
- --disable-liba52-internal \\\
%{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\
%{!?_with_faac:--disable-faac} \\\
--disable-faad-internal \\\
%{!?_with_libmad:--disable-mad} \\\
+ --disable-libmpeg2-internal \\\
--disable-tremor-internal \\\
%{?_with_xmms:--enable-xmms} \\\
%{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\
\\\
--disable-bitmap-font \\\
--%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\
- --with-fribidi-config="pkg-config fribidi" \\\
%{!?_with_svgalib:--disable-svga} \\\
--disable-termcap \\\
--enable-xvmc \\\
@@ -220,7 +220,6 @@
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
-%patch15 -p1 -b .libgif
doconv() {
iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \
@@ -393,6 +392,12 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.118.20100703svn
+- 20100703 snapshot
+- dropped obsolete libgif patch
+- enabled libvpx support
+- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream)
+
* Thu May 06 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org> - 1.0-0.117.20100429svn
- Rebuilt for live555
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- sources 29 Apr 2010 21:56:52 -0000 1.19
+++ sources 3 Jul 2010 17:06:10 -0000 1.20
@@ -1,2 +1,3 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
b393c9cabe1d10f412a9e56624957ef5 mplayer-export-2010-04-29.tar.bz2
+6169cad296bd67c399fd3dc18cca71aa mplayer-export-2010-07-03.tar.bz2
--- mplayer-libgif.patch DELETED ---
14 years, 6 months
rpms/devede/F-12 .cvsignore, 1.16, 1.17 devede.spec, 1.21, 1.22 sources, 1.16, 1.17
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28276
Modified Files:
.cvsignore devede.spec sources
Log Message:
* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
- Updated to version 3.16.9
- Fixed help directory
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/F-12/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 19 Apr 2010 19:59:08 -0000 1.16
+++ .cvsignore 3 Jul 2010 16:09:52 -0000 1.17
@@ -1 +1 @@
-devede-3.16.8.tar.bz2
+devede-3.16.9.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-12/devede.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- devede.spec 19 Apr 2010 19:59:08 -0000 1.21
+++ devede.spec 3 Jul 2010 16:09:52 -0000 1.22
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.16.8
+Version: 3.16.9
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -37,9 +37,12 @@
%prep
%setup -q
-# Fix devede module directory
+# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
+# Fix help directory
+sed -i 's!/usr/share/doc/devede!%{_docdir}/%{name}-%{version}!' devede.py
+
# Remove backup files
find . -name *\~ -exec rm {} \;
@@ -107,6 +110,10 @@
%changelog
+* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
+- Updated to version 3.16.9
+- Fixed help directory
+
* Mon Apr 19 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.8-1
- Updated to version 3.16.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/F-12/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 19 Apr 2010 19:59:08 -0000 1.16
+++ sources 3 Jul 2010 16:09:52 -0000 1.17
@@ -1 +1 @@
-7879f9832c447e9cabca3d0be7d3a6c8 devede-3.16.8.tar.bz2
+f35c5e72264ee272194cfa558b43e598 devede-3.16.9.tar.bz2
14 years, 6 months
rpms/devede/F-13 .cvsignore, 1.16, 1.17 devede.spec, 1.21, 1.22 sources, 1.16, 1.17
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28143
Modified Files:
.cvsignore devede.spec sources
Log Message:
* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
- Updated to version 3.16.9
- Fixed help directory
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/F-13/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 19 Apr 2010 19:58:43 -0000 1.16
+++ .cvsignore 3 Jul 2010 16:09:06 -0000 1.17
@@ -1 +1 @@
-devede-3.16.8.tar.bz2
+devede-3.16.9.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/F-13/devede.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- devede.spec 19 Apr 2010 19:58:43 -0000 1.21
+++ devede.spec 3 Jul 2010 16:09:06 -0000 1.22
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.16.8
+Version: 3.16.9
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -37,9 +37,12 @@
%prep
%setup -q
-# Fix devede module directory
+# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
+# Fix help directory
+sed -i 's!/usr/share/doc/devede!%{_docdir}/%{name}-%{version}!' devede.py
+
# Remove backup files
find . -name *\~ -exec rm {} \;
@@ -107,6 +110,10 @@
%changelog
+* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
+- Updated to version 3.16.9
+- Fixed help directory
+
* Mon Apr 19 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.8-1
- Updated to version 3.16.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/F-13/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 19 Apr 2010 19:58:43 -0000 1.16
+++ sources 3 Jul 2010 16:09:06 -0000 1.17
@@ -1 +1 @@
-7879f9832c447e9cabca3d0be7d3a6c8 devede-3.16.8.tar.bz2
+f35c5e72264ee272194cfa558b43e598 devede-3.16.9.tar.bz2
14 years, 6 months
rpms/devede/devel .cvsignore, 1.16, 1.17 devede.spec, 1.21, 1.22 sources, 1.16, 1.17
by Andrea Musuruane
Author: musuruan
Update of /cvs/free/rpms/devede/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv27261
Modified Files:
.cvsignore devede.spec sources
Log Message:
* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
- Updated to version 3.16.9
- Fixed help directory
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/devede/devel/.cvsignore,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- .cvsignore 19 Apr 2010 19:58:09 -0000 1.16
+++ .cvsignore 3 Jul 2010 16:02:23 -0000 1.17
@@ -1 +1 @@
-devede-3.16.8.tar.bz2
+devede-3.16.9.tar.bz2
Index: devede.spec
===================================================================
RCS file: /cvs/free/rpms/devede/devel/devede.spec,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- devede.spec 19 Apr 2010 19:58:09 -0000 1.21
+++ devede.spec 3 Jul 2010 16:02:23 -0000 1.22
@@ -1,5 +1,5 @@
Name: devede
-Version: 3.16.8
+Version: 3.16.9
Release: 1%{?dist}
Summary: A program to create video DVDs and CDs (VCD, sVCD or CVD)
@@ -37,9 +37,12 @@
%prep
%setup -q
-# Fix devede module directory
+# Fix module directory
sed -i 's!/usr/lib/!%{_datadir}/!' devede.py
+# Fix help directory
+sed -i 's!/usr/share/doc/devede!%{_docdir}/%{name}-%{version}!' devede.py
+
# Remove backup files
find . -name *\~ -exec rm {} \;
@@ -107,6 +110,10 @@
%changelog
+* Sat Jul 03 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.9-1
+- Updated to version 3.16.9
+- Fixed help directory
+
* Mon Apr 19 2010 Andrea Musuruane <musuruan(a)gmail.com> 3.16.8-1
- Updated to version 3.16.8
Index: sources
===================================================================
RCS file: /cvs/free/rpms/devede/devel/sources,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- sources 19 Apr 2010 19:58:09 -0000 1.16
+++ sources 3 Jul 2010 16:02:23 -0000 1.17
@@ -1 +1 @@
-7879f9832c447e9cabca3d0be7d3a6c8 devede-3.16.8.tar.bz2
+f35c5e72264ee272194cfa558b43e598 devede-3.16.9.tar.bz2
14 years, 6 months
rpms/ffmpeg/F-12 ffmpeg.spec,1.26,1.27
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv26049
Modified Files:
ffmpeg.spec
Log Message:
* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-2
- enable libvpx (WebM/VP8) support (rfbz#1250)
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-12/ffmpeg.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- ffmpeg.spec 19 Jun 2010 20:09:32 -0000 1.26
+++ ffmpeg.spec 3 Jul 2010 15:46:04 -0000 1.27
@@ -6,7 +6,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -30,6 +30,7 @@
%{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 0.9.1
%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
@@ -101,6 +102,7 @@
--enable-libspeex \\\
--enable-libtheora \\\
--enable-libvorbis \\\
+ --enable-libvpx \\\
--enable-libx264 \\\
--enable-libxvid \\\
--enable-x11grab \\\
@@ -229,6 +231,9 @@
%changelog
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-2
+- enable libvpx (WebM/VP8) support (rfbz#1250)
+
* Sat Jun 19 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-1
- 0.6 release
14 years, 6 months
rpms/ffmpeg/F-13 ffmpeg.spec,1.28,1.29
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/ffmpeg/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv25919
Modified Files:
ffmpeg.spec
Log Message:
* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-2
- enable libvpx (WebM/VP8) support (rfbz#1250)
Index: ffmpeg.spec
===================================================================
RCS file: /cvs/free/rpms/ffmpeg/F-13/ffmpeg.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ffmpeg.spec 19 Jun 2010 20:37:45 -0000 1.28
+++ ffmpeg.spec 3 Jul 2010 15:45:20 -0000 1.29
@@ -6,7 +6,7 @@
Summary: Digital VCR and streaming server
Name: ffmpeg
Version: 0.6
-Release: 1%{?dist}
+Release: 2%{?dist}
%if 0%{?_with_opencore_amr:1}
License: GPLv3+
%else
@@ -29,6 +29,7 @@
%{?_with_vaapi:BuildRequires:libva-devel >= 0.31.0}
BuildRequires: libvdpau-devel
BuildRequires: libvorbis-devel
+BuildRequires: libvpx-devel >= 0.9.1
%{?_with_opencore_amr:BuildRequires: opencore-amr-devel}
BuildRequires: openjpeg-devel
BuildRequires: schroedinger-devel
@@ -100,6 +101,7 @@
--enable-libspeex \\\
--enable-libtheora \\\
--enable-libvorbis \\\
+ --enable-libvpx \\\
--enable-libx264 \\\
--enable-libxvid \\\
--enable-x11grab \\\
@@ -226,6 +228,9 @@
%changelog
+* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-2
+- enable libvpx (WebM/VP8) support (rfbz#1250)
+
* Sat Jun 19 2010 Dominik Mierzejewski <rpm at greysector.net> - 0.6-1
- 0.6 release
14 years, 6 months
rpms/cairo-dock/devel cairo-dock.spec,1.53,1.54
by Mamoru Tasaka
Author: mtasaka
Update of /cvs/free/rpms/cairo-dock/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3027
Modified Files:
cairo-dock.spec
Log Message:
* Sat Jul 3 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
- Rebuild against new webkitgtk
Index: cairo-dock.spec
===================================================================
RCS file: /cvs/free/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -r1.53 -r1.54
--- cairo-dock.spec 10 Jun 2010 17:10:36 -0000 1.53
+++ cairo-dock.spec 3 Jul 2010 10:19:43 -0000 1.54
@@ -36,7 +36,7 @@
Name: cairo-dock
Version: %{mainver}%{?postver:.%postver}
-Release: %{fedora_rel}%{?dist}
+Release: %{fedora_rel}%{?dist}.1
Summary: Light eye-candy fully themable animated dock
Group: User Interface/Desktops
@@ -631,6 +631,9 @@
%{_libdir}/pkgconfig/*.pc
%changelog
+* Sat Jul 3 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp>
+- Rebuild against new webkitgtk
+
* Fri Jun 11 2010 Mamoru Tasaka <mtasaka(a)ioa.s.u-tokyo.ac.jp> - 2.1.3.9-3
- Fix for "GMenu does not handle desktop file exec strings properly"
(Lauchpad 526138, rpmfusion 1265)
14 years, 6 months