[mpv] Try again to fix man
by Leigh Scott
commit 23ea9df1b33f15775bfa8d3420a7dbb3bdd23983
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 25 08:25:20 2018 +0100
Try again to fix man
mpv.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mpv.spec b/mpv.spec
index df377d4..2acceb2 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -61,7 +61,7 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xscrnsaver)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zlib)
-%if 0%{?fedora} >= 28
+%if 0%{?fedora} >= 29
BuildRequires: python3-docutils
%else
BuildRequires: python2-docutils
6 years, 4 months
[mpv/f28] Fix build with older fedora
by Leigh Scott
Summary of changes:
b6fc252... Fix build with older fedora (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[mpv] Fix build with older fedora
by Leigh Scott
commit b6fc2527bfdf16323e7acb219f4aa3624129dc88
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 25 08:14:23 2018 +0100
Fix build with older fedora
mpv.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mpv.spec b/mpv.spec
index 3cc36fa..df377d4 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -61,8 +61,11 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xscrnsaver)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zlib)
+%if 0%{?fedora} >= 28
BuildRequires: python3-docutils
-
+%else
+BuildRequires: python2-docutils
+%endif
BuildRequires: perl(Math::BigInt)
BuildRequires: perl(Math::BigRat)
BuildRequires: perl(Encode)
6 years, 4 months
[mpv/f28] (4 commits) ...Update to 0.29.0
by Leigh Scott
Summary of changes:
5b4ab47... Rebuild for new libass version (*)
b4a49f8... vulkan is x86 only due to missing drivers (*)
3604a5b... Revert last commit (*)
2c519bf... Update to 0.29.0 (*)
(*) This commit already existed in another branch; no separate mail sent
6 years, 4 months
[mpv] Update to 0.29.0
by Leigh Scott
commit 2c519bf99cbc236b483b21fc729c3663c74ba969
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Jul 25 07:58:04 2018 +0100
Update to 0.29.0
mpv-do-not-fail-with-minor-ffmpeg-updates.patch | 21 ++++++++++++---------
mpv.spec | 11 +++++++----
sources | 2 +-
3 files changed, 20 insertions(+), 14 deletions(-)
---
diff --git a/mpv-do-not-fail-with-minor-ffmpeg-updates.patch b/mpv-do-not-fail-with-minor-ffmpeg-updates.patch
index c421dc6..dbff2ae 100644
--- a/mpv-do-not-fail-with-minor-ffmpeg-updates.patch
+++ b/mpv-do-not-fail-with-minor-ffmpeg-updates.patch
@@ -1,13 +1,17 @@
-diff -Naur mpv-0.28.0.old/player/main.c mpv-0.28.0/player/main.c
---- mpv-0.28.0.old/player/main.c
-+++ mpv-0.28.0/player/main.c
-@@ -428,18 +428,6 @@
- if (handle_help_options(mpctx))
- return -2;
+diff -Naur mpv-0.29.0.old/player/main.c mpv-0.29.0/player/main.c
+--- mpv-0.29.0.old/player/main.c
++++ mpv-0.29.0/player/main.c
+@@ -380,21 +380,6 @@
+ if (handle_help_options(mpctx))
+ return 1; // help
+-
- if (!print_libav_versions(mp_null_log, 0)) {
- // Using mismatched libraries can be legitimate, but even then it's
- // a bad idea. We don't acknowledge its usefulness and stability.
+- // Distro maintainers who patch this out should be aware that mpv
+- // intentionally ignores ABI in some places where it's not possible to
+- // get by without violating it.
- print_libav_versions(mpctx->log, MSGL_FATAL);
- MP_FATAL(mpctx, "\nmpv was compiled against a different version of "
- "FFmpeg/Libav than the shared\nlibrary it is linked against. "
@@ -16,8 +20,7 @@ diff -Naur mpv-0.28.0.old/player/main.c mpv-0.28.0/player/main.c
- "configuration and will not run - rebuild mpv instead.\n");
- return -1;
- }
--
- if (!mpctx->playlist->first && !opts->player_idle_mode)
- return -3;
+ if (!mpctx->playlist->first && !opts->player_idle_mode) {
+ // nothing to play
diff --git a/mpv.spec b/mpv.spec
index 28c68a2..3cc36fa 100644
--- a/mpv.spec
+++ b/mpv.spec
@@ -1,6 +1,6 @@
Name: mpv
-Version: 0.28.2
-Release: 6%{?dist}
+Version: 0.29.0
+Release: 1%{?dist}
Summary: Movie player playing most video formats and DVDs
License: GPLv2+ and LGPLv2+
URL: http://%{name}.io/
@@ -23,6 +23,7 @@ BuildRequires: pkgconfig(dvdread)
BuildRequires: pkgconfig(egl)
BuildRequires: pkgconfig(enca)
BuildRequires: ffmpeg-devel >= 3.5
+BuildRequires: nv-codec-headers
BuildRequires: pkgconfig(gbm)
BuildRequires: pkgconfig(gl)
BuildRequires: pkgconfig(jack)
@@ -60,7 +61,7 @@ BuildRequires: pkgconfig(xrandr)
BuildRequires: pkgconfig(xscrnsaver)
BuildRequires: pkgconfig(xv)
BuildRequires: pkgconfig(zlib)
-BuildRequires: python2-docutils
+BuildRequires: python3-docutils
BuildRequires: perl(Math::BigInt)
BuildRequires: perl(Math::BigRat)
@@ -112,7 +113,6 @@ waf configure \
--enable-sdl2 \
--enable-libarchive \
--enable-libsmbclient \
- --enable-encoding \
--enable-dvdread \
--enable-dvdnav \
--enable-cdda \
@@ -149,6 +149,9 @@ install -Dpm 644 README.md etc/input.conf etc/mpv.conf -t %{buildroot}%{_docdir}
%{_libdir}/pkgconfig/mpv.pc
%changelog
+* Wed Jul 25 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.29.0-1
+- Update to 0.29.0
+
* Wed Jun 27 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 0.28.2-6
- Revert last commit
diff --git a/sources b/sources
index 77e8f6f..5c479af 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b6538dec29a2a69574f4e3a3d688fb8b mpv-0.28.2.tar.gz
+5a4844da6f3683e27a99db7703721a64 mpv-0.29.0.tar.gz
6 years, 4 months
[caja-dropbox] fix patch
by Leigh Scott
commit 249edce704e55127a69d3b07d647b4a4572b8c19
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 24 21:00:30 2018 +0100
fix patch
use_python2.patch | 23 +++++++++++------------
1 file changed, 11 insertions(+), 12 deletions(-)
---
diff --git a/use_python2.patch b/use_python2.patch
index 46fa215..a7fec19 100644
--- a/use_python2.patch
+++ b/use_python2.patch
@@ -1,6 +1,6 @@
--- a/configure.ac
+++ b/configure.ac
-@@ -29,16 +29,16 @@
+@@ -30,16 +30,16 @@ fi
PKG_CHECK_MODULES(CAJA, libcaja-extension >= $CAJA_REQUIRED)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
@@ -20,20 +20,19 @@
try:
import $2
except:
-
--- a/Makefile.am
+++ b/Makefile.am
- man_MANS = dropbox.1
+@@ -6,11 +6,11 @@ EXTRA_DIST = caja-dropbox.in serializeim
+ man_MANS = caja-dropbox.1
- dropbox: dropbox.in serializeimages.py
-- python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
-+ python2 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
- chmod +x dropbox
+ caja-dropbox: caja-dropbox.in serializeimages.py
+- python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox
++ python2 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < caja-dropbox.in > caja-dropbox
+ chmod +x caja-dropbox
- dropbox.1: dropbox dropbox.txt.in docgen.py
-- python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
-+ python2 docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
- $(RST2MAN) dropbox.txt > dropbox.1
+ caja-dropbox.1: caja-dropbox.txt.in caja-dropbox docgen.py
+- python docgen.py $(PACKAGE_VERSION) caja-dropbox.txt.in caja-dropbox.txt
++ python2 docgen.py $(PACKAGE_VERSION) caja-dropbox.txt.in caja-dropbox.txt
+ $(RST2MAN) caja-dropbox.txt > caja-dropbox.1
SUBDIRS = data src
-
6 years, 4 months
[nemo-dropbox] fix patch
by Leigh Scott
commit 875827ebbd92d0a490087c2f40a201abe99ec090
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 24 20:54:40 2018 +0100
fix patch
use_python2.patch | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
---
diff --git a/use_python2.patch b/use_python2.patch
index ee5ab46..f4a3a18 100644
--- a/use_python2.patch
+++ b/use_python2.patch
@@ -1,6 +1,6 @@
--- a/nemo-dropbox/configure.ac
+++ b/nemo-dropbox/configure.ac
-@@ -29,16 +29,16 @@
+@@ -29,16 +29,16 @@ fi
PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
@@ -20,9 +20,9 @@
try:
import $2
except:
-
--- a/nemo-dropbox/Makefile.am
+++ b/nemo-dropbox/Makefile.am
+@@ -6,11 +6,11 @@ EXTRA_DIST = dropbox.in serializeimages.
man_MANS = dropbox.1
dropbox: dropbox.in serializeimages.py
@@ -36,4 +36,3 @@
$(RST2MAN) dropbox.txt > dropbox.1
SUBDIRS = data src
-
6 years, 4 months
[caja-dropbox] Fix build for f29 python changes
by Leigh Scott
commit d7ac824a16ffa3637c94791d7e25b48d63fe4245
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 24 20:32:59 2018 +0100
Fix build for f29 python changes
caja-dropbox.spec | 25 ++++++++++++++-----------
use_python2.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 53 insertions(+), 11 deletions(-)
---
diff --git a/caja-dropbox.spec b/caja-dropbox.spec
index 569dfce..e6cb6e8 100644
--- a/caja-dropbox.spec
+++ b/caja-dropbox.spec
@@ -4,11 +4,12 @@
Summary: Dropbox extension for caja
Name: caja-dropbox
Version: %{branch}.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+
Group: User Interface/Desktops
URL: http://git.mate-desktop.org/%{name}
Source0: http://pub.mate-desktop.org/releases/%{branch}/%{name}-%{version}.tar.xz
+Patch0: use_python2.patch
ExclusiveArch: i686 x86_64
@@ -34,33 +35,35 @@ Dropbox allows you to sync your files online and across
your computers automatically.
%prep
-%setup -q
+%autosetup -p1
+autoreconf -fiv
%build
%configure
-make %{?_smp_mflags}
+%{make_build}
%install
%{make_install}
-find ${RPM_BUILD_ROOT} -type f -name "*.la" -exec rm -f {} ';'
-find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
+find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
-rm -rf ${RPM_BUILD_ROOT}%{_bindir}
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}
+rm -rf %{buildroot}%{_bindir}
+rm -rf %{buildroot}%{_datadir}
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
%files
-%doc AUTHORS COPYING NEWS README
+%doc AUTHORS NEWS README
+%license COPYING
%{_libdir}/caja/extensions-2.0/libcaja-dropbox.so
%changelog
+* Tue Jul 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.20.0-2
+- Fix build for f29 python changes
+
* Mon May 02 2018 Wolfgang Ulbrich <fedora(a)raveit.de> - 1.20.0-1
- update to 1.20.0
diff --git a/use_python2.patch b/use_python2.patch
new file mode 100644
index 0000000..46fa215
--- /dev/null
+++ b/use_python2.patch
@@ -0,0 +1,39 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,16 +29,16 @@
+ PKG_CHECK_MODULES(CAJA, libcaja-extension >= $CAJA_REQUIRED)
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+
+-AC_PATH_PROG([PYTHON], [python])
++AC_PATH_PROG([PYTHON], [python2])
+
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man], [python2 rst2man.py])
+ AC_SUBST(RST2MAN)
+
+ # define module checking macro
+ AC_DEFUN([PYTHON_CHECK_MODULE], [
+ AC_MSG_CHECKING([for $1])
+
+-cat <<EOF | python
++cat <<EOF | python2
+ try:
+ import $2
+ except:
+
+--- a/Makefile.am
++++ b/Makefile.am
+ man_MANS = dropbox.1
+
+ dropbox: dropbox.in serializeimages.py
+- python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
++ python2 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
+ chmod +x dropbox
+
+ dropbox.1: dropbox dropbox.txt.in docgen.py
+- python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
++ python2 docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
+ $(RST2MAN) dropbox.txt > dropbox.1
+
+ SUBDIRS = data src
+
6 years, 4 months
[nemo-dropbox] Fix build for f29 python changes
by Leigh Scott
commit 1eacb5142335a879175a038fcd7c30639600cb60
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Tue Jul 24 20:22:01 2018 +0100
Fix build for f29 python changes
nemo-dropbox.spec | 14 +++++++++-----
use_python2.patch | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 5 deletions(-)
---
diff --git a/nemo-dropbox.spec b/nemo-dropbox.spec
index c99da68..0a6a205 100644
--- a/nemo-dropbox.spec
+++ b/nemo-dropbox.spec
@@ -1,10 +1,11 @@
Summary: Dropbox extension for nemo
Name: nemo-dropbox
Version: 3.8.0
-Release: 1%{?dist}
+Release: 2%{?dist}
License: GPLv2+ and LGPLv2+ and MIT
URL: https://github.com/linuxmint/nemo-extensions
Source0: %url/archive/%{version}.tar.gz#/nemo-extensions-%{version}.tar.gz
+Patch0: use_python2.patch
ExclusiveArch: i686 x86_64
@@ -23,7 +24,7 @@ Dropbox allows you to sync your files online and across
your computers automatically.
%prep
-%setup -q -n nemo-extensions-%{version}
+%autosetup -p1 -n nemo-extensions-%{version}
%build
pushd nemo-dropbox
@@ -38,10 +39,10 @@ pushd nemo-dropbox
popd
#Remove libtool archives.
-find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f
+find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
-rm -rf ${RPM_BUILD_ROOT}%{_bindir}
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}
+rm -rf %{buildroot}%{_bindir}
+rm -rf %{buildroot}%{_datadir}
%ldconfig_scriptlets
@@ -52,6 +53,9 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}
%changelog
+* Tue Jul 24 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.0-2
+- Fix build for f29 python changes
+
* Tue May 01 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 3.8.0-1
- Update to 3.8.0
diff --git a/use_python2.patch b/use_python2.patch
new file mode 100644
index 0000000..ee5ab46
--- /dev/null
+++ b/use_python2.patch
@@ -0,0 +1,39 @@
+--- a/nemo-dropbox/configure.ac
++++ b/nemo-dropbox/configure.ac
+@@ -29,16 +29,16 @@
+ PKG_CHECK_MODULES(NEMO, libnemo-extension >= $NEMO_REQUIRED)
+ PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
+
+-AC_PATH_PROG([PYTHON], [python])
++AC_PATH_PROG([PYTHON], [python2])
+
+-AC_PATH_PROG([RST2MAN], [rst2man], [python rst2man.py])
++AC_PATH_PROG([RST2MAN], [rst2man], [python2 rst2man.py])
+ AC_SUBST(RST2MAN)
+
+ # define module checking macro
+ AC_DEFUN([PYTHON_CHECK_MODULE], [
+ AC_MSG_CHECKING([for $1])
+
+-cat <<EOF | python
++cat <<EOF | python2
+ try:
+ import $2
+ except:
+
+--- a/nemo-dropbox/Makefile.am
++++ b/nemo-dropbox/Makefile.am
+ man_MANS = dropbox.1
+
+ dropbox: dropbox.in serializeimages.py
+- python serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
++ python2 serializeimages.py $(PACKAGE_VERSION) $(datadir)/applications < dropbox.in > dropbox
+ chmod +x dropbox
+
+ dropbox.1: dropbox dropbox.txt.in docgen.py
+- python docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
++ python2 docgen.py $(PACKAGE_VERSION) < dropbox.txt.in > dropbox.txt
+ $(RST2MAN) dropbox.txt > dropbox.1
+
+ SUBDIRS = data src
+
6 years, 4 months