rpms/vlc/F-13 vlc.spec,1.94,1.95
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1781/F-13
Modified Files:
vlc.spec
Log Message:
Fix tarball version Update
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- vlc.spec 12 Apr 2011 15:47:00 -0000 1.94
+++ vlc.spec 12 Apr 2011 17:56:58 -0000 1.95
@@ -1,7 +1,7 @@
#global live555_date 2009.07.28
#global vlc_rc -rc3
%global vlc_bootstrap 1
-%global tarball_version 1.1.8
+%global tarball_version 1.1.9
#global _with_workaround_circle_deps 1
%global _with_freeworld 1
%if 0%{?_with_freeworld:1}
13 years
rpms/vlc/F-14 vlc.spec,1.107,1.108
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1781/F-14
Modified Files:
vlc.spec
Log Message:
Fix tarball version Update
13 years
rpms/vlc/devel vlc.spec,1.121,1.122
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv1781/devel
Modified Files:
vlc.spec
Log Message:
Fix tarball version Update
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- vlc.spec 12 Apr 2011 15:47:00 -0000 1.121
+++ vlc.spec 12 Apr 2011 17:56:58 -0000 1.122
@@ -1,7 +1,7 @@
#global live555_date 2009.07.28
#global vlc_rc -rc3
%global vlc_bootstrap 1
-%global tarball_version 1.1.8
+%global tarball_version 1.1.9
#global _with_workaround_circle_deps 1
%global _with_freeworld 1
%if 0%{?_with_freeworld:1}
13 years
rpms/mplayer/devel .cvsignore, 1.22, 1.23 mplayer-ffmpeg.patch, 1.2, 1.3 mplayer.spec, 1.36, 1.37 sources, 1.23, 1.24 mplayer-libvorbis.patch, 1.1, NONE
by Dominik Mierzejewski
Author: rathann
Update of /cvs/free/rpms/mplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv20419
Modified Files:
.cvsignore mplayer-ffmpeg.patch mplayer.spec sources
Removed Files:
mplayer-libvorbis.patch
Log Message:
* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
- 20110412 snapshot
- drop obsolete libvorbis patch
- add explanatory comments to all patches
- temporarily disable mp3lib decoder (workaround for bug #1680)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- .cvsignore 27 Mar 2011 21:52:45 -0000 1.22
+++ .cvsignore 12 Apr 2011 16:33:03 -0000 1.23
@@ -1,3 +1,5 @@
Blue-1.7.tar.bz2
mplayer-export-2011-01-10.tar.bz2
mplayer-export-2011-02-27.tar.bz2
+mplayer-export-2011-04-04.tar.bz2
+mplayer-export-2011-04-12.tar.bz2
mplayer-ffmpeg.patch:
Makefile | 2
configure | 5 +-
ffmpeg/libavformat/riff.h | 41 ++++++++++++++++++
ffmpeg/libavutil/aes.h | 47 +++++++++++++++++++++
ffmpeg/libavutil/sha.h | 56 +++++++++++++++++++++++++
ffmpeg/libavutil/x86_cpu.h | 98 +++++++++++++++++++++++++++++++++++++++++++++
6 files changed, 246 insertions(+), 3 deletions(-)
Index: mplayer-ffmpeg.patch
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-ffmpeg.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- mplayer-ffmpeg.patch 27 Mar 2011 21:52:45 -0000 1.2
+++ mplayer-ffmpeg.patch 12 Apr 2011 16:33:03 -0000 1.3
@@ -1,7 +1,7 @@
-diff -up mplayer-export-2011-02-27/configure.ffmpeg mplayer-export-2011-02-27/configure
---- mplayer-export-2011-02-27/configure.ffmpeg 2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/configure 2011-03-23 19:42:40.000000000 +0100
-@@ -6887,7 +6887,8 @@ elif test "$ffmpeg_so" = auto ; then
+diff -up mplayer-export-2011-04-12/configure.ffmpeg mplayer-export-2011-04-12/configure
+--- mplayer-export-2011-04-12/configure.ffmpeg 2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/configure 2011-04-12 17:18:33.000000000 +0200
+@@ -6888,7 +6888,8 @@ elif test "$ffmpeg_so" = auto ; then
inc_ffmpeg=$($_pkg_config --cflags libpostproc libswscale libavformat libavcodec libavutil)
_ld_tmp=$($_pkg_config --libs libpostproc libswscale libavformat libavcodec libavutil)
header_check libavutil/avutil.h $inc_ffmpeg $_ld_tmp &&
@@ -11,7 +11,7 @@
elif header_check libavutil/avutil.h -lpostproc -lswscale -lavformat -lavcodec -lavutil $_ld_lm ; then
extra_ldflags="$extra_ldflags -lpostproc -lswscale -lavformat -lavcodec -lavutil"
ffmpeg_so=yes
-@@ -7574,7 +7575,7 @@ if test "$_gui" = yes ; then
+@@ -7593,7 +7594,7 @@ if test "$_gui" = yes ; then
# Required libraries
if test "$ffmpeg" != yes ||
@@ -20,9 +20,9 @@
die "The GUI requires libavcodec with PNG support (needs zlib)."
fi
test "$_freetype" = no && test "$_bitmap_font" = no &&
-diff -up mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h
---- mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavformat/riff.h 2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h
+--- mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavformat/riff.h 2011-04-12 17:18:33.000000000 +0200
@@ -0,0 +1,41 @@
+/*
+ * RIFF codec tags
@@ -65,9 +65,9 @@
+extern const AVCodecTag ff_codec_wav_tags[];
+
+#endif /* AVFORMAT_RIFF_H */
-diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h
---- mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavutil/aes.h 2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h
+--- mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavutil/aes.h 2011-04-12 17:18:33.000000000 +0200
@@ -0,0 +1,47 @@
+/*
+ * copyright (c) 2007 Michael Niedermayer <michaelni(a)gmx.at>
@@ -116,9 +116,9 @@
+void av_aes_crypt(struct AVAES *a, uint8_t *dst, const uint8_t *src, int count, uint8_t *iv, int decrypt);
+
+#endif /* AVUTIL_AES_H */
-diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h
---- mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavutil/sha.h 2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h
+--- mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavutil/sha.h 2011-04-12 17:18:33.000000000 +0200
@@ -0,0 +1,56 @@
+/*
+ * Copyright (C) 2007 Michael Niedermayer <michaelni(a)gmx.at>
@@ -176,9 +176,9 @@
+void av_sha_final(struct AVSHA* context, uint8_t *digest);
+
+#endif /* AVUTIL_SHA_H */
-diff -up mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h
---- mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/ffmpeg/libavutil/x86_cpu.h 2011-03-23 19:39:17.000000000 +0100
+diff -up mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h.ffmpeg mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h
+--- mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h.ffmpeg 2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/ffmpeg/libavutil/x86_cpu.h 2011-04-12 17:18:33.000000000 +0200
@@ -0,0 +1,98 @@
+/*
+ * copyright (c) 2006 Michael Niedermayer <michaelni(a)gmx.at>
@@ -278,25 +278,10 @@
+#endif
+
+#endif /* AVUTIL_X86_CPU_H */
-diff -up mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg mplayer-export-2011-02-27/libmpcodecs/vf_pp.c
---- mplayer-export-2011-02-27/libmpcodecs/vf_pp.c.ffmpeg 2011-02-04 11:01:46.000000000 +0100
-+++ mplayer-export-2011-02-27/libmpcodecs/vf_pp.c 2011-03-23 19:39:17.000000000 +0100
-@@ -34,10 +34,10 @@
- #include "img_format.h"
- #include "mp_image.h"
- #include "vf.h"
--#include "libavutil/internal.h"
- #include "libpostproc/postprocess.h"
-
- #ifdef CONFIG_FFMPEG_A
-+#include "libavutil/internal.h"
- #define EMU_OLD
- #include "libpostproc/postprocess_internal.h"
- #endif
-diff -up mplayer-export-2011-02-27/Makefile.ffmpeg mplayer-export-2011-02-27/Makefile
---- mplayer-export-2011-02-27/Makefile.ffmpeg 2011-03-23 19:39:17.000000000 +0100
-+++ mplayer-export-2011-02-27/Makefile 2011-03-23 19:39:17.000000000 +0100
-@@ -808,7 +808,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
+diff -up mplayer-export-2011-04-12/Makefile.ffmpeg mplayer-export-2011-04-12/Makefile
+--- mplayer-export-2011-04-12/Makefile.ffmpeg 2011-04-12 17:18:33.000000000 +0200
++++ mplayer-export-2011-04-12/Makefile 2011-04-12 17:18:33.000000000 +0200
+@@ -809,7 +809,7 @@ mencoder$(EXESUF) mplayer$(EXESUF):
$(CC) -o $@ $^ $(EXTRALIBS)
codec-cfg$(EXESUF): codec-cfg.c codec-cfg.h help_mp.h
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- mplayer.spec 27 Mar 2011 21:52:45 -0000 1.36
+++ mplayer.spec 12 Apr 2011 16:33:04 -0000 1.37
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-%define pre 20110227svn
+%define pre 20110412svn
%define svn 1
-%define svnbuild 2011-02-27
+%define svnbuild 2011-04-12
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.0
-Release: 0.122.%{pre}%{?dist}
+Release: 0.123.%{pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
Group: Applications/Multimedia
@@ -24,10 +24,13 @@
%endif
Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2
Source10: mplayer-snapshot.sh
+# set defaults for Fedora
Patch2: %{name}-config.patch
+# use roff include statements instead of symlinks
Patch8: %{name}-manlinks.patch
+# erase any trace of libdvdcss
Patch14: %{name}-nodvdcss.patch
-Patch17: %{name}-libvorbis.patch
+# use system FFmpeg libraries
Patch18: %{name}-ffmpeg.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -41,7 +44,7 @@
BuildRequires: em8300-devel
BuildRequires: enca-devel
BuildRequires: faad2-devel >= %{faad2min}
-BuildRequires: ffmpeg-devel
+BuildRequires: ffmpeg-devel >= 0.6.90-0.1.rc0
BuildRequires: fontconfig-devel
BuildRequires: freetype-devel >= 2.0.9
BuildRequires: fribidi-devel
@@ -214,6 +217,7 @@
%{!?_with_esound:--disable-esd} \\\
%{!?_with_jack:--disable-jack} \\\
%{!?_with_openal:--disable-openal} \\\
+ --disable-mp3lib \\\
%prep
@@ -225,7 +229,6 @@
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
-%patch17 -p1 -b .libvorbis
%patch18 -p1 -b .ffmpeg
doconv() {
@@ -399,6 +402,12 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Tue Apr 12 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.123.20110412svn
+- 20110412 snapshot
+- drop obsolete libvorbis patch
+- add explanatory comments to all patches
+- temporarily disable mp3lib decoder (workaround for bug #1680)
+
* Sun Mar 27 2011 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.122.20110227svn
- 20110227 snapshot
- rebuilt for new ffmpeg and x264
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 27 Mar 2011 21:52:45 -0000 1.23
+++ sources 12 Apr 2011 16:33:04 -0000 1.24
@@ -1,3 +1,2 @@
e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2
-d1c8316979ec850a8b345a08775739e7 mplayer-export-2011-01-10.tar.bz2
-98d92317fbadd65a404c1a1524fa6ad3 mplayer-export-2011-02-27.tar.bz2
+8d56ef3c6200b81e1b9b6824afb2fba2 mplayer-export-2011-04-12.tar.bz2
--- mplayer-libvorbis.patch DELETED ---
13 years
rpms/vlc/devel .cvsignore, 1.37, 1.38 sources, 1.45, 1.46 vlc.spec, 1.120, 1.121 vlc-1.1.8-bugfix-20110406.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16627/devel
Modified Files:
.cvsignore sources vlc.spec
Removed Files:
vlc-1.1.8-bugfix-20110406.patch
Log Message:
Update to 1.1.9
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- .cvsignore 24 Mar 2011 08:37:44 -0000 1.37
+++ .cvsignore 12 Apr 2011 15:47:00 -0000 1.38
@@ -1 +1 @@
-vlc-1.1.8.tar.bz2
+vlc-1.1.9.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- sources 24 Mar 2011 08:37:44 -0000 1.45
+++ sources 12 Apr 2011 15:47:00 -0000 1.46
@@ -1 +1 @@
-c0065ec11b6fd12167cd440cbe0ef0d9 vlc-1.1.8.tar.bz2
+06adb1848e6b87fbe1ced77ec0f91e4c vlc-1.1.9.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- vlc.spec 6 Apr 2011 16:26:18 -0000 1.120
+++ vlc.spec 12 Apr 2011 15:47:00 -0000 1.121
@@ -28,8 +28,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.1.9
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -41,7 +41,6 @@
Patch3: vlc-1.1.6-hardode_font_patch.patch
Patch4: vlc-1.1.4-tls_path.patch
Patch5: vlc-1.1.8-bugfix.opencv22.patch
-Patch6: vlc-1.1.8-bugfix-20110406.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -254,7 +253,6 @@
%if 0%{?fedora} >= 15
%patch5 -p1 -b .opencv22
%endif
-%patch6 -p1
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
rm modules/access/videodev2.h
@@ -566,6 +564,9 @@
%changelog
+* Tue Apr 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.9-1
+- Update to 1.1.9
+
* Wed Apr 06 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-2
- Backport youtube lua fix - rfbz#1675
--- vlc-1.1.8-bugfix-20110406.patch DELETED ---
13 years
rpms/vlc/F-14 .cvsignore, 1.36, 1.37 sources, 1.42, 1.43 vlc.spec, 1.106, 1.107 vlc-1.1.8-bugfix-20110406.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16627/F-14
Modified Files:
.cvsignore sources vlc.spec
Removed Files:
vlc-1.1.8-bugfix-20110406.patch
Log Message:
Update to 1.1.9
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/.cvsignore,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- .cvsignore 24 Mar 2011 08:39:36 -0000 1.36
+++ .cvsignore 12 Apr 2011 15:47:00 -0000 1.37
@@ -1 +1 @@
-vlc-1.1.8.tar.bz2
+vlc-1.1.9.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/sources,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- sources 24 Mar 2011 08:39:36 -0000 1.42
+++ sources 12 Apr 2011 15:47:00 -0000 1.43
@@ -1 +1 @@
-c0065ec11b6fd12167cd440cbe0ef0d9 vlc-1.1.8.tar.bz2
+06adb1848e6b87fbe1ced77ec0f91e4c vlc-1.1.9.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-14/vlc.spec,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -r1.106 -r1.107
--- vlc.spec 6 Apr 2011 16:28:10 -0000 1.106
+++ vlc.spec 12 Apr 2011 15:47:00 -0000 1.107
@@ -28,8 +28,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.1.9
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -41,7 +41,6 @@
Patch3: vlc-1.1.6-hardode_font_patch.patch
Patch4: vlc-1.1.4-tls_path.patch
Patch5: vlc-1.1.8-bugfix.opencv22.patch
-Patch6: vlc-1.1.8-bugfix-20110406.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -254,7 +253,6 @@
%if 0%{?fedora} >= 15
%patch5 -p1 -b .opencv22
%endif
-%patch6 -p1
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
rm modules/access/videodev2.h
@@ -566,6 +564,9 @@
%changelog
+* Tue Apr 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.9-1
+- Update to 1.1.9
+
* Wed Apr 06 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-2
- Backport youtube lua fix - rfbz#1675
--- vlc-1.1.8-bugfix-20110406.patch DELETED ---
13 years
rpms/vlc/F-13 .cvsignore, 1.32, 1.33 sources, 1.38, 1.39 vlc.spec, 1.93, 1.94 vlc-1.1.8-bugfix-20110406.patch, 1.1, NONE
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-13
In directory se02.es.rpmfusion.net:/tmp/cvs-serv16627/F-13
Modified Files:
.cvsignore sources vlc.spec
Removed Files:
vlc-1.1.8-bugfix-20110406.patch
Log Message:
Update to 1.1.9
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 24 Mar 2011 08:39:36 -0000 1.32
+++ .cvsignore 12 Apr 2011 15:47:00 -0000 1.33
@@ -1 +1 @@
-vlc-1.1.8.tar.bz2
+vlc-1.1.9.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/sources,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- sources 24 Mar 2011 08:39:36 -0000 1.38
+++ sources 12 Apr 2011 15:47:00 -0000 1.39
@@ -1 +1 @@
-c0065ec11b6fd12167cd440cbe0ef0d9 vlc-1.1.8.tar.bz2
+06adb1848e6b87fbe1ced77ec0f91e4c vlc-1.1.9.tar.bz2
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-13/vlc.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- vlc.spec 6 Apr 2011 16:28:11 -0000 1.93
+++ vlc.spec 12 Apr 2011 15:47:00 -0000 1.94
@@ -28,8 +28,8 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 1.1.8
-Release: 2%{?dist}
+Version: 1.1.9
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
@@ -41,7 +41,6 @@
Patch3: vlc-1.1.6-hardode_font_patch.patch
Patch4: vlc-1.1.4-tls_path.patch
Patch5: vlc-1.1.8-bugfix.opencv22.patch
-Patch6: vlc-1.1.8-bugfix-20110406.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -254,7 +253,6 @@
%if 0%{?fedora} >= 15
%patch5 -p1 -b .opencv22
%endif
-%patch6 -p1
sed -i.dmo_pic -e 's/fno-PIC/fPIC/' libs/loader/Makefile.in
rm modules/access/videodev2.h
@@ -566,6 +564,9 @@
%changelog
+* Tue Apr 12 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.9-1
+- Update to 1.1.9
+
* Wed Apr 06 2011 Nicolas Chauvet <kwizart(a)gmail.com> - 1.1.8-2
- Backport youtube lua fix - rfbz#1675
--- vlc-1.1.8-bugfix-20110406.patch DELETED ---
13 years
rpms/openshot/F-14 openshot-1.3.0-doc-install.diff, NONE, 1.1 openshot-1.3.0-use_mlt-melt.diff, NONE, 1.1 openshot.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/openshot/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9268/F-14
Modified Files:
.cvsignore sources
Added Files:
openshot-1.3.0-doc-install.diff
openshot-1.3.0-use_mlt-melt.diff openshot.spec
Log Message:
Import for initial release.
openshot-1.3.0-doc-install.diff:
setup.py | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
--- NEW FILE openshot-1.3.0-doc-install.diff ---
--- openshot-1.3.0-orig/setup.py 2011-02-04 14:07:09.000000000 -0600
+++ openshot-1.3.0/setup.py 2011-02-14 14:49:17.835220961 -0600
@@ -52,6 +52,31 @@ for filepath in glob.glob("openshot/loca
filepath = filepath.replace('openshot/', '')
locale_files.append(filepath)
+# Add the help files
+help_files = []
+for path in glob.glob(os.path.join('docs', 'gnome', '*')):
+ lang = os.path.basename(path)
+ if lang == 'figures':
+ continue
+ path_xml = os.path.join('share', 'gnome', 'help', 'openshot', lang)
+ help_files.append((path_xml, glob.glob('%s/*.xml' % path)))
+
+# figures are not locale-specific
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures')
+help_files.append((figures_path, figures))
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'effects', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'effects')
+help_files.append((figures_path, figures))
+figures = glob.glob(os.path.join('docs', 'gnome', 'figures', 'transitions', '*.png'))
+figures_path = os.path.join('share', 'gnome', 'help', 'openshot', 'figures', 'transitions')
+help_files.append((figures_path, figures))
+
+# OMFs are in a different directory
+omfs = glob.glob(os.path.join('docs', 'omf', '*.omf'))
+omf_path = os.path.join('share', 'omf', 'openshot')
+help_files.append((omf_path, omfs))
+
# Call the main Distutils setup command
# -------------------------------------
dist = setup(
@@ -62,7 +87,7 @@ dist = setup(
'openshot.windows' : ['ui/*.ui', 'ui/icons/*'],
'openshot.uploads' : ['logos/*.png'],
},
- data_files = os_files,
+ data_files = os_files + help_files,
**info.SETUP
)
# -------------------------------------
openshot-1.3.0-use_mlt-melt.diff:
classes/av_formats.py | 2 +-
windows/preferences.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- NEW FILE openshot-1.3.0-use_mlt-melt.diff ---
diff -upr openshot-1.3.0-orig/openshot/classes/av_formats.py openshot-1.3.0/openshot/classes/av_formats.py
--- openshot-1.3.0-orig/openshot/classes/av_formats.py 2011-01-29 13:58:49.000000000 -0600
+++ openshot-1.3.0/openshot/classes/av_formats.py 2011-02-14 14:45:31.313113270 -0600
@@ -36,7 +36,7 @@ from language import Language_Init
class formats:
- def __init__(self, melt_command="melt"):
+ def __init__(self, melt_command="mlt-melt"):
# init melt command
self.melt_command = melt_command
diff -upr openshot-1.3.0-orig/openshot/windows/preferences.py openshot-1.3.0/openshot/windows/preferences.py
--- openshot-1.3.0-orig/openshot/windows/preferences.py 2011-01-29 22:13:46.000000000 -0600
+++ openshot-1.3.0/openshot/windows/preferences.py 2011-02-14 14:46:33.354416506 -0600
@@ -329,7 +329,7 @@ class Settings:
"default_profile" : "DV NTSC",
"project_file_type" : "ascii",
"max_history_size" : "20",
- "melt_command" : "melt",
+ "melt_command" : "mlt-melt",
"blender_command" : "blender",
"output_mode" : "sdl",
"use_stock_icons" : "Yes",
# -------------------------------------
--- NEW FILE openshot.spec ---
Name: openshot
Version: 1.3.0
Release: 3%{?dist}
Summary: A GTK based non-linear video editor
Group: Applications/Multimedia
# All files are GPLv3+ except for files under openshot/uploads/youtube which
# are ASL 2.0 and openshot/window/SimpleGtkBuilderApp.py which is LGPLv3 making
# the effective license of openshot GPLv3.
License: GPLv3
URL: http://www.openshotvideo.com/
Source0: http://launchpad.net/openshot/1.3/%{version}/+download/openshot-%{version...
Patch0: %{name}-%{version}-use_mlt-melt.diff
Patch1: %{name}-%{version}-doc-install.diff
BuildArch: noarch
#BuildRequires: gettext
BuildRequires: desktop-file-utils
BuildRequires: python2-devel
Requires: mlt
Requires: mlt-python
Requires: notify-python
Requires: pygoocanvas
Requires: pygtk2-libglade
Requires: python(abi) >= 2.5
Requires: python-imaging
Requires: pyxdg
Requires: SDL
Requires: sox
#Requires: librsvg2
Requires: frei0r-plugins
%description
OpenShot Video Editor is a free, open-source, non-linear video editor, based on
Python, GTK, and MLT. It can edit video and audio files, composite and
transition video files, and mix multiple layers of video and audio together and
render the output in many different formats.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
# Don't install unnecessary stuff
sed -i -e '/lib\/mime\/packages/d' setup.py
%build
%{__python} setup.py build
%install
rm -rf $RPM_BUILD_ROOT
%{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
# Remove unnecessary .po files
rm %{buildroot}%{python_sitelib}/%{name}/locale/*/*/*.po
rm %{buildroot}%{python_sitelib}/%{name}/locale/OpenShot/OpenShot.pot
rm %{buildroot}%{python_sitelib}/%{name}/locale/README
# We strip bad shebangs (/usr/bin/env) instead of fixing them
# since these files are not executable anyways
find %{buildroot}/%{python_sitelib} -name '*.py' \
-exec grep -q '^#!' '{}' \; -print | while read F
do
awk '/^#!/ {if (FNR == 1) next;} {print}' $F >chopped
touch -r $F chopped
mv chopped $F
done
# Validate desktop file
desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop
# modify find-lang.sh to deal with gettext .mo files under
# openshot/locale
%{__sed} -e 's|/share/locale/|/%{name}/locale/|' \
/usr/lib/rpm/find-lang.sh \
> find-lang-modified.sh
sh find-lang-modified.sh %{buildroot} OpenShot %{name}.lang
find %{buildroot}%{python_sitelib}/%{name}/locale -type d | while read dir
do
echo "%%dir ${dir#%{buildroot}}" >> %{name}.lang
done
%clean
rm -rf %{buildroot}
%post
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%postun
update-desktop-database &> /dev/null || :
update-mime-database %{_datadir}/mime &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING README
%{_datadir}/gnome/help/openshot/
%{_datadir}/omf/openshot/
%{_bindir}/*
%{_datadir}/applications/%{name}.desktop
%{_datadir}/pixmaps/*
%{_datadir}/mime/packages/*
%dir %{python_sitelib}/%{name}
%{python_sitelib}/%{name}/*.py*
%{python_sitelib}/%{name}/blender
%{python_sitelib}/%{name}/classes
%{python_sitelib}/%{name}/effects
%{python_sitelib}/%{name}/export_presets
%{python_sitelib}/%{name}/images
%{python_sitelib}/%{name}/language
%{python_sitelib}/%{name}/profiles
%{python_sitelib}/%{name}/themes
%{python_sitelib}/%{name}/titles
%{python_sitelib}/%{name}/transitions
%{python_sitelib}/%{name}/uploads
%{python_sitelib}/%{name}/windows
%{python_sitelib}/*egg-info
%{_mandir}/man*/*
%changelog
* Sun Apr 10 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.3.0-2
- Fixed spec file for packaging guidelines compliance.
* Mon Feb 14 2011 Richard Shaw <hobbes1069(a)gmail.com> - 1.3.0-1
- Release 1.3.0
* Thu Oct 11 2010 Elliott Sales de Andrade <quantum.analyst(a)gmail.com> - 1.2.2-1
- Release 1.2.2
* Tue Jun 22 2010 Renich Bon Ćirić <renich(a)woralelandia.com> - 1.1.3-1
- Release 1.1.3
* Tue Jan 12 2010 Zarko <zarko.pintar(a)gmail.com> - 1.0.0-1
- Release 1.0.0
* Thu Dec 04 2009 Zarko <zarko.pintar(a)gmail.com> - 0.9.54-1
- initial release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/openshot/F-14/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 12 Apr 2011 10:51:56 -0000 1.1
+++ .cvsignore 12 Apr 2011 14:14:39 -0000 1.2
@@ -0,0 +1 @@
+openshot-1.3.0.tar.gz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openshot/F-14/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 12 Apr 2011 10:51:56 -0000 1.1
+++ sources 12 Apr 2011 14:14:39 -0000 1.2
@@ -0,0 +1 @@
+c44a09af0874a1612ed0693f8e369172 openshot-1.3.0.tar.gz
13 years
rpms/openshot/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openshot/devel
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsd21908/rpms/openshot/devel
Added Files:
.cvsignore Makefile sources
Log Message:
Setup of module openshot
--- NEW FILE .cvsignore ---
--- NEW FILE Makefile ---
# Makefile for source rpm: openshot
# $Id: Makefile,v 1.1 2011/04/12 10:51:56 kwizart Exp $
NAME := openshot
SPECFILE = $(firstword $(wildcard *.spec))
define find-makefile-common
for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
endef
MAKEFILE_COMMON := $(shell $(find-makefile-common))
ifeq ($(MAKEFILE_COMMON),)
# attept a checkout
define checkout-makefile-common
test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
endef
MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
endif
include $(MAKEFILE_COMMON)
--- NEW FILE sources ---
13 years
rpms/openshot Makefile, NONE, 1.1 import.log, NONE, 1.1 pkg.acl, NONE, 1.1
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/openshot
In directory se02.es.rpmfusion.net:/home/rpmfusion/kwizart/free/owners/tmpcvsd21908/rpms/openshot
Added Files:
Makefile import.log pkg.acl
Log Message:
Setup of module openshot
--- NEW FILE Makefile ---
# Top level Makefile for module openshot
all : CVS/Root common-update
@cvs update
common-update : common
@cd common && cvs update
common : CVS/Root
@cvs checkout common
CVS/Root :
@echo "ERROR: This does not look like a CVS checkout" && exit 1
clean :
@find . -type f -name *~ -exec rm -fv {} \;
--- NEW FILE import.log ---
--- NEW FILE pkg.acl ---
13 years