[x264/el7] don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
by Dominik Mierzejewski
commit 9f2f48ef45e3f4ceb2df7e8f776d4a50addb405e
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Fri Oct 4 09:54:00 2019 +0200
don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
x264.spec | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/x264.spec b/x264.spec
index dc40d48..ed45c63 100644
--- a/x264.spec
+++ b/x264.spec
@@ -31,7 +31,7 @@
Summary: H264/AVC video streams encoder
Name: x264
Version: 0.%{api}
-Release: 23%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
+Release: 24%{?gver}%{?_with_bootstrap:_bootstrap}%{?dist}
License: GPLv2+
URL: https://www.videolan.org/developers/x264.html
Source0: %{name}-0.%{api}-%{snapshot}.tar.bz2
@@ -153,7 +153,7 @@ pushd ${variant}
popd
done
%ifarch %{simdarch}
-for variant in simd simd10 ; do
+for variant in simd10 simd ; do
pushd ${variant}
%make_install
rm -f %{buildroot}%{slibdir}/pkgconfig/x264.pc
@@ -204,6 +204,9 @@ cp -a generic/doc %{buildroot}%{_pkgdocdir}/
%endif
%changelog
+* Fri Oct 04 2019 Dominik Mierzejewski <rpm(a)greysector.net> - 0.148-24.20170521gitaaa9aa8
+- don't overwrite generic headers with 10bit on simdarch (rfbz#5071)
+
* Thu Nov 22 2018 Antonio Trande <sagitter(a)fedoraproject.org> - 0.148-23.20170521gitaaa9aa8
- Rebuild for ffmpeg-3.* on el7
- Rebuild for x265-2.9 on el7
4 years, 6 months
[chromium-libs-media-freeworld/f29: 8/8] Merge remote-tracking branch 'origin/master' into f29
by Nicolas Chauvet
commit fd805ca559bd54130bf8ba12a7bbe0502958d659
Merge: f0c46aa be6c8dc
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 4 09:16:32 2019 +0200
Merge remote-tracking branch 'origin/master' into f29
chromium-45.0.2454.101-linux-path-max.patch | 44 ---
...7.0.2526.80-nacl-ignore-broken-fd-counter.patch | 27 --
chromium-47.0.2526.80-pnacl-fgnu-inline-asm.patch | 11 -
chromium-53.0.2785.92-boringssl-time-fix.patch | 11 -
chromium-54.0.2840.59-jpeg-include-dir.patch | 11 -
chromium-55.0.2883.75-addrfix.patch | 11 -
chromium-59.0.3071.86-i686-ld-memory-tricks.patch | 12 -
...3112.113-libavutil-timer-include-path-fix.patch | 21 --
chromium-62.0.3202.62-kmaxskip-constexpr.patch | 12 -
chromium-63.0.3289.84-nullfix.patch | 43 ---
chromium-64.0.3282.119-ffmpeg-stdatomic.patch | 17 -
chromium-65.0.3325.146-gcc-round-fix.patch | 12 -
chromium-65.0.3325.146-memcpy-fix.patch | 12 -
...fully-declare-ConfigurationPolicyProvider.patch | 18 -
chromium-66.0.3359.117-system-clang.patch | 12 -
chromium-67.0.3396.62-gcc5.patch | 12 -
...8.0.3440.106-fix-default-on-redeclaration.patch | 30 --
chromium-69.0.3497.81-build-sanely-please.patch | 33 --
...m-70.0.3538.77-aarch64-arch-want-new-stat.patch | 12 -
chromium-71.0.3578.98-skia-aarch64-buildfix.patch | 21 --
chromium-72.0.3626.121-notest.patch | 11 -
...75-disable-fno-delete-null-pointer-checks.patch | 48 ---
chromium-75.0.3770.100-git00281713.patch | 34 --
chromium-75.0.3770.80-SIOCGSTAMP.patch | 15 -
...ium-75.0.3770.80-aeed4d-gcc-dcheck_ne-fix.patch | 14 -
chromium-75.0.3770.80-gcc-no-assume.patch | 21 --
chromium-75.0.3770.80-revert-daff6b.patch | 13 -
...0.3809.100-libusb_interrupt_event_handler.patch | 15 -
chromium-77.0.3865.75-boolfix.patch | 24 --
chromium-77.0.3865.75-gcc-no-opt-safe-math.patch | 15 -
chromium-77.0.3865.75-gcc5-r3.patch | 36 --
chromium-77.0.3865.90-linked-hash-set.patch | 130 +++++++
chromium-libs-media-freeworld.spec | 402 ++++-----------------
33 files changed, 206 insertions(+), 954 deletions(-)
---
4 years, 6 months
[chromium-libs-media-freeworld/f29] (8 commits) ...Merge remote-tracking branch 'origin/master' into f29
by Nicolas Chauvet
Summary of changes:
a2942aa... Don't try to revert a previously removed patch (*)
1ef42a2... Remove support for (p)NaCL (*)
d8b8fc1... Fix how the arguments are passed to GN's bootstrap.py (*)
5a01686... Remove the unused patches or patches that are not needed an (*)
6aa7bda... Fix the icon (*)
0f0792f... Fix the icon Remove quite a few of downstream patches Fix t (*)
be6c8dc... Merge Fedora, chromium-77.0.3865.90-2 (*)
fd805ca... Merge remote-tracking branch 'origin/master' into f29
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[chromium-libs-media-freeworld/f29] Add python2-devel by default
by Nicolas Chauvet
commit f0c46aa98da603fcb5083bf5b21fed382c0e86ce
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 4 07:43:21 2019 +0200
Add python2-devel by default
chromium-libs-media-freeworld.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/chromium-libs-media-freeworld.spec b/chromium-libs-media-freeworld.spec
index 85f12a6..4add33e 100644
--- a/chromium-libs-media-freeworld.spec
+++ b/chromium-libs-media-freeworld.spec
@@ -519,8 +519,8 @@ BuildRequires: python-markupsafe
BuildRequires: python-ply
%endif
BuildRequires: python2-simplejson
-BuildRequires: python2-devel
%endif
+BuildRequires: python2-devel
%if 0%{?bundlere2}
# Using bundled bits, do nothing.
%else
4 years, 6 months
[celluloid/el7] Fixup for el7: patch for old mpv and define metainfodir
by Leigh Scott
commit 21a3d49fd6f92f69c03db0bfdff153c66e2da48c
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Thu Oct 3 20:35:47 2019 +0100
Fixup for el7: patch for old mpv and define metainfodir
build_with_mpv27.patch | 445 +++++++++++++++++++++++++++++++++++++++++++++++++
celluloid.spec | 7 +-
configure_mpv27.patch | 62 +++++++
3 files changed, 513 insertions(+), 1 deletion(-)
---
diff --git a/build_with_mpv27.patch b/build_with_mpv27.patch
new file mode 100644
index 0000000..543b0ab
--- /dev/null
+++ b/build_with_mpv27.patch
@@ -0,0 +1,445 @@
+diff --git a/src/celluloid-model.c b/src/celluloid-model.c
+index 4e0e240..d95aae7 100644
+--- a/src/celluloid-model.c
++++ b/src/celluloid-model.c
+@@ -119,7 +119,7 @@ static gboolean
+ emit_frame_ready(gpointer data);
+
+ static void
+-render_update_callback(gpointer render_ctx);
++opengl_cb_update_callback(gpointer opengl_cb_ctx);
+
+ static void
+ mpv_prop_change_handler( CelluloidMpv *mpv,
+@@ -344,7 +344,7 @@ dispose(GObject *object)
+
+ if(mpv)
+ {
+- celluloid_mpv_set_render_update_callback(mpv, NULL, NULL);
++ celluloid_mpv_set_opengl_cb_callback(mpv, NULL, NULL);
+ while(g_source_remove_by_user_data(model));
+ }
+
+@@ -559,19 +559,13 @@ g_param_spec_by_type( const gchar *name,
+ static gboolean
+ emit_frame_ready(gpointer data)
+ {
+- CelluloidModel *model = data;
+- guint64 flags = celluloid_mpv_render_context_update(CELLULOID_MPV(model));
+-
+- if(flags&MPV_RENDER_UPDATE_FRAME)
+- {
+- g_signal_emit_by_name(model, "frame-ready");
+- }
++ g_signal_emit_by_name(data, "frame-ready");
+
+ return FALSE;
+ }
+
+ static void
+-render_update_callback(gpointer data)
++opengl_cb_update_callback(gpointer data)
+ {
+ g_idle_add_full( G_PRIORITY_HIGH,
+ emit_frame_ready,
+@@ -733,8 +727,8 @@ celluloid_model_initialize(CelluloidModel *model, const gchar *options)
+
+ celluloid_mpv_initialize
+ (mpv);
+- celluloid_mpv_set_render_update_callback
+- (mpv, render_update_callback, model);
++ celluloid_mpv_set_opengl_cb_callback
++ (mpv, opengl_cb_update_callback, model);
+ }
+
+ void
+@@ -988,23 +982,15 @@ celluloid_model_initialize_gl(CelluloidModel *model)
+ void
+ celluloid_model_render_frame(CelluloidModel *model, gint width, gint height)
+ {
+- mpv_render_context *render_ctx;
++ mpv_opengl_cb_context *opengl_ctx;
+
+- render_ctx = celluloid_mpv_get_render_context(CELLULOID_MPV(model));
++ opengl_ctx = celluloid_mpv_get_opengl_cb_context(CELLULOID_MPV(model));
+
+- if(render_ctx)
++ if(opengl_ctx)
+ {
+- gint fbo = -1;
++ int fbo = -1;
+ glGetIntegerv(GL_FRAMEBUFFER_BINDING, &fbo);
+-
+- mpv_opengl_fbo opengl_fbo =
+- {fbo, width, height, 0};
+- mpv_render_param params[] =
+- { {MPV_RENDER_PARAM_OPENGL_FBO, &opengl_fbo},
+- {MPV_RENDER_PARAM_FLIP_Y, &(int){1}},
+- {0, NULL} };
+-
+- mpv_render_context_render(render_ctx, params);
++ mpv_opengl_cb_draw(opengl_ctx, fbo, width, (-1)*height);
+ }
+ }
+
+diff --git a/src/celluloid-mpv-private.h b/src/celluloid-mpv-private.h
+index 49b161d..178554f 100644
+--- a/src/celluloid-mpv-private.h
++++ b/src/celluloid-mpv-private.h
+@@ -37,7 +37,7 @@ enum
+ struct _CelluloidMpvPrivate
+ {
+ mpv_handle *mpv_ctx;
+- mpv_render_context *render_ctx;
++ mpv_opengl_cb_context *opengl_ctx;
+ gboolean ready;
+ gchar *tmp_input_file;
+ GSList *log_level_list;
+@@ -45,8 +45,8 @@ struct _CelluloidMpvPrivate
+ gboolean force_opengl;
+ gboolean use_opengl;
+ gint64 wid;
+- void *render_update_callback_data;
+- void (*render_update_callback)(void *data);
++ void *opengl_cb_callback_data;
++ void (*opengl_cb_callback)(void *data);
+ };
+
+ #define get_private(mpv) \
+diff --git a/src/celluloid-mpv-wrapper.c b/src/celluloid-mpv-wrapper.c
+index 603f23f..4ae57b8 100644
+--- a/src/celluloid-mpv-wrapper.c
++++ b/src/celluloid-mpv-wrapper.c
+@@ -244,28 +244,21 @@ celluloid_mpv_set_property_flag( CelluloidMpv *mpv,
+ }
+
+ void
+-celluloid_mpv_set_render_update_callback( CelluloidMpv *mpv,
+- mpv_render_update_fn func,
++celluloid_mpv_set_opengl_cb_callback( CelluloidMpv *mpv,
++ mpv_opengl_cb_update_fn func,
+ void *data )
+ {
+ CelluloidMpvPrivate *priv = get_private(mpv);
+
+- priv->render_update_callback = func;
+- priv->render_update_callback_data = data;
++ priv->opengl_cb_callback = func;
++ priv->opengl_cb_callback_data = data;
+
+- if(priv->render_ctx)
++ if(priv->opengl_ctx)
+ {
+- mpv_render_context_set_update_callback
+- (priv->render_ctx, func, data);
++ mpv_opengl_cb_set_update_callback(priv->opengl_ctx, func, data);
+ }
+ }
+
+-guint64
+-celluloid_mpv_render_context_update(CelluloidMpv *mpv)
+-{
+- return mpv_render_context_update(get_private(mpv)->render_ctx);
+-}
+-
+ gint
+ celluloid_mpv_load_config_file(CelluloidMpv *mpv, const gchar *filename)
+ {
+diff --git a/src/celluloid-mpv-wrapper.h b/src/celluloid-mpv-wrapper.h
+index dd68aba..c6874d7 100644
+--- a/src/celluloid-mpv-wrapper.h
++++ b/src/celluloid-mpv-wrapper.h
+@@ -22,7 +22,7 @@
+
+ #include <glib.h>
+ #include <mpv/client.h>
+-#include <mpv/render_gl.h>
++#include <mpv/opengl_cb.h>
+
+ #include "celluloid-mpv.h"
+
+@@ -74,13 +74,10 @@ celluloid_mpv_set_event_callback( CelluloidMpv *mpv,
+ void *data );
+
+ void
+-celluloid_mpv_set_render_update_callback( CelluloidMpv *mpv,
+- mpv_render_update_fn func,
++celluloid_mpv_set_opengl_cb_callback( CelluloidMpv *mpv,
++ mpv_opengl_cb_update_fn func,
+ void *data );
+
+-guint64
+-celluloid_mpv_render_context_update(CelluloidMpv *mpv);
+-
+ gint
+ celluloid_mpv_load_config_file(CelluloidMpv *mpv, const gchar *filename);
+
+diff --git a/src/celluloid-mpv.c b/src/celluloid-mpv.c
+index 2972af1..a26fa70 100644
+--- a/src/celluloid-mpv.c
++++ b/src/celluloid-mpv.c
+@@ -49,6 +49,8 @@
+ #include "celluloid-def.h"
+ #include "celluloid-marshal.h"
+
++static void *GLAPIENTRY glMPGetNativeDisplay(const gchar *name);
++
+ static void *
+ get_proc_address(void *fn_ctx, const gchar *name);
+
+@@ -91,12 +93,6 @@ process_mpv_events(gpointer data);
+ static gboolean
+ check_mpv_version(const gchar *version);
+
+-static gpointer
+-get_wl_display(void);
+-
+-static gpointer
+-get_x11_display(void);
+-
+ static void
+ initialize(CelluloidMpv *mpv);
+
+@@ -108,11 +104,30 @@ reset(CelluloidMpv *mpv);
+
+ G_DEFINE_TYPE_WITH_PRIVATE(CelluloidMpv, celluloid_mpv, G_TYPE_OBJECT)
+
++static void *GLAPIENTRY glMPGetNativeDisplay(const gchar *name)
++{
++ GdkDisplay *display = gdk_display_get_default();
++
++#ifdef GDK_WINDOWING_WAYLAND
++ if(GDK_IS_WAYLAND_DISPLAY(display) && g_strcmp0(name, "wl") == 0)
++ return gdk_wayland_display_get_wl_display(display);
++#endif
++#ifdef GDK_WINDOWING_X11
++ if(GDK_IS_X11_DISPLAY(display) && g_strcmp0(name, "x11") == 0)
++ return gdk_x11_display_get_xdisplay(display);
++#endif
++
++ return NULL;
++}
++
+ static void *
+ get_proc_address(void *fn_ctx, const gchar *name)
+ {
+ GdkDisplay *display = gdk_display_get_default();
+
++ if(g_strcmp0(name, "glMPGetNativeDisplay") == 0)
++ return glMPGetNativeDisplay;
++
+ #ifdef GDK_WINDOWING_WAYLAND
+ if (GDK_IS_WAYLAND_DISPLAY(display))
+ return eglGetProcAddress(name);
+@@ -346,40 +361,6 @@ check_mpv_version(const gchar *version)
+ return result;
+ }
+
+-static gpointer
+-get_wl_display(void)
+-{
+- gpointer wl_display = NULL;
+-
+-#ifdef GDK_WINDOWING_WAYLAND
+- GdkDisplay *display = gdk_display_get_default();
+-
+- if(GDK_IS_WAYLAND_DISPLAY(display))
+- {
+- wl_display = gdk_wayland_display_get_wl_display(display);
+- }
+-#endif
+-
+- return wl_display;
+-}
+-
+-static gpointer
+-get_x11_display(void)
+-{
+- gpointer x11_display = NULL;
+-
+-#ifdef GDK_WINDOWING_X11
+- GdkDisplay *display = gdk_display_get_default();
+-
+- if(GDK_IS_X11_DISPLAY(display))
+- {
+- x11_display = gdk_x11_display_get_xdisplay(display);
+- }
+-#endif
+-
+- return x11_display;
+-}
+-
+ static void
+ initialize(CelluloidMpv *mpv)
+ {
+@@ -389,8 +370,8 @@ initialize(CelluloidMpv *mpv)
+
+ if(priv->wid < 0)
+ {
+- g_info("Forcing --vo=libmpv");
+- mpv_set_option_string(priv->mpv_ctx, "vo", "libmpv");
++ g_info("Forcing --vo=opengl-cb");
++ mpv_set_option_string(priv->mpv_ctx, "vo", "opengl-cb");
+ }
+ else if(priv->wid == 0)
+ {
+@@ -420,6 +401,13 @@ initialize(CelluloidMpv *mpv)
+ MIN_MPV_PATCH );
+ }
+
++ if(priv->use_opengl)
++ {
++ priv->opengl_ctx = mpv_get_sub_api
++ ( priv->mpv_ctx,
++ MPV_SUB_API_OPENGL_CB );
++ }
++
+ priv->ready = TRUE;
+ g_object_notify(G_OBJECT(mpv), "ready");
+
+@@ -487,10 +475,10 @@ reset(CelluloidMpv *mpv)
+ priv->mpv_ctx = mpv_create();
+ celluloid_mpv_initialize(mpv);
+
+- celluloid_mpv_set_render_update_callback
++ celluloid_mpv_set_opengl_cb_callback
+ ( mpv,
+- priv->render_update_callback,
+- priv->render_update_callback_data );
++ priv->opengl_cb_callback,
++ priv->opengl_cb_callback_data );
+
+ celluloid_mpv_set_property_string
+ (mpv, "loop-file", loop_file?"inf":"no");
+@@ -638,13 +626,13 @@ celluloid_mpv_init(CelluloidMpv *mpv)
+ setlocale(LC_NUMERIC, "C");
+
+ priv->mpv_ctx = mpv_create();
+- priv->render_ctx = NULL;
++ priv->opengl_ctx = NULL;
+ priv->ready = FALSE;
+ priv->init_vo_config = TRUE;
+ priv->use_opengl = FALSE;
+ priv->wid = -1;
+- priv->render_update_callback_data = NULL;
+- priv->render_update_callback = NULL;
++ priv->opengl_cb_callback_data = NULL;
++ priv->opengl_cb_callback = NULL;
+ }
+
+ CelluloidMpv *
+@@ -653,10 +641,10 @@ celluloid_mpv_new(gint64 wid)
+ return CELLULOID_MPV(g_object_new(celluloid_mpv_get_type(), "wid", wid, NULL));
+ }
+
+-inline mpv_render_context *
+-celluloid_mpv_get_render_context(CelluloidMpv *mpv)
++inline mpv_opengl_cb_context *
++celluloid_mpv_get_opengl_cb_context(CelluloidMpv *mpv)
+ {
+- return get_private(mpv)->render_ctx;
++ return get_private(mpv)->opengl_ctx;
+ }
+
+ inline gboolean
+@@ -674,26 +662,19 @@ celluloid_mpv_initialize(CelluloidMpv *mpv)
+ void
+ celluloid_mpv_init_gl(CelluloidMpv *mpv)
+ {
+- CelluloidMpvPrivate *priv = get_private(mpv);
+- mpv_opengl_init_params init_params =
+- {.get_proc_address = get_proc_address};
+- mpv_render_param params[] =
+- { {MPV_RENDER_PARAM_API_TYPE, MPV_RENDER_API_TYPE_OPENGL},
+- {MPV_RENDER_PARAM_OPENGL_INIT_PARAMS, &init_params},
+- {MPV_RENDER_PARAM_WL_DISPLAY, get_wl_display()},
+- {MPV_RENDER_PARAM_X11_DISPLAY, get_x11_display()},
+- {0, NULL} };
+- gint rc = mpv_render_context_create( &priv->render_ctx,
+- priv->mpv_ctx,
+- params );
++ mpv_opengl_cb_context *opengl_ctx = celluloid_mpv_get_opengl_cb_context(mpv);
++ gint rc = mpv_opengl_cb_init_gl( opengl_ctx,
++ "GL_MP_MPGetNativeDisplay",
++ get_proc_address,
++ NULL );
+
+ if(rc >= 0)
+ {
+- g_debug("Initialized render context");
++ g_debug("Initialized opengl-cb");
+ }
+ else
+ {
+- g_critical("Failed to initialize render context");
++ g_critical("Failed to initialize opengl-cb");
+ }
+ }
+
+@@ -711,12 +692,12 @@ celluloid_mpv_quit(CelluloidMpv *mpv)
+ g_info("Terminating mpv");
+ celluloid_mpv_command_string(mpv, "quit");
+
+- if(priv->render_ctx)
++ if(priv->opengl_ctx)
+ {
+- g_debug("Uninitializing render context");
+- mpv_render_context_free(priv->render_ctx);
++ g_debug("Uninitializing opengl_ctx");
++ mpv_opengl_cb_uninit_gl(priv->opengl_ctx);
+
+- priv->render_ctx = NULL;
++ priv->opengl_ctx = NULL;
+ }
+
+ g_assert(priv->mpv_ctx);
+diff --git a/src/celluloid-mpv.h b/src/celluloid-mpv.h
+index d338d7e..ab7634d 100644
+--- a/src/celluloid-mpv.h
++++ b/src/celluloid-mpv.h
+@@ -23,7 +23,7 @@
+ #include <glib.h>
+ #include <glib-object.h>
+ #include <mpv/client.h>
+-#include <mpv/render_gl.h>
++#include <mpv/opengl_cb.h>
+
+ #include "celluloid-common.h"
+
+@@ -54,8 +54,8 @@ struct _CelluloidMpvClass
+ CelluloidMpv *
+ celluloid_mpv_new(gint64 wid);
+
+-mpv_render_context *
+-celluloid_mpv_get_render_context(CelluloidMpv *mpv);
++mpv_opengl_cb_context *
++celluloid_mpv_get_opengl_cb_context(CelluloidMpv *mpv);
+
+ gboolean
+ celluloid_mpv_get_use_opengl_cb(CelluloidMpv *mpv);
+diff --git a/src/celluloid-player.c b/src/celluloid-player.c
+index 0a0fcc5..ffc58c0 100644
+--- a/src/celluloid-player.c
++++ b/src/celluloid-player.c
+@@ -443,7 +443,7 @@ apply_default_options(CelluloidMpv *mpv)
+ const gchar *name;
+ const gchar *value;
+ }
+- options[] = { {"vo", "opengl,vdpau,vaapi,xv,x11,libmpv,"},
++ options[] = { {"vo", "opengl,vdpau,vaapi,xv,x11,opengl-cb,"},
+ {"osd-level", "1"},
+ {"softvol", "yes"},
+ {"force-window", "immediate"},
+diff --git a/src/meson.build b/src/meson.build
+index 51ebea9..e578bad 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -125,7 +125,7 @@ executable('celluloid', sources,
+ libgtk,
+ libgio,
+ meson.get_compiler('c').find_library('m', required: false),
+- dependency('mpv', version: '>= 1.101'),
++ dependency('mpv', version: '>= 1.25'),
+ dependency('epoxy')
+ ],
+ link_with: extra_libs,
diff --git a/celluloid.spec b/celluloid.spec
index 535f774..7d9980d 100644
--- a/celluloid.spec
+++ b/celluloid.spec
@@ -1,3 +1,4 @@
+%global _metainfodir %{_datadir}/metainfo
Name: celluloid
Version: 0.17
Release: 1%{?dist}
@@ -6,6 +7,10 @@ Summary: A simple GTK+ frontend for mpv
License: GPLv3+
URL: https://github.com/celluloid-player/celluloid
Source0: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.xz
+# Patch from Clem's fork
+Patch0: build_with_mpv27.patch
+# Add configure patch as the packager decided to use autotools
+Patch1: configure_mpv27.patch
BuildRequires: gcc
BuildRequires: desktop-file-utils
@@ -27,7 +32,7 @@ Celluloid (formerly GNOME MPV) is a simple GTK+ frontend for mpv.
It aims to be easy to use while maintaining high level of configurability.
%prep
-%autosetup
+%autosetup -p1
%build
%configure
diff --git a/configure_mpv27.patch b/configure_mpv27.patch
new file mode 100644
index 0000000..4a8e9b7
--- /dev/null
+++ b/configure_mpv27.patch
@@ -0,0 +1,62 @@
+diff -uNrp a/configure b/configure
+--- a/configure
++++ b/configure
+@@ -8911,19 +8911,19 @@
+
+
+ pkg_failed=no
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy" >&5
+-$as_echo_n "checking for gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy" >&5
++$as_echo_n "checking for gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy... " >&6; }
+
+ if test -n "$DEPS_CFLAGS"; then
+ pkg_cv_DEPS_CFLAGS="$DEPS_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy" 2>/dev/null`
++ pkg_cv_DEPS_CFLAGS=`$PKG_CONFIG --cflags "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -8935,12 +8935,12 @@
+ pkg_cv_DEPS_LIBS="$DEPS_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy" 2>/dev/null`
++ pkg_cv_DEPS_LIBS=`$PKG_CONFIG --libs "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -8961,14 +8961,14 @@
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy" 2>&1`
++ DEPS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy" 2>&1`
+ else
+- DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy" 2>&1`
++ DEPS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$DEPS_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.101 epoxy) were not met:
++ as_fn_error $? "Package requirements (gtk+-3.0 >= 3.22.23 glib-2.0 >= 2.44 mpv >= 1.25 epoxy) were not met:
+
+ $DEPS_PKG_ERRORS
+
4 years, 6 months
[chromium-libs-media-freeworld/f29] (265 commits) ...Fixup
by Nicolas Chauvet
Summary of changes:
ae08a77... fix dep issue with chrome-remote-desktop on el7 (*)
b413a74... Another player has entered the game: aarch64! (*)
c74ab79... add BR: ninja-build (*)
984bf67... update to 60.0.3112.113, fix ffmpeg clean script to not del (*)
761a028... fixed sources (*)
7d1f0ea... fixed sources for aarch64 (*)
321d5de... fix include pathing in libavutil/timer.h (*)
21e3607... more aarch64 ffmpeg files (*)
a546230... disable aarch64 on rhel7, missing libatomic.so for some rea (*)
1c11a82... Require explicit version-release of chromium-libs from medi (*)
9debcb0... 61.0.3163.79 (*)
2484dd8... fix aarch64 compile in rawhide (*)
661f204... fix patch (*)
f43b0ab... drop unnecessary patch for epel7 (*)
bcf9692... use fpermissive on cc/paint (*)
92bd8d8... try different cc/paint fix (*)
c00dedb... more epel gcc fixes (*)
5ff888b... will it never stop? (*)
a0a687b... ugly hack to make epel7 build. maybe (*)
1144ae5... i think this will build (*)
79d8235... 61.0.3163.100 and lots of epel7 fixes (*)
fac5ada... uploaded sources this time (*)
faa2842... Update the chromium-lastest.py to always download the polic (*)
9d223e0... Update the chromium-lastest.py to always download the polic (*)
18ab5a5... Update the chromium-lastest.py to always download the polic (*)
b36884a... Improve the chromium-latest.py script (*)
404a6d2... Improve the chromium-latest.py script (*)
07728cd... Improve the chromium-latest.py script (*)
69e5304... 62.0.3202.62 (*)
3f324a0... Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ (*)
c28ea78... Merge branch 'master' into f26 (*)
12bdf54... Merge branch 'master' into epel7 (*)
7abe45e... do not attempt to use std=c++14 on epel7 (*)
2abf30d... Fix the policy templates handling (*)
d02ac4e... Fix the policy templates handling (*)
d8f6aaa... Fix the policy templates handling (*)
530c35b... instead use std=c++11 on epel7 (*)
6aefd88... Merge branch 'epel7' of ssh://pkgs.fedoraproject.org/rpms/c (*)
f6767a1... fix decay_t usage for gcc 4.8/c++11 (*)
2180bdb... more C++11 type handling (enable_if) (*)
2f12a92... even moar c++11 (*)
4b560f7... 62.0.3202.75 (*)
7d1b47a... fix merge (*)
7745b94... fix merge (*)
bc9e77b... 62.0.3202.89 (*)
6844a76... Merge branch 'master' into f26 (*)
db2acc0... Remove support for running the unit tests (*)
06c182b... Adapt to man page changes for Chromium 63 (*)
8a70ade... Remove unused patches (*)
b8d27d6... Remove unused AppData file (*)
b0b7736... Merge #4 `Remove unused patches and an AppData file` (*)
07c88ef... Merge #3 `Remove support for running the unit tests` (*)
6af85f9... 63.0.3239.84 (*)
a2f0a87... Merge branch 'master' into f26 (*)
42ed338... fix aarch64 patch (*)
b18325e... new sources for aarch64 (*)
70ab91a... moar aarch64 files (*)
b9fa76f... moar moar aarch64 files (*)
3698ffd... moar moar aarch64 files (*)
eac1e39... moar moar moar aarch64 files (*)
7bb0a21... Don't require libcanberra-gtk2 GTK+ 3 build is enabled (*)
7d49b3d... Add missing ffmpeg files on aarch64 (*)
41a8870... Update to 63.0.3239.108 (*)
699efa4... Merge branch 'master' into f26 (*)
dfd304e... Add python2 as BR (*)
6fc5f9d... Merge branch 'master' into f26 (*)
867ed1f... 64.0.3282.119 (*)
b75e5eb... correct source (*)
7bfd513... include user-session binary in chrome-remote-desktop subpac (*)
7451062... 64.0.3282.140 (*)
ff8eb29... update to 64.0.3282.167, include workaround for gcc8 bug in (*)
dee55f8... Merge branch 'master' into f26 (*)
cf44702... Merge branch 'f26' of ssh://pkgs.fedoraproject.org/rpms/chr (*)
c558cc1... 64.0.3282.186 (*)
1795734... Merge branch 'master' into f26 (*)
e36a0c8... 65.0.3325.146 (*)
c5342c3... this gets past prep... (*)
4e6c6ef... 65.0.3325.162 (*)
8ca12f1... clean sources (*)
fb49317... Merge branch 'master' into f26 (*)
fe5b552... version conditionalize gnome-keyring-devel (*)
3534f5e... use bundled libjpeg on epel7 (*)
8cfa28d... fix bool issue triggered by newer gcc (*)
61203bf... use normal bool cast (*)
9e38b7c... fix skia build issue on aarch64 (*)
bdba7c7... disable StartupNotify in chromium-browser.desktop (not in g (*)
b2a482e... Merge branch 'master' into f26 (*)
6d9e418... use bundled freetype on epel7 (*)
dcb134e... Merge branch 'master' into f26 (*)
f7e3b54... use bundled libdrm on epel7 (*)
f525a51... try use_custom_libcxx=true on epel7 (*)
6113fdf... rhel 7 might need libc++ bundled (*)
0d818fb... force lstdc++ on epel7 (*)
c747d58... 65.0.3325.181 (*)
752de26... Merge branch 'master' into f26 (*)
6588e7b... check that there is no system google module, shadowing bund (*)
11492d0... add explicit dependency on minizip (bz 1534282) (*)
0996727... Merge branch 'master' into f26 (*)
cdad621... Be explicit about the Python version used (*)
e00e15d... use system fontconfig (except on epel7) (*)
b899d5f... Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/ (*)
5479a8c... 66.0.3359.139 (*)
5afa5c7... Merge branch 'master' into f26 (*)
840f0be... fix sources (*)
85fa5c5... missing patch (*)
c380501... Merge branch 'master' into f26 (*)
8667898... disable patch47 (*)
3f9e662... fix arm build (*)
0f7615a... Merge branch 'master' into f26 (*)
55ffd95... 66.0.3359.170 (*)
b3bbed0... add swiftshader to files (*)
16a75be... only x86_64 i686 have swiftshader (*)
f953b3f... fix gcc8 alignof issue on i686 (*)
7575596... update to 66.0.3359.181 (*)
f1f56dc... fix missing files (*)
d164b66... also filter out fontconfig on epel7 (*)
afb86c1... 67 (*)
169992d... 67 patches (*)
02b89a3... fixup spec (*)
3bfff4f... fix sources (*)
022abfe... fix crashpad issue on aarch64 (*)
27ff9a9... fix epel fonts (*)
0b37303... work around bug in RHEL7 python exec (*)
9cdea2b... update to 67.0.3396.79 (*)
afed03b... 67.0.3396.87 (*)
92b60dd... move from appdata/ to metainfo/ (*)
77c46e3... add fedora to the user agent string (*)
2c3a8f9... 67.0.3396.99 (*)
8fac8b3... try to fix version.py for rawhide (*)
f7dfb30... - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass (*)
7048e95... setuid user-session, more python2 hacks (*)
f3867e4... missed one gn gen (*)
e0bcc17... include third_party/rcssmin (*)
cb0be2c... fix more python hardcoding (*)
14101bb... 68 (*)
9ac9791... add Ahem font (*)
65058cd... add Public Domain GardinerMod fonts (*)
1d9acb4... fix aarch64 compile (*)
4cfe27e... Fix default on redeclaration error (*)
016a7a3... fix library filters (*)
f9b8d48... Update dependency to minizip-compat(-devel) (*)
e688f35... conditionalize minizip-compat change (*)
0fc6cb9... 69.0.3497.92 (*)
a913b5c... Also fix shebangs with spaces (*)
a367efa... update to 69.0.3497.100 (*)
cf170d6... freeworld build does not need fonts (*)
5266162... 70.0.3538.77 (*)
a8d905f... drop jumbo_file_merge_limit to 8 to (hopefully) avoid OOMs (*)
3558506... fix build with harfbuzz2 in rawhide (*)
35ec6a6... fix aarch64 build against latest linux kernel headers (*)
4e28fb2... fix library requires filtering (*)
785459d... https://fedoraproject.org/wiki/Changes/No_more_automagic_Py (*)
8401a03... .110 (*)
7029b1f... remove sysroot options (*)
278c627... enable vaapi support (thanks to Akarshan Biswas for doing t (*)
4a92824... increment release, you dummy (*)
8529bb8... fix patch (*)
0d5fe2e... use clean vaapi patch, add BR: libva-devel (*)
20998a3... use fpermissive on vaapi code on i686 (*)
6223833... Update vaapi patch for 71 and add to patch to relax the ver (*)
f97ba1b... Add relax libva version check patch (*)
b2e427f... 71.0.3578.98 (*)
39f8148... need to use devtoolset-8-*. I love hardcoded versions in pa (*)
8e01649... more hardcoded devtoolset versions (*)
e708c75... Use a variable for the DTS version (*)
e9829bb... okay, lets try this (*)
2829ac3... RHEL 7s nodejs is too old, do not use it in the buildroot (*)
a4a01eb... use prebuilt node on rhel7 (*)
09bce82... add BR (*)
41f326e... fix noexcept, moar (*)
143e466... fix noexcept, moar moar (*)
1b1fef9... I SAID MOAR (*)
7ccede1... drop rsp clobber, which breaks gcc9 (thanks to Jeff Law) (*)
c8e53a4... Fix widevine on chromium (*)
1788834... rebuild with widevine fix (*)
ea2fe9d... Remove obsolete scriptlets (*)
e58b7c1... - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass (*)
2d03f67... rebuild for libva api change (*)
4818465... chromium 72 (*)
6f3b08b... new source (*)
9071ee2... go 73, go! (*)
a73d776... Add java to build requires (*)
70ab9e4... Rebase the vaapi i686 -fpermissive patch (*)
d805cb9... swiftshader for aarch64? ok. (*)
a21606a... add aarch64 crashpad compile fix (*)
6a0dee3... try disabling jumbo for aarch64 (*)
24a7923... do not package pyproto/protoc (*)
9d8ad7c... fix merge (*)
a01021d... disable vaapi on epel7 (*)
6bc005a... update noexcept patch (*)
f9dc161... update to 73.0.3683.86 (*)
c0e09c7... remove lang macro from en-US.pak* because Chromium crashes (*)
ae0be16... update to 73.0.3683.103, add CLONE_VFORK to seccomp filter (*)
41b87b0... improved seccomp glibc 2.29 patch (*)
f4a1a5c... 74.0.3729.169 (*)
43b2c19... 75.0.3770.80 (*)
ee64066... fix i686 fpermissive (*)
86f6063... more headers to save (*)
3d2e9d1... rename function to avoid conflict with rawhide glibc "getti (*)
e860623... one more file for aarch64 (*)
8008a52... .90 and another missing aarch64 file (*)
3a2a8e7... update to 75.0.3770.100 (*)
8ca0005... update epel7 patches (*)
583677e... disable jumbo for epel7 (*)
1646709... fix v8 compile with gcc (*)
3da184d... apply upstream fix to resolve issue where it is dangerous t (*)
8c4c53d... - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass (*)
a779813... Cleanup the patches (*)
38e8f68... Update to 76.0.3809.100 (*)
44822a9... Add more fixes (*)
fcb9e6e... Backport more build fixes from upstream (*)
481c90e... third_party/openscreen need to be preserved (*)
3f2dbf4... third_party/boringssl/linux-x86_64/crypto/third_party/sike (*)
6c1fd53... loosen dependency on chromium-libs in freeworld build (*)
8b12346... Pulseaudio changed the API in 12.99 and we need to adapt th (*)
a491a86... Add missing ffmpeg file on aarch64 (*)
4376be3... Update the Pulseaudio's pa_operation_get_state() signature (*)
453dfe1... Backport another upstream build fix (*)
cfc50a5... Upload the new cleaned tarball with aarch64 sources (*)
6ab36cd... Backport and create more of the GCC fixes (*)
f32de41... //third_party dependency missing for remoting (*)
05ed80c... Fix the build of remoting_all target (*)
234bd98... Fix the previously uploaded patch (*)
02877cc... Update the list of private libraries and remove a pak file (*)
ec9b3b1... Restore build from chromium-libs-media-freeworld (*)
32351d8... Clean-up gitignore using wildcard (*)
9cf28e3... Restore freeworld build from libs-media- (*)
6453812... Switch to chromium-libs-media-freeworld#2 (*)
fcd18a8... Fix the EL7 build as it doesn't like part of the upstream G (*)
250b15f... More el7 fixes (*)
2f9ffec... Another el7 noexcept change (*)
77fd050... Another noexec fix for EL7 (*)
937790b... Update to 76.0.3809.132 (*)
5039438... Add an updated patch that was missed (*)
ec9d075... Use bundled Python 2 libraries during build (*)
9bb933d... update chromium-latest.py to Python3 (*)
41c2299... Backport patch to fix certificate transparency (*)
be81360... Fix certificate-transparency patch (*)
f341b67... More fixes to a backported patch for certificate transparen (*)
892e596... Update to 77.0.3865.75 (*)
8458f58... Unbundle the zlib (*)
1b0a93b... Missing bundled dependency for headless (*)
2cfc18c... Fix the previously rebased patched (*)
5e3b7f3... Update the clean-ffmpeg.sh script (*)
d08e680... Include <memory> to fix the headless build (*)
1a11ef1... Use the bundled harfbuzz-ng for < F31 (*)
63945f4... Remove an unneeded patch that's breaking the build (*)
8ed36c4... Another export and alignas gcc compilation fix (*)
fb22c7a... Preserve the spirv heads for swiftshader compilation (*)
ecb75de... Fix the release number and add a changelog entry (*)
dc2f301... More of the harfbuzz related fixes (*)
057d9fc... Don't remove an additional bundled library (*)
63ccbdc... Backport another GCC build fix (*)
578228a... Customize the ninja status to show the currently build targ (*)
4d35c8a... Fix the aarch64 build (*)
7fc2813... 22x22 icon was removed and use the symbolic one as well (*)
fa69419... Update the list of private libraries (*)
ce1cd8e... Update the list of private libraries (*)
1a179e7... Update the el7 noexcept patch and fix the el7 build (*)
c510174... Forget to generate diff for one affected el7-noexcept file (*)
06cf3b0... Update to 77.0.3865.90 (*)
baa2c18... Merge remote-tracking branch 'fedora/master' (*)
d67718e... Fixup sources (*)
f9dd18b... Sync to fedora merged patches (*)
898e5d5... Fixup (*)
(*) This commit already existed in another branch; no separate mail sent
4 years, 6 months
[chromium-vaapi/f29] unbundle pylibs on fedora 29 and fix build
by hellbanger
commit 5144c74dfa97bef895439e5336167c24913c719b
Author: Akarshan Biswas <akarshanbiswas(a)fedoraproject.org>
Date: Thu Oct 3 22:07:41 2019 +0530
unbundle pylibs on fedora 29 and fix build
chromium-vaapi.spec | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/chromium-vaapi.spec b/chromium-vaapi.spec
index e1fd554..1e761fe 100644
--- a/chromium-vaapi.spec
+++ b/chromium-vaapi.spec
@@ -14,9 +14,13 @@
%global __requires_exclude %{chromiumdir}/.*\\.so
%global __provides_exclude_from %{chromiumdir}/.*\\.so
#######################################CONFIGS###########################################
+%if 0%{?fedora} >= 30
# Fedora's Python 2 stack is being removed, we use the bundled Python libraries
# This can be revisited once we upgrade to Python 3
%global bundlepylibs 1
+%else
+%global bundlepylibs 0
+%endif
%if 0%{bundlepylibs}
%bcond_with system_ply
%else
@@ -31,8 +35,6 @@
%else
%bcond_with system_harfbuzz
%endif
-# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
-%bcond_without system_libxml2
# Allow testing whether icu can be unbundled
@@ -47,12 +49,16 @@
#Allow minizip to be unbundled
#mini-compat is going to be removed from fedora 30!
%bcond_without system_minizip
+# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
+%bcond_without system_libxml2
%else
%bcond_with system_libvpx
%bcond_with system_ffmpeg
#Allow minizip to be unbundled
#mini-compat is going to be removed from fedora 30!
%bcond_with system_minizip
+# Require libxml2 > 2.9.4 for XML_PARSE_NOXXE
+%bcond_with system_libxml2
%endif
# Need re2 ver. 2016.07.21 for re2::LazyRE2
@@ -247,6 +253,9 @@ Patch74: link-against-harfbuzz-subset.patch
%if !%{freeworld}
%patch54 -p1 -R
%endif
+%if !%{with system_minizip}
+%patch71 -p1 -R
+%endif
%if !%{with system_harfbuzz}
%patch74 -p1 -R
%endif
4 years, 6 months
[unifi] Change requirement from policycoreutils-python to policycoreutils-python-utils so Python 3 is used
by Richard Shaw
commit 6ae8e05c4dea876007b584eb04bfdaa2d2bd24a2
Author: Richard Shaw <hobbes1069(a)gmail.com>
Date: Thu Oct 3 08:03:14 2019 -0500
Change requirement from policycoreutils-python to policycoreutils-python-utils
so Python 3 is used instead of Python 2 to manage selinux contexts.
unifi.spec | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/unifi.spec b/unifi.spec
index c4d0ab7..ce15591 100644
--- a/unifi.spec
+++ b/unifi.spec
@@ -5,7 +5,7 @@
Name: unifi
Version: 5.11.46
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Ubiquiti UniFi controller
License: Proprietary
@@ -31,8 +31,8 @@ BuildRequires: %{_bindir}/execstack
# https://fedoraproject.org/wiki/Changes/MongoDB_Removal
Requires: /usr/bin/mongod
Requires: java-1.8.0-openjdk-headless
-Requires(post): policycoreutils-python
-Requires(postun): policycoreutils-python
+Requires(post): policycoreutils-python-utils
+Requires(postun): policycoreutils-python-utils
# Unbundled fonts
Requires: fontawesome-fonts
@@ -279,6 +279,10 @@ fi
%changelog
+* Thu Oct 03 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.11.46-2
+- Change requirement from policycoreutils-python to policycoreutils-python-utils
+ so Python 3 is used instead of Python 2 to manage selinux contexts.
+
* Sun Sep 29 2019 Richard Shaw <hobbes1069(a)gmail.com> - 5.11.46-1
- Update to 5.11.46, for release notes see:
https://community.ui.com/releases/UniFi-Network-Controller-5-11-46/1984aa...
4 years, 7 months
