[lpf-flash-plugin] Update to 32.0.0.445
by Leigh Scott
commit 25a967d7fb2e4376acedb66c43d1d0f51a7919e5
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Fri Oct 30 18:37:09 2020 +0000
Update to 32.0.0.445
flash-plugin.spec.in | 5 ++++-
lpf-flash-plugin.spec | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/flash-plugin.spec.in b/flash-plugin.spec.in
index 270c92a..61efcf4 100644
--- a/flash-plugin.spec.in
+++ b/flash-plugin.spec.in
@@ -2,7 +2,7 @@
%global __strip /bin/true
Name: flash-plugin
-Version: 32.0.0.433
+Version: 32.0.0.445
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player
@@ -63,6 +63,9 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/flash-player-properti
%{_datadir}/icons/hicolor/*/apps/flash-player-properties.png
%changelog
+* Fri Oct 30 18:36:40 GMT 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:32.0.0.445-1
+- Update to 32.0.0.445
+
* Sat Sep 19 2020 Sérgio Basto <sergio(a)serjux.com> - 1:32.0.0.433-1
- Update to 32.0.0.433
diff --git a/lpf-flash-plugin.spec b/lpf-flash-plugin.spec
index 8c7acb5..db82e71 100644
--- a/lpf-flash-plugin.spec
+++ b/lpf-flash-plugin.spec
@@ -5,7 +5,7 @@
%define target_pkg %(t=%{name}; echo ${t#lpf-})
Name: lpf-flash-plugin
-Version: 32.0.0.433
+Version: 32.0.0.445
Release: 1%{?dist}
Epoch: 1
Summary: Adobe Flash Player package bootstrap
@@ -67,6 +67,9 @@ fi
%changelog
+* Fri Oct 30 18:36:40 GMT 2020 Leigh Scott <leigh123linux(a)gmail.com> - 1:32.0.0.445-1
+- Update to 32.0.0.445
+
* Sat Sep 19 2020 Sérgio Basto <sergio(a)serjux.com> - 1:32.0.0.433-1
- Update to 32.0.0.433
3 years, 5 months
[vlc/f33] (15 commits) ...Apply notify patch
by Nicolas Chauvet
Summary of changes:
f8e5cc6... rebuilt (*)
cf7f85b... Rebuild for new protobuf (*)
42eb349... Add patches (*)
417faf9... Fix arm tests (*)
453f7d2... Rebuild for new libdvdread (*)
4bc2da4... Move mmal_20 (*)
7cf4d6a... Update to mmal_20 (*)
46a3f6a... Add mmal_chain (*)
46a690e... Update mmal patches (*)
d58f682... Update snapshot (*)
4058237... Add lua-5.1 patch (*)
daf4e0a... Switch to lua-5.1 when needed (*)
ad3d48e... Also switch luac (*)
55d2510... Add notify patch (*)
7ee7aef... Apply notify patch (*)
(*) This commit already existed in another branch; no separate mail sent
3 years, 5 months
[vlc] Apply notify patch
by Nicolas Chauvet
commit 7ee7aef757bde758644c62f236f2716c58424320
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 30 13:53:09 2020 +0100
Apply notify patch
vlc.spec | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 2e34608..c773e1e 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -51,7 +51,7 @@ Summary: The cross-platform open-source multimedia framework, player and server
Epoch: 1
Name: vlc
Version: 3.0.12
-Release: 0.1%{?dist}
+Release: 0.2%{?dist}
License: GPLv2+
URL: https://www.videolan.org
%if 0%{?commit0:1}
@@ -68,6 +68,10 @@ Patch5: Lower-libgcrypt-to-1.5.3.patch
Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch
# lua-5.1 is used by default for vlc build
Patch7: Switch-to-Fedora-lua-5.1.patch
+
+# Backport for 3.0 notifyd without gtk3
+Patch9: notify-don-t-depend-on-any-GTK-version.patch
+
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
@@ -151,6 +155,7 @@ BuildRequires: pkgconfig(libplacebo)
%endif
BuildRequires: pkgconfig(libudev)
BuildRequires: pkgconfig(libvncclient)
+BuildRequires: pkgconfig(libnotify)
BuildRequires: libupnp-devel
BuildRequires: libv4l-devel
%{?_with_vaapi:BuildRequires: libva-devel}
@@ -339,6 +344,8 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac
sed -i -e 's/luac/luac-5.1/g' configure.ac
%endif
+%patch9 -p1
+
%{?_with_bootstrap:
rm aclocal.m4 m4/lib*.m4 m4/lt*.m4 || :
./bootstrap
@@ -606,6 +613,9 @@ fi || :
%changelog
+* Fri Oct 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.12-0.2
+- Backport fix for libnotify - Enable vlc notify
+
* Fri Oct 30 2020 Nicolas Chauvet <kwizart(a)gmail.com> - 1:3.0.12-0.1
- Update snapshoot
- Switch to lua-5.1
3 years, 5 months
[vlc] Add notify patch
by Nicolas Chauvet
commit 55d25101a4892f830e94938c33d6c27801648303
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 30 13:42:05 2020 +0100
Add notify patch
notify-don-t-depend-on-any-GTK-version.patch | 101 +++++++++++++++++++++++++++
1 file changed, 101 insertions(+)
---
diff --git a/notify-don-t-depend-on-any-GTK-version.patch b/notify-don-t-depend-on-any-GTK-version.patch
new file mode 100644
index 0000000..b01a73c
--- /dev/null
+++ b/notify-don-t-depend-on-any-GTK-version.patch
@@ -0,0 +1,101 @@
+From c25400b146f7a7b3b4a29c0efa4daee9d1c49633 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <remi(a)remlab.net>
+Date: Tue, 5 May 2020 18:48:06 +0300
+Subject: [PATCH] notify: don't depend on any GTK version
+
+If there's one in the process use it. If there's none fallback to
+default VLC icon with the old code.
+
+This not only avoids VLC builds depending on GTK, but this should
+prevent crashes if GTK 2 is present in the process (e.g. through Qt plugin).
+
+Adapted to vlc-3.x by "Nicolas Chauvet <kwizart(a)gmail.com>"
+---
+ configure.ac | 2 +-
+ modules/notify/notify.c | 38 ++++++++++++++++++++++----------------
+ 2 files changed, 23 insertions(+), 17 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 09ac250ff483..a3ef64318561 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4206,7 +4206,7 @@ AS_IF([test "${enable_osx_notifications}" != "no"], [
+ dnl
+ dnl Libnotify notification plugin
+ dnl
+-PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify gtk+-3.0], [libnotify notification], [auto])
++PKG_ENABLE_MODULES_VLC([NOTIFY], [], [libnotify], [libnotify notification], [auto])
+
+ dnl
+ dnl libplacebo support
+diff --git a/modules/notify/notify.c b/modules/notify/notify.c
+index bd6bba6c32c8..20b7c4acb761 100644
+--- a/modules/notify/notify.c
++++ b/modules/notify/notify.c
+@@ -36,10 +36,16 @@
+ #include <vlc_playlist.h>
+ #include <vlc_url.h>
+
+-#include <gtk/gtk.h>
+ #include <gdk-pixbuf/gdk-pixbuf.h>
+ #include <libnotify/notify.h>
+
++typedef struct GtkIconTheme GtkIconTheme;
++enum GtkIconLookupFlags { dummy = 0x7fffffff };
++
++__attribute__((weak)) GtkIconTheme *gtk_icon_theme_get_default(void);
++__attribute__((weak)) GdkPixbuf *gtk_icon_theme_load_icon(GtkIconTheme *,
++ const char *icon_name, int size, enum GtkIconLookupFlags, GError **);
++
+ #ifndef NOTIFY_CHECK_VERSION
+ # define NOTIFY_CHECK_VERSION(x,y,z) 0
+ #endif
+@@ -222,30 +228,30 @@ static int ItemChange( vlc_object_t *p_this, const char *psz_var,
+ GError *p_error = NULL;
+ pix = gdk_pixbuf_new_from_file_at_scale( psz_arturl,
+ 72, 72, TRUE, &p_error );
++ free( psz_arturl );
+ }
+- else /* else we show state-of-the art logo */
++ else
++ /* else we show state-of-the art logo */
++ if( gtk_icon_theme_get_default != NULL
++ && gtk_icon_theme_load_icon != NULL )
+ {
+ /* First try to get an icon from the current theme. */
+ GtkIconTheme* p_theme = gtk_icon_theme_get_default();
+ pix = gtk_icon_theme_load_icon( p_theme, "vlc", 72, 0, NULL);
+-
+- if( !pix )
++ }
++ else
++ { /* Load icon from share/ */
++ GError *p_error = NULL;
++ char *psz_pixbuf;
++ char *psz_data = config_GetDataDir();
++ if( asprintf( &psz_pixbuf, "%s/icons/48x48/vlc.png", psz_data ) >= 0 )
+ {
+- /* Load icon from share/ */
+- GError *p_error = NULL;
+- char *psz_pixbuf;
+- char *psz_data = config_GetDataDir();
+- if( asprintf( &psz_pixbuf, "%s/icons/48x48/vlc.png", psz_data ) >= 0 )
+- {
+- pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
+- free( psz_pixbuf );
+- }
+- free( psz_data );
++ pix = gdk_pixbuf_new_from_file( psz_pixbuf, &p_error );
++ free( psz_pixbuf );
+ }
++ free( psz_data );
+ }
+
+- free( psz_arturl );
+-
+ /* we need to replace '&' with '&' because '&' is a keyword of
+ * notification-daemon parser */
+ const int i_len = strlen( psz_tmp );
+--
+2.25.4
+
3 years, 5 months
[mixxx] Restore deleted sources
by Uwe Klotz
commit 4f20fd44bd918242102d1954526a97bef157bed5
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Oct 30 14:52:56 2020 +0100
Restore deleted sources
sources | 1 +
1 file changed, 1 insertion(+)
---
diff --git a/sources b/sources
index f56d1fd..64036aa 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
SHA512 (libKeyFinder_v2.2.2.zip) = 4c8745ebcda65c7bbe00016e53b813e704eff1ca7262868a91359f51979b84e43492993cfc7b02ecd8142ded15a7c3ec64751234cb06fa5b27b7695f9937110b
+SHA512 (mixxx-ac834c60888ce35b7e247ab1c3e46c15d2256270.tar.gz) = 0e070e94dcb1f6a62c31e62eb9df084f0d97b33d0dec08a4a4851bf9fd6bb1ef8bde015403a917802ebc83a64ff6d0347b2e7f9523f509488d1048a560058d2d
3 years, 5 months
[mixxx] Add missing libKeyFinder sources
by Uwe Klotz
commit a4117412753c882fd6e5c15b596f090aa6f4b76c
Author: Uwe Klotz <uklotz(a)mixxx.org>
Date: Fri Oct 30 14:39:02 2020 +0100
Add missing libKeyFinder sources
.gitignore | 1 +
mixxx.spec | 8 +++++---
sources | 2 +-
3 files changed, 7 insertions(+), 4 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ff044b1..3274195 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@
# these large binary files are placed in `rpmbuild/SOURCES` and never
# end up in the project directory.
*.tar.gz
+*.zip
diff --git a/mixxx.spec b/mixxx.spec
index 410c87c..6ece1a8 100644
--- a/mixxx.spec
+++ b/mixxx.spec
@@ -29,7 +29,7 @@ Summary: Mixxx is open source software for DJ'ing
License: GPLv2+
URL: http://www.mixxx.org
Source0: https://github.com/mixxxdj/%{name}/archive/%{sources}/%{name}-%{sources}....
-Source1: https://github.com/ibsh/libKeyFinder/archive/v2.2.2.zip
+Source1: https://github.com/ibsh/libKeyFinder/archive/v2.2.2.zip#/libKeyFinder_v2....
# Build Tools
BuildRequires: desktop-file-utils
@@ -102,8 +102,10 @@ echo "#pragma once" > src/build.h
%endif
# Copy the libKeyFinder source archive into the download folder
-mkdir -p %{_target_platform}/download/libKeyFinder
-cp %{SOURCE1} %{_target_platform}/download/libKeyFinder/
+# of the build directory. Rename the archive back into the
+# original name with only a version number
+mkdir -p %{__cmake_builddir}/download/libKeyFinder
+cp %{SOURCE1} %{__cmake_builddir}/download/libKeyFinder/v2.2.2.zip
%build
diff --git a/sources b/sources
index f7561f4..f56d1fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mixxx-ac834c60888ce35b7e247ab1c3e46c15d2256270.tar.gz) = 0e070e94dcb1f6a62c31e62eb9df084f0d97b33d0dec08a4a4851bf9fd6bb1ef8bde015403a917802ebc83a64ff6d0347b2e7f9523f509488d1048a560058d2d
+SHA512 (libKeyFinder_v2.2.2.zip) = 4c8745ebcda65c7bbe00016e53b813e704eff1ca7262868a91359f51979b84e43492993cfc7b02ecd8142ded15a7c3ec64751234cb06fa5b27b7695f9937110b
3 years, 5 months
[vlc] Also switch luac
by Nicolas Chauvet
commit ad3d48e3f49a9b16c6d8e157f77575855526d689
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 30 11:15:36 2020 +0100
Also switch luac
vlc.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/vlc.spec b/vlc.spec
index 6a5b090..2e34608 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -166,7 +166,7 @@ BuildRequires: pkgconfig(glu)
BuildRequires: libsamplerate-devel
BuildRequires: libshout-devel
%if 0%{?fedora} || 0%{?rhel} > 7
-BuildRequires: lua5.1-devel
+BuildRequires: lua5.1-devel, lua5.1
%else
BuildRequires: lua-devel
%endif
@@ -336,6 +336,7 @@ sed -i -e 's/taglib >= 1.9/taglib >= 1.8/' configure.ac
%endif
%if 0%{?fedora} || 0%{?rhel} > 7
%patch7 -p1
+sed -i -e 's/luac/luac-5.1/g' configure.ac
%endif
%{?_with_bootstrap:
3 years, 5 months
[vlc] Switch to lua-5.1 when needed
by Nicolas Chauvet
commit daf4e0aad764456dce012739eb23508de9b0f4f8
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 30 10:53:50 2020 +0100
Switch to lua-5.1 when needed
vlc.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/vlc.spec b/vlc.spec
index 9f9fca8..6a5b090 100644
--- a/vlc.spec
+++ b/vlc.spec
@@ -66,8 +66,8 @@ Patch1: https://github.com/RPi-Distro/vlc/raw/buster-rpt/debian/patches/mmal_cha
Patch3: 0001-Use-SYSTEM-wide-ciphers-for-gnutls.patch
Patch5: Lower-libgcrypt-to-1.5.3.patch
Patch6: Restore-support-for-thread-callbacks-for-older-gcryp.patch
-# Patch based on https://code.videolan.org/videolan/vlc/commit/0e0b070c26d197e848f1548fca4...
-Patch7: replace_deprecated_luaL_checkint.patch
+# lua-5.1 is used by default for vlc build
+Patch7: Switch-to-Fedora-lua-5.1.patch
BuildRequires: desktop-file-utils
BuildRequires: libappstream-glib
BuildRequires: fontpackages-devel
3 years, 5 months
[vlc] Add lua-5.1 patch
by Nicolas Chauvet
commit 4058237d262bf5f19e9b732b9ed3d9791f941e1c
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Oct 30 10:53:31 2020 +0100
Add lua-5.1 patch
Switch-to-Fedora-lua-5.1.patch | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
---
diff --git a/Switch-to-Fedora-lua-5.1.patch b/Switch-to-Fedora-lua-5.1.patch
new file mode 100644
index 0000000..7c8c575
--- /dev/null
+++ b/Switch-to-Fedora-lua-5.1.patch
@@ -0,0 +1,36 @@
+From 3965d3cf07a62a7ed64c79f44a7cc416b76cb27e Mon Sep 17 00:00:00 2001
+From: Leigh Scott <leigh123linux(a)gmail.com>
+Date: Fri, 30 Oct 2020 10:51:52 +0100
+Subject: [PATCH] Switch to Fedora lua-5.1
+
+---
+ configure.ac | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 3aa07a8c715d..9bc7ceafb5ff 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1681,7 +1681,7 @@ then
+ [
+ AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+
+- PKG_CHECK_MODULES(LUA, lua5.1,
++ PKG_CHECK_MODULES(LUA, lua-5.1,
+ [ have_lua=yes ],
+ [
+ AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
+@@ -1695,8 +1695,8 @@ then
+ [ have_lua=no ] )
+ AC_CHECK_LIB( lua5.2 , luaL_newstate,
+ [LUA_LIBS="-llua5.2"],
+- AC_CHECK_LIB( lua5.1 , luaL_newstate,
+- [LUA_LIBS="-llua5.1"],
++ AC_CHECK_LIB( lua-5.1 , luaL_newstate,
++ [LUA_LIBS="-llua-5.1"],
+ AC_CHECK_LIB( lua51 , luaL_newstate,
+ [LUA_LIBS="-llua51"],
+ AC_CHECK_LIB( lua , luaL_newstate,
+--
+2.25.4
+
3 years, 5 months