rpms/gecko-mediaplayer/devel .cvsignore, 1.15, 1.16 gecko-mediaplayer.spec, 1.24, 1.25 sources, 1.15, 1.16 gecko-mediaplayer-1.0.0-libxul2.patch, 1.1, NONE
by Julian Sikorski
Author: belegdol
Update of /cvs/free/rpms/gecko-mediaplayer/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10196
Modified Files:
.cvsignore gecko-mediaplayer.spec sources
Removed Files:
gecko-mediaplayer-1.0.0-libxul2.patch
Log Message:
* Mon Apr 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.3-1
- Dropped included patches
- Added logic to support gsettings/GConf
- Updated GConf scriptlets to the latest spec
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 6 Nov 2010 01:18:40 -0000 1.15
+++ .cvsignore 25 Apr 2011 21:13:55 -0000 1.16
@@ -1 +1 @@
-gecko-mediaplayer-1.0.0.tar.gz
+gecko-mediaplayer-1.0.3.tar.gz
Index: gecko-mediaplayer.spec
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/gecko-mediaplayer.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- gecko-mediaplayer.spec 6 Nov 2010 10:06:38 -0000 1.24
+++ gecko-mediaplayer.spec 25 Apr 2011 21:13:56 -0000 1.25
@@ -1,5 +1,5 @@
Name: gecko-mediaplayer
-Version: 1.0.0
+Version: 1.0.3
Release: 1%{?dist}
Summary: Gnome MPlayer browser plugin
@@ -11,7 +11,9 @@
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: dbus-glib-devel
+%if 0%{?fedora} < 15
BuildRequires: GConf2-devel
+%endif
BuildRequires: gettext
BuildRequires: libX11-devel
BuildRequires: gecko-devel
@@ -19,9 +21,11 @@
Requires: mozilla-filesystem
Requires: gnome-mplayer-binary >= %{version}
+%if 0%{?fedora} < 15
Requires(pre): GConf2
Requires(post): GConf2
Requires(preun): GConf2
+%endif
Obsoletes: mplayerplug-in < 3.50
@@ -33,11 +37,14 @@
%prep
%setup -q
-%patch0 -p1 -b .libxul2
%build
+%if 0%{?fedora} == 14
+%configure --with-gconf
+%else
%configure
+%endif
make %{?_smp_mflags}
@@ -52,28 +59,21 @@
%pre
-if [ "$1" -gt 1 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas >/dev/null || :
- # If the schema file has ever been renamed::
- #gconftool-2 --makefile-uninstall-rule \
- # %{_sysconfdir}/gconf/schemas/[OLDNAME].schemas > /dev/null || :
-fi
+%if 0%{?fedora} < 15
+%gconf_schema_prepare gecko-mediaplayer
+%endif
%post
-export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
-gconftool-2 --makefile-install-rule \
- %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
+%if 0%{?fedora} < 15
+%gconf_schema_upgrade gecko-mediaplayer
+%endif
%preun
-if [ "$1" -eq 0 ]; then
- export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
- gconftool-2 --makefile-uninstall-rule \
- %{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas > /dev/null || :
-fi
+%if 0%{?fedora} < 15
+%gconf_schema_remove gecko-mediaplayer
+%endif
%clean
@@ -83,7 +83,9 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc COPYING ChangeLog
+%if 0%{?fedora} < 15
%{_sysconfdir}/gconf/schemas/gecko-mediaplayer.schemas
+%endif
%{_libdir}/mozilla/plugins/gecko-mediaplayer-dvx.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-qt.so
%{_libdir}/mozilla/plugins/gecko-mediaplayer-rm.so
@@ -92,6 +94,11 @@
%changelog
+* Mon Apr 25 2011 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.3-1
+- Dropped included patches
+- Added logic to support gsettings/GConf
+- Updated GConf scriptlets to the latest spec
+
* Sat Nov 06 2010 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.0.0-1
- Updated to 1.0.0
- Fixed xulrunner 2 detection
Index: sources
===================================================================
RCS file: /cvs/free/rpms/gecko-mediaplayer/devel/sources,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- sources 6 Nov 2010 01:18:41 -0000 1.15
+++ sources 25 Apr 2011 21:13:56 -0000 1.16
@@ -1 +1 @@
-80ccb671aea90153be9f9e6dc41b7eae gecko-mediaplayer-1.0.0.tar.gz
+4996b243ed720dc30f5dcc9bc253bf68 gecko-mediaplayer-1.0.3.tar.gz
--- gecko-mediaplayer-1.0.0-libxul2.patch DELETED ---
13 years, 7 months
rpms/cmus/F-14 .cvsignore, 1.2, 1.3 cmus.spec, 1.4, 1.5 sources, 1.2, 1.3 cmus-2.2.0-new-ffmpeg.patch, 1.1, NONE
by Conrad Meyer
Author: konradm
Update of /cvs/free/rpms/cmus/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv7821
Modified Files:
.cvsignore cmus.spec sources
Removed Files:
cmus-2.2.0-new-ffmpeg.patch
Log Message:
* Wed Apr 20 2011 Johannes Weißl <jargon(a)molb.org> - 2.3.5-1
- New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cmus/F-14/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Feb 2009 06:27:42 -0000 1.2
+++ .cvsignore 25 Apr 2011 01:12:52 -0000 1.3
@@ -1 +1 @@
-cmus-2.2.0.tar.bz2
+cmus-v2.3.5.tar.bz2
Index: cmus.spec
===================================================================
RCS file: /cvs/free/rpms/cmus/F-14/cmus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmus.spec 28 Sep 2010 16:10:55 -0000 1.4
+++ cmus.spec 25 Apr 2011 01:12:52 -0000 1.5
@@ -1,13 +1,11 @@
Name: cmus
-Version: 2.2.0
-Release: 5%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
Summary: Ncurses-Based Music Player
Group: Applications/Multimedia
License: GPLv2+
URL: http://cmus.sourceforge.net/
-Source0: http://mirror.greaterscope.net/cmus/cmus-%{version}.tar.bz2
-# This comes from Gentoo Bugzilla #218105:
-Patch0: cmus-2.2.0-new-ffmpeg.patch
+Source0: http://downloads.sourceforge.net/cmus/cmus-v%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -21,6 +19,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: libvorbis-devel
BuildRequires: wavpack-devel
+BuildRequires: pulseaudio-libs-devel
BuildRequires: ncurses-devel
@@ -32,18 +31,14 @@
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-v%{version}
%build
./configure prefix=%{_prefix} bindir=%{_bindir} datadir=%{_datadir} \
libdir=%{_libdir} mandir=%{_mandir} \
exampledir=%{_datadir}/%{name}/examples \
- CONFIG_FLAC=y CONFIG_MAD=y CONFIG_MODPLUG=y CONFIG_MIKMOD=n \
- CONFIG_MPC=y CONFIG_VORBIS=y CONFIG_WAV=y CONFIG_WAVPACK=y \
- CONFIG_MP4=y CONFIG_AAC=y CONFIG_FFMPEG=y CONFIG_ALSA=y \
- CONFIG_AO=y CONFIG_ARTS=n CONFIG_OSS=n CONFIG_SUN=n \
+ CONFIG_ROAR=n CONFIG_ARTS=n CONFIG_SUN=n \
CFLAGS="%{optflags}"
make %{?_smp_mflags} V=2
@@ -69,9 +64,13 @@
%{_datadir}/%{name}
%{_mandir}/man1/cmus-remote.1*
%{_mandir}/man1/cmus.1*
+%{_mandir}/man7/cmus-tutorial.7*
%changelog
+* Wed Apr 20 2011 Johannes Weißl <jargon(a)molb.org> - 2.3.5-1
+- New upstream release
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.0-4
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cmus/F-14/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Feb 2009 06:27:42 -0000 1.2
+++ sources 25 Apr 2011 01:12:52 -0000 1.3
@@ -1 +1 @@
-7a9895ecfc10cd16577c73051436962f cmus-2.2.0.tar.bz2
+535a7567ee4cbfa2de8957907a649908 cmus-v2.3.5.tar.bz2
--- cmus-2.2.0-new-ffmpeg.patch DELETED ---
13 years, 7 months
rpms/cmus/devel .cvsignore, 1.2, 1.3 cmus.spec, 1.4, 1.5 sources, 1.2, 1.3 cmus-2.2.0-new-ffmpeg.patch, 1.1, NONE
by Conrad Meyer
Author: konradm
Update of /cvs/free/rpms/cmus/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5994
Modified Files:
.cvsignore cmus.spec sources
Removed Files:
cmus-2.2.0-new-ffmpeg.patch
Log Message:
* Wed Apr 20 2011 Johannes Weißl <jargon(a)molb.org> - 2.3.5-1
- New upstream release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/cmus/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 16 Feb 2009 06:27:42 -0000 1.2
+++ .cvsignore 25 Apr 2011 00:50:44 -0000 1.3
@@ -1 +1 @@
-cmus-2.2.0.tar.bz2
+cmus-v2.3.5.tar.bz2
Index: cmus.spec
===================================================================
RCS file: /cvs/free/rpms/cmus/devel/cmus.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cmus.spec 28 Sep 2010 16:10:55 -0000 1.4
+++ cmus.spec 25 Apr 2011 00:50:44 -0000 1.5
@@ -1,13 +1,11 @@
Name: cmus
-Version: 2.2.0
-Release: 5%{?dist}
+Version: 2.3.5
+Release: 1%{?dist}
Summary: Ncurses-Based Music Player
Group: Applications/Multimedia
License: GPLv2+
URL: http://cmus.sourceforge.net/
-Source0: http://mirror.greaterscope.net/cmus/cmus-%{version}.tar.bz2
-# This comes from Gentoo Bugzilla #218105:
-Patch0: cmus-2.2.0-new-ffmpeg.patch
+Source0: http://downloads.sourceforge.net/cmus/cmus-v${version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: alsa-lib-devel
@@ -21,6 +19,7 @@
BuildRequires: libmpcdec-devel
BuildRequires: libvorbis-devel
BuildRequires: wavpack-devel
+BuildRequires: pulseaudio-libs-devel
BuildRequires: ncurses-devel
@@ -32,18 +31,14 @@
%prep
-%setup -q
-%patch0 -p1
+%setup -q -n %{name}-v%{version}
%build
./configure prefix=%{_prefix} bindir=%{_bindir} datadir=%{_datadir} \
libdir=%{_libdir} mandir=%{_mandir} \
exampledir=%{_datadir}/%{name}/examples \
- CONFIG_FLAC=y CONFIG_MAD=y CONFIG_MODPLUG=y CONFIG_MIKMOD=n \
- CONFIG_MPC=y CONFIG_VORBIS=y CONFIG_WAV=y CONFIG_WAVPACK=y \
- CONFIG_MP4=y CONFIG_AAC=y CONFIG_FFMPEG=y CONFIG_ALSA=y \
- CONFIG_AO=y CONFIG_ARTS=n CONFIG_OSS=n CONFIG_SUN=n \
+ CONFIG_ROAR=n CONFIG_ARTS=n CONFIG_SUN=n \
CFLAGS="%{optflags}"
make %{?_smp_mflags} V=2
@@ -69,9 +64,13 @@
%{_datadir}/%{name}
%{_mandir}/man1/cmus-remote.1*
%{_mandir}/man1/cmus.1*
+%{_mandir}/man7/cmus-tutorial.7*
%changelog
+* Wed Apr 20 2011 Johannes Weißl <jargon(a)molb.org> - 2.3.5-1
+- New upstream release
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 2.2.0-4
- rebuild for new F11 features
Index: sources
===================================================================
RCS file: /cvs/free/rpms/cmus/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 16 Feb 2009 06:27:42 -0000 1.2
+++ sources 25 Apr 2011 00:50:44 -0000 1.3
@@ -1 +1 @@
-7a9895ecfc10cd16577c73051436962f cmus-2.2.0.tar.bz2
+535a7567ee4cbfa2de8957907a649908 cmus-v2.3.5.tar.bz2
--- cmus-2.2.0-new-ffmpeg.patch DELETED ---
13 years, 7 months
rpms/avidemux/F-14 avidemux-2.5.4-x264_fix.patch, 1.1, 1.2 avidemux.spec, 1.41, 1.42
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv13486
Modified Files:
avidemux-2.5.4-x264_fix.patch avidemux.spec
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
- Really fix AAC this time.
- Really fix x264 this time.
avidemux-2.5.4-x264_fix.patch:
qt4/x264ConfigDialog.cpp | 7 +++++++
qt4/x264ConfigDialog.ui | 4 ++--
x264Options.cpp | 11 +++++++++++
x264Param.xsd | 2 ++
4 files changed, 22 insertions(+), 2 deletions(-)
Index: avidemux-2.5.4-x264_fix.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux-2.5.4-x264_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.5.4-x264_fix.patch 21 Apr 2011 01:59:03 -0000 1.1
+++ avidemux-2.5.4-x264_fix.patch 24 Apr 2011 15:21:46 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2010-09-29 15:20:48.000000000 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-17 16:10:58.327555878 -0500
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:02:58.063666919 +0200
@@ -94,6 +94,13 @@
connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));
connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));
@@ -15,9 +15,27 @@
// Frame tab
connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));
-diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-17 16:17:26.318246984 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-17 16:17:48.213370981 -0500
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:02:58.063666919 +0200
+@@ -1131,12 +1131,12 @@
+ </item>
+ <item>
+ <property name="text">
+- <string>Blind Offset</string>
++ <string>Weighted References</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+- <string>Smart Analysis</string>
++ <string>Weighted References + Duplicates</string>
+ </property>
+ </item>
+ </widget>
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:02:58.062666914 +0200
@@ -1386,9 +1386,15 @@
case X264_WEIGHTP_NONE:
strcpy((char*)xmlBuffer, "none");
@@ -48,9 +66,9 @@
else if (strcmp(content, "smart") == 0)
weightedPredPFrames = X264_WEIGHTP_SMART;
-diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2010-09-29 14:48:29.000000000 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-04-17 16:19:10.877113040 -0500
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:02:58.062666914 +0200
@@ -335,7 +335,9 @@
<xs:simpleType>
<xs:restriction base="xs:string">
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- avidemux.spec 24 Apr 2011 12:27:37 -0000 1.41
+++ avidemux.spec 24 Apr 2011 15:21:46 -0000 1.42
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -297,9 +297,13 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
+- Really fix AAC this time.
+- Really fix x264 this time.
+
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
-- AAC encoding now working. (Kevin Kolfer)
-- Fedora 15 build dependecy fixed. (Kevin Kolfer)
+- AAC encoding now working. (Kevin Kofler)
+- Fedora 15 build dependecy fixed. (Kevin Kofler)
- Audio device peferences now remembered.
* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
13 years, 7 months
rpms/avidemux/devel avidemux.spec,1.44,1.45
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv10013
Modified Files:
avidemux.spec
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
- Really fix AAC this time.
- Really fix x264 this time.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- avidemux.spec 24 Apr 2011 14:34:56 -0000 1.44
+++ avidemux.spec 24 Apr 2011 14:35:31 -0000 1.45
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
13 years, 7 months
rpms/avidemux/devel avidemux-2.5.4-x264_fix.patch, 1.1, 1.2 avidemux.spec, 1.43, 1.44 avidemux_2.5.4-ffmpeg-aac.patch, 1.1, 1.2
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv9970
Modified Files:
avidemux-2.5.4-x264_fix.patch avidemux.spec
avidemux_2.5.4-ffmpeg-aac.patch
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
- Really fix AAC this time.
- Really fix x264 this time.
avidemux-2.5.4-x264_fix.patch:
qt4/x264ConfigDialog.cpp | 7 +++++++
qt4/x264ConfigDialog.ui | 4 ++--
x264Options.cpp | 11 +++++++++++
x264Param.xsd | 2 ++
4 files changed, 22 insertions(+), 2 deletions(-)
Index: avidemux-2.5.4-x264_fix.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux-2.5.4-x264_fix.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux-2.5.4-x264_fix.patch 19 Apr 2011 23:50:00 -0000 1.1
+++ avidemux-2.5.4-x264_fix.patch 24 Apr 2011 14:34:56 -0000 1.2
@@ -1,6 +1,6 @@
-diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2010-09-29 15:20:48.000000000 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-04-17 16:10:58.327555878 -0500
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.cpp 2011-03-12 12:02:58.063666919 +0200
@@ -94,6 +94,13 @@
connect(ui.dct8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(dct8x8CheckBox_toggled(bool)));
connect(ui.p8x8CheckBox, SIGNAL(toggled(bool)), this, SLOT(p8x8CheckBox_toggled(bool)));
@@ -15,9 +15,27 @@
// Frame tab
connect(ui.loopFilterCheckBox, SIGNAL(toggled(bool)), this, SLOT(loopFilterCheckBox_toggled(bool)));
-diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-17 16:17:26.318246984 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-04-17 16:17:48.213370981 -0500
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/qt4/x264ConfigDialog.ui 2011-03-12 12:02:58.063666919 +0200
+@@ -1131,12 +1131,12 @@
+ </item>
+ <item>
+ <property name="text">
+- <string>Blind Offset</string>
++ <string>Weighted References</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+- <string>Smart Analysis</string>
++ <string>Weighted References + Duplicates</string>
+ </property>
+ </item>
+ </widget>
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Options.cpp 2011-03-12 12:02:58.062666914 +0200
@@ -1386,9 +1386,15 @@
case X264_WEIGHTP_NONE:
strcpy((char*)xmlBuffer, "none");
@@ -48,9 +66,9 @@
else if (strcmp(content, "smart") == 0)
weightedPredPFrames = X264_WEIGHTP_SMART;
-diff -Naur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd
---- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2010-09-29 14:48:29.000000000 -0500
-+++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-04-17 16:19:10.877113040 -0500
+diff -ur avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd
+--- avidemux_2.5.4.orig/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:04:53.100131791 +0200
++++ avidemux_2.5.4/plugins/ADM_videoEncoder/ADM_vidEnc_x264/x264Param.xsd 2011-03-12 12:02:58.062666914 +0200
@@ -335,7 +335,9 @@
<xs:simpleType>
<xs:restriction base="xs:string">
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- avidemux.spec 24 Apr 2011 12:23:08 -0000 1.43
+++ avidemux.spec 24 Apr 2011 14:34:56 -0000 1.44
@@ -297,9 +297,13 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-6
+- Really fix AAC this time.
+- Really fix x264 this time.
+
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
-- AAC encoding now working. (Kevin Kolfer)
-- Fedora 15 build dependecy fixed. (Kevin Kolfer)
+- AAC encoding now working. (Kevin Kofler)
+- Fedora 15 build dependecy fixed. (Kevin Kofler)
- Audio device peferences now remembered.
* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
avidemux_2.5.4-ffmpeg-aac.patch:
cmake/admFFmpegBuild.cmake | 2 -
plugins/ADM_audioEncoders/lavcodec/CMakeLists.txt | 9 ++++
plugins/ADM_audioEncoders/lavcodec/audioencoder_lavcodec.cpp | 21 ++++++++---
3 files changed, 26 insertions(+), 6 deletions(-)
Index: avidemux_2.5.4-ffmpeg-aac.patch
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux_2.5.4-ffmpeg-aac.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- avidemux_2.5.4-ffmpeg-aac.patch 16 Apr 2011 23:38:04 -0000 1.1
+++ avidemux_2.5.4-ffmpeg-aac.patch 24 Apr 2011 14:34:56 -0000 1.2
@@ -71,3 +71,15 @@
+ INIT_AUDIO_ENCODER(ADM_ae_lav_aac)
+ INSTALL_AUDIOENCODER(ADM_ae_lav_aac)
+diff -Naur avidemux_2.5.4.orig/cmake/admFFmpegBuild.cmake avidemux_2.5.4/cmake/admFFmpegBuild.cmake
+--- avidemux_2.5.4.orig/cmake/admFFmpegBuild.cmake 2010-09-05 06:42:43.000000000 -0500
++++ avidemux_2.5.4/cmake/admFFmpegBuild.cmake 2011-04-21 21:03:21.512707903 -0500
+@@ -10,7 +10,7 @@
+ set(FFMPEG_DECODERS adpcm_ima_amv amv bmp cinepak cyuv dca dvbsub dvvideo ffv1 ffvhuff flv fraps h263 h264 huffyuv mjpeg
+ mjpegb mpeg2video mpeg4 msmpeg4v2 msmpeg4v3 msvideo1 nellymoser png qdm2 rawvideo snow svq3 theora tscc
+ vc1 vp3 vp6 vp6a vp6f wmav2 wmv1 wmv2 wmv3)
+-set(FFMPEG_ENCODERS ac3 dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
++set(FFMPEG_ENCODERS ac3 aac dvvideo ffv1 ffvhuff flv h263 huffyuv mjpeg mp2 mpeg1video mpeg2video mpeg4 snow)
+ set(FFMPEG_MUXERS flv matroska mpeg1vcd mpeg2dvd mpeg2svcd mpegts mov mp4 psp)
+ set(FFMPEG_PARSERS ac3 h263 h264 mpeg4video)
+ set(FFMPEG_PROTOCOLS file)
13 years, 7 months
rpms/avidemux/F-14 avidemux.spec,1.40,1.41
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-14
In directory se02.es.rpmfusion.net:/tmp/cvs-serv32371
Modified Files:
avidemux.spec
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
- AAC encoding now working. (Kevin Kolfer)
- Fedora 15 build dependecy fixed. (Kevin Kolfer)
- Audio device peferences now remembered.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-14/avidemux.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- avidemux.spec 24 Apr 2011 12:18:44 -0000 1.40
+++ avidemux.spec 24 Apr 2011 12:27:37 -0000 1.41
@@ -43,7 +43,8 @@
Patch8: avidemux-2.5.4-gtk_menu_crash_fix.patch
# Patch needed for version of x264 in F15/rawhide.
Patch9: avidemux-2.5.4-x264_fix.patch
-Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
+# Work in progress
+#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
Patch11: avidemux-2.5.4-audio_prefs.patch
Patch12: avidemux-2.5.4-ffmpeg_perms.patch
13 years, 7 months
rpms/avidemux/devel avidemux.spec,1.42,1.43
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31822
Modified Files:
avidemux.spec
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
- AAC encoding now working. (Kevin Kolfer)
- Fedora 15 build dependecy fixed. (Kevin Kolfer)
- Audio device peferences now remembered.
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- avidemux.spec 24 Apr 2011 12:20:09 -0000 1.42
+++ avidemux.spec 24 Apr 2011 12:23:08 -0000 1.43
@@ -43,7 +43,8 @@
Patch8: avidemux-2.5.4-gtk_menu_crash_fix.patch
# Patch needed for version of x264 in F15/rawhide.
Patch9: avidemux-2.5.4-x264_fix.patch
-Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
+# Work in progress
+#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
Patch11: avidemux-2.5.4-audio_prefs.patch
Patch12: avidemux-2.5.4-ffmpeg_perms.patch
13 years, 7 months
rpms/avidemux/devel avidemux-2.5.4-audio_prefs.patch, NONE, 1.1 avidemux-2.5.4-ffmpeg_perms.patch, NONE, 1.1 avidemux.spec, 1.41, 1.42
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv31689
Modified Files:
avidemux.spec
Added Files:
avidemux-2.5.4-audio_prefs.patch
avidemux-2.5.4-ffmpeg_perms.patch
Log Message:
* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
- AAC encoding now working. (Kevin Kolfer)
- Fedora 15 build dependecy fixed. (Kevin Kolfer)
- Audio device peferences now remembered.
avidemux-2.5.4-audio_prefs.patch:
config.h.cmake | 2 --
1 file changed, 2 deletions(-)
--- NEW FILE avidemux-2.5.4-audio_prefs.patch ---
diff -Naur avidemux_2.5.4.orig/cmake/config.h.cmake avidemux_2.5.4/cmake/config.h.cmake
--- avidemux_2.5.4.orig/cmake/config.h.cmake 2010-09-29 14:01:12.000000000 -0500
+++ avidemux_2.5.4/cmake/config.h.cmake 2011-04-22 10:52:22.664268351 -0500
@@ -76,9 +76,7 @@
/* use Nvwa memory leak detector */
#cmakedefine FIND_LEAKS
-#if defined(OSS_SUPPORT) || defined (USE_ARTS) || defined(USE_SDL) || defined(__APPLE__) || defined(__WIN32) || defined(ALSA_SUPPORT)
#define HAVE_AUDIO
-#endif
#define HAVE_ENCODER
avidemux-2.5.4-ffmpeg_perms.patch:
admFFmpegBuild.cmake | 19 +++++++++++++------
1 file changed, 13 insertions(+), 6 deletions(-)
--- NEW FILE avidemux-2.5.4-ffmpeg_perms.patch ---
diff -ur avidemux_2.5.4/cmake/admFFmpegBuild.cmake avidemux_2.5.4-ffmpeg-permissions/cmake/admFFmpegBuild.cmake
--- avidemux_2.5.4/cmake/admFFmpegBuild.cmake 2010-09-05 13:42:43.000000000 +0200
+++ avidemux_2.5.4-ffmpeg-permissions/cmake/admFFmpegBuild.cmake 2011-04-24 04:02:46.000000000 +0200
@@ -178,29 +178,36 @@
set(FFMPEG_INSTALL_DIR lib${LIB_SUFFIX})
endif (WIN32)
+if (CMAKE_INSTALL_SO_NO_EXE)
+ set(FFMPEG_SHLIB_INSTALL_TYPE FILES)
+else (CMAKE_INSTALL_SO_NO_EXE)
+ set(FFMPEG_SHLIB_INSTALL_TYPE PROGRAMS)
+endif (CMAKE_INSTALL_SO_NO_EXE)
+
+
add_library(ADM_libswscale UNKNOWN IMPORTED)
set_property(TARGET ADM_libswscale PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libswscale/${LIBSWSCALE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
add_library(ADM_libpostproc UNKNOWN IMPORTED)
set_property(TARGET ADM_libpostproc PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libpostproc/${LIBPOSTPROC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
add_library(ADM_libavutil UNKNOWN IMPORTED)
set_property(TARGET ADM_libavutil PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavutil/${LIBAVUTIL_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
add_library(ADM_libavcodec UNKNOWN IMPORTED)
set_property(TARGET ADM_libavcodec PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavcodec/${LIBAVCODEC_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
add_library(ADM_libavformat UNKNOWN IMPORTED)
set_property(TARGET ADM_libavformat PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavformat/${LIBAVFORMAT_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
add_library(ADM_libavcore UNKNOWN IMPORTED)
set_property(TARGET ADM_libavcore PROPERTY IMPORTED_LOCATION "${FFMPEG_BINARY_DIR}/libavcore/${LIBAVCORE_LIB}")
-install(FILES "${FFMPEG_BINARY_DIR}/libavcore/${LIBAVCORE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
+install(${FFMPEG_SHLIB_INSTALL_TYPE} "${FFMPEG_BINARY_DIR}/libavcore/${LIBAVCORE_LIB}" DESTINATION "${FFMPEG_INSTALL_DIR}")
include_directories("${FFMPEG_SOURCE_DIR}")
include_directories("${FFMPEG_SOURCE_DIR}/libavutil")
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- avidemux.spec 21 Apr 2011 01:56:25 -0000 1.41
+++ avidemux.spec 24 Apr 2011 12:20:09 -0000 1.42
@@ -2,7 +2,7 @@
Name: avidemux
Version: 2.5.4
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -38,12 +38,14 @@
Patch4: avidemux-2.5.3-mpeg2enc.patch
Patch5: avidemux-2.5.3-pluginlibs.patch
# Patch8 obtained from http://lists.rpmfusion.org/pipermail/rpmfusion-developers/2010-October/00...
-#Patch6: avidemux_2.5.4-ffmpeg-aac.patch
+Patch6: avidemux_2.5.4-ffmpeg-aac.patch
Patch7: avidemux-2.5.4-gcc46_tmp_fix.patch
Patch8: avidemux-2.5.4-gtk_menu_crash_fix.patch
# Patch needed for version of x264 in F15/rawhide.
Patch9: avidemux-2.5.4-x264_fix.patch
-#Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
+Patch10: avidemux-2.5.4-ext_lib_cmake_fix.patch
+Patch11: avidemux-2.5.4-audio_prefs.patch
+Patch12: avidemux-2.5.4-ffmpeg_perms.patch
# Upstream has been informed http://avidemux.org/admForum/viewtopic.php?id=6447
ExcludeArch: ppc ppc64
@@ -184,13 +186,14 @@
%patch3 -p1 -b .tmplinktarget
%patch4 -p1 -b .mpeg2enc
%patch5 -p1 -b .pluginlibs
-# Does not work as is. Disabled for now.
-#%patch6 -p1 -b .ffmpegaac
+%patch6 -p1 -b .ffmpegaac
%patch7 -p1 -b .gcc46tmpfix
%patch8 -b .gtk_menu
%patch9 -p1 -b .x264fix
# Fixes cmake configuration but build fails.
#%patch10 -p1 -b .extlibfix
+%patch11 -p1 -b .audioprefs
+%patch12 -p1 -b .ffmpegperms
%build
# Out of source build
@@ -293,6 +296,11 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Sun Apr 24 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-5
+- AAC encoding now working. (Kevin Kolfer)
+- Fedora 15 build dependecy fixed. (Kevin Kolfer)
+- Audio device peferences now remembered.
+
* Wed Apr 20 2011 Richard Shaw <hobbes1069(a)gmail.com> - 2.5.4-4
- Disabled non-working patch for experimental aac encoding with ffmpeg.
- Removed dependency on bundled javascript library. Now uses system library.
13 years, 7 months