May 2010 - rpmfusion-commits

rpms/ffmpeg/F-12 ffmpeg-x264.patch,NONE,1.1

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/ffmpeg/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11468 Added Files: ffmpeg-x264.patch Log Message: - patch to build with old x264 in F-12 ffmpeg-x264.patch: configure | 4 - ffpresets/libx264-baseline.ffpreset | 1 ffpresets/libx264-default.ffpreset | 1 ffpresets/libx264-fast.ffpreset | 23 ---------- ffpresets/libx264-fast_firstpass.ffpreset | 23 ---------- ffpresets/libx264-faster.ffpreset | 23 ---------- ffpresets/libx264-faster_firstpass.ffpreset | 23 ---------- ffpresets/libx264-fastfirstpass.ffpreset | 3 - ffpresets/libx264-hq.ffpreset | 1 ffpresets/libx264-ipod320.ffpreset | 1 ffpresets/libx264-ipod640.ffpreset | 1 ffpresets/libx264-lossless_fast.ffpreset | 1 ffpresets/libx264-lossless_max.ffpreset | 1 ffpresets/libx264-lossless_medium.ffpreset | 1 ffpresets/libx264-lossless_slow.ffpreset | 1 ffpresets/libx264-lossless_slower.ffpreset | 1 ffpresets/libx264-max.ffpreset | 1 ffpresets/libx264-medium.ffpreset | 22 ---------- ffpresets/libx264-medium_firstpass.ffpreset | 22 ---------- ffpresets/libx264-normal.ffpreset | 1 ffpresets/libx264-placebo.ffpreset | 23 ---------- ffpresets/libx264-placebo_firstpass.ffpreset | 23 ---------- ffpresets/libx264-slow.ffpreset | 23 ---------- ffpresets/libx264-slow_firstpass.ffpreset | 23 ---------- ffpresets/libx264-slower.ffpreset | 23 ---------- ffpresets/libx264-slower_firstpass.ffpreset | 23 ---------- ffpresets/libx264-slowfirstpass.ffpreset | 1 ffpresets/libx264-superfast.ffpreset | 22 ---------- ffpresets/libx264-superfast_firstpass.ffpreset | 22 ---------- ffpresets/libx264-ultrafast.ffpreset | 23 ---------- ffpresets/libx264-ultrafast_firstpass.ffpreset | 23 ---------- ffpresets/libx264-veryfast.ffpreset | 22 ---------- ffpresets/libx264-veryfast_firstpass.ffpreset | 22 ---------- ffpresets/libx264-veryslow.ffpreset | 23 ---------- ffpresets/libx264-veryslow_firstpass.ffpreset | 23 ---------- libavcodec/avcodec.h | 55 ------------------------- libavcodec/libx264.c | 25 ++--------- libavcodec/options.c | 11 ----- 38 files changed, 9 insertions(+), 556 deletions(-) --- NEW FILE ffmpeg-x264.patch --- diff -up ffmpeg-20100425/configure.x264 ffmpeg-20100425/configure --- ffmpeg-20100425/configure.x264 2010-04-23 18:41:55.000000000 +0200 +++ ffmpeg-20100425/configure 2010-04-25 23:31:45.000000000 +0200 @@ -2615,8 +2615,8 @@ enabled libspeex && require libspeex enabled libtheora && require libtheora theora/theoraenc.h th_info_init -ltheoraenc -ltheoradec -logg enabled libvorbis && require libvorbis vorbis/vorbisenc.h vorbis_info_init -lvorbisenc -lvorbis -logg enabled libx264 && require libx264 x264.h x264_encoder_encode -lx264 -lm && - { check_cpp_condition x264.h "X264_BUILD >= 83" || - die "ERROR: libx264 version must be >= 0.83."; } + { check_cpp_condition x264.h "X264_BUILD >= 78" || + die "ERROR: libx264 version must be >= 0.78."; } enabled libxvid && require libxvid xvid.h xvid_global -lxvidcore enabled mlib && require mediaLib mlib_types.h mlib_VectorSub_S16_U8_Mod -lmlib diff -up ffmpeg-20100425/ffpresets/libx264-baseline.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-baseline.ffpreset --- ffmpeg-20100425/ffpresets/libx264-baseline.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-baseline.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -1,4 +1,3 @@ coder=0 bf=0 flags2=-wpred-dct8x8 -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-default.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-default.ffpreset --- ffmpeg-20100425/ffpresets/libx264-default.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-default.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -19,4 +19,3 @@ refs=3 directpred=1 trellis=1 flags2=+mixed_refs+wpred+dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-faster.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-faster.ffpreset --- ffmpeg-20100425/ffpresets/libx264-faster.ffpreset.x264 2010-03-29 03:34:33.000000000 +0200 +++ ffmpeg-20100425/ffpresets/libx264-faster.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partb8x8 -me_method=hex -subq=4 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=2 -directpred=1 -trellis=1 -flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip -wpredp=1 -rc_lookahead=20 diff -up ffmpeg-20100425/ffpresets/libx264-faster_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-faster_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-faster_firstpass.ffpreset.x264 2010-03-29 03:34:33.000000000 +0200 +++ ffmpeg-20100425/ffpresets/libx264-faster_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip -wpredp=1 -rc_lookahead=20 diff -up ffmpeg-20100425/ffpresets/libx264-fast.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-fast.ffpreset --- ffmpeg-20100425/ffpresets/libx264-fast.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-fast.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partb8x8 -me_method=hex -subq=6 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=2 -directpred=1 -trellis=1 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp=2 -rc_lookahead=30 diff -up ffmpeg-20100425/ffpresets/libx264-fast_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-fast_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-fast_firstpass.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-fast_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip -wpredp=2 -rc_lookahead=30 diff -up ffmpeg-20100425/ffpresets/libx264-fastfirstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-fastfirstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-fastfirstpass.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-fastfirstpass.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -3,7 +3,7 @@ flags=+loop cmp=+chroma partitions=-parti8x8-parti4x4-partp8x8-partp4x4-partb8x8 me_method=dia -subq=2 +subq=1 me_range=16 g=250 keyint_min=25 @@ -19,4 +19,3 @@ refs=1 directpred=3 trellis=0 flags2=-bpyramid-wpred-mixed_refs-dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-hq.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-hq.ffpreset --- ffmpeg-20100425/ffpresets/libx264-hq.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-hq.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -19,4 +19,3 @@ refs=4 directpred=3 trellis=1 flags2=+wpred+mixed_refs+dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-ipod320.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-ipod320.ffpreset --- ffmpeg-20100425/ffpresets/libx264-ipod320.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-ipod320.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -4,4 +4,3 @@ flags2=-wpred-dct8x8 level=13 maxrate=768000 bufsize=3000000 -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-ipod640.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-ipod640.ffpreset --- ffmpeg-20100425/ffpresets/libx264-ipod640.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-ipod640.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -5,4 +5,3 @@ flags2=-wpred-dct8x8 level=30 maxrate=10000000 bufsize=10000000 -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-lossless_fast.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-lossless_fast.ffpreset --- ffmpeg-20100425/ffpresets/libx264-lossless_fast.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-lossless_fast.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -17,4 +17,3 @@ qdiff=4 directpred=1 flags2=+fastpskip cqp=0 -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-lossless_max.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-lossless_max.ffpreset --- ffmpeg-20100425/ffpresets/libx264-lossless_max.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-lossless_max.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -18,4 +18,3 @@ refs=16 directpred=1 flags2=+mixed_refs+dct8x8+fastpskip cqp=0 -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-lossless_medium.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-lossless_medium.ffpreset --- ffmpeg-20100425/ffpresets/libx264-lossless_medium.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-lossless_medium.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -17,4 +17,3 @@ qdiff=4 directpred=1 flags2=+fastpskip cqp=0 -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-lossless_slower.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-lossless_slower.ffpreset --- ffmpeg-20100425/ffpresets/libx264-lossless_slower.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-lossless_slower.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -18,4 +18,3 @@ refs=4 directpred=1 flags2=+mixed_refs+dct8x8+fastpskip cqp=0 -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-lossless_slow.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-lossless_slow.ffpreset --- ffmpeg-20100425/ffpresets/libx264-lossless_slow.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-lossless_slow.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -18,4 +18,3 @@ refs=2 directpred=1 flags2=+dct8x8+fastpskip cqp=0 -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-lossless_ultrafast.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-lossless_ultrafast.ffpreset diff -up ffmpeg-20100425/ffpresets/libx264-main.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-main.ffpreset diff -up ffmpeg-20100425/ffpresets/libx264-max.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-max.ffpreset --- ffmpeg-20100425/ffpresets/libx264-max.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-max.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -19,4 +19,3 @@ refs=16 directpred=3 trellis=2 flags2=+wpred+mixed_refs+dct8x8-fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-medium.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-medium.ffpreset --- ffmpeg-20100425/ffpresets/libx264-medium.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-medium.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,22 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partb8x8 -me_method=hex -subq=7 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=3 -directpred=1 -trellis=1 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-medium_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-medium_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-medium_firstpass.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-medium_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,22 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-normal.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-normal.ffpreset --- ffmpeg-20100425/ffpresets/libx264-normal.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-normal.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -19,4 +19,3 @@ refs=2 directpred=3 trellis=0 flags2=+wpred+dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-placebo.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-placebo.ffpreset --- ffmpeg-20100425/ffpresets/libx264-placebo.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-placebo.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 -me_method=tesa -subq=10 -me_range=24 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=16 -refs=16 -directpred=3 -trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip -wpredp=2 -rc_lookahead=60 diff -up ffmpeg-20100425/ffpresets/libx264-placebo_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-placebo_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-placebo_firstpass.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-placebo_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 -me_method=tesa -subq=10 -me_range=24 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=16 -refs=16 -directpred=3 -trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8-fastpskip -wpredp=2 -rc_lookahead=60 diff -up ffmpeg-20100425/ffpresets/libx264-slower.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-slower.ffpreset --- ffmpeg-20100425/ffpresets/libx264-slower.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-slower.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 -me_method=umh -subq=9 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=8 -directpred=3 -trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp=2 -rc_lookahead=60 diff -up ffmpeg-20100425/ffpresets/libx264-slower_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-slower_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-slower_firstpass.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-slower_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=3 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip -wpredp=2 -rc_lookahead=60 diff -up ffmpeg-20100425/ffpresets/libx264-slow.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-slow.ffpreset --- ffmpeg-20100425/ffpresets/libx264-slow.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-slow.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partb8x8 -me_method=umh -subq=8 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=5 -directpred=3 -trellis=1 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp=2 -rc_lookahead=50 diff -up ffmpeg-20100425/ffpresets/libx264-slow_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-slow_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-slow_firstpass.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-slow_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=3 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip -wpredp=2 -rc_lookahead=50 diff -up ffmpeg-20100425/ffpresets/libx264-slowfirstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-slowfirstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-slowfirstpass.ffpreset.x264 2010-03-25 20:39:06.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-slowfirstpass.ffpreset 2010-04-25 23:31:45.000000000 +0200 @@ -19,4 +19,3 @@ refs=1 directpred=3 trellis=0 flags2=+wpred+dct8x8+fastpskip -wpredp=2 diff -up ffmpeg-20100425/ffpresets/libx264-superfast.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-superfast.ffpreset --- ffmpeg-20100425/ffpresets/libx264-superfast.ffpreset.x264 2010-03-29 03:34:33.000000000 +0200 +++ ffmpeg-20100425/ffpresets/libx264-superfast.ffpreset 2010-04-25 23:28:45.000000000 +0200 @@ -1,22 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4-partp8x8-partb8x8 -me_method=dia -subq=1 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-superfast_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-superfast_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-superfast_firstpass.ffpreset.x264 2010-03-29 03:34:33.000000000 +0200 +++ ffmpeg-20100425/ffpresets/libx264-superfast_firstpass.ffpreset 2010-04-25 23:28:45.000000000 +0200 @@ -1,22 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=1 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-ultrafast.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-ultrafast.ffpreset --- ffmpeg-20100425/ffpresets/libx264-ultrafast.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-ultrafast.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=0 -flags=-loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=0 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=0 -i_qfactor=0.71 -b_strategy=0 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=0 -refs=1 -directpred=1 -trellis=0 -flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree -wpredp=0 -aq_mode=0 diff -up ffmpeg-20100425/ffpresets/libx264-ultrafast_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-ultrafast_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-ultrafast_firstpass.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-ultrafast_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=0 -flags=-loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=0 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=0 -i_qfactor=0.71 -b_strategy=0 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=0 -refs=1 -directpred=1 -trellis=0 -flags2=-bpyramid-mixed_refs-wpred-dct8x8+fastpskip-mbtree -wpredp=0 -aq_mode=0 diff -up ffmpeg-20100425/ffpresets/libx264-veryfast.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-veryfast.ffpreset --- ffmpeg-20100425/ffpresets/libx264-veryfast.ffpreset.x264 2010-03-29 03:34:33.000000000 +0200 +++ ffmpeg-20100425/ffpresets/libx264-veryfast.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,22 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partb8x8 -me_method=hex -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred+dct8x8+fastpskip-mbtree -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-veryfast_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-veryfast_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-veryfast_firstpass.ffpreset.x264 2010-03-29 03:34:33.000000000 +0200 +++ ffmpeg-20100425/ffpresets/libx264-veryfast_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,22 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=16 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=1 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=3 -refs=1 -directpred=1 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip-mbtree -wpredp=0 diff -up ffmpeg-20100425/ffpresets/libx264-veryslow.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-veryslow.ffpreset --- ffmpeg-20100425/ffpresets/libx264-veryslow.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-veryslow.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=+parti8x8+parti4x4+partp8x8+partp4x4+partb8x8 -me_method=umh -subq=10 -me_range=24 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=8 -refs=16 -directpred=3 -trellis=2 -flags2=+bpyramid+mixed_refs+wpred+dct8x8+fastpskip -wpredp=2 -rc_lookahead=60 diff -up ffmpeg-20100425/ffpresets/libx264-veryslow_firstpass.ffpreset.x264 ffmpeg-20100425/ffpresets/libx264-veryslow_firstpass.ffpreset --- ffmpeg-20100425/ffpresets/libx264-veryslow_firstpass.ffpreset.x264 2010-03-26 23:40:55.000000000 +0100 +++ ffmpeg-20100425/ffpresets/libx264-veryslow_firstpass.ffpreset 2010-04-25 23:30:58.000000000 +0200 @@ -1,23 +0,0 @@ -coder=1 -flags=+loop -cmp=+chroma -partitions=-parti8x8-parti4x4-partp8x8-partb8x8 -me_method=dia -subq=2 -me_range=24 -g=250 -keyint_min=25 -sc_threshold=40 -i_qfactor=0.71 -b_strategy=2 -qcomp=0.6 -qmin=10 -qmax=51 -qdiff=4 -bf=8 -refs=1 -directpred=3 -trellis=0 -flags2=+bpyramid-mixed_refs+wpred-dct8x8+fastpskip -wpredp=2 -rc_lookahead=60 diff -up ffmpeg-20100425/libavcodec/avcodec.h.x264 ffmpeg-20100425/libavcodec/avcodec.h --- ffmpeg-20100425/libavcodec/avcodec.h.x264 2010-04-20 16:45:34.000000000 +0200 +++ ffmpeg-20100425/libavcodec/avcodec.h 2010-04-25 23:31:45.000000000 +0200 @@ -594,9 +594,6 @@ typedef struct RcOverride{ #define CODEC_FLAG2_CHUNKS 0x00008000 ///< Input bitstream might be truncated at a packet boundaries instead of only at frame boundaries. #define CODEC_FLAG2_NON_LINEAR_QUANT 0x00010000 ///< Use MPEG-2 nonlinear quantizer. #define CODEC_FLAG2_BIT_RESERVOIR 0x00020000 ///< Use a bit reservoir when encoding if possible -#define CODEC_FLAG2_MBTREE 0x00040000 ///< Use macroblock tree ratecontrol (x264 only) -#define CODEC_FLAG2_PSY 0x00080000 ///< Use psycho visual optimizations. -#define CODEC_FLAG2_SSIM 0x00100000 ///< Compute SSIM during encoding, error[] values are undefined. /* Unsupported options : * Syntax Arithmetic coding (SAC) @@ -2594,58 +2591,6 @@ typedef struct AVCodecContext { * - decoding: Set by libavcodec, user can override. */ int (*execute2)(struct AVCodecContext *c, int (*func)(struct AVCodecContext *c2, void *arg, int jobnr, int threadnr), void *arg2, int *ret, int count); - - /** - * explicit P-frame weighted prediction analysis method - * 0: off - * 1: fast blind weighting (one reference duplicate with -1 offset) - * 2: smart weighting (full fade detection analysis) - * - encoding: Set by user. - * - decoding: unused - */ - int weighted_p_pred; - - /** - * AQ mode - * 0: Disabled - * 1: Variance AQ (complexity mask) - * 2: Auto-variance AQ (experimental) - * - encoding: Set by user - * - decoding: unused - */ - int aq_mode; - - /** - * AQ strength - * Reduces blocking and blurring in flat and textured areas. - * - encoding: Set by user - * - decoding: unused - */ - float aq_strength; - - /** - * PSY RD - * Strength of psychovisual optimization - * - encoding: Set by user - * - decoding: unused - */ - float psy_rd; - - /** - * PSY trellis - * Strength of psychovisual optimization - * - encoding: Set by user - * - decoding: unused - */ - float psy_trellis; - - /** - * RC lookahead - * Number of frames for frametype and ratecontrol lookahead - * - encoding: Set by user - * - decoding: unused - */ - int rc_lookahead; } AVCodecContext; /** diff -up ffmpeg-20100425/libavcodec/libx264.c.x264 ffmpeg-20100425/libavcodec/libx264.c --- ffmpeg-20100425/libavcodec/libx264.c.x264 2010-04-19 23:20:20.000000000 +0200 +++ ffmpeg-20100425/libavcodec/libx264.c 2010-04-25 23:31:45.000000000 +0200 @@ -109,7 +109,7 @@ static int X264_frame(AVCodecContext *ct if (bufsize < 0) return -1; - /* FIXME: libx264 now provides DTS, but AVFrame doesn't have a field for it. */ + /* FIXME: dts */ x4->out_pic.pts = pic_out.i_pts; switch (pic_out.i_type) { @@ -126,7 +126,7 @@ static int X264_frame(AVCodecContext *ct break; } - x4->out_pic.key_frame = pic_out.b_keyframe; + x4->out_pic.key_frame = pic_out.i_type == X264_TYPE_IDR; x4->out_pic.quality = (pic_out.i_qpplus1 - 1) * FF_QP2LAMBDA; return bufsize; @@ -208,8 +208,8 @@ static av_cold int X264_init(AVCodecCont x4->params.i_height = avctx->height; x4->params.vui.i_sar_width = avctx->sample_aspect_ratio.num; x4->params.vui.i_sar_height = avctx->sample_aspect_ratio.den; - x4->params.i_fps_num = x4->params.i_timebase_den = avctx->time_base.den; - x4->params.i_fps_den = x4->params.i_timebase_num = avctx->time_base.num; + x4->params.i_fps_num = avctx->time_base.den; + x4->params.i_fps_den = avctx->time_base.num; x4->params.analyse.inter = 0; if (avctx->partitions) { @@ -228,7 +228,6 @@ static av_cold int X264_init(AVCodecCont x4->params.analyse.i_direct_mv_pred = avctx->directpred; x4->params.analyse.b_weighted_bipred = avctx->flags2 & CODEC_FLAG2_WPRED; - x4->params.analyse.i_weighted_pred = avctx->weighted_p_pred; if (avctx->me_method == ME_EPZS) x4->params.analyse.i_me_method = X264_ME_DIA; @@ -242,14 +241,6 @@ static av_cold int X264_init(AVCodecCont x4->params.analyse.i_me_method = X264_ME_TESA; else x4->params.analyse.i_me_method = X264_ME_HEX; - x4->params.rc.i_aq_mode = avctx->aq_mode; - x4->params.rc.f_aq_strength = avctx->aq_strength; - x4->params.rc.i_lookahead = avctx->rc_lookahead; - - x4->params.analyse.b_psy = avctx->flags2 & CODEC_FLAG2_PSY; - x4->params.analyse.f_psy_rd = avctx->psy_rd; - x4->params.analyse.f_psy_trellis = avctx->psy_trellis; - x4->params.analyse.i_me_range = avctx->me_range; x4->params.analyse.i_subpel_refine = avctx->me_subpel_quality; @@ -274,13 +265,11 @@ static av_cold int X264_init(AVCodecCont } else x4->params.rc.f_vbv_buffer_init = 0.9; - x4->params.rc.b_mb_tree = !!(avctx->flags2 & CODEC_FLAG2_MBTREE); x4->params.rc.f_ip_factor = 1 / fabs(avctx->i_quant_factor); x4->params.rc.f_pb_factor = avctx->b_quant_factor; x4->params.analyse.i_chroma_qp_offset = avctx->chromaoffset; x4->params.analyse.b_psnr = avctx->flags & CODEC_FLAG_PSNR; - x4->params.analyse.b_ssim = avctx->flags2 & CODEC_FLAG2_SSIM; x4->params.i_log_level = X264_LOG_DEBUG; x4->params.b_aud = avctx->flags2 & CODEC_FLAG2_AUD; @@ -300,14 +289,10 @@ static av_cold int X264_init(AVCodecCont if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { x264_nal_t *nal; - int nnal, s, i; + int nnal, s; s = x264_encoder_headers(x4->enc, &nal, &nnal); - for (i = 0; i < nnal; i++) - if (nal[i].i_type == NAL_SEI) - av_log(avctx, AV_LOG_INFO, "%s\n", nal[i].p_payload+25); - avctx->extradata = av_malloc(s); avctx->extradata_size = encode_nals(avctx, avctx->extradata, s, nal, nnal, 1); } diff -up ffmpeg-20100425/libavcodec/options.c.x264 ffmpeg-20100425/libavcodec/options.c --- ffmpeg-20100425/libavcodec/options.c.x264 2010-04-20 16:45:34.000000000 +0200 +++ ffmpeg-20100425/libavcodec/options.c 2010-04-25 23:31:45.000000000 +0200 @@ -124,7 +124,6 @@ static const AVOption options[]={ {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, 1.25, -FLT_MAX, FLT_MAX, V|E}, {"rc_strategy", "ratecontrol method", OFFSET(rc_strategy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"b_strategy", "strategy to choose between I/P/B-frames", OFFSET(b_frame_strategy), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, -{"wpredp", "weighted prediction analysis method", OFFSET(weighted_p_pred), FF_OPT_TYPE_INT, 0, INT_MIN, INT_MAX, V|E}, {"hurry_up", NULL, OFFSET(hurry_up), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D}, {"ps", "rtp payload size in bytes", OFFSET(rtp_payload_size), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"mv_bits", NULL, OFFSET(mv_bits), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, @@ -307,7 +306,7 @@ static const AVOption options[]={ {"nr", "noise reduction", OFFSET(noise_reduction), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"rc_init_occupancy", "number of bits which should be loaded into the rc buffer before decoding starts", OFFSET(rc_initial_buffer_occupancy), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"inter_threshold", NULL, OFFSET(inter_threshold), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, -{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR|CODEC_FLAG2_PSY|CODEC_FLAG2_MBTREE, 0, UINT_MAX, V|A|E|D, "flags2"}, +{"flags2", NULL, OFFSET(flags2), FF_OPT_TYPE_FLAGS, CODEC_FLAG2_FASTPSKIP|CODEC_FLAG2_BIT_RESERVOIR, 0, UINT_MAX, V|A|E|D, "flags2"}, {"error", NULL, OFFSET(error_rate), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|E}, {"antialias", "MP3 antialias algorithm", OFFSET(antialias_algo), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX, V|D, "aa"}, {"auto", NULL, 0, FF_OPT_TYPE_CONST, FF_AA_AUTO, INT_MIN, INT_MAX, V|D, "aa"}, @@ -392,7 +391,6 @@ static const AVOption options[]={ {"request_channels", "set desired number of audio channels", OFFSET(request_channels), FF_OPT_TYPE_INT, DEFAULT, 0, INT_MAX, A|D}, {"drc_scale", "percentage of dynamic range compression to apply", OFFSET(drc_scale), FF_OPT_TYPE_FLOAT, 1.0, 0.0, 1.0, A|D}, {"reservoir", "use bit reservoir", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_BIT_RESERVOIR, INT_MIN, INT_MAX, A|E, "flags2"}, -{"mbtree", "use macroblock tree ratecontrol (x264 only)", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_MBTREE, INT_MIN, INT_MAX, V|E, "flags2"}, {"bits_per_raw_sample", NULL, OFFSET(bits_per_raw_sample), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"channel_layout", NULL, OFFSET(channel_layout), FF_OPT_TYPE_INT64, DEFAULT, 0, INT64_MAX, A|E|D, "channel_layout"}, {"request_channel_layout", NULL, OFFSET(request_channel_layout), FF_OPT_TYPE_INT64, DEFAULT, 0, INT64_MAX, A|D, "request_channel_layout"}, @@ -404,13 +402,6 @@ static const AVOption options[]={ {"colorspace", NULL, OFFSET(colorspace), FF_OPT_TYPE_INT, AVCOL_SPC_UNSPECIFIED, 1, AVCOL_SPC_NB-1, V|E|D}, {"color_range", NULL, OFFSET(color_range), FF_OPT_TYPE_INT, AVCOL_RANGE_UNSPECIFIED, 0, AVCOL_RANGE_NB-1, V|E|D}, {"chroma_sample_location", NULL, OFFSET(chroma_sample_location), FF_OPT_TYPE_INT, AVCHROMA_LOC_UNSPECIFIED, 0, AVCHROMA_LOC_NB-1, V|E|D}, -{"psy", "use psycho visual optimization", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_PSY, INT_MIN, INT_MAX, V|E, "flags2"}, -{"psy_rd", "specify psycho visual strength", OFFSET(psy_rd), FF_OPT_TYPE_FLOAT, 1.0, 0, FLT_MAX, V|E}, -{"psy_trellis", "specify psycho visual trellis", OFFSET(psy_trellis), FF_OPT_TYPE_FLOAT, 0, 0, FLT_MAX, V|E}, -{"aq_mode", "specify aq method", OFFSET(aq_mode), FF_OPT_TYPE_INT, 1, 0, INT_MAX, V|E}, -{"aq_strength", "specify aq strength", OFFSET(aq_strength), FF_OPT_TYPE_FLOAT, 1.0, 0, FLT_MAX, V|E}, -{"rc_lookahead", "specify number of frames to look ahead for frametype", OFFSET(rc_lookahead), FF_OPT_TYPE_INT, 40, 0, INT_MAX, V|E}, -{"ssim", "ssim will be calculated during encoding", 0, FF_OPT_TYPE_CONST, CODEC_FLAG2_SSIM, INT_MIN, INT_MAX, V|E, "flags2"}, {NULL}, };

14 years, 7 months

1
0
0 / 0

rpms/lame/F-12 lame.spec,1.4,1.5

by Dominik Mierzejewski

Author: rathann Update of /cvs/free/rpms/lame/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10929 Modified Files: lame.spec Log Message: * Tue May 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.3-1.1 - bump and rebuild to fix ppc64 repo dep problem Index: lame.spec =================================================================== RCS file: /cvs/free/rpms/lame/F-12/lame.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- lame.spec 27 Mar 2010 18:16:36 -0000 1.4 +++ lame.spec 11 May 2010 18:08:52 -0000 1.5 @@ -1,6 +1,6 @@ Name: lame Version: 3.98.3 -Release: 1%{?dist} +Release: 1%{?dist}.1 Summary: Free MP3 audio compressor Group: Applications/Multimedia @@ -122,6 +122,9 @@ %{_bindir}/mp3x %changelog +* Tue May 11 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.3-1.1 +- bump and rebuild to fix ppc64 repo dep problem + * Sat Feb 27 2010 Dominik Mierzejewski <rpm at greysector.net> - 3.98.3-1 - update to 3.98.3

14 years, 7 months

1
0
0 / 0

rpms/mythtv-themes/F-12 mythtv-themes.spec,1.30,1.31

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv2487 Modified Files: mythtv-themes.spec Log Message: hack to try to make the damned thing build. noarch build keeps landing on ppc64, which borks, because of some lame-devel dep being unsatisfied Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-12/mythtv-themes.spec,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- mythtv-themes.spec 10 May 2010 16:10:27 -0000 1.30 +++ mythtv-themes.spec 10 May 2010 18:29:34 -0000 1.31 @@ -46,6 +46,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch +ExcludeArch: ppc64 ################################################################################

14 years, 7 months

1
0
0 / 0

rpms/mythtv-themes/F-11 mythtv-themes.spec, 1.18, 1.19 sources, 1.11, 1.12 myththemes-0.22-svnfixes.patch, 1.1, NONE

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25793 Modified Files: mythtv-themes.spec sources Removed Files: myththemes-0.22-svnfixes.patch Log Message: * Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 - Update to 0.23 release (svn rev 24509) Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-11/mythtv-themes.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mythtv-themes.spec 22 Nov 2009 05:46:11 -0000 1.18 +++ mythtv-themes.spec 10 May 2010 16:11:03 -0000 1.19 @@ -17,8 +17,8 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r22880 -%define branch release +%define _svnrev r24509 +%define branch release-0-23-fixes # # Basic descriptive tags for this package: @@ -30,12 +30,11 @@ License: GPLv2 # Version/Release info -Version: 0.22 +Version: 0.23 %if "%{branch}" == "trunk" -Release: 0.1.rc2%{?dist} -#Release: 0.5.svn.%{_svnrev}%{?dist} +Release: 0.1.svn.%{_svnrev}%{?dist} %else -Release: 2%{?dist} +Release: 1%{?dist} %endif ################################################################################ @@ -43,7 +42,6 @@ # Tarballs created from svn directories, should be formal tarballs after release #Source0: http://www.mythtv.org/mc/mythtv-themes-%{version}.tar.bz2 Source0: myththemes-%{version}.tar.bz2 -Patch0: myththemes-0.22-svnfixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,7 +49,7 @@ ################################################################################ -BuildRequires: libmyth-devel = %{version} +BuildRequires: mythtv-devel = %{version} BuildRequires: qt4-devel # Themes do require a frontend @@ -75,9 +73,6 @@ %prep %setup -q -c -cd myththemes-%{version} -%patch0 -p1 -cd .. ################################################################################ @@ -93,6 +88,10 @@ cd myththemes-%{version} make install INSTALL_ROOT=%{buildroot} +# move font files to more appropriate locations +mkdir -p %{buildroot}%{_datadir}/fonts/%{name} +mv %{buildroot}%{_datadir}/mythtv/themes/Arclight/*.otf \ + %{buildroot}%{_datadir}/fonts/%{name}/ cd .. ################################################################################ @@ -102,13 +101,54 @@ ################################################################################ +%post +%{_bindir}/fc-cache -f + %files %defattr(-,root,root,-) %{_datadir}/mythtv/themes/* +%dir %{_datadir}/fonts/%{name} +%{_datadir}/fonts/%{name}/*.otf %changelog -* Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2 -- Update to release-0-22-fixes branch, svn revision 22880 +* Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 +- Update to 0.23 release (svn rev 24509) + +* Fri May 07 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.7.rc3 +- Update to post-rc3 svn snapshot, revision 24473 + +* Tue May 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.6.rc3 +- Update to post-rc3 svn snapshot, revision 24414 +- Includes addition of theming contest winner "Childish" + +* Fri Apr 16 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.5.rc2 +- Update to post-rc2 svn snapshot, revision 24159 + +* Tue Apr 06 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.4.rc2 +- Update to post-rc2 svn snapshot, revision 24014 + +* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.3.rc1 +- Update to post-rc1 snapshot +- Start tracking release-0-23-fixes branch + +* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1 +- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less) + +* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702 +- Update to pre-0.23 svn trunk, rev 23702 + +* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662 +- Update to pre-0.23 svn trunk, rev 23662 + +* Sun Feb 28 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23627 +- Update to pre-0.23 svn trunk, rev 23627 + +* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586 +- Update to pre-0.23 svn trunk, rev 23586 + +* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479 +- Update to pre-0.23 svn trunk, rev 23479 +- Add hacky install of Arclight themes, still needs to be done Right * Mon Nov 09 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-1 - Update to 0.22 release Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-11/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 9 Nov 2009 16:26:56 -0000 1.11 +++ sources 10 May 2010 16:11:03 -0000 1.12 @@ -1 +1 @@ -a5f00f152fb430a20c70aaa3bf456347 myththemes-0.22.tar.bz2 +1837ac72f7a03cb780d070cbea549bfe myththemes-0.23.tar.bz2 --- myththemes-0.22-svnfixes.patch DELETED ---

14 years, 7 months

1
0
0 / 0

rpms/mythtv-themes/F-12 mythtv-themes.spec, 1.29, 1.30 sources, 1.21, 1.22 myththemes-0.22-svnfixes.patch, 1.1, NONE

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25665 Modified Files: mythtv-themes.spec sources Removed Files: myththemes-0.22-svnfixes.patch Log Message: * Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 - Update to 0.23 release (svn rev 24509) Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-12/mythtv-themes.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- mythtv-themes.spec 7 May 2010 17:03:35 -0000 1.29 +++ mythtv-themes.spec 10 May 2010 16:10:27 -0000 1.30 @@ -17,8 +17,8 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r24473 -%define branch trunk +%define _svnrev r24509 +%define branch release-0-23-fixes # # Basic descriptive tags for this package: @@ -32,8 +32,7 @@ # Version/Release info Version: 0.23 %if "%{branch}" == "trunk" -#Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.7.rc3%{?dist} +Release: 0.1.svn.%{_svnrev}%{?dist} %else Release: 1%{?dist} %endif @@ -112,6 +111,9 @@ %{_datadir}/fonts/%{name}/*.otf %changelog +* Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 +- Update to 0.23 release (svn rev 24509) + * Fri May 07 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.7.rc3 - Update to post-rc3 svn snapshot, revision 24473 Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-12/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 7 May 2010 17:03:35 -0000 1.21 +++ sources 10 May 2010 16:10:27 -0000 1.22 @@ -1,2 +1 @@ -a5f00f152fb430a20c70aaa3bf456347 myththemes-0.22.tar.bz2 -ffd59bc76975d89c03df3ad37736b103 myththemes-0.23.tar.bz2 +1837ac72f7a03cb780d070cbea549bfe myththemes-0.23.tar.bz2 --- myththemes-0.22-svnfixes.patch DELETED ---

14 years, 7 months

1
0
0 / 0

rpms/mythtv/F-11 mythbackend.init, NONE, 1.1 mythbackend.logrotate, NONE, 1.1 mythbackend.sysconfig, NONE, 1.1 mythtv-version.patch, NONE, 1.1 mythtv.spec, 1.42, 1.43 sources, 1.21, 1.22 mythbackend.init.in, 1.1, NONE mythbackend.logrotate.in, 1.1, NONE mythbackend.sysconfig.in, 1.1, NONE mythplugins-0.21-svnfixes.patch, 1.7, NONE mythplugins-0.22-svnfixes.patch, 1.2, NONE mythtv-0.20-mythstreammenu.diff, 1.1, NONE mythtv-0.21-fix-version-output.patch, 1.1, NONE mythtv-0.21-svnfixes.patch, 1.8, NONE mythtv

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv25222 Modified Files: mythtv.spec sources Added Files: mythbackend.init mythbackend.logrotate mythbackend.sysconfig mythtv-version.patch Removed Files: mythbackend.init.in mythbackend.logrotate.in mythbackend.sysconfig.in mythplugins-0.21-svnfixes.patch mythplugins-0.22-svnfixes.patch mythtv-0.20-mythstreammenu.diff mythtv-0.21-fix-version-output.patch mythtv-0.21-svnfixes.patch mythtv-0.22-svnfixes.patch Log Message: * Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 - Update to 0.23 release (svn rev 24509) --- NEW FILE mythbackend.init --- #!/bin/bash # # Startup script for mythbackend # # chkconfig: - 86 14 # description: mythbackend. # processname: mythbackend # pidfile: /var/run/mythbackend.pid # config: # Source function library. . /etc/init.d/functions if [ -f /etc/sysconfig/mythbackend ]; then . /etc/sysconfig/mythbackend fi ## Defaults, override them in /etc/sysconfig/mythbackend : ${MYTHTV_HOME=/etc/mythtv} binary=/usr/bin/mythbackend prog=mythbackend RETVAL=0 OPTIONS="$OPTIONS --daemon --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid" # Would be nice to run as non-root, but it doesn't work -- dvb/v4l devices owned by root become unusable #OPTIONS="$OPTIONS --daemon --user mythtv --logfile /var/log/mythtv/$prog.log --pidfile /var/run/$prog.pid" start() { echo -n $"Starting $prog: " touch /var/run/mythbackend.pid; chown mythtv:mythtv /var/run/mythbackend.pid export MYTHCONFDIR="$MYTHTV_HOME" export HOME="$MYTHTV_HOME" daemon $binary $OPTIONS RETVAL=$? echo [ $RETVAL = 0 ] && touch /var/lock/subsys/$prog return $RETVAL } stop() { echo -n $"Stopping $prog: " killproc $binary RETVAL=$? echo [ $RETVAL = 0 ] && rm -f /var/lock/subsys/$prog /var/run/$prog.pid } # See how we were called. case "$1" in start) start ;; stop) stop ;; reload|restart) stop start ;; status) status $prog RETVAL=$? ;; *) echo $"Usage: $prog {start|stop|status|restart}" exit 1 esac exit $RETVAL --- NEW FILE mythbackend.logrotate --- /var/log/mythtv/mythbackend.log { notifempty missingok compress compresscmd /usr/bin/bzip2 uncompresscmd /usr/bin/bunzip2 compressext .bz2 weekly rotate 4 size 10M postrotate /bin/kill -HUP `cat /var/run/mythbackend.pid 2>/dev/null` 2> /dev/null || true endscript } --- NEW FILE mythbackend.sysconfig --- #MYTHTV_HOME=/etc/mythtv #OPTIONS= mythtv-version.patch: version.sh | 27 ++++++--------------------- 1 file changed, 6 insertions(+), 21 deletions(-) --- NEW FILE mythtv-version.patch --- Index: mythtv/version.sh =================================================================== --- mythtv/version.sh (revision 23627) +++ mythtv/version.sh (working copy) @@ -23,29 +23,14 @@ SVNREPOPATH=$(echo $2 | sed -e 's,.*/svn/,,' \ -e 's,/mythtv/version\.pro.*,,' \ -e 's,/version\.pro.*,,') -SOURCE_VERSION=$(svnversion ${SVNTREEDIR} 2>/dev/null || echo Unknown) +SOURCE_VERSION="###SOURCE_VERSION###" -case "${SOURCE_VERSION}" in - exported|Unknown) - if test -e $SVNTREEDIR/VERSION ; then - . $SVNTREEDIR/VERSION - fi - ;; -esac - # Get a string like "0.21.20071125-1" BINARY_VERSION=$(grep MYTH_BINARY_VERSION \ - "${SVNTREEDIR}/libs/libmythdb/mythversion.h" \ + "${SVNTREEDIR}/libs/libmythdb/mythversion.h" \ | sed -e 's/.*MYTH_BINARY_VERSION //') -echo "#include \"mythexp.h\"" > .vers.new -echo "const MPUBLIC char *myth_source_version = \"${SOURCE_VERSION}\";" >> .vers.new -echo "const MPUBLIC char *myth_source_path = \"${SVNREPOPATH}\";" >> .vers.new -echo "const MPUBLIC char *myth_binary_version = ${BINARY_VERSION};" >> .vers.new - -# check if the version strings are changed and update version.pro if necessary -diff .vers.new version.cpp > .vers.diff 2>&1 -if test -s .vers.diff ; then - mv -f .vers.new version.cpp -fi -rm -f .vers.new .vers.diff +echo "#include \"mythexp.h\"" > version.cpp +echo "const MPUBLIC char *myth_source_version = \"${SOURCE_VERSION}\";" >> version.cpp +echo "const MPUBLIC char *myth_source_path = \"${SVNREPOPATH}\";" >> version.cpp +echo "const MPUBLIC char *myth_binary_version = ${BINARY_VERSION};" >> version.cpp Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-11/mythtv.spec,v retrieving revision 1.42 retrieving revision 1.43 diff -u -r1.42 -r1.43 --- mythtv.spec 2 Feb 2010 02:56:45 -0000 1.42 +++ mythtv.spec 10 May 2010 16:07:37 -0000 1.43 @@ -44,11 +44,11 @@ # # --without mytharchive # --without mythbrowser -# --without mythflix # --without mythgallery # --without mythgame # --without mythmovies # --without mythmusic +# --without mythnetvision # --without mythnews # --without mythvideo # --without mythweather @@ -65,8 +65,8 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r23433 -%define branch release +%define _svnrev r24509 +%define branch release-0-23-fixes # # Basic descriptive tags for this package: @@ -77,11 +77,11 @@ Group: Applications/Multimedia # Version/Release info -Version: 0.22 +Version: 0.23 %if "%{branch}" == "trunk" Release: 0.1.svn.%{_svnrev}%{?dist} %else -Release: 5%{?dist} +Release: 1%{?dist} %endif # The primary license is GPLv2+, but bits are borrowed from a number of @@ -108,7 +108,6 @@ # The following options are disabled by default. Use --with to enable them %define with_directfb %{?_with_directfb: 1} %{!?_with_directfb: 0} -%define with_xvmcnvidia %{?_with_xvmcnvidia: 1} %{?!_with_xvmcnvidia: 0} # FAAC is non-free, so we disable it by default %define with_faac %{?_with_faac: 1} %{?!_with_faac: 0} @@ -116,7 +115,6 @@ %define with_plugins %{?_without_plugins: 0} %{!?_without_plugins: 1} %define with_mytharchive %{?_without_mytharchive: 0} %{!?_without_mytharchive: 1} %define with_mythbrowser %{?_without_mythbrowser: 0} %{!?_without_mythbrowser: 1} -%define with_mythflix %{?_without_mythflix: 0} %{!?_without_mythflix: 1} %define with_mythgallery %{?_without_mythgallery: 0} %{!?_without_mythgallery: 1} %define with_mythgame %{?_without_mythgame: 0} %{!?_without_mythgame: 1} %define with_mythmovies %{?_without_mythmovies: 0} %{!?_without_mythmovies: 1} @@ -126,17 +124,19 @@ %define with_mythweather %{?_without_mythweather: 0} %{!?_without_mythweather: 1} %define with_mythweb %{?_without_mythweb: 0} %{!?_without_mythweb: 1} %define with_mythzoneminder %{?_without_mythzoneminder: 0} %{!?_without_mythzoneminder: 1} +%define with_mythnetvision %{?_without_mythnetvision: 0} %{!?_without_mythnetvision: 1} ################################################################################ Source0: http://www.mythtv.org/mc/mythtv-%{version}.tar.bz2 -Patch0: mythtv-0.22-svnfixes.patch +#Patch0: mythtv-%{version}-svnfixes.patch Source1: http://www.mythtv.org/mc/mythplugins-%{version}.tar.bz2 -Patch1: mythplugins-0.22-svnfixes.patch +#Patch1: mythplugins-%{version}-svnfixes.patch +Patch2: mythtv-version.patch Source10: PACKAGE-LICENSING -Source101: mythbackend.sysconfig.in -Source102: mythbackend.init.in -Source103: mythbackend.logrotate.in +Source101: mythbackend.sysconfig +Source102: mythbackend.init +Source103: mythbackend.logrotate Source106: mythfrontend.png Source107: mythfrontend.desktop Source108: mythtv-setup.png @@ -193,6 +193,7 @@ BuildRequires: flac-devel >= 1.0.4 BuildRequires: gsm-devel BuildRequires: lame-devel +BuildRequires: libdca-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel >= 0.9.4 # nb: libdvdcss will be dynamically loaded if installed @@ -226,10 +227,6 @@ BuildRequires: directfb-devel %endif -%if %{with_xvmcnvidia} -BuildRequires: xorg-x11-drv-nvidia-devel -%endif - %if %{with_vdpau} BuildRequires: libvdpau-devel %endif @@ -286,12 +283,15 @@ %if %{with_mythzoneminder} %endif +%if %{with_mythnetvision} +%endif + %endif ################################################################################ # Requirements for the mythtv meta package -Requires: libmyth = %{version}-%{release} +Requires: mythtv-libs = %{version}-%{release} Requires: mythtv-backend = %{version}-%{release} Requires: mythtv-base-themes = %{version}-%{release} Requires: mythtv-common = %{version}-%{release} @@ -347,27 +347,31 @@ ################################################################################ -%package -n libmyth +%package libs Summary: Library providing mythtv support Group: System Environment/Libraries +Provides: libmyth = %{version}-%{release} +Obsoletes: libmyth < %{version}-%{release} Requires: freetype >= 2 Requires: lame Requires: qt4 >= 4.4 Requires: qt4-MySQL -%description -n libmyth +%description libs Common library code for MythTV and add-on modules (development) MythTV provides a unified graphical interface for recording and viewing television programs. Refer to the mythtv package for more information. ################################################################################ -%package -n libmyth-devel -Summary: Development files for libmyth +%package devel +Summary: Development files for mythtv Group: Development/Libraries +Provides: libmyth-devel = %{version}-%{release} +Obsoletes: libmyth-devel < %{version}-%{release} -Requires: libmyth = %{version}-%{release} +Requires: mythtv-libs = %{version}-%{release} Requires: freetype-devel >= 2 Requires: mysql-devel >= 5 @@ -399,6 +403,7 @@ Requires: flac-devel >= 1.0.4 Requires: gsm-devel Requires: lame-devel +Requires: libdca-devel Requires: libdvdnav-devel Requires: libdvdread-devel >= 0.9.4 Requires: libfame-devel >= 0.9.0 @@ -431,15 +436,11 @@ Requires: directfb-devel %endif -%if %{with_xvmcnvidia} -Requires: xorg-x11-drv-nvidia-devel -%endif - %if %{with_vdpau} Requires: libvdpau-devel %endif -%description -n libmyth-devel +%description devel This package contains the header files and libraries for developing add-ons for mythtv. @@ -524,6 +525,9 @@ # mythphone is now DOA, but we need this for upgrade path preservation. Provides: mythphone = %{version}-%{release} Obsoletes: mythphone < %{version}-%{release} +# same deal for mythflix +Provides: mythflix = %{version}-%{release} +Obsoletes: mythflix < %{version}-%{release} %description common MythTV provides a unified graphical interface for recording and viewing @@ -585,11 +589,11 @@ Requires: mythgame = %{version}-%{release} Requires: mythnews = %{version}-%{release} Requires: mythbrowser = %{version}-%{release} -Requires: mythflix = %{version}-%{release} Requires: mytharchive = %{version}-%{release} Requires: mythzoneminder = %{version}-%{release} Requires: mythmovies = %{version}-%{release} Requires: mythweb = %{version}-%{release} +Requires: mythnetvision = %{version}-%{release} %description -n mythplugins This is a consolidation of all the official MythTV plugins that used to be @@ -639,18 +643,6 @@ %endif ################################################################################ -%if %{with_mythflix} - -%package -n mythflix -Summary: A NetFlix module for MythTV -Group: Applications/Multimedia -Requires: mythtv-frontend-api = %{mythfeapiver} - -%description -n mythflix -MythFlix is a NetFlix queue manager for MythTV. - -%endif -################################################################################ %if %{with_mythgallery} %package -n mythgallery @@ -747,6 +739,7 @@ Requires: mplayer Requires: transcode >= 0.6.8 Requires: python-imdb +Requires: python-MythTV = %{version}-%{release} Provides: mythdvd = %{version}-%{release} Obsoletes: mythdvd < %{version}-%{release} @@ -766,13 +759,13 @@ %if %{with_mythweather} %package -n mythweather -Summary: A MythTV module that displays a weather forcast +Summary: A MythTV module that displays a weather forecast Group: Applications/Multimedia Requires: mythtv-frontend-api = %{mythfeapiver} Requires: perl(XML::SAX::Base) %description -n mythweather -A MythTV module that displays a weather forcast. +A MythTV module that displays a weather forecast. %endif ################################################################################ @@ -809,6 +802,25 @@ %endif ################################################################################ +%if %{with_mythnetvision} + +%package -n mythnetvision +Summary: A MythTV module for Internet video on demand +Group: Applications/Multimedia +Requires: mythtv-frontend-api = %{mythfeapiver} +Requires: mythbrowser = %{version}-%{release} +Requires: python-MythTV = %{version}-%{release} +Requires: python-pycurl +Requires: python >= 2.5 +# This is packaged in adobe's yum repo +#Requires: flash-plugin + +%description -n mythnetvision +A MythTV module that supports searching and browsing of Internet video +on demand content. + +%endif +################################################################################ # End of plugins %endif @@ -829,7 +841,8 @@ ##### MythTV cd mythtv-%{version} -%patch0 -p1 +#patch0 -p1 +%patch2 -p1 # Drop execute permissions on contrib bits, since they'll be %doc find contrib/ -type f -exec chmod -x "{}" \; @@ -843,25 +856,9 @@ sed -i -e 's#perl Makefile.PL#%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS"#' \ bindings/perl/perl.pro -# Install other source files, and fix pathnames +# Install other source files cp -a %{SOURCE10} %{SOURCE101} %{SOURCE102} %{SOURCE103} . cp -a %{SOURCE106} %{SOURCE107} %{SOURCE108} %{SOURCE109} . - for file in mythbackend.init \ - mythbackend.sysconfig \ - mythbackend.logrotate; do - sed -e's|@logdir@|%{_localstatedir}/log|g' \ - -e's|@rundir@|%{_localstatedir}/run|g' \ - -e's|@sysconfdir@|%{_sysconfdir}|g' \ - -e's|@sysconfigdir@|%{_sysconfdir}/sysconfig|g' \ - -e's|@initdir(a)|%{_sysconfdir}/init.d|g' \ - -e's|@bindir@|%{_bindir}|g' \ - -e's|@sbindir@|%{_sbindir}|g' \ - -e's|@subsysdir@|%{_localstatedir}/lock/subsys|g' \ - -e's|@varlibdir@|%{_localstatedir}/lib|g' \ - -e's|@varcachedir@|%{_localstatedir}/cache|g' \ - -e's|@logrotatedir(a)|%{_sysconfdir}/logrotate.d|g' \ - < $file.in > $file - done # Prevent all of those nasty installs to ../../../../../bin/whatever # echo "QMAKE_PROJECT_DEPTH = 0" >> mythtv.pro @@ -878,7 +875,7 @@ %if %{with_plugins} cd mythplugins-%{version} -%patch1 -p1 +#patch1 -p1 # Fix /mnt/store -> /var/lib/mythmusic cd mythmusic @@ -895,8 +892,6 @@ chmod -R g-w ./* cd .. -# Add execute bits to mythvideo python helper scripts - chmod +x mythvideo/mythvideo/scripts/ttvdb/*.py # Remove execute bits from some php mythweb files chmod -x mythweb/classes/*.php @@ -924,7 +919,6 @@ --enable-pthreads \ --enable-ffmpeg-pthreads \ --enable-joystick-menu \ - --enable-audio-arts \ --enable-audio-alsa \ --enable-audio-oss \ --enable-audio-jack \ @@ -945,11 +939,14 @@ --enable-libmp3lame \ --enable-libtheora --enable-libvorbis \ --enable-libxvid \ -%if %{with_xvmcnvidia} - --xvmc-lib=XvMCNVIDIA_dynamic \ -%endif %if %{with_vdpau} - --enable-vdpau \ + --enable-vdpau \ +%endif +%if !%{with_xvmc} + --disable-xvmcw \ +%endif +%if !%{with_xvmc} + --disable-xvmcw \ %endif %if %{with_directfb} --enable-directfb \ @@ -983,7 +980,7 @@ --enable-debug # Insert rpm version-release for mythbackend --version output - find . -name version.pro -exec sed -i -e 's,myth_binary_version = \$\${BINARY_VERSION},myth_binary_version = %{version}-%{release} (%{_svnrev}),g' {} \; + sed -i -e 's,###SOURCE_VERSION###,%{version}-%{release} (%_svnrev),' version.sh # Make make %{?_smp_mflags} @@ -999,7 +996,7 @@ %if %{with_plugins} cd mythplugins-%{version} -# Fix things up so they can find our "temp" install location for libmyth +# Fix things up so they can find our "temp" install location for mythtv-libs echo "QMAKE_PROJECT_DEPTH = 0" >> settings.pro find . -name \*.pro \ -exec sed -i -e "s,INCLUDEPATH += .\+/include/mythtv,INCLUDEPATH += $temp%{_includedir}/mythtv," {} \; \ @@ -1028,11 +1025,6 @@ %else --disable-mythbrowser \ %endif - %if %{with_mythflix} - --enable-mythflix \ - %else - --disable-mythflix \ - %endif %if %{with_mythgallery} --enable-mythgallery \ --enable-exif \ @@ -1082,6 +1074,11 @@ %else --disable-mythzoneminder \ %endif + %if %{with_mythnetvision} + --enable-mythnetvision \ + %else + --disable-mythnetvision \ + %endif --enable-opengl \ --enable-libvisual \ --enable-fftw \ @@ -1115,7 +1112,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/mythtv # Fix permissions on executable python bindings - chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth{DB,TV}.py + chmod +x %{buildroot}%{python_sitelib}/MythTV/Myth*.py # mysql.txt and other config/init files install -m 644 %{SOURCE110} %{buildroot}%{_sysconfdir}/mythtv/ @@ -1198,9 +1195,9 @@ ################################################################################ -%post -n libmyth -p /sbin/ldconfig +%post libs -p /sbin/ldconfig -%postun -n libmyth -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %pre backend # Add the "mythtv" user, with membership in the video group @@ -1291,11 +1288,11 @@ %dir %{_datadir}/mythtv/themes %{_datadir}/mythtv/themes/* -%files -n libmyth +%files libs %defattr(-,root,root,-) %{_libdir}/*.so.* -%files -n libmyth-devel +%files devel %defattr(-,root,root,-) %{_includedir}/* %{_libdir}/*.so @@ -1320,10 +1317,8 @@ %defattr(-,root,root,-) %dir %{python_sitelib}/MythTV/ %{python_sitelib}/MythTV/* -%if 0%{?fedora} >= 9 %{python_sitelib}/MythTV-*.egg-info %endif -%endif %if %{with_plugins} %files -n mythplugins @@ -1355,19 +1350,6 @@ %{_datadir}/mythtv/i18n/mythbrowser_*.qm %endif -%if %{with_mythflix} -%files -n mythflix -%defattr(-,root,root,-) -%doc mythplugins-%{version}/mythflix/AUTHORS -%doc mythplugins-%{version}/mythflix/COPYING -%doc mythplugins-%{version}/mythflix/README -%{_libdir}/mythtv/plugins/libmythflix.so -%{_datadir}/mythtv/mythflix -%{_datadir}/mythtv/i18n/mythflix_*.qm -%{_datadir}/mythtv/i18n/mythflix_*.ts -%{_datadir}/mythtv/netflix_menu.xml -%endif - %if %{with_mythgallery} %files -n mythgallery %defattr(-,root,root,-) @@ -1480,21 +1462,97 @@ %{_datadir}/mythtv/i18n/mythzoneminder_*.qm %endif +%if %{with_mythnetvision} +%files -n mythnetvision +%defattr(-,root,root,-) +%doc mythplugins-%{version}/mythnetvision/AUTHORS +%doc mythplugins-%{version}/mythnetvision/ChangeLog +%doc mythplugins-%{version}/mythnetvision/README +%{_libdir}/mythtv/plugins/libmythnetvision.so +%{_datadir}/mythtv/mythnetvision +%{_datadir}/mythtv/netvisionmenu.xml +%{_datadir}/mythtv/i18n/mythnetvision_*.qm +%endif + %endif ################################################################################ %changelog -* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.22-5 -- Update to release-0-22-fixes branch, svn revision 23433 -- Fix mythtv user creation (rpm fusion bz#1027) - -* Mon Jan 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.22-4 -- Update to release-0-22-fixes branch, svn revision 23074 - -* Fri Dec 18 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-3 -- Update to release-0-22-fixes branch, svn revision 22981 -- Contains targeted fixes for DVD playback, among other things +* Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 +- Update to 0.23 release (svn rev 24509) + +* Wed May 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.11.rc3 +- Update to post-rc3 svn snapshot, revision 24443 +- Fixes ppc64 build missing -maltivec + +* Tue May 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.10.rc3 +- Update to post-rc3 svn snapshot, revision 24414 + +* Wed Apr 28 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.9.rc2 +- Update to post-rc2 svn snapshot, revision 24292 + +* Fri Apr 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.8.rc2 +- Update to post-rc2 svn snapshot, revision 24240 + +* Fri Apr 16 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.7.rc2 +- Update to post-rc2 svn snapshot, revision 24159 + +* Tue Apr 13 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.6.rc2 +- Update to post-rc2 svn snapshot, revision 24129 +- Assorted spec file resyncs w/mythtv svn spec + +* Thu Apr 08 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.5.rc2 +- Update to post-rc2 svn snapshot, revision 24030 +- Should fix some recording issues when using both inputs + on an hdhomerun + +* Tue Apr 06 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.4.rc2 +- Update to post-rc2 svn snapshot, revision 24014 + +* Thu Apr 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.3.rc1 +- Start tracking release-0-23-fixes branch +- Update to post-rc1 svn snapshot, revision 23894 + +* Tue Mar 23 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.2.rc1 +- Update to svn trunk, revision 23781, aka MythTV 0.23 RC1 (more or less) + +* Thu Mar 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23718 +- Update to svn trunk, revision 23718 + +* Tue Mar 09 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23702 +- Update to svn trunk, revision 23702 +- Add missing Requires: python-MythTV to mythvideo and mythnetvision plugins + +* Thu Mar 04 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23662 +- Update to svn trunk, revision 23662 + +* Mon Mar 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23630 +- Update to svn trunk, revision 23630 +- Make mythbackend --version actually print useful stuff now (like pkg ver) + +* Mon Feb 22 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23586 +- Update to svn trunk, revision 23586 +- Attempt to fix implicit link issue w/XvMCW + +* Thu Feb 11 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23535 +- Update to svn trunk, revision 23535 + +* Fri Feb 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23479 +- Update to svn trunk, revision 23479 +- Rename libmyth to mythtv-libs, libmyth-devel to mythtv-devel + +* Wed Feb 03 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23456 +- Update to svn trunk, revision 23456 + +* Tue Feb 02 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23443 +- Update to svn trunk, revision 23443 +- Don't try applying 0.22 svn fixes branch patches to 0.23 svn trunk, duh + +* Mon Feb 01 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.1.svn.r23433 +- Update to svn trunk, revision 23433 +- Drop dropped mythflix plugin +- Add new mythnetvision plugin * Sat Nov 21 2009 Jarod Wilson <jarod(a)wilsonet.com> 0.22-2 - Update to release-0-22-fixes branch, svn revision 22880 Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-11/sources,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- sources 9 Nov 2009 17:02:42 -0000 1.21 +++ sources 10 May 2010 16:07:37 -0000 1.22 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -09c8fa1058399a0c5db169a71561e985 mythplugins-0.22.tar.bz2 -e8f8b5b6a51cd7be700e215b2a1bf2c0 mythtv-0.22.tar.bz2 +be44db841f9e03d0d17ab449545b38aa mythplugins-0.23.tar.bz2 +3c58f4f45a550b60fbddfb8726d7fc38 mythtv-0.23.tar.bz2 --- mythbackend.init.in DELETED --- --- mythbackend.logrotate.in DELETED --- --- mythbackend.sysconfig.in DELETED --- --- mythplugins-0.21-svnfixes.patch DELETED --- --- mythplugins-0.22-svnfixes.patch DELETED --- --- mythtv-0.20-mythstreammenu.diff DELETED --- --- mythtv-0.21-fix-version-output.patch DELETED --- --- mythtv-0.21-svnfixes.patch DELETED --- --- mythtv-0.22-svnfixes.patch DELETED ---

14 years, 7 months

1
0
0 / 0

rpms/mythtv/F-12 mythtv.spec,1.65,1.66 sources,1.38,1.39

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-12 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24903 Modified Files: mythtv.spec sources Log Message: * Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 - Update to 0.23 release (svn rev 24509) Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-12/mythtv.spec,v retrieving revision 1.65 retrieving revision 1.66 diff -u -r1.65 -r1.66 --- mythtv.spec 6 May 2010 03:18:15 -0000 1.65 +++ mythtv.spec 10 May 2010 16:04:22 -0000 1.66 @@ -65,8 +65,8 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r24443 -%define branch trunk +%define _svnrev r24509 +%define branch release-0-23-fixes # # Basic descriptive tags for this package: @@ -79,8 +79,7 @@ # Version/Release info Version: 0.23 %if "%{branch}" == "trunk" -#Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.11.rc3%{?dist} +Release: 0.1.svn.%{_svnrev}%{?dist} %else Release: 1%{?dist} %endif @@ -1480,6 +1479,9 @@ ################################################################################ %changelog +* Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 +- Update to 0.23 release (svn rev 24509) + * Wed May 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.11.rc3 - Update to post-rc3 svn snapshot, revision 24443 - Fixes ppc64 build missing -maltivec Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-12/sources,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- sources 6 May 2010 03:18:15 -0000 1.38 +++ sources 10 May 2010 16:04:22 -0000 1.39 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -ba79d92f9a749daee830f7df1bfe940a mythtv-0.23.tar.bz2 -8ad82b0cac4b202d0997bd1555ea7216 mythplugins-0.23.tar.bz2 +be44db841f9e03d0d17ab449545b38aa mythplugins-0.23.tar.bz2 +3c58f4f45a550b60fbddfb8726d7fc38 mythtv-0.23.tar.bz2

14 years, 7 months

1
0
0 / 0

rpms/mythtv/F-13 mythtv.spec,1.79,1.80 sources,1.52,1.53

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24796 Modified Files: mythtv.spec sources Log Message: * Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 - Update to 0.23 release (svn rev 24509) Index: mythtv.spec =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/mythtv.spec,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- mythtv.spec 6 May 2010 03:17:02 -0000 1.79 +++ mythtv.spec 10 May 2010 16:03:45 -0000 1.80 @@ -65,8 +65,8 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r24443 -%define branch trunk +%define _svnrev r24509 +%define branch release-0-23-fixes # # Basic descriptive tags for this package: @@ -79,8 +79,7 @@ # Version/Release info Version: 0.23 %if "%{branch}" == "trunk" -#Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.11.rc3%{?dist} +Release: 0.1.svn.%{_svnrev}%{?dist} %else Release: 1%{?dist} %endif @@ -1480,6 +1479,9 @@ ################################################################################ %changelog +* Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 +- Update to 0.23 release (svn rev 24509) + * Wed May 05 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.11.rc3 - Update to post-rc3 svn snapshot, revision 24443 - Fixes ppc64 build missing -maltivec Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv/F-13/sources,v retrieving revision 1.52 retrieving revision 1.53 diff -u -r1.52 -r1.53 --- sources 6 May 2010 03:17:02 -0000 1.52 +++ sources 10 May 2010 16:03:45 -0000 1.53 @@ -1,4 +1,4 @@ be3ab99952c2a3a135a7c4af90b08f15 mythfrontend.png be3ab99952c2a3a135a7c4af90b08f15 mythtv-setup.png -ba79d92f9a749daee830f7df1bfe940a mythtv-0.23.tar.bz2 -8ad82b0cac4b202d0997bd1555ea7216 mythplugins-0.23.tar.bz2 +be44db841f9e03d0d17ab449545b38aa mythplugins-0.23.tar.bz2 +3c58f4f45a550b60fbddfb8726d7fc38 mythtv-0.23.tar.bz2

14 years, 7 months

1
0
0 / 0

rpms/mythtv-themes/F-13 mythtv-themes.spec, 1.33, 1.34 sources, 1.27, 1.28

by Jarod Wilson

Author: jarod Update of /cvs/free/rpms/mythtv-themes/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv24388 Modified Files: mythtv-themes.spec sources Log Message: * Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 - Update to 0.23 release (svn rev 24509) Index: mythtv-themes.spec =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-13/mythtv-themes.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- mythtv-themes.spec 7 May 2010 17:02:09 -0000 1.33 +++ mythtv-themes.spec 10 May 2010 16:02:43 -0000 1.34 @@ -17,8 +17,8 @@ %define desktop_vendor RPMFusion # SVN Revision number and branch ID -%define _svnrev r24473 -%define branch trunk +%define _svnrev r24509 +%define branch release-0-23-fixes # # Basic descriptive tags for this package: @@ -32,8 +32,7 @@ # Version/Release info Version: 0.23 %if "%{branch}" == "trunk" -#Release: 0.1.svn.%{_svnrev}%{?dist} -Release: 0.7.rc3%{?dist} +Release: 0.1.svn.%{_svnrev}%{?dist} %else Release: 1%{?dist} %endif @@ -112,6 +111,9 @@ %{_datadir}/fonts/%{name}/*.otf %changelog +* Mon May 10 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-1 +- Update to 0.23 release (svn rev 24509) + * Fri May 07 2010 Jarod Wilson <jarod(a)wilsonet.com> 0.23-0.7.rc3 - Update to post-rc3 svn snapshot, revision 24473 Index: sources =================================================================== RCS file: /cvs/free/rpms/mythtv-themes/F-13/sources,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- sources 7 May 2010 17:02:49 -0000 1.27 +++ sources 10 May 2010 16:02:43 -0000 1.28 @@ -1,2 +1 @@ -a5f00f152fb430a20c70aaa3bf456347 myththemes-0.22.tar.bz2 -ffd59bc76975d89c03df3ad37736b103 myththemes-0.23.tar.bz2 +1837ac72f7a03cb780d070cbea549bfe myththemes-0.23.tar.bz2

14 years, 7 months

1
0
0 / 0

rpms/VirtualBox-OSE/F-13 VirtualBox-OSE.spec,1.47,1.48

by Lubomir Rintel

Author: lkundrak Update of /cvs/free/rpms/VirtualBox-OSE/F-13 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18281 Modified Files: VirtualBox-OSE.spec Log Message: VBoxRandr is no more. Index: VirtualBox-OSE.spec =================================================================== RCS file: /cvs/free/rpms/VirtualBox-OSE/F-13/VirtualBox-OSE.spec,v retrieving revision 1.47 retrieving revision 1.48 diff -u -r1.47 -r1.48 --- VirtualBox-OSE.spec 10 May 2010 12:37:45 -0000 1.47 +++ VirtualBox-OSE.spec 10 May 2010 14:43:36 -0000 1.48 @@ -253,9 +253,6 @@ obj/bin/additions/VBoxClient \ obj/bin/additions/VBoxControl -install -m 0755 src/VBox/Additions/x11/Installer/VBoxRandR.sh \ - $RPM_BUILD_ROOT%{_bindir}/VBoxRandR - install -m 0755 -D src/VBox/Additions/x11/Installer/98vboxadd-xclient \ $RPM_BUILD_ROOT%{_sysconfdir}/X11/xinit/xinitrc.d/98vboxadd-xclient.sh @@ -330,7 +327,6 @@ $RPM_BUILD_ROOT%{_datadir}/{pixmaps,applications}/* \ -maxdepth 0 -type f \ -not -name '*.py[co]' \ - -not -name VBoxRandR \ -not -name VBox -exec basename '{}' \; |sort) set -o posix @@ -402,7 +398,6 @@ %{_bindir}/VBoxClient %{_bindir}/VBoxControl %{_bindir}/VBoxService -%{_bindir}/VBoxRandR %{_libdir}/xorg/modules/drivers/* %{_libdir}/dri/* %{_libdir}/VBoxOGL*.so @@ -423,6 +418,7 @@ %changelog * Mon May 10 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.8-1 - New upstream release +- VBoxRandr no more * Fri Mar 26 2010 Lubomir Rintel <lkundrak(a)v3.sk> - 3.1.6-1 - New upstream release

14 years, 7 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

rpmfusion-commits May 2010