summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorleigh123linux <leigh123linux@googlemail.com>2018-09-01 14:18:59 +0100
committerleigh123linux <leigh123linux@googlemail.com>2018-09-01 14:18:59 +0100
commit616eac2d94fd8c276970c8e52997e530e0d301d4 (patch)
tree204e4cbecc927fd04cc9bd94e45a772b10a14087
parentafe60f8446b513d82ae4904fa3a3a670bf98ee3a (diff)
downloadbino-616eac2d94fd8c276970c8e52997e530e0d301d4.zip
bino-616eac2d94fd8c276970c8e52997e530e0d301d4.tar.gz
bino-616eac2d94fd8c276970c8e52997e530e0d301d4.tar.xz
New versionf29f28f27
-rw-r--r--bino.spec24
-rw-r--r--ffmpeg35_buildfix.patch23
-rw-r--r--sources2
3 files changed, 11 insertions, 38 deletions
diff --git a/bino.spec b/bino.spec
index 56d0184..65074ad 100644
--- a/bino.spec
+++ b/bino.spec
@@ -1,12 +1,11 @@
Name: bino
-Version: 1.6.6
-Release: 6%{?dist}
+Version: 1.6.7
+Release: 1%{?dist}
Summary: 3D video player
Group: System Environment/Base
License: GPLv3+
-URL: http://bino3d.org
-Source0: http://download.savannah.nongnu.org/releases/bino/%{name}-%{version}.tar.xz
-Patch0: ffmpeg35_buildfix.patch
+URL: https://bino3d.org
+Source0: %url/releases/%{name}-%{version}.tar.xz
# No libquadmath-devel on any other arch apart from x86
ExclusiveArch: i686 x86_64
@@ -17,6 +16,7 @@ Requires: hicolor-icon-theme
BuildRequires: automake
BuildRequires: ffmpeg-devel
+BuildRequires: gcc-c++
BuildRequires: glew-devel
BuildRequires: libass-devel
BuildRequires: openal-devel
@@ -24,7 +24,6 @@ BuildRequires: qt5-qtbase-devel
BuildRequires: libquadmath-devel
BuildRequires: gettext-devel
BuildRequires: texinfo
-BuildRequires: oxygen-icon-theme
BuildRequires: desktop-file-utils
%description
@@ -35,9 +34,6 @@ multi-projector setups.
%prep
%autosetup -p1
-# Needed for revert_glewmx.patch
-mkdir m4
-autoreconf -fiv
# Removal of unneeded stuff
rm -rf pkg/macosx/*
@@ -45,14 +41,11 @@ touch pkg/macosx/Info.plist.in
%build
%configure --with-qt-version=5
-%{make_build}
+%{make_build} V=1
%install
%{make_install}
rm -f %{buildroot}%{_infodir}/dir
-
-mkdir _tmpdoc
-mv %{buildroot}%{_datadir}/doc/%{name}/* _tmpdoc/
rm -rf %{buildroot}%{_datadir}/doc
desktop-file-validate %{buildroot}%{_datadir}/applications/bino.desktop
@@ -72,7 +65,7 @@ if [ $1 -eq 0 ]; then
fi
%files -f %{name}.lang
-%doc AUTHORS ChangeLog NEWS README _tmpdoc/*
+%doc AUTHORS ChangeLog NEWS README doc/*
%license COPYING
%{_bindir}/bino
%{_infodir}/*
@@ -81,6 +74,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Sat Sep 01 2018 Leigh Scott <leigh123linux@googlemail.com> - 1.6.7-1
+- New version
+
* Thu Jul 26 2018 RPM Fusion Release Engineering <leigh123linux@gmail.com> - 1.6.6-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
deleted file mode 100644
index 7c334d8..0000000
--- a/ffmpeg35_buildfix.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- a/src/media_object.cpp
-+++ b/src/media_object.cpp
-@@ -59,6 +59,10 @@
-
- #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 25, 0)
- #define AV_CODEC_ID_TEXT CODEC_ID_TEXT
-+#endif
-+
-+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(58, 9, 100)
-+#define CODEC_FLAG_EMU_EDGE 0x4000
- #endif
-
- // The read thread.
-@@ -905,7 +909,7 @@
- #ifdef FF_API_LOWRES
- lowres = codec_ctx->lowres;
- #endif
-- if (lowres || (codec && (codec->capabilities & CODEC_CAP_DR1)))
-+ if (lowres || (codec && (codec->capabilities & AV_CODEC_CAP_DR1)))
- codec_ctx->flags |= CODEC_FLAG_EMU_EDGE;
- }
- // Find and open the codec. AV_CODEC_ID_TEXT is a special case: it has no decoder since it is unencoded raw data.
-
diff --git a/sources b/sources
index 2bd4bb3..c51bca2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-214dcc4ab223b8f6a7536d9b35433092 bino-1.6.6.tar.xz
+54dcaea515838db50d6e2c5b1a9d32d9 bino-1.6.7.tar.xz