Author: kwizart Update of /cvs/free/rpms/vlmc/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv28044/devel Modified Files: .cvsignore sources vlmc.spec Added Files: vlmc-gcc47.patch vlmc-snapshot.sh Log Message: Update to current snapshot vlmc-gcc47.patch: Project/WorkspaceWorker.cpp | 2 ++ vlmc.h | 2 ++ 2 files changed, 4 insertions(+) --- NEW FILE vlmc-gcc47.patch --- diff -up vlmc-20120408/src/Project/WorkspaceWorker.cpp.gcc47 vlmc-20120408/src/Project/WorkspaceWorker.cpp --- vlmc-20120408/src/Project/WorkspaceWorker.cpp.gcc47 2012-03-29 19:37:10.000000000 +0200 +++ vlmc-20120408/src/Project/WorkspaceWorker.cpp 2012-04-08 17:34:05.298089633 +0200 @@ -20,6 +20,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ +#include <unistd.h> // link + #include "WorkspaceWorker.h" #include "Media.h" diff -up vlmc-20120408/src/vlmc.h.gcc47 vlmc-20120408/src/vlmc.h --- vlmc-20120408/src/vlmc.h.gcc47 2012-03-29 19:37:10.000000000 +0200 +++ vlmc-20120408/src/vlmc.h 2012-04-08 17:33:15.322088791 +0200 @@ -24,6 +24,8 @@ #ifndef VLMC_H #define VLMC_H +#include <unistd.h> // sleep + #include <QtGlobal> #ifdef Q_OS_WIN --- NEW FILE vlmc-snapshot.sh --- #!/bin/bash set -e tmp=$(mktemp -d) trap cleanup EXIT cleanup() { set +e [ -z "$tmp" -o ! -d "$tmp" ] || rm -rf "$tmp" } unset CDPATH pwd=$(pwd) date=$(date +%Y%m%d) package=vlmc pushd "$tmp" git clone git://git.videolan.org/vlmc.git cd $package git archive --prefix="${package}-${date}/" --format=tar master | bzip2 > "$pwd"/${package}-${date}.tar.bz2 popd Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/vlmc/devel/.cvsignore,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- .cvsignore 9 Mar 2012 22:52:11 -0000 1.5 +++ .cvsignore 8 Apr 2012 15:29:12 -0000 1.6 @@ -1 +1 @@ -vlmc-991cfe4.tar.gz +vlmc-20120408.tar.bz2 Index: sources =================================================================== RCS file: /cvs/free/rpms/vlmc/devel/sources,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- sources 9 Mar 2012 22:52:11 -0000 1.5 +++ sources 8 Apr 2012 15:29:12 -0000 1.6 @@ -1 +1 @@ -9774c01382950fd1a3b89140f3248c23 vlmc-991cfe4.tar.gz +35cd181a7481754f4823b24533197e34 vlmc-20120408.tar.bz2 Index: vlmc.spec =================================================================== RCS file: /cvs/free/rpms/vlmc/devel/vlmc.spec,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- vlmc.spec 9 Mar 2012 22:52:11 -0000 1.4 +++ vlmc.spec 8 Apr 2012 15:29:12 -0000 1.5 @@ -1,17 +1,17 @@ -%global gitsnapshot 991cfe4 +%global date 20120408 Name: vlmc Version: 0.2.0 -Release: 0.5.git%{gitsnapshot}%{?dist} +Release: 0.5.git%{date}%{?dist} Summary: VideoLAN Movie Creator Group: Applications/Multimedia License: GPLv2+ URL: http://trac.videolan.org/vlmc -#Current snapshot at 20110109 -#http://git.videolan.org/?p=vlmc.git;a=snapshot;h=25a398b4e84a81e1482f93957f55077f4842f59e;sf=tgz -Source0: vlmc-%{gitsnapshot}.tar.gz +Source0: vlmc-%{date}.tar.bz2 +Source9: vlmc-snapshot.sh Patch0: vlmc-13c4dbc-ldf.patch +Patch1: vlmc-gcc47.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: vlc-devel >= 1.1.4 @@ -25,8 +25,9 @@ VideoLAN Movie Creator is a non-linear editing software for video creation based on libVLC %prep -%setup -q -n vlmc-%{gitsnapshot} +%setup -q -n vlmc-%{date} %patch0 -p1 -b .ldf +%patch1 -p1 -b .gcc47 %build