rpms/smplayer/devel .cvsignore, 1.15, 1.16 smplayer-0.8.1-system-qtsingleapplication.patch, 1.2, 1.3 smplayer.spec, 1.25, 1.26 sources, 1.17, 1.18
by Sérgio M. Basto
Author: sergiomb
Update of /cvs/free/rpms/smplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4134
Modified Files:
.cvsignore smplayer-0.8.1-system-qtsingleapplication.patch
smplayer.spec sources
Log Message:
* Mon Dec 17 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.2.1-1
- New updates to smplayer-0.8.2.1 and smtube-1.4 .
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- .cvsignore 22 Nov 2012 00:22:55 -0000 1.15
+++ .cvsignore 17 Dec 2012 03:58:18 -0000 1.16
@@ -1,2 +1,2 @@
-smplayer-0.8.2.tar.bz2
-smtube-1.3.tar.bz2
+smplayer-0.8.2.1.tar.bz2
+smtube-1.4.tar.bz2
smplayer-0.8.1-system-qtsingleapplication.patch:
smplayer-0.8.1/src/smplayer.pro | 10 +---------
smplayer-0.8.2.1/smtube-1.4/src/smtube.pro | 9 +++------
2 files changed, 4 insertions(+), 15 deletions(-)
Index: smplayer-0.8.1-system-qtsingleapplication.patch
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer-0.8.1-system-qtsingleapplication.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- smplayer-0.8.1-system-qtsingleapplication.patch 22 Nov 2012 00:21:26 -0000 1.2
+++ smplayer-0.8.1-system-qtsingleapplication.patch 17 Dec 2012 03:58:19 -0000 1.3
@@ -1,5 +1,5 @@
---- smplayer-0.8.1/smtube-1.3/src/smtube.pro 2012-05-09 01:12:42.000000000 +0300
-+++ smplayer-0.8.1/smtube-1.3/src/smtube.pro 2012-09-20 13:11:52.937317532 +0300
+--- smplayer-0.8.2.1/smtube-1.4/src/smtube.pro.qtsingleapplication 2012-11-30 16:46:02.000000000 +0000
++++ smplayer-0.8.2.1/smtube-1.4/src/smtube.pro 2012-12-17 03:10:55.424870074 +0000
@@ -5,10 +5,11 @@
TEMPLATE = app
QT += network xml
@@ -14,9 +14,9 @@
RESOURCES = icons.qrc
-@@ -63,10 +64,6 @@
- translations/smtube_hu.ts \
- translations/smtube_pl.ts
+@@ -65,10 +66,6 @@ TRANSLATIONS = translations/smtube_es.ts
+ translations/smtube_gl.ts \
+ translations/smtube_el.ts
-# qtsingleapplication
-SOURCES += qtsingleapplication.cpp qtlocalpeer.cpp
Index: smplayer.spec
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- smplayer.spec 26 Nov 2012 00:05:35 -0000 1.25
+++ smplayer.spec 17 Dec 2012 03:58:19 -0000 1.26
@@ -1,8 +1,8 @@
-%global smtube_ver 1.3
+%global smtube_ver 1.4
Name: smplayer
-Version: 0.8.2
-Release: 3%{?dist}
+Version: 0.8.2.1
+Release: 1%{?dist}
Summary: A graphical frontend for mplayer
Group: Applications/Multimedia
@@ -127,6 +127,9 @@
%{_datadir}/kde4/services/ServiceMenus/smplayer_enqueue.desktop
%changelog
+* Mon Dec 17 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.2.1-1
+- New updates to smplayer-0.8.2.1 and smtube-1.4 .
+
* Sun Nov 25 2012 Sérgio Basto <sergio(a)serjux.com> - 0.8.2-3
- now smtube new source b372bd396c068aa28798bf2b5385bf59 smtube-1.3.tar.bz2 .
Index: sources
===================================================================
RCS file: /cvs/free/rpms/smplayer/devel/sources,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- sources 26 Nov 2012 00:05:35 -0000 1.17
+++ sources 17 Dec 2012 03:58:19 -0000 1.18
@@ -1,2 +1,2 @@
-0dee3f9a4f0d87d37455efc800f9bba7 smplayer-0.8.2.tar.bz2
-b372bd396c068aa28798bf2b5385bf59 smtube-1.3.tar.bz2
+3b3cad54b2f7f0026ab285de055bf40e smplayer-0.8.2.1.tar.bz2
+4c9a8bc54311408e479482798ee87a28 smtube-1.4.tar.bz2
11 years, 11 months
rpms/avidemux/F-16 avidemux.spec, 1.59, 1.60 avidemux-2.6-use_external_libass.patch, 1.1, NONE avidemux3-glu_fix.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-16
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9071
Modified Files:
avidemux.spec
Removed Files:
avidemux-2.6-use_external_libass.patch avidemux3-glu_fix.patch
Log Message:
* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
- Make sure we're building all availabel plugins. (#2575)
- Don't install the gtk interface when all you want is the qt one. (#2574)
- Exclude arm as a build target. (#2466)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-16/avidemux.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- avidemux.spec 30 Oct 2012 14:06:29 -0000 1.59
+++ avidemux.spec 16 Dec 2012 16:34:08 -0000 1.60
@@ -1,14 +1,13 @@
-%global realname avidemux
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
Version: 2.6.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
-Source0: http://downloads.sourceforge.net/%{realname}/%{realname}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: avidemux-qt.desktop
Source2: avidemux-gtk.desktop
@@ -17,6 +16,9 @@
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
+# Don't try to build on arm
+ExcludeArch: %{arm}
+
# Utilities
BuildRequires: cmake
BuildRequires: gettext intltool
@@ -64,9 +66,6 @@
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
-Conflicts: avidemux < 2.6.0
-Provides: avidemux = %{version}-%{release}
-
# Main package is a metapackage, bring in something useful.
Requires: avidemux-gui = %{version}-%{release}
@@ -77,6 +76,8 @@
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
+This is a meta package that brings in all interfaces: GTK, QT, and CLI.
+
%package cli
Summary: CLI for %{name}
@@ -99,9 +100,7 @@
Group: Applications/Multimedia
BuildRequires: gtk3-devel
BuildRequires: cairo-devel
-# Slightly higher so it is default, but it can be avoided by installing
-# avidemux-qt directly or it can be removed later once avidemux-qt is installed
-Provides: %{name}-gui = %{version}-%{release}.1
+Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-help = %{version}-%{release}
@@ -139,7 +138,7 @@
%prep
-%setup -q -n %{realname}_%{version}
+%setup -q -n %{name}_%{version}
#patch0 -p1 -b .ffmpeg_build
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
@@ -172,6 +171,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/cli
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build QT4 gui
@@ -180,6 +180,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/qt4
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build GTK gui
@@ -188,13 +189,14 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/gtk
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
-# Build avidemux_plugins
-rm -rf build_plugins && mkdir build_plugins && pushd build_plugins
+# Build avidemux_plugins_common
+rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins_common
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
- -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{realname}_%{version} \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
-DPLUGIN_UI=COMMON \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
@@ -202,6 +204,52 @@
-DUSE_EXTERNAL_TWOLAME=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_cli
+rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=CLI \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_qt4
+rm -rf build_plugins_qt4 && mkdir build_plugins_qt4 && pushd build_plugins_qt4
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=QT4 \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_gtk
+rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=GTK \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -210,7 +258,10 @@
make -C build_cli install DESTDIR=%{buildroot}
make -C build_qt4 install DESTDIR=%{buildroot}
make -C build_gtk install DESTDIR=%{buildroot}
-make -C build_plugins install DESTDIR=%{buildroot}
+make -C build_plugins_common install DESTDIR=%{buildroot}
+make -C build_plugins_cli install DESTDIR=%{buildroot}
+make -C build_plugins_qt4 install DESTDIR=%{buildroot}
+make -C build_plugins_gtk install DESTDIR=%{buildroot}
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -268,26 +319,26 @@
%files
%doc AUTHORS COPYING README
-%files libs
+%files libs -f build_plugins_common/install_manifest.txt
%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
%{_libdir}/ADM_plugins6/
-%files cli
+%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
%{_libdir}/libADM_UI_Cli6.so
%{_libdir}/libADM_render6_cli.so
-%files gtk
+%files gtk -f build_plugins_gtk/install_manifest.txt
%{_bindir}/avidemux3_gtk
%{_libdir}/libADM_UIGtk6.so
%{_libdir}/libADM_render6_gtk.so
%{_libdir}/ADM_glade/
%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
-%files qt
+%files qt -f build_plugins_qt4/install_manifest.txt
%{_bindir}/avidemux3_qt4
%{_bindir}/avidemux3_jobs
%{_libdir}/libADM_UIQT46.so
@@ -301,5 +352,13 @@
%{_includedir}/avidemux/
%changelog
+* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
+- Make sure we're building all availabel plugins. (#2575)
+- Don't install the gtk interface when all you want is the qt one. (#2574)
+- Exclude arm as a build target. (#2466)
+
+* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.0-2
+- Rebuilt for x264
+
* Sun Oct 14 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-1
- Update to new upstream release.
--- avidemux-2.6-use_external_libass.patch DELETED ---
--- avidemux3-glu_fix.patch DELETED ---
11 years, 11 months
rpms/avidemux/F-17 avidemux.spec, 1.67, 1.68 avidemux-2.6-use_external_libass.patch, 1.1, NONE avidemux3-glu_fix.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv7877
Modified Files:
avidemux.spec
Removed Files:
avidemux-2.6-use_external_libass.patch avidemux3-glu_fix.patch
Log Message:
* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
- Make sure we're building all availabel plugins. (#2575)
- Don't install the gtk interface when all you want is the qt one. (#2574)
- Exclude arm as a build target. (#2466)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-17/avidemux.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- avidemux.spec 30 Oct 2012 14:04:39 -0000 1.67
+++ avidemux.spec 16 Dec 2012 16:01:33 -0000 1.68
@@ -1,14 +1,13 @@
-%global realname avidemux
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
Version: 2.6.0
-Release: 1%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
-Source0: http://downloads.sourceforge.net/%{realname}/%{realname}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: avidemux-qt.desktop
Source2: avidemux-gtk.desktop
@@ -17,6 +16,9 @@
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
+# Don't try to build on arm
+ExcludeArch: %{arm}
+
# Utilities
BuildRequires: cmake
BuildRequires: gettext intltool
@@ -64,9 +66,6 @@
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
-Conflicts: avidemux < 2.6.0
-Provides: avidemux = %{version}-%{release}
-
# Main package is a metapackage, bring in something useful.
Requires: avidemux-gui = %{version}-%{release}
@@ -77,6 +76,8 @@
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
+This is a meta package that brings in all interfaces: GTK, QT, and CLI.
+
%package cli
Summary: CLI for %{name}
@@ -99,9 +100,7 @@
Group: Applications/Multimedia
BuildRequires: gtk3-devel
BuildRequires: cairo-devel
-# Slightly higher so it is default, but it can be avoided by installing
-# avidemux-qt directly or it can be removed later once avidemux-qt is installed
-Provides: %{name}-gui = %{version}-%{release}.1
+Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-help = %{version}-%{release}
@@ -139,7 +138,7 @@
%prep
-%setup -q -n %{realname}_%{version}
+%setup -q -n %{name}_%{version}
#patch0 -p1 -b .ffmpeg_build
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
@@ -172,6 +171,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/cli
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build QT4 gui
@@ -180,6 +180,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/qt4
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build GTK gui
@@ -188,13 +189,14 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/gtk
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
-# Build avidemux_plugins
-rm -rf build_plugins && mkdir build_plugins && pushd build_plugins
+# Build avidemux_plugins_common
+rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins_common
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
- -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{realname}_%{version} \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
-DPLUGIN_UI=COMMON \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
@@ -202,6 +204,52 @@
-DUSE_EXTERNAL_TWOLAME=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_cli
+rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=CLI \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_qt4
+rm -rf build_plugins_qt4 && mkdir build_plugins_qt4 && pushd build_plugins_qt4
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=QT4 \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_gtk
+rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=GTK \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -210,7 +258,10 @@
make -C build_cli install DESTDIR=%{buildroot}
make -C build_qt4 install DESTDIR=%{buildroot}
make -C build_gtk install DESTDIR=%{buildroot}
-make -C build_plugins install DESTDIR=%{buildroot}
+make -C build_plugins_common install DESTDIR=%{buildroot}
+make -C build_plugins_cli install DESTDIR=%{buildroot}
+make -C build_plugins_qt4 install DESTDIR=%{buildroot}
+make -C build_plugins_gtk install DESTDIR=%{buildroot}
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -268,26 +319,26 @@
%files
%doc AUTHORS COPYING README
-%files libs
+%files libs -f build_plugins_common/install_manifest.txt
%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
%{_libdir}/ADM_plugins6/
-%files cli
+%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
%{_libdir}/libADM_UI_Cli6.so
%{_libdir}/libADM_render6_cli.so
-%files gtk
+%files gtk -f build_plugins_gtk/install_manifest.txt
%{_bindir}/avidemux3_gtk
%{_libdir}/libADM_UIGtk6.so
%{_libdir}/libADM_render6_gtk.so
%{_libdir}/ADM_glade/
%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
-%files qt
+%files qt -f build_plugins_qt4/install_manifest.txt
%{_bindir}/avidemux3_qt4
%{_bindir}/avidemux3_jobs
%{_libdir}/libADM_UIQT46.so
@@ -301,5 +352,13 @@
%{_includedir}/avidemux/
%changelog
+* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
+- Make sure we're building all availabel plugins. (#2575)
+- Don't install the gtk interface when all you want is the qt one. (#2574)
+- Exclude arm as a build target. (#2466)
+
+* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.0-2
+- Rebuilt for x264
+
* Sun Oct 14 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-1
- Update to new upstream release.
--- avidemux-2.6-use_external_libass.patch DELETED ---
--- avidemux3-glu_fix.patch DELETED ---
11 years, 11 months
rpms/avidemux/F-18 avidemux.spec, 1.69, 1.70 avidemux-2.6-use_external_libass.patch, 1.1, NONE avidemux3-glu_fix.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5265
Modified Files:
avidemux.spec
Removed Files:
avidemux-2.6-use_external_libass.patch avidemux3-glu_fix.patch
Log Message:
* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
- Make sure we're building all availabel plugins. (#2575)
- Don't install the gtk interface when all you want is the qt one. (#2574)
- Exclude arm as a build target. (#2466)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-18/avidemux.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- avidemux.spec 23 Nov 2012 22:43:10 -0000 1.69
+++ avidemux.spec 16 Dec 2012 15:17:28 -0000 1.70
@@ -1,14 +1,13 @@
-%global realname avidemux
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
Version: 2.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
-Source0: http://downloads.sourceforge.net/%{realname}/%{realname}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: avidemux-qt.desktop
Source2: avidemux-gtk.desktop
@@ -17,6 +16,9 @@
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
+# Don't try to build on arm
+ExcludeArch: %{arm}
+
# Utilities
BuildRequires: cmake
BuildRequires: gettext intltool
@@ -64,9 +66,6 @@
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
-Conflicts: avidemux < 2.6.0
-Provides: avidemux = %{version}-%{release}
-
# Main package is a metapackage, bring in something useful.
Requires: avidemux-gui = %{version}-%{release}
@@ -77,6 +76,8 @@
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
+This is a meta package that brings in all interfaces: GTK, QT, and CLI.
+
%package cli
Summary: CLI for %{name}
@@ -99,9 +100,7 @@
Group: Applications/Multimedia
BuildRequires: gtk3-devel
BuildRequires: cairo-devel
-# Slightly higher so it is default, but it can be avoided by installing
-# avidemux-qt directly or it can be removed later once avidemux-qt is installed
-Provides: %{name}-gui = %{version}-%{release}.1
+Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-help = %{version}-%{release}
@@ -139,7 +138,7 @@
%prep
-%setup -q -n %{realname}_%{version}
+%setup -q -n %{name}_%{version}
#patch0 -p1 -b .ffmpeg_build
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
@@ -172,6 +171,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/cli
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build QT4 gui
@@ -180,6 +180,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/qt4
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build GTK gui
@@ -188,13 +189,14 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/gtk
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
-# Build avidemux_plugins
-rm -rf build_plugins && mkdir build_plugins && pushd build_plugins
+# Build avidemux_plugins_common
+rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins_common
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
- -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{realname}_%{version} \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
-DPLUGIN_UI=COMMON \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
@@ -202,6 +204,52 @@
-DUSE_EXTERNAL_TWOLAME=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_cli
+rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=CLI \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_qt4
+rm -rf build_plugins_qt4 && mkdir build_plugins_qt4 && pushd build_plugins_qt4
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=QT4 \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_gtk
+rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=GTK \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -210,7 +258,10 @@
make -C build_cli install DESTDIR=%{buildroot}
make -C build_qt4 install DESTDIR=%{buildroot}
make -C build_gtk install DESTDIR=%{buildroot}
-make -C build_plugins install DESTDIR=%{buildroot}
+make -C build_plugins_common install DESTDIR=%{buildroot}
+make -C build_plugins_cli install DESTDIR=%{buildroot}
+make -C build_plugins_qt4 install DESTDIR=%{buildroot}
+make -C build_plugins_gtk install DESTDIR=%{buildroot}
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -268,26 +319,26 @@
%files
%doc AUTHORS COPYING README
-%files libs
+%files libs -f build_plugins_common/install_manifest.txt
%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
%{_libdir}/ADM_plugins6/
-%files cli
+%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
%{_libdir}/libADM_UI_Cli6.so
%{_libdir}/libADM_render6_cli.so
-%files gtk
+%files gtk -f build_plugins_gtk/install_manifest.txt
%{_bindir}/avidemux3_gtk
%{_libdir}/libADM_UIGtk6.so
%{_libdir}/libADM_render6_gtk.so
%{_libdir}/ADM_glade/
%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
-%files qt
+%files qt -f build_plugins_qt4/install_manifest.txt
%{_bindir}/avidemux3_qt4
%{_bindir}/avidemux3_jobs
%{_libdir}/libADM_UIQT46.so
@@ -301,6 +352,11 @@
%{_includedir}/avidemux/
%changelog
+* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
+- Make sure we're building all availabel plugins. (#2575)
+- Don't install the gtk interface when all you want is the qt one. (#2574)
+- Exclude arm as a build target. (#2466)
+
* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.0-2
- Rebuilt for x264
--- avidemux-2.6-use_external_libass.patch DELETED ---
--- avidemux3-glu_fix.patch DELETED ---
11 years, 11 months
rpms/avidemux/devel avidemux.spec, 1.70, 1.71 avidemux-2.6-use_external_libass.patch, 1.1, NONE avidemux3-glu_fix.patch, 1.1, NONE
by Richard Shaw
Author: hobbes1069
Update of /cvs/free/rpms/avidemux/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv4579
Modified Files:
avidemux.spec
Removed Files:
avidemux-2.6-use_external_libass.patch avidemux3-glu_fix.patch
Log Message:
* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
- Make sure we're building all availabel plugins. (#2575)
- Don't install the gtk interface when all you want is the qt one. (#2574)
- Exclude arm as a build target. (#2466)
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/devel/avidemux.spec,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- avidemux.spec 23 Nov 2012 08:49:36 -0000 1.70
+++ avidemux.spec 16 Dec 2012 14:38:20 -0000 1.71
@@ -1,14 +1,13 @@
-%global realname avidemux
%global _pkgbuilddir %{_builddir}/%{name}_%{version}
Name: avidemux
Version: 2.6.0
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
URL: http://www.avidemux.org
-Source0: http://downloads.sourceforge.net/%{realname}/%{realname}_%{version}.tar.gz
+Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz
Source1: avidemux-qt.desktop
Source2: avidemux-gtk.desktop
@@ -17,6 +16,9 @@
Patch2: avidemux3-libass.patch
Patch3: avidemux3-bundled_libs.patch
+# Don't try to build on arm
+ExcludeArch: %{arm}
+
# Utilities
BuildRequires: cmake
BuildRequires: gettext intltool
@@ -64,9 +66,6 @@
BuildRequires: x264-devel
BuildRequires: ffmpeg-devel
-Conflicts: avidemux < 2.6.0
-Provides: avidemux = %{version}-%{release}
-
# Main package is a metapackage, bring in something useful.
Requires: avidemux-gui = %{version}-%{release}
@@ -77,6 +76,8 @@
MPEG files, MP4 and ASF, using a variety of codecs. Tasks can be automated
using projects, job queue and powerful scripting capabilities.
+This is a meta package that brings in all interfaces: GTK, QT, and CLI.
+
%package cli
Summary: CLI for %{name}
@@ -99,9 +100,7 @@
Group: Applications/Multimedia
BuildRequires: gtk3-devel
BuildRequires: cairo-devel
-# Slightly higher so it is default, but it can be avoided by installing
-# avidemux-qt directly or it can be removed later once avidemux-qt is installed
-Provides: %{name}-gui = %{version}-%{release}.1
+Provides: %{name}-gui = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
Requires: %{name}-help = %{version}-%{release}
@@ -139,7 +138,7 @@
%prep
-%setup -q -n %{realname}_%{version}
+%setup -q -n %{name}_%{version}
#patch0 -p1 -b .ffmpeg_build
%patch1 -p1 -b .bund_libs
%patch2 -p1 -b .libass
@@ -172,6 +171,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/cli
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build QT4 gui
@@ -180,6 +180,7 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/qt4
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
# Build GTK gui
@@ -188,13 +189,14 @@
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
../avidemux/gtk
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
-# Build avidemux_plugins
-rm -rf build_plugins && mkdir build_plugins && pushd build_plugins
+# Build avidemux_plugins_common
+rm -rf build_plugins_common && mkdir build_plugins_common && pushd build_plugins_common
%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
- -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{realname}_%{version} \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
-DPLUGIN_UI=COMMON \
-DUSE_EXTERNAL_LIBASS=TRUE \
-DUSE_EXTERNAL_LIBMAD=TRUE \
@@ -202,6 +204,52 @@
-DUSE_EXTERNAL_TWOLAME=TRUE \
../avidemux_plugins
make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_cli
+rm -rf build_plugins_cli && mkdir build_plugins_cli && pushd build_plugins_cli
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=CLI \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_qt4
+rm -rf build_plugins_qt4 && mkdir build_plugins_qt4 && pushd build_plugins_qt4
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=QT4 \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
+popd
+
+# Build avidemux_plugins_gtk
+rm -rf build_plugins_gtk && mkdir build_plugins_gtk && pushd build_plugins_gtk
+%cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+ -DFAKEROOT=%{_pkgbuilddir}/fakeRoot \
+ -DAVIDEMUX_SOURCE_DIR=%{_builddir}/%{name}_%{version} \
+ -DPLUGIN_UI=GTK \
+ -DUSE_EXTERNAL_LIBASS=TRUE \
+ -DUSE_EXTERNAL_LIBMAD=TRUE \
+ -DUSE_EXTERNAL_LIBA52=TRUE \
+ -DUSE_EXTERNAL_TWOLAME=TRUE \
+ ../avidemux_plugins
+make %{?_smp_mflags}
+make install DESTDIR=%{_pkgbuilddir}/fakeRoot
popd
@@ -210,7 +258,10 @@
make -C build_cli install DESTDIR=%{buildroot}
make -C build_qt4 install DESTDIR=%{buildroot}
make -C build_gtk install DESTDIR=%{buildroot}
-make -C build_plugins install DESTDIR=%{buildroot}
+make -C build_plugins_common install DESTDIR=%{buildroot}
+make -C build_plugins_cli install DESTDIR=%{buildroot}
+make -C build_plugins_qt4 install DESTDIR=%{buildroot}
+make -C build_plugins_gtk install DESTDIR=%{buildroot}
# FFMpeg libraries are not being installed as executable.
chmod +x %{buildroot}%{_libdir}/libADM6*.so.*
@@ -268,26 +319,26 @@
%files
%doc AUTHORS COPYING README
-%files libs
+%files libs -f build_plugins_common/install_manifest.txt
%{_datadir}/icons/hicolor/*/apps/avidemux.png
%{_libdir}/libADM*
%exclude %{_libdir}/libADM_UI*
%exclude %{_libdir}/libADM_render*
%{_libdir}/ADM_plugins6/
-%files cli
+%files cli -f build_plugins_cli/install_manifest.txt
%{_bindir}/avidemux3_cli
%{_libdir}/libADM_UI_Cli6.so
%{_libdir}/libADM_render6_cli.so
-%files gtk
+%files gtk -f build_plugins_gtk/install_manifest.txt
%{_bindir}/avidemux3_gtk
%{_libdir}/libADM_UIGtk6.so
%{_libdir}/libADM_render6_gtk.so
%{_libdir}/ADM_glade/
%{_datadir}/applications/rpmfusion-avidemux-gtk.desktop
-%files qt
+%files qt -f build_plugins_qt4/install_manifest.txt
%{_bindir}/avidemux3_qt4
%{_bindir}/avidemux3_jobs
%{_libdir}/libADM_UIQT46.so
@@ -301,6 +352,11 @@
%{_includedir}/avidemux/
%changelog
+* Sun Dec 16 2012 Richard Shaw <hobbes1069(a)gmail.com> - 2.6.0-3
+- Make sure we're building all availabel plugins. (#2575)
+- Don't install the gtk interface when all you want is the qt one. (#2574)
+- Exclude arm as a build target. (#2466)
+
* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.6.0-2
- Rebuilt for x264
--- avidemux-2.6-use_external_libass.patch DELETED ---
--- avidemux3-glu_fix.patch DELETED ---
11 years, 11 months
rpms/vlc/F-18 .cvsignore, 1.50, 1.51 sources, 1.58, 1.59 vlc.spec, 1.164, 1.165
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18388/F-18
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 2.0.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 19 Oct 2012 14:41:59 -0000 1.50
+++ .cvsignore 14 Dec 2012 22:46:57 -0000 1.51
@@ -1 +1 @@
-vlc-2.0.4.tar.xz
+vlc-2.0.5.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 19 Oct 2012 14:41:59 -0000 1.58
+++ sources 14 Dec 2012 22:46:57 -0000 1.59
@@ -1 +1 @@
-f36dab8f126922c56b372388b7fade47 vlc-2.0.4.tar.xz
+4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-18/vlc.spec,v
retrieving revision 1.164
retrieving revision 1.165
diff -u -r1.164 -r1.165
--- vlc.spec 23 Nov 2012 22:43:45 -0000 1.164
+++ vlc.spec 14 Dec 2012 22:46:57 -0000 1.165
@@ -30,14 +30,13 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.4
-Release: 2%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
-Patch1: vlc-2.0.4-cache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -227,7 +226,6 @@
touch -r config.h.in configure configure.ac
}
%endif
-%patch1 -p1 -b .vlc_cache
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -293,7 +291,7 @@
%endif
-%if 1
+%if 0
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -514,6 +512,12 @@
%changelog
+* Fri Dec 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-1
+- Update to 2.0.5
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-3
+- Fix build with kernel-3.7
+
* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-2
- Rebuilt for x264
11 years, 11 months
rpms/vlc/devel .cvsignore, 1.50, 1.51 sources, 1.58, 1.59 vlc.spec, 1.166, 1.167
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18388/devel
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 2.0.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 19 Oct 2012 14:41:57 -0000 1.50
+++ .cvsignore 14 Dec 2012 22:46:57 -0000 1.51
@@ -1 +1 @@
-vlc-2.0.4.tar.xz
+vlc-2.0.5.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 19 Oct 2012 14:41:58 -0000 1.58
+++ sources 14 Dec 2012 22:46:57 -0000 1.59
@@ -1 +1 @@
-f36dab8f126922c56b372388b7fade47 vlc-2.0.4.tar.xz
+4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/devel/vlc.spec,v
retrieving revision 1.166
retrieving revision 1.167
diff -u -r1.166 -r1.167
--- vlc.spec 24 Nov 2012 17:12:45 -0000 1.166
+++ vlc.spec 14 Dec 2012 22:46:57 -0000 1.167
@@ -30,15 +30,13 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.4
-Release: 3%{?dist}
+Version: 2.0.5
+Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
-Patch1: vlc-2.0.4-cache.patch
-Patch2: vlc-backport-dvb58.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -228,8 +226,6 @@
touch -r config.h.in configure configure.ac
}
%endif
-%patch1 -p1 -b .vlc_cache
-%patch2 -p1
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -516,6 +512,9 @@
%changelog
+* Fri Dec 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-1
+- Update to 2.0.5
+
* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-3
- Fix build with kernel-3.7
11 years, 11 months
rpms/vlc/F-17 .cvsignore, 1.50, 1.51 sources, 1.58, 1.59 vlc.spec, 1.156, 1.157
by Nicolas Chauvet
Author: kwizart
Update of /cvs/free/rpms/vlc/F-17
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv18388/F-17
Modified Files:
.cvsignore sources vlc.spec
Log Message:
Update to 2.0.5
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/.cvsignore,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- .cvsignore 19 Oct 2012 15:36:31 -0000 1.50
+++ .cvsignore 14 Dec 2012 22:46:58 -0000 1.51
@@ -1 +1 @@
-vlc-2.0.4.tar.xz
+vlc-2.0.5.tar.xz
Index: sources
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/sources,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sources 19 Oct 2012 15:36:31 -0000 1.58
+++ sources 14 Dec 2012 22:46:58 -0000 1.59
@@ -1 +1 @@
-f36dab8f126922c56b372388b7fade47 vlc-2.0.4.tar.xz
+4f959c0766ada8cea5a72c65fce94ebe vlc-2.0.5.tar.xz
Index: vlc.spec
===================================================================
RCS file: /cvs/free/rpms/vlc/F-17/vlc.spec,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -r1.156 -r1.157
--- vlc.spec 19 Oct 2012 21:30:04 -0000 1.156
+++ vlc.spec 14 Dec 2012 22:46:58 -0000 1.157
@@ -30,14 +30,13 @@
Summary: The cross-platform open-source multimedia framework, player and server
Name: vlc
-Version: 2.0.4
+Version: 2.0.5
Release: 1%{?dist}
License: GPLv2+
Group: Applications/Multimedia
URL: http://www.videolan.org
Source0: http://download.videolan.org/pub/videolan/vlc/%{version}/vlc-%{version}%{...
Patch0: vlc-2.0.2-xcb_discard.patch
-Patch1: vlc-2.0.4-cache.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: desktop-file-utils
@@ -227,7 +226,6 @@
touch -r config.h.in configure configure.ac
}
%endif
-%patch1 -p1 -b .vlc_cache
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
@@ -293,7 +291,7 @@
%endif
-%if 1
+%if 0
# remove rpath from libtool
sed -i.rpath 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
sed -i.rpath 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
@@ -514,6 +512,15 @@
%changelog
+* Fri Dec 14 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.5-1
+- Update to 2.0.5
+
+* Sat Nov 24 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-3
+- Fix build with kernel-3.7
+
+* Fri Nov 23 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-2
+- Rebuilt for x264
+
* Fri Oct 19 2012 Nicolas Chauvet <kwizart(a)gmail.com> - 2.0.4-1
- Update to 2.0.4
- Enable opus
11 years, 11 months
rpms/dolphin-emu/F-18 dolphin-emu-3.0-gcc-4.7.patch, NONE, 1.1 dolphin-emu-3.0-libavapichange.patch, NONE, 1.1 dolphin-emu.spec, 1.1, 1.2 dolphin-emu-gcc-4.7.patch, 1.1, NONE
by Jeremy Newton
Author: jem256
Update of /cvs/nonfree/rpms/dolphin-emu/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv1290/F-18
Modified Files:
dolphin-emu.spec
Added Files:
dolphin-emu-3.0-gcc-4.7.patch
dolphin-emu-3.0-libavapichange.patch
Removed Files:
dolphin-emu-gcc-4.7.patch
Log Message:
Update Dolphin to work on F18, need libav api patch
dolphin-emu-3.0-gcc-4.7.patch:
CommonFuncs.h | 1 +
1 file changed, 1 insertion(+)
--- NEW FILE dolphin-emu-3.0-gcc-4.7.patch ---
diff -Nru dolphin-emu-3.0.orig/Source/Core/Common/Src/CommonFuncs.h dolphin-emu-3.0/Source/Core/Common/Src/CommonFuncs.h
--- dolphin-emu-3.0.orig/Source/Core/Common/Src/CommonFuncs.h 2012-06-02 20:09:12.652636536 -0400
+++ dolphin-emu-3.0/Source/Core/Common/Src/CommonFuncs.h 2012-06-02 20:09:43.822657738 -0400
@@ -21,6 +21,7 @@
#ifdef _WIN32
#define SLEEP(x) Sleep(x)
#else
+#include <unistd.h>
#define SLEEP(x) usleep(x*1000)
#endif
dolphin-emu-3.0-libavapichange.patch:
AVIDump.cpp | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
--- NEW FILE dolphin-emu-3.0-libavapichange.patch ---
>From e5d051a4e977443785f4e78cb6464eca0408e578 Mon Sep 17 00:00:00 2001
From: Glenn Rice <glennricster(a)gmail.com>
Date: Tue, 22 Nov 2011 19:24:05 -0600
Subject: [PATCH] Update linux libav frame dump code for recent api changes.
---
Source/Core/VideoCommon/Src/AVIDump.cpp | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/Source/Core/VideoCommon/Src/AVIDump.cpp b/Source/Core/VideoCommon/Src/AVIDump.cpp
index a5a6098..469e00d 100644
--- a/Source/Core/VideoCommon/Src/AVIDump.cpp
+++ b/Source/Core/VideoCommon/Src/AVIDump.cpp
@@ -267,8 +267,6 @@ bool AVIDump::CreateFile()
s_Stream->codec->gop_size = 12;
s_Stream->codec->pix_fmt = g_Config.bUseFFV1 ? PIX_FMT_BGRA : PIX_FMT_YUV420P;
- av_set_parameters(s_FormatContext, NULL);
-
if (!(codec = avcodec_find_encoder(s_Stream->codec->codec_id)) ||
(avcodec_open(s_Stream->codec, codec) < 0))
{
@@ -287,14 +285,14 @@ bool AVIDump::CreateFile()
s_OutBuffer = new uint8_t[s_size];
NOTICE_LOG(VIDEO, "Opening file %s for dumping", s_FormatContext->filename);
- if (url_fopen(&s_FormatContext->pb, s_FormatContext->filename, URL_WRONLY) < 0)
+ if (avio_open(&s_FormatContext->pb, s_FormatContext->filename, AVIO_FLAG_WRITE) < 0)
{
WARN_LOG(VIDEO, "Could not open %s", s_FormatContext->filename);
CloseFile();
return false;
}
- av_write_header(s_FormatContext);
+ avformat_write_header(s_FormatContext, NULL);
return true;
}
@@ -374,7 +372,7 @@ void AVIDump::CloseFile()
if (s_FormatContext)
{
if (s_FormatContext->pb)
- url_fclose(s_FormatContext->pb);
+ avio_close(s_FormatContext->pb);
av_free(s_FormatContext);
s_FormatContext = NULL;
}
--
1.8.0.1
Index: dolphin-emu.spec
===================================================================
RCS file: /cvs/nonfree/rpms/dolphin-emu/F-18/dolphin-emu.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- dolphin-emu.spec 5 Jul 2012 15:48:10 -0000 1.1
+++ dolphin-emu.spec 14 Dec 2012 16:39:20 -0000 1.2
@@ -1,6 +1,6 @@
Name: dolphin-emu
Version: 3.0
-Release: 10%{?dist}
+Release: 11%{?dist}
Summary: Gamecube / Wii / Triforce Emulator
Url: http://www.dolphin-emulator.com/
@@ -19,7 +19,9 @@
Patch0: %{name}-%{version}-clrun.patch
#Build fix for gcc 4.7.0 (backwards compatible)
#Note this is already fixed in the unstable version
-Patch1: dolphin-emu-gcc-4.7.patch
+Patch1: %{name}-%{version}-gcc-4.7.patch
+#Thanks to Xiao-Long Chen, fixes recent api change in libav
+Patch2: %{name}-%{version}-libavapichange.patch
# Dolphin only runs on Intel x86 archictures
ExclusiveArch: i686 x86_64
@@ -62,6 +64,7 @@
%setup -q -a 1
%patch0 -p1 -b .clrun
%patch1 -p1 -b .gcc470
+%patch2 -p1 -b .libav
sed -i '/CMAKE_C.*_FLAGS/d' CMakeLists.txt
#Remove all Bundled Libraries except Bochs:
@@ -126,6 +129,10 @@
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
+* Fri Dec 14 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-11
+- Added patch for recent libav api change in fc18, credit to Xiao-Long Chen
+- Renamed patch 1 for consistency
+
* Mon Jun 25 2012 Jeremy Newton <alexjnewt(a)hotmail.com> - 3.0-10
- Changed CLRun buildrequire package name
- Renamed GCC 4.7 patch to suit fedora standards
--- dolphin-emu-gcc-4.7.patch DELETED ---
11 years, 11 months
rpms/openafs/F-18 openafs.spec, 1.30, 1.31 sources, 1.11, 1.12 openafs-1.6.1-afsd-sys-resource-h.patch, 1.1, NONE openafs-1.6.1-int31-partsize.patch, 1.1, NONE
by Ken Dreyer
Author: ktdreyer
Update of /cvs/free/rpms/openafs/F-18
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv15818
Modified Files:
openafs.spec sources
Removed Files:
openafs-1.6.1-afsd-sys-resource-h.patch
openafs-1.6.1-int31-partsize.patch
Log Message:
* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre1
- Update to OpenAFS 1.6.2 pre-release 1
- Remove upstreamed patches
Index: openafs.spec
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/openafs.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- openafs.spec 12 Dec 2012 05:12:29 -0000 1.30
+++ openafs.spec 13 Dec 2012 20:13:13 -0000 1.31
@@ -10,15 +10,17 @@
%define sysname amd64_linux26
%endif
+%define pre pre1
+
Summary: Enterprise Network File System
Name: openafs
-Version: 1.6.1
-Release: 9%{?dist}
+Version: 1.6.2
+Release: 0.%{pre}%{?dist}
License: IBM
Group: System Environment/Daemons
URL: http://www.openafs.org
-Source0: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-src.tar.bz2
-Source1: http://dl.openafs.org/dl/%{version}/%{name}-%{version}-doc.tar.bz2
+Source0: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
+Source1: http://dl.openafs.org/dl/candidate/%{version}%{pre}/%{name}-%{version}%{p...
Source11: http://grand.central.org/dl/cellservdb/CellServDB
Source12: cacheinfo
Source13: openafs.init
@@ -36,22 +38,16 @@
BuildRequires: automake, autoconf
Patch0: openafs-1.6.0-fPIC.patch
-# Upstream patch to fix fileservers with >2TB partitions
-Patch1: openafs-1.6.1-int31-partsize.patch
-# Upstream patch to compile with newer glibc
-# (not yet on openafs-stable-1_6_x; cherry-picked from master)
-Patch2: openafs-1.6.1-afsd-sys-resource-h.patch
# systemd: Skip CellServDB manipulation
-Patch3: openafs-1.6.1-systemd-no-cellservdb.patch
+Patch1: openafs-1.6.1-systemd-no-cellservdb.patch
# systemd: unload the proper kernel module
-# (TODO: check if this can be upstreamed)
-Patch4: openafs-1.6.1-systemd-kmod-name.patch
+Patch2: openafs-1.6.1-systemd-kmod-name.patch
# systemd: use FHS-style paths instead of transarc paths
-Patch5: openafs-1.6.1-systemd-fhs.patch
+Patch3: openafs-1.6.1-systemd-fhs.patch
# systemd: add additional user-friendly environment vars
-Patch6: openafs-1.6.1-systemd-env-vars.patch
+Patch4: openafs-1.6.1-systemd-env-vars.patch
# Add ExecPostStart "sysnames" helper script.
-Patch7: openafs-1.6.1-systemd-execpoststart.patch
+Patch5: openafs-1.6.1-systemd-execpoststart.patch
# Use systemd unit files on Fedora 18 and above.
%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
@@ -132,24 +128,17 @@
Cell.
%prep
-%setup -q -b 1 -n openafs-%{version}
+%setup -q -b 1 -n openafs-%{version}%{pre}
# This changes osconf.m4 to build with -fPIC on i386 and x86_64
%patch0
-# This allows fileservers to report correct partition usage on
-# partitions greater than 2TB.
-%patch1 -p1
-
-# This allows us to build with newer glibc
-%patch2 -p1
-
# systemd unit file changes for RPM Fusion
-%patch3 -p1 -b .cellservdb
-%patch4 -p1 -b .kmod
-%patch5 -p1 -b .fhs
-%patch6 -p1 -b .envvars
-%patch7 -p1 -b .execpoststart
+%patch1 -p1 -b .cellservdb
+%patch2 -p1 -b .kmod
+%patch3 -p1 -b .fhs
+%patch4 -p1 -b .envvars
+%patch5 -p1 -b .execpoststart
# Convert the licese to UTF-8
mv src/LICENSE src/LICENSE~
@@ -465,6 +454,10 @@
%{_datadir}/openafs/C/afszcm.cat
%changelog
+* Thu Dec 13 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.2-0.pre1
+- Update to OpenAFS 1.6.2 pre-release 1
+- Remove upstreamed patches
+
* Tue Dec 11 2012 Ken Dreyer <ktdreyer(a)ktdreyer.com> 0:1.6.1-9
- Correct bosserver path in systemd unit file
Index: sources
===================================================================
RCS file: /cvs/free/rpms/openafs/F-18/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources 4 Apr 2012 18:10:38 -0000 1.11
+++ sources 13 Dec 2012 20:13:13 -0000 1.12
@@ -1,2 +1,2 @@
-7215609990a2b253f8980fc1e1da0530 openafs-1.6.1-src.tar.bz2
-73d9a86038e827f95de90cf56c940bf7 openafs-1.6.1-doc.tar.bz2
+5d77189a51e3b91783ac52eb0748e739 openafs-1.6.2pre1-src.tar.bz2
+e05267e5e0b67c86baf11b35860fc8ff openafs-1.6.2pre1-doc.tar.bz2
--- openafs-1.6.1-afsd-sys-resource-h.patch DELETED ---
--- openafs-1.6.1-int31-partsize.patch DELETED ---
11 years, 11 months