[vlmc/f28] (3 commits) ...Rebase version
by Nicolas Chauvet
Summary of changes:
70a906f... Update vlmc-snapshot.sh (*)
b8a7c03... Update to git20170812 Move to autotools Add some new depend (*)
724a90b... Rebase version (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 8 months
[vlmc] Rebase version
by Nicolas Chauvet
commit 724a90b19069c0ecf884460c00535f4b873bc1bd
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Thu Mar 8 08:26:26 2018 +0100
Rebase version
.gitignore | 3 +--
sources | 2 +-
vlmc.spec | 74 ++++++++++++++++++++++++++++++++------------------------------
3 files changed, 40 insertions(+), 39 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 44f74d0..2b00337 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1 @@
-vlmc-20120408.tar.bz2
-/vlmc-20170812.tar.bz2
+/vlmc-*.tar.gz
diff --git a/sources b/sources
index 4b5d894..a46d308 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-beab64f2b97fa97c8c0f9c48ed61f21b vlmc-20170812.tar.bz2
+94683a904dc28ca91d6dda651377c576 vlmc-34dab07.tar.gz
diff --git a/vlmc.spec b/vlmc.spec
index 0b221f0..f75bee7 100644
--- a/vlmc.spec
+++ b/vlmc.spec
@@ -1,64 +1,64 @@
-%global date 20170812
+%global commit 34dab072f6ff5d13755b81aa79e71706b4b4d358
+%global shortcommit %(c=%{commit}; echo ${c:0:7})
Name: vlmc
Version: 0.2.0
-Release: 0.11.git%{date}%{?dist}
+Release: 0.12.git%{shortcommit}%{?dist}
Summary: VideoLAN Movie Creator
-Group: Applications/Multimedia
License: GPLv2+
-URL: http://trac.videolan.org/vlmc
-Source0: vlmc-%{date}.tar.bz2
-Source9: vlmc-snapshot.sh
+URL: https://www.videolan.org/vlmc/
+Source0: https://code.videolan.org/videolan/vlmc/repository/archive.tar.gz?ref=%{c...
Patch1: vlmc-gcc47.patch
-BuildRequires: autoconf automake libtool
-BuildRequires: vlc-devel >= 3.0
-BuildRequires: libvlcpp-devel
-BuildRequires: medialibrary-devel
-BuildRequires: mlt-devel
-BuildRequires: frei0r-devel
-BuildRequires: qt5-devel >= 4.5.1
-BuildRequires: cmake >= 2.6.0
BuildRequires: desktop-file-utils
-BuildRequires: /usr/bin/hostname
+BuildRequires: gcc-c++
+BuildRequires: hostname
+BuildRequires: libtool
+
+BuildRequires: pkgconfig(frei0r)
+BuildRequires: pkgconfig(Qt5Core)
+BuildRequires: pkgconfig(Qt5Widgets)
+BuildRequires: pkgconfig(Qt5Gui)
+BuildRequires: pkgconfig(Qt5Network)
+BuildRequires: pkgconfig(Qt5Quick)
+BuildRequires: pkgconfig(libvlc)
+BuildRequires: pkgconfig(libvlcpp)
+BuildRequires: pkgconfig(medialibrary)
+BuildRequires: pkgconfig(mlt-framework)
+
+
Requires: frei0r-plugins
+Requires: mlt-freeworld >= 6.3
+
%description
VideoLAN Movie Creator is a non-linear editing software for video creation based on libVLC
%prep
-%setup -q -n vlmc-%{date}
-%patch1 -p1 -b .gcc47
+%autosetup -p1 -n vlmc-%{commit}-%{commit}
+./bootstrap
%build
-./bootstrap
-./configure --help
%configure
-%make_build VERBOSE=1
+
+%make_build V=1
%install
%make_install
-#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-
-# below is the desktop file and icon stuff.
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
-desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
- share/vlmc.desktop
-
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
-install -p -m 644 share/vlmc.png \
- $RPM_BUILD_ROOT%{_datadir}/pixmaps
+mkdir -p %{buildroot}%{_datadir}/pixmaps
+install -pm 0644 share/vlmc.png \
+ %{buildroot}%{_datadir}/pixmaps
-mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
-install -p -m 644 doc/vlmc.1 \
- $RPM_BUILD_ROOT%{_mandir}/man1
+mkdir -p %{buildroot}%{_mandir}/man1
+install -pm 0644 doc/vlmc.1 \
+ %{buildroot}%{_mandir}/man1
-desktop-file-validate \
- $RPM_BUILD_ROOT%{_datadir}/applications/vlmc.desktop
+desktop-file-install share/vlmc.desktop \
+ %{buildroot}%{_datadir}/applications/vlmc.desktop
%files
@@ -71,6 +71,9 @@ desktop-file-validate \
%changelog
+* Thu Mar 08 2018 Nicolas Chauvet <kwizart(a)gmail.com> - 0.2.0-0.12.git34dab07
+- Rebase to gitlab source URL
+
* Thu Mar 08 2018 Sérgio Basto <sergio(a)serjux.com> - 0.2.0-0.11.git20170812
- Update to git20170812
- Move to autotools
@@ -79,7 +82,6 @@ desktop-file-validate \
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 0.2.0-0.10.git20120408
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
* Thu Aug 31 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.2.0-0.9.git20120408
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
6 years, 8 months
[vlmc] Update to git20170812 Move to autotools Add some new dependencies Spec clean up and add license tag
by Sérgio M. Basto
commit b8a7c03b698674ec929dd2d163ea525f98582384
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 8 04:19:03 2018 +0000
Update to git20170812
Move to autotools
Add some new dependencies
Spec clean up and add license tag
.gitignore | 1 +
sources | 2 +-
vlmc-13c4dbc-ldf.patch | 12 ----------
vlmc-gcc47.patch | 15 ++++++------
vlmc.spec | 65 ++++++++++++++++++++++++++++----------------------
5 files changed, 46 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ef6e571..44f74d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
vlmc-20120408.tar.bz2
+/vlmc-20170812.tar.bz2
diff --git a/sources b/sources
index d1d5179..4b5d894 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-35cd181a7481754f4823b24533197e34 vlmc-20120408.tar.bz2
+beab64f2b97fa97c8c0f9c48ed61f21b vlmc-20170812.tar.bz2
diff --git a/vlmc-gcc47.patch b/vlmc-gcc47.patch
index 976257e..d875b50 100644
--- a/vlmc-gcc47.patch
+++ b/vlmc-gcc47.patch
@@ -1,15 +1,14 @@
-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.
- *****************************************************************************/
+--- ./src/Project/WorkspaceWorker.cpp.orig 2018-03-08 01:01:36.043866949 +0000
++++ ./src/Project/WorkspaceWorker.cpp 2018-03-08 01:02:14.669251802 +0000
+@@ -24,6 +24,8 @@
+ # include "config.h"
+ #endif
+#include <unistd.h> // link
+
- #include "WorkspaceWorker.h"
+ #include "Project/WorkspaceWorker.h"
- #include "Media.h"
+ #include "Media/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
diff --git a/vlmc.spec b/vlmc.spec
index e7f0277..0b221f0 100644
--- a/vlmc.spec
+++ b/vlmc.spec
@@ -1,24 +1,27 @@
-%global date 20120408
+%global date 20170812
Name: vlmc
Version: 0.2.0
-Release: 0.10.git%{date}%{?dist}
+Release: 0.11.git%{date}%{?dist}
Summary: VideoLAN Movie Creator
Group: Applications/Multimedia
License: GPLv2+
URL: http://trac.videolan.org/vlmc
Source0: vlmc-%{date}.tar.bz2
-Source9: vlmc-snapshot.sh
-Patch0: vlmc-13c4dbc-ldf.patch
+Source9: vlmc-snapshot.sh
Patch1: vlmc-gcc47.patch
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: vlc-devel >= 1.1.4
+BuildRequires: autoconf automake libtool
+BuildRequires: vlc-devel >= 3.0
+BuildRequires: libvlcpp-devel
+BuildRequires: medialibrary-devel
+BuildRequires: mlt-devel
BuildRequires: frei0r-devel
-BuildRequires: qt-devel >= 4.5.1
+BuildRequires: qt5-devel >= 4.5.1
BuildRequires: cmake >= 2.6.0
BuildRequires: desktop-file-utils
+BuildRequires: /usr/bin/hostname
Requires: frei0r-plugins
%description
@@ -26,41 +29,41 @@ VideoLAN Movie Creator is a non-linear editing software for video creation based
%prep
%setup -q -n vlmc-%{date}
-%patch0 -p1 -b .ldf
%patch1 -p1 -b .gcc47
%build
-mkdir -p build
-pushd build
-%cmake \
- -DVLMC_LIB_SUBDIR=%{_lib} \
- -DCMAKE_BUILD_TYPE=Release \
- ..
-
-make VERBOSE=1 %{?_smp_mflags}
-popd
+./bootstrap
+./configure --help
+%configure
+%make_build VERBOSE=1
%install
-rm -rf $RPM_BUILD_ROOT
-pushd build
-make install DESTDIR=$RPM_BUILD_ROOT
-popd
+%make_install
-rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
+#rm -rf $RPM_BUILD_ROOT%{_datadir}/doc
-desktop-file-validate \
- $RPM_BUILD_ROOT%{_datadir}/applications/vlmc.desktop
+# below is the desktop file and icon stuff.
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+desktop-file-install --dir $RPM_BUILD_ROOT%{_datadir}/applications \
+ share/vlmc.desktop
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/pixmaps
+install -p -m 644 share/vlmc.png \
+ $RPM_BUILD_ROOT%{_datadir}/pixmaps
-%clean
-rm -rf $RPM_BUILD_ROOT
+mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1
+install -p -m 644 doc/vlmc.1 \
+ $RPM_BUILD_ROOT%{_mandir}/man1
+
+desktop-file-validate \
+ $RPM_BUILD_ROOT%{_datadir}/applications/vlmc.desktop
%files
-%defattr(-,root,root,-)
-%doc AUTHORS COPYING NEWS README TRANSLATORS
+%doc AUTHORS NEWS README.md TRANSLATORS
+%license COPYING
%{_bindir}/vlmc
%{_mandir}/man1/vlmc.1.*
%{_datadir}/applications/vlmc.desktop
@@ -68,6 +71,12 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Thu Mar 08 2018 Sérgio Basto <sergio(a)serjux.com> - 0.2.0-0.11.git20170812
+- Update to git20170812
+- Move to autotools
+- Add some new dependencies
+- Spec clean up and add license tag
+
* Thu Mar 01 2018 RPM Fusion Release Engineering <leigh123linux(a)googlemail.com> - 0.2.0-0.10.git20120408
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
6 years, 8 months
[vlmc] Update vlmc-snapshot.sh
by Sérgio M. Basto
commit 70a906f35d07524f9bda908cf8105a43b9c2ec34
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Thu Mar 8 04:12:21 2018 +0000
Update vlmc-snapshot.sh
vlmc-snapshot.sh | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/vlmc-snapshot.sh b/vlmc-snapshot.sh
index d72e968..9238c3d 100755
--- a/vlmc-snapshot.sh
+++ b/vlmc-snapshot.sh
@@ -12,11 +12,12 @@ cleanup() {
unset CDPATH
pwd=$(pwd)
-date=$(date +%Y%m%d)
package=vlmc
pushd "$tmp"
-git clone git://git.videolan.org/vlmc.git
+git clone https://code.videolan.org/videolan/vlmc.git
cd $package
+date=$(git log -1 --format=%cd --date=short | tr -d \-)
git archive --prefix="${package}-${date}/" --format=tar master | bzip2 > "$pwd"/${package}-${date}.tar.bz2
popd
+sed -i "s|^%global date .*|%global date $date|" vlmc.spec
6 years, 8 months