[k3b-extras-freeworld] Patch for gcc7
by Leigh Scott
commit 45fdbd7e76a4b90423959f777851a244ae11e3e2
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Thu Mar 23 00:40:03 2017 +0000
Patch for gcc7
k3b-2.0.3-gcc7.patch | 57 +++++++++++++++++++++++++++++++++++++++++++++++
k3b-extras-freeworld.spec | 10 +++++----
2 files changed, 63 insertions(+), 4 deletions(-)
---
diff --git a/k3b-2.0.3-gcc7.patch b/k3b-2.0.3-gcc7.patch
new file mode 100644
index 0000000..db4c9d0
--- /dev/null
+++ b/k3b-2.0.3-gcc7.patch
@@ -0,0 +1,57 @@
+From 1777236203f21eed7a9baade632472094c8081d3 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino(a)kde.org>
+Date: Sat, 4 Feb 2017 10:48:45 +0100
+Subject: [PATCH] ffmpeg: fix/simplify metadata conversion to string
+
+Comparing a pointer with an integer value is (correctly) an error with
+GCC 7.
+---
+ plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp | 21 +++------------------
+ 1 file changed, 3 insertions(+), 18 deletions(-)
+
+diff --git a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+index a4fc784..22928b2 100644
+--- a/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
++++ b/plugins/decoder/ffmpeg/k3bffmpegwrapper.cpp
+@@ -259,12 +259,7 @@ QString K3bFFMpegFile::title() const
+ {
+ // FIXME: is this UTF8 or something??
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "TITLE", NULL, 0 );
+- if( ade == NULL )
+- return QString();
+- if( ade->value != '\0' )
+- return QString::fromLocal8Bit( ade->value );
+- else
+- return QString();
++ return ade && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString();
+ }
+
+
+@@ -272,12 +267,7 @@ QString K3bFFMpegFile::author() const
+ {
+ // FIXME: is this UTF8 or something??
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "ARTIST", NULL, 0 );
+- if( ade == NULL )
+- return QString();
+- if( ade->value != '\0' )
+- return QString::fromLocal8Bit( ade->value );
+- else
+- return QString();
++ return ade && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString();
+ }
+
+
+@@ -285,12 +275,7 @@ QString K3bFFMpegFile::comment() const
+ {
+ // FIXME: is this UTF8 or something??
+ AVDictionaryEntry *ade = av_dict_get( d->formatContext->metadata, "COMMENT", NULL, 0 );
+- if( ade == NULL )
+- return QString();
+- if( ade->value != '\0' )
+- return QString::fromLocal8Bit( ade->value );
+- else
+- return QString();
++ return ade && ade->value[0] != '\0' ? QString::fromLocal8Bit( ade->value ) : QString();
+ }
+
+
diff --git a/k3b-extras-freeworld.spec b/k3b-extras-freeworld.spec
index 5c8dafd..7b96eb8 100644
--- a/k3b-extras-freeworld.spec
+++ b/k3b-extras-freeworld.spec
@@ -8,7 +8,7 @@ Name: k3b-extras-freeworld
Summary: Additional codec plugins for the k3b CD/DVD burning application
Epoch: 1
Version: 2.0.3
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2+
URL: http://www.k3b.org/
@@ -21,6 +21,7 @@ ExcludeArch: s390 s390x
# see also http://bugs.kde.org/325486
Patch500: k3b-ffmpeg3.patch
Patch501: k3b-2.0.3-gcc6.patch
+Patch502: k3b-2.0.3-gcc7.patch
BuildRequires: desktop-file-utils
BuildRequires: gettext
@@ -59,9 +60,7 @@ handle CD/DVD burning application.
%prep
-%setup -q -n k3b-%{version}
-%patch500 -p1
-%patch501 -p1
+%autosetup -p1 -n k3b-%{version}
# hack around cmake-related FTBFS
sed -i.cmakehack -e "s|^cmake_minimum_required|#cmake_minimum_required|" CMakeLists.txt
@@ -106,6 +105,9 @@ popd
%changelog
+* Thu Mar 23 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1:2.0.3-5
+- Patch for gcc7
+
* Sun Mar 19 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1:2.0.3-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[x264] Unbootstrap
by Sérgio M. Basto
commit d3b68f03dfb8765f0c5370af2f0a11ab0ce6b090
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Mar 22 20:33:37 2017 +0000
Unbootstrap
x264.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index 5a0bc75..96be3cc 100644
--- a/x264.spec
+++ b/x264.spec
@@ -7,7 +7,7 @@
%global gver .%{gitdate}git%{gitversion}
%global branch stable
-%global _with_bootstrap 1
+#global _with_bootstrap 1
%{?_with_bootstrap:
%global _without_gpac 1
@@ -201,7 +201,7 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
-* Wed Mar 22 2017 Sérgio Basto <sergio(a)serjux.com> - 0.148-18.20170121git97eaef2_bootstrap
+* Wed Mar 22 2017 Sérgio Basto <sergio(a)serjux.com> - 0.148-18.20170121git97eaef2
- Unbootstrap
* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.148-17.20170121git97eaef2_bootstrap
7 years, 8 months
[x264] Unbootstrap
by Sérgio M. Basto
commit 3a0e8ce28e9c4db4ad92ed7fe72d294121272249
Author: Sérgio M. Basto <sergio(a)serjux.com>
Date: Wed Mar 22 20:30:39 2017 +0000
Unbootstrap
x264.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/x264.spec b/x264.spec
index 491c632..5a0bc75 100644
--- a/x264.spec
+++ b/x264.spec
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 17%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 18%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -201,6 +201,9 @@ install -pm644 generic/{AUTHORS,COPYING} %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Wed Mar 22 2017 Sérgio Basto <sergio(a)serjux.com> - 0.148-18.20170121git97eaef2_bootstrap
+- Unbootstrap
+
* Mon Mar 20 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 0.148-17.20170121git97eaef2_bootstrap
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[bino] Build is x86 only
by Leigh Scott
commit 0766fd69d4910d48d5c2c101f43f6818c02eb78c
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 14:12:08 2017 +0000
Build is x86 only
bino.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/bino.spec b/bino.spec
index df1c608..9f52f0e 100644
--- a/bino.spec
+++ b/bino.spec
@@ -8,8 +8,8 @@ URL: http://bino3d.org
Source0: http://download.savannah.nongnu.org/releases/bino/%{name}-%{version}.tar.xz
Patch0: revert_glewmx.patch
-# No libquadmath-devel on ARM
-ExcludeArch: armhfp armv7hl
+# No libquadmath-devel on any other arch apart from x86
+ExclusiveArch: i686 x86_64
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
@@ -97,6 +97,7 @@ fi
* Wed Mar 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.6.5-1
- New version
- Patch for glew-2.0 changes
+- Build is x86 only
* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[bino] Change gettext to gettext-devel
by Leigh Scott
commit 2c92d155441f0df79bd39646f7afa815f56d7c74
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 13:54:08 2017 +0000
Change gettext to gettext-devel
bino.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/bino.spec b/bino.spec
index 0f932d5..df1c608 100644
--- a/bino.spec
+++ b/bino.spec
@@ -22,7 +22,7 @@ BuildRequires: libass-devel
BuildRequires: openal-devel
BuildRequires: qt5-qtbase-devel
BuildRequires: libquadmath-devel
-BuildRequires: gettext
+BuildRequires: gettext-devel
BuildRequires: texinfo
BuildRequires: oxygen-icon-theme
BuildRequires: desktop-file-utils
@@ -36,6 +36,7 @@ multi-projector setups.
%prep
%autosetup -p1
# Needed for revert_glewmx.patch
+mkdir m4
autoreconf -fiv
# Removal of unneeded stuff
7 years, 8 months
[bino] Change autoconf to automake
by Leigh Scott
commit 4a165f4423d2113df03c79197d1acbbb01258fbf
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 13:33:01 2017 +0000
Change autoconf to automake
bino.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/bino.spec b/bino.spec
index d2eac05..0f932d5 100644
--- a/bino.spec
+++ b/bino.spec
@@ -15,7 +15,7 @@ Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: hicolor-icon-theme
-BuildRequires: autoconf
+BuildRequires: automake
BuildRequires: ffmpeg-devel
BuildRequires: glew-devel
BuildRequires: libass-devel
7 years, 8 months
[bino] Add build requires autoconf
by Leigh Scott
commit a94f254e727809101a59a1ab192a7047d7e19f19
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 13:26:40 2017 +0000
Add build requires autoconf
bino.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/bino.spec b/bino.spec
index f6900e2..d2eac05 100644
--- a/bino.spec
+++ b/bino.spec
@@ -15,6 +15,7 @@ Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Requires: hicolor-icon-theme
+BuildRequires: autoconf
BuildRequires: ffmpeg-devel
BuildRequires: glew-devel
BuildRequires: libass-devel
@@ -34,7 +35,7 @@ multi-projector setups.
%prep
%autosetup -p1
-# Need for revert_glewmx.patch
+# Needed for revert_glewmx.patch
autoreconf -fiv
# Removal of unneeded stuff
7 years, 8 months
[bino] Patch for glew-2.0 changes
by Leigh Scott
commit a5c932b01634baa4a017d149772de594f145987a
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 13:03:12 2017 +0000
Patch for glew-2.0 changes
bino.spec | 13 +++-
revert_glewmx.patch | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++
sources | 2 +-
3 files changed, 219 insertions(+), 4 deletions(-)
---
diff --git a/bino.spec b/bino.spec
index 5cfbe26..f6900e2 100644
--- a/bino.spec
+++ b/bino.spec
@@ -1,11 +1,12 @@
Name: bino
-Version: 1.6.4
-Release: 2%{?dist}
+Version: 1.6.5
+Release: 1%{?dist}
Summary: 3D video player
Group: System Environment/Base
License: GPLv3+
URL: http://bino3d.org
-Source0: http://download.savannah.nongnu.org/releases-noredirect/bino/%{name}-%{ve...
+Source0: http://download.savannah.nongnu.org/releases/bino/%{name}-%{version}.tar.xz
+Patch0: revert_glewmx.patch
# No libquadmath-devel on ARM
ExcludeArch: armhfp armv7hl
@@ -33,6 +34,8 @@ multi-projector setups.
%prep
%autosetup -p1
+# Need for revert_glewmx.patch
+autoreconf -fiv
# Removal of unneeded stuff
rm -rf pkg/macosx/*
@@ -89,6 +92,10 @@ fi
%{_datadir}/icons/hicolor/*/apps/*
%changelog
+* Wed Mar 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 1.6.5-1
+- New version
+- Patch for glew-2.0 changes
+
* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 1.6.4-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
diff --git a/revert_glewmx.patch b/revert_glewmx.patch
new file mode 100644
index 0000000..aab413f
--- /dev/null
+++ b/revert_glewmx.patch
@@ -0,0 +1,208 @@
+From 7098cd6afb7ed805de085ed72a5a3ff56e529277 Mon Sep 17 00:00:00 2001
+From: Martin Lambers <marlam(a)marlam.de>
+Date: Sun, 18 Dec 2016 14:37:52 +0100
+Subject: Revert "Always use GLEWmx, do not fall back to GLEW."
+
+This reverts commit eaf9278782b32a13cea19d1be331cb74a6cddce9.
+---
+ configure.ac | 15 +++++++++++++--
+ src/Makefile.am | 8 ++++++--
+ src/video_output.h | 4 +++-
+ src/video_output_qt.cpp | 13 ++++++++-----
+ src/video_output_qt.h | 20 +++++++++++++-------
+ 5 files changed, 43 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 52181ed..03c6b58 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -296,7 +296,9 @@ fi
+ AC_DEFINE_UNQUOTED([HAVE_LIBEQUALIZER], [$HAVE_LIBEQUALIZER], [Have Equalizer?])
+ AM_CONDITIONAL([HAVE_LIBEQUALIZER], [test "$HAVE_LIBEQUALIZER" = "1"])
+
+-dnl glewmx
++dnl glew
++dnl With Equalizer, we need glewmx, since that is what Equalizer uses.
++dnl Without Equalizer, glew (without mx) is ok to use, too.
+ PKG_CHECK_MODULES([libglewmx], [glewmx >= 1.6.0], [HAVE_LIBGLEWMX=1], [HAVE_LIBGLEWMX=0])
+ if test "$HAVE_LIBGLEWMX" != "1"; then
+ AC_MSG_WARN([required library libglewmx >= 1.6.0 not found:])
+@@ -304,6 +306,15 @@ if test "$HAVE_LIBGLEWMX" != "1"; then
+ AC_MSG_WARN([libglewmx is provided by glew; Debian package: libglewmx-dev])
+ fi
+ AM_CONDITIONAL([HAVE_LIBGLEWMX], [test "$HAVE_LIBGLEWMX" = "1"])
++if test "$HAVE_LIBGLEWMX" != "1" -a "$HAVE_LIBEQUALIZER" != "1"; then
++ AC_MSG_NOTICE([trying to use libglew instead of libglewmx])
++ PKG_CHECK_MODULES([libglew], [glew >= 1.6.0], [HAVE_LIBGLEW=1], [HAVE_LIBGLEW=0])
++ if test "$HAVE_LIBGLEW" != "1"; then
++ AC_MSG_WARN([required library libglew >= 1.6.0 not found:])
++ AC_MSG_WARN([$libglew_PKG_ERRORS])
++ AC_MSG_WARN([libglew is provided by glew; Debian package: libglew-dev])
++ fi
++fi
+
+ dnl libXNVCtrl
+ AC_ARG_WITH([xnvctrl],
+@@ -390,7 +401,7 @@ if test "$am_cv_func_iconv" != "yes" \
+ -o "$HAVE_LIBASS" != "1" \
+ -o "$HAVE_LIBOPENAL" != "1" \
+ -o "$HAVE_LIBQTOPENGL" != "1" \
+- -o "$HAVE_LIBGLEWMX" != "1" \
++ -o \( "$HAVE_LIBGLEWMX" != "1" -a "$HAVE_LIBGLEW" != "1" \) \
+ -o \( "$equalizer" = "yes" -a "$HAVE_LIBEQUALIZER" != "1" \) \
+ -o \( "$xnvctrl" = "yes" -a "$HAVE_LIBXNVCTRL" != "1" \) \
+ -o \( "$lirc" = "yes" -a "$HAVE_LIRC" != "1" \) ; then
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 6fc12bb..65cbae6 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -149,11 +149,15 @@ DEFS += -DHTMLDIR=\"$(htmldir)\" -DLOCALEDIR=\"$(localedir)\"
+
+ AM_CPPFLAGS = \
+ $(libavformat_CFLAGS) $(libavdevice_CFLAGS) $(libswscale_CFLAGS) $(libass_CFLAGS) \
+- $(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libqtopengl_CFLAGS)
++ $(libopenal_CFLAGS) $(libgl_CFLAGS) $(libglewmx_CFLAGS) $(libglew_CFLAGS) $(libqtopengl_CFLAGS)
+
+ bino_LDADD = $(top_builddir)/src/base/libbase.a $(LIBINTL) $(LIBICONV) \
+ $(libavformat_LIBS) $(libavdevice_LIBS) $(libswscale_LIBS) $(libass_LIBS) \
+- $(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libqtopengl_LIBS)
++ $(libopenal_LIBS) $(libgl_LIBS) $(libglewmx_LIBS) $(libglew_LIBS) $(libqtopengl_LIBS)
++
++if HAVE_LIBGLEWMX
++AM_CPPFLAGS += -DGLEW_MX
++endif
+
+ if HAVE_LIBEQUALIZER
+ bino_SOURCES += player_equalizer.h player_equalizer.cpp
+diff --git a/src/video_output.h b/src/video_output.h
+index 8430ddc..2fd72ce 100644
+--- a/src/video_output.h
++++ b/src/video_output.h
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012, 2015
++ * Copyright (C) 2010, 2011, 2012, 2015, 2016
+ * Martin Lambers <marlam(a)marlam.de>
+ * Frédéric Devernay <Frederic.Devernay(a)inrialpes.fr>
+ * Joe <cuchac(a)email.cz>
+@@ -128,7 +128,9 @@ private:
+ protected:
+ subtitle_renderer _subtitle_renderer;
+
++#ifdef GLEW_MX
+ virtual GLEWContext* glewGetContext() const = 0;
++#endif
+
+ // Get the total viewport size.
+ int full_display_width() const;
+diff --git a/src/video_output_qt.cpp b/src/video_output_qt.cpp
+index 0758892..ab82388 100644
+--- a/src/video_output_qt.cpp
++++ b/src/video_output_qt.cpp
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015
++ * Copyright (C) 2010, 2011, 2012, 2013, 2014, 2015, 2016
+ * Martin Lambers <marlam(a)marlam.de>
+ * Frédéric Devernay <frederic.devernay(a)inrialpes.fr>
+ * Joe <cuchac(a)email.cz>
+@@ -80,11 +80,13 @@ gl_thread::gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widge
+ {
+ }
+
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext* gl_thread::glxewGetContext() const
+ {
+ return _vo_qt->glxewGetContext();
+ }
++# endif
+ #endif
+
+ void gl_thread::set_render(bool r)
+@@ -781,17 +783,18 @@ void video_output_qt::create_widget()
+ process_events();
+ }
+
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext* video_output_qt::glxewGetContext() const
+ {
+ return const_cast<GLXEWContext*>(&_glxew_context);
+ }
+-#endif
+-
++# endif
+ GLEWContext* video_output_qt::glewGetContext() const
+ {
+ return const_cast<GLEWContext*>(&_glew_context);
+ }
++#endif
+
+ bool video_output_qt::context_is_stereo() const
+ {
+diff --git a/src/video_output_qt.h b/src/video_output_qt.h
+index 1cc3174..089bac9 100644
+--- a/src/video_output_qt.h
++++ b/src/video_output_qt.h
+@@ -1,7 +1,7 @@
+ /*
+ * This file is part of bino, a 3D video player.
+ *
+- * Copyright (C) 2010, 2011, 2012, 2013, 2015
++ * Copyright (C) 2010, 2011, 2012, 2013, 2015, 2016
+ * Martin Lambers <marlam(a)marlam.de>
+ *
+ * This program is free software; you can redistribute it and/or modify
+@@ -69,8 +69,10 @@ private:
+ public:
+ gl_thread(video_output_qt* vo_qt, video_output_qt_widget* vo_qt_widget);
+
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext* glxewGetContext() const;
++# endif
+ #endif
+
+ void set_render(bool r);
+@@ -166,10 +168,12 @@ protected:
+ class video_output_qt : public video_output
+ {
+ private:
+-#if HAVE_X11
++#ifdef GLEW_MX
++# if HAVE_X11
+ GLXEWContext _glxew_context;
+-#endif
++# endif
+ GLEWContext _glew_context;
++#endif
+ int _screen_width, _screen_height;
+ float _screen_pixel_aspect_ratio;
+ video_container_widget *_container_widget;
+@@ -192,10 +196,12 @@ private:
+ void resume_screensaver();
+
+ protected:
+-#if HAVE_X11
+- GLXEWContext* glxewGetContext() const;
+-#endif
++#ifdef GLEW_MX
++# if HAVE_X11
++ virtual GLXEWContext* glxewGetContext() const;
++# endif
+ virtual GLEWContext* glewGetContext() const;
++#endif
+ virtual bool context_is_stereo() const;
+ virtual void recreate_context(bool stereo);
+ virtual void trigger_resize(int w, int h);
+--
+cgit v1.0-41-gc330
+
diff --git a/sources b/sources
index 91a9b64..c3c0649 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c82cf3d4d917341eba12dbffbff3f15d bino-1.6.4.tar.xz
+36da300a320481ae9637c66f1f4617d9 bino-1.6.5.tar.xz
7 years, 8 months
[avidemux] Build for x86 only
by Leigh Scott
commit 3b9bbd75849d443bed51c3d67a3c4dc93fc54b62
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 12:30:55 2017 +0000
Build for x86 only
avidemux.spec | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/avidemux.spec b/avidemux.spec
index f4a64af..59f2278 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -18,8 +18,8 @@ Patch1: avidemux-2.6.16-filter-preview.patch
Patch2: avidemux-2.6.16-unbundle-libmp4v2.patch
Patch3: avidemux-2.6.16-mp4muxer-eac3.patch
-# Don't try to build on arm or aarch64
-ExcludeArch: %{arm} aarch64
+# Don't try to build on arm, aarch64 or ppc
+ExclusiveArch: i686 x86_64
# Utilities
BuildRequires: cmake
@@ -307,7 +307,7 @@ fi
%changelog
* Wed Mar 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.16-5
-- Add aarch64 to ExcludeArch
+- Build for x86 only
* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.6.16-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months
[avidemux] Add aarch64 to ExcludeArch
by Leigh Scott
commit 59579228d90af089512321a79176f965b2499df1
Author: leigh123linux <leigh123linux(a)googlemail.com>
Date: Wed Mar 22 08:37:09 2017 +0000
Add aarch64 to ExcludeArch
avidemux.spec | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/avidemux.spec b/avidemux.spec
index fd088ec..f4a64af 100644
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -5,7 +5,7 @@
Name: avidemux
Version: 2.6.16
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Graphical video editing and transcoding tool
License: GPLv2+
@@ -18,8 +18,8 @@ Patch1: avidemux-2.6.16-filter-preview.patch
Patch2: avidemux-2.6.16-unbundle-libmp4v2.patch
Patch3: avidemux-2.6.16-mp4muxer-eac3.patch
-# Don't try to build on arm
-ExcludeArch: %{arm}
+# Don't try to build on arm or aarch64
+ExcludeArch: %{arm} aarch64
# Utilities
BuildRequires: cmake
@@ -306,6 +306,9 @@ fi
%changelog
+* Wed Mar 22 2017 Leigh Scott <leigh123linux(a)googlemail.com> - 2.6.16-5
+- Add aarch64 to ExcludeArch
+
* Sat Mar 18 2017 RPM Fusion Release Engineering <kwizart(a)rpmfusion.org> - 2.6.16-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
7 years, 8 months