[bino] update and fix build
commit 46387bb807eef61e6c1b9dd0b6047e1647d631a8
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Jan 18 01:26:44 2018 +0000
update and fix build
bino.spec | 9 ++-
ffmpeg35_buildfix.patch | 23 ++++++
revert_glewmx.patch | 208 ------------------------------------------------
sources | 2 +-
4 files changed, 30 insertions(+), 212 deletions(-)
---
diff --git a/bino.spec b/bino.spec
index b9b946a..c867a7c 100644
--- a/bino.spec
+++ b/bino.spec
@@ -1,12 +1,12 @@
Name: bino
-Version: 1.6.5
-Release: 4%{?dist}
+Version: 1.6.6
+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: revert_glewmx.patch
+Patch0: ffmpeg35_buildfix.patch
# No libquadmath-devel on any other arch apart from x86
ExclusiveArch: i686 x86_64
@@ -94,6 +94,9 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.6.6-1
+- New version
+
* Thu Jan 18 2018 Leigh Scott <leigh123linux(a)googlemail.com> - 1.6.5-4
- Rebuilt for ffmpeg-3.5 git
diff --git a/ffmpeg35_buildfix.patch b/ffmpeg35_buildfix.patch
new file mode 100644
index 0000000..7c334d8
--- /dev/null
+++ b/ffmpeg35_buildfix.patch
@@ -0,0 +1,23 @@
+--- 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 c3c0649..2bd4bb3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-36da300a320481ae9637c66f1f4617d9 bino-1.6.5.tar.xz
+214dcc4ab223b8f6a7536d9b35433092 bino-1.6.6.tar.xz