Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=64158478ee29d69ab3a64533e777ce27f50fe341
commit 64158478ee29d69ab3a64533e777ce27f50fe341 Author: DeX77 <[email protected]> Date: Mon May 15 11:29:50 2017 +0200 vlc-2.2.5.1-1-x86_64 * version bump diff --git a/source/xmultimedia/vlc/Fix-build-using-old-GCC-intrinsics.patch b/source/xmultimedia/vlc/Fix-build-using-old-GCC-intrinsics.patch deleted file mode 100644 index 7bfc0e6..0000000 --- a/source/xmultimedia/vlc/Fix-build-using-old-GCC-intrinsics.patch +++ /dev/null @@ -1,292 +0,0 @@ -From 8b0a359be21c8b66c7f7f5d34b85df3cf6689035 Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie <[email protected]> -Date: Sun, 24 Jul 2016 12:59:20 +0200 -Subject: [PATCH] Fix build using old GCC intrinsics - -As the 2.2 headers are still using vlc_atomics (picture) -we cannot have a way to avoid collisions with early -or late <atomic> inclusion when using GCC >= 4.7 - -Conditionals in vlc_atomic won't work. - -Happens in ProjectM and Qt5. - -Signed-off-by: Jean-Baptiste Kempf <[email protected]> ---- - modules/gui/qt4/actions_manager.cpp | 2 ++ - modules/gui/qt4/adapters/seekpoints.cpp | 4 +-- - modules/gui/qt4/adapters/seekpoints.hpp | 4 +-- - modules/gui/qt4/components/controller.cpp | 2 ++ - .../gui/qt4/components/playlist/playlist_model.hpp | 4 +-- - modules/gui/qt4/components/playlist/views.cpp | 6 ++++ - modules/gui/qt4/dialogs/messages.cpp | 2 ++ - modules/gui/qt4/dialogs/vlm.cpp | 4 --- - modules/gui/qt4/dialogs/vlm.hpp | 4 ++- - modules/gui/qt4/input_manager.cpp | 2 ++ - modules/gui/qt4/input_manager.hpp | 3 +- - modules/gui/qt4/menus.cpp | 2 ++ - modules/gui/qt4/qt4.hpp | 32 ++++++++++++++++++---- - modules/gui/qt4/util/pictureflow.cpp | 2 ++ - modules/visualization/projectm.cpp | 4 +++ - 15 files changed, 56 insertions(+), 21 deletions(-) - -diff --git a/modules/gui/qt4/actions_manager.cpp b/modules/gui/qt4/actions_manager.cpp -index eff40d9..b7ca967 100644 ---- a/modules/gui/qt4/actions_manager.cpp -+++ b/modules/gui/qt4/actions_manager.cpp -@@ -25,6 +25,8 @@ - # include "config.h" - #endif - -+#include "qt4.hpp" -+ - #include <vlc_vout.h> - #include <vlc_keys.h> - -diff --git a/modules/gui/qt4/adapters/seekpoints.cpp b/modules/gui/qt4/adapters/seekpoints.cpp -index fbf2957..a3564bb 100644 ---- a/modules/gui/qt4/adapters/seekpoints.cpp -+++ b/modules/gui/qt4/adapters/seekpoints.cpp -@@ -19,14 +19,12 @@ - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -+#include "seekpoints.hpp" - - #include "recents.hpp" - #include "dialogs_provider.hpp" - #include "menus.hpp" - --#include "seekpoints.hpp" -- --#include "qt4.hpp" - #include "input_manager.hpp" - - SeekPoints::SeekPoints( QObject *parent, intf_thread_t *p_intf_ ) : -diff --git a/modules/gui/qt4/adapters/seekpoints.hpp b/modules/gui/qt4/adapters/seekpoints.hpp -index 0083989..bbb9214 100644 ---- a/modules/gui/qt4/adapters/seekpoints.hpp -+++ b/modules/gui/qt4/adapters/seekpoints.hpp -@@ -22,9 +22,7 @@ - #ifndef SEEKPOINTS_HPP - #define SEEKPOINTS_HPP - --#ifdef HAVE_CONFIG_H --#include "config.h" --#endif -+#include "qt4.hpp" - - #include <vlc_common.h> - #include <vlc_interface.h> -diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp -index d93e0db..c43d929 100644 ---- a/modules/gui/qt4/components/controller.cpp -+++ b/modules/gui/qt4/components/controller.cpp -@@ -26,6 +26,8 @@ - # include "config.h" - #endif - -+#include "qt4.hpp" -+ - #include <vlc_vout.h> /* vout_thread_t for FSC */ - - /* Widgets */ -diff --git a/modules/gui/qt4/components/playlist/playlist_model.hpp b/modules/gui/qt4/components/playlist/playlist_model.hpp -index f9d1d0c..1f71ac9 100644 ---- a/modules/gui/qt4/components/playlist/playlist_model.hpp -+++ b/modules/gui/qt4/components/playlist/playlist_model.hpp -@@ -25,9 +25,7 @@ - #ifndef _PLAYLIST_MODEL_H_ - #define _PLAYLIST_MODEL_H_ - --#ifdef HAVE_CONFIG_H --# include "config.h" --#endif -+#include "qt4.hpp" - - #include <vlc_input.h> - #include <vlc_playlist.h> -diff --git a/modules/gui/qt4/components/playlist/views.cpp b/modules/gui/qt4/components/playlist/views.cpp -index 59f6535..0066205 100644 ---- a/modules/gui/qt4/components/playlist/views.cpp -+++ b/modules/gui/qt4/components/playlist/views.cpp -@@ -21,6 +21,12 @@ - * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "qt4.hpp" -+ - #include "components/playlist/views.hpp" - #include "components/playlist/vlc_model.hpp" /* VLCModel */ - #include "components/playlist/sorting.h" /* Columns List */ -diff --git a/modules/gui/qt4/dialogs/messages.cpp b/modules/gui/qt4/dialogs/messages.cpp -index 30793a2..9c79c99 100644 ---- a/modules/gui/qt4/dialogs/messages.cpp -+++ b/modules/gui/qt4/dialogs/messages.cpp -@@ -24,6 +24,8 @@ - # include "config.h" - #endif - -+#include "qt4.hpp" -+ - #include "dialogs/messages.hpp" - - #include <QPlainTextEdit> -diff --git a/modules/gui/qt4/dialogs/vlm.cpp b/modules/gui/qt4/dialogs/vlm.cpp -index 0da88cc..595f015 100644 ---- a/modules/gui/qt4/dialogs/vlm.cpp -+++ b/modules/gui/qt4/dialogs/vlm.cpp -@@ -23,10 +23,6 @@ - * Foundation, Inc., 51 Franklin street, Fifth Floor, Boston MA 02110-1301, USA. - *****************************************************************************/ - --#ifdef HAVE_CONFIG_H --# include "config.h" --#endif -- - #include "dialogs/vlm.hpp" - - #ifdef ENABLE_VLM -diff --git a/modules/gui/qt4/dialogs/vlm.hpp b/modules/gui/qt4/dialogs/vlm.hpp -index a3c6e5d..dcf7110 100644 ---- a/modules/gui/qt4/dialogs/vlm.hpp -+++ b/modules/gui/qt4/dialogs/vlm.hpp -@@ -25,8 +25,10 @@ - #ifndef QVLC_VLM_DIALOG_H_ - #define QVLC_VLM_DIALOG_H_ 1 - -+#include "qt4.hpp" -+ - #ifdef HAVE_CONFIG_H --# include "config.h" -+#include "config.h" - #endif - - #ifdef ENABLE_VLM -diff --git a/modules/gui/qt4/input_manager.cpp b/modules/gui/qt4/input_manager.cpp -index fd45f4a..c50cb6c 100644 ---- a/modules/gui/qt4/input_manager.cpp -+++ b/modules/gui/qt4/input_manager.cpp -@@ -30,6 +30,8 @@ - # include "config.h" - #endif - -+#include "qt4.hpp" -+ - #include "input_manager.hpp" - #include "recents.hpp" - -diff --git a/modules/gui/qt4/input_manager.hpp b/modules/gui/qt4/input_manager.hpp -index 7d3b76a..4fbecbb 100644 ---- a/modules/gui/qt4/input_manager.hpp -+++ b/modules/gui/qt4/input_manager.hpp -@@ -29,9 +29,10 @@ - # include "config.h" - #endif - -+#include "qt4.hpp" -+ - #include <vlc_input.h> - --#include "qt4.hpp" - #include "util/singleton.hpp" - #include "adapters/variables.hpp" - -diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp -index 116e98c..46240b0 100644 ---- a/modules/gui/qt4/menus.cpp -+++ b/modules/gui/qt4/menus.cpp -@@ -34,6 +34,8 @@ - # include "config.h" - #endif - -+#include "qt4.hpp" -+ - #include <vlc_common.h> - #include <vlc_intf_strings.h> - #include <vlc_vout.h> /* vout_thread_t */ -diff --git a/modules/gui/qt4/qt4.hpp b/modules/gui/qt4/qt4.hpp -index 44d7db6..5aec957 100644 ---- a/modules/gui/qt4/qt4.hpp -+++ b/modules/gui/qt4/qt4.hpp -@@ -29,12 +29,7 @@ - # include "config.h" - #endif - --#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */ --#include <vlc_interface.h> /* intf_thread_t */ --#include <vlc_playlist.h> /* playlist_t */ -- --#define QT_NO_CAST_TO_ASCII --#include <QString> -+#include <QtGlobal> - - #if ( QT_VERSION < 0x040600 ) - # error Update your Qt version to at least 4.6.0 -@@ -43,6 +38,31 @@ - #define HAS_QT47 ( QT_VERSION >= 0x040700 ) - #define HAS_QT5 ( QT_VERSION >= 0x050000 ) - -+#if HAS_QT5 -+ #include <QtCore/qcompilerdetection.h> -+ #if defined(Q_COMPILER_ATOMICS) && \ -+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) ) -+ #define VLC_ATOMIC_H -+ #include <atomic> -+ using namespace std; -+ # define atomic_store(object,desired) \ -+ do { \ -+ *(object) = (desired); \ -+ __sync_synchronize(); \ -+ } while (0) -+ -+ # define atomic_load(object) \ -+ (__sync_synchronize(), *(object)) -+ #endif -+#endif -+ -+#include <vlc_common.h> /* VLC_COMMON_MEMBERS for vlc_interface.h */ -+#include <vlc_interface.h> /* intf_thread_t */ -+#include <vlc_playlist.h> /* playlist_t */ -+ -+#define QT_NO_CAST_TO_ASCII -+#include <QString> -+ - enum { - DialogEventTypeOffset = 0, - IMEventTypeOffset = 100, -diff --git a/modules/gui/qt4/util/pictureflow.cpp b/modules/gui/qt4/util/pictureflow.cpp -index 9318953..a7e6a01 100644 ---- a/modules/gui/qt4/util/pictureflow.cpp -+++ b/modules/gui/qt4/util/pictureflow.cpp -@@ -29,6 +29,8 @@ - THE SOFTWARE. - */ - -+#include "qt4.hpp" -+ - #include "pictureflow.hpp" - - #include <QApplication> -diff --git a/modules/visualization/projectm.cpp b/modules/visualization/projectm.cpp -index e80fbf4..96d532d 100644 ---- a/modules/visualization/projectm.cpp -+++ b/modules/visualization/projectm.cpp -@@ -30,6 +30,10 @@ - #endif - - #include <assert.h> -+#if defined(__GNUC__) && \ -+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) ) -+ #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */ -+#endif - - #include <vlc_common.h> - #include <vlc_plugin.h> --- -2.8.1 - diff --git a/source/xmultimedia/vlc/FrugalBuild b/source/xmultimedia/vlc/FrugalBuild index 5d94970..fba626f 100644 --- a/source/xmultimedia/vlc/FrugalBuild +++ b/source/xmultimedia/vlc/FrugalBuild @@ -7,9 +7,9 @@ : ${USE_DEVEL="n"} pkgname=vlc -pkgver=2.2.4 +pkgver=2.2.5.1 pkgextraver= -pkgrel=15 +pkgrel=1 pkgdesc="The cross-platform media player and streaming server." url="http://www.videolan.org/vlc/"; ## TODO: split a lot more -- crazy -- @@ -97,29 +97,20 @@ up2date="Flastverdir http://download.videolan.org/pub/videolan/vlc"; if ! Fuse $USE_DEVEL; then source=(http://download.videolan.org/pub/videolan/vlc/$pkgver/$pkgname-$pkgver$pkgextraver.tar.xz \ lua53-compat.patch \ - freerdp.patch \ bug-14908.patch \ - Fix-build-using-old-GCC-intrinsics.patch \ - vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch \ - vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch \ vlc-2.1.0-TomWij-bisected-PA-broken-underflow.patch \ vlc-9999-libva-1.2.1-compat.patch \ vlc-2.2.4-relax_ffmpeg.patch \ vlc-2.2.4-ffmpeg3.patch) - sha1sums=('ec171b0ad731d9d114540cd7b7fcb41fc3293696' \ + sha1sums=('042962dba68e1414aa563883b0172ee121cf9555' \ '5d7dba23756ff577a90b8631b187fbeac1f94e17' \ - '8c88192908330151f363b95748492bfed0adca05' \ 'b1d20239bd0f7ee0666cec8d1f8118ab087f9893' \ - 'ac4d7eebbb1a3281294cc3b54fb2ac3571e18dcd' \ - '38b63efd768137074681ce8cb4bb47e0c78375ea' \ - 'bafabafd2362c82b52fa6be780bec61d1cde801f' \ '61ce442f390b3f744bbcd5771368c13e9236ea81' \ 'b435ddbb4df0cbe7f983fba74e5b5747d6a62e9c' \ 'e09103af98841ca149e26c0ef8051ecef588832b' \ 'c572727ab1604aed3414ce5622bcc123d2accd7d') - else pkgver=3.0.0 pkgextraver=-git diff --git a/source/xmultimedia/vlc/freerdp.patch b/source/xmultimedia/vlc/freerdp.patch deleted file mode 100644 index 00d2a69..0000000 --- a/source/xmultimedia/vlc/freerdp.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -Naur vlc-2.2.2/modules/access/rdp.c vlc-2.2.2-p/modules/access/rdp.c ---- vlc-2.2.2/modules/access/rdp.c 2015-04-30 15:45:33.000000000 +0200 -+++ vlc-2.2.2-p/modules/access/rdp.c 2016-04-06 21:20:09.021938399 +0200 -@@ -46,7 +46,7 @@ - #endif - - #if !defined(FREERDP_VERSION_MAJOR) || \ -- (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 )) -+ (defined(FREERDP_VERSION_MAJOR) && !(FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_VERSION_MINOR >= 1))) - # define SoftwareGdi sw_gdi - # define Fullscreen fullscreen - # define ServerHostname hostname -@@ -233,7 +233,7 @@ - vlcrdp_context_t * p_vlccontext = (vlcrdp_context_t *) p_instance->context; - - msg_Dbg( p_vlccontext->p_demux, "connected to desktop %dx%d (%d bpp)", --#if (FREERDP_VERSION_MAJOR >= 1 && FREERDP_VERSION_MINOR >= 1 ) -+#if defined(FREERDP_VERSION_MAJOR) && (FREERDP_VERSION_MAJOR > 1 || (FREERDP_VERSION_MAJOR == 1 && FREERDP_MINOR_VERSION >= 1)) - p_instance->settings->DesktopWidth, - p_instance->settings->DesktopHeight, - p_instance->settings->ColorDepth diff --git a/source/xmultimedia/vlc/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch b/source/xmultimedia/vlc/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch deleted file mode 100644 index 5ba1a83..0000000 --- a/source/xmultimedia/vlc/vlc_atomic-atomic_compare_exchange_strong_explicit-t.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ec34ff174f04d1e81c939ed0325a0073c6f68fce Mon Sep 17 00:00:00 2001 -From: Francois Cartegnie <[email protected]> -Date: Fri, 22 Jul 2016 13:37:15 +0200 -Subject: [PATCH 2/2] vlc_atomic: atomic_compare_exchange_strong_explicit takes - 5 parameters - -Signed-off-by: Jean-Baptiste Kempf <[email protected]> ---- - include/vlc_atomic.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h -index 01e0f85..15ccf8c 100644 ---- a/include/vlc_atomic.h -+++ b/include/vlc_atomic.h -@@ -152,7 +152,7 @@ typedef uintmax_t atomic_uintmax_t; - # define atomic_compare_exchange_strong(object,expected,desired) \ - atomic_compare_exchange(object, expected, desired) - --# define atomic_compare_exchange_strong_explicit(object,expected,desired,order) \ -+# define atomic_compare_exchange_strong_explicit(object,expected,desired,order,order_different) \ - atomic_compare_exchange_strong(object, expected, desired) - - # define atomic_compare_exchange_weak(object,expected,desired) \ --- -2.8.1 - diff --git a/source/xmultimedia/vlc/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch b/source/xmultimedia/vlc/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch deleted file mode 100644 index 2c07fc7..0000000 --- a/source/xmultimedia/vlc/vlc_atomic-atomic_compare_exchange_weak_explicit-tak.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ce8cc916ab43e12b85abd6a1b850f1ccf43319c8 Mon Sep 17 00:00:00 2001 -From: Steve Lhomme <[email protected]> -Date: Fri, 22 Jul 2016 13:37:14 +0200 -Subject: [PATCH 1/2] vlc_atomic: atomic_compare_exchange_weak_explicit takes 5 - parameters -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Rémi Denis-Courmont <[email protected]> -Signed-off-by: Jean-Baptiste Kempf <[email protected]> ---- - include/vlc_atomic.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/include/vlc_atomic.h b/include/vlc_atomic.h -index af88eab..01e0f85 100644 ---- a/include/vlc_atomic.h -+++ b/include/vlc_atomic.h -@@ -158,7 +158,7 @@ typedef uintmax_t atomic_uintmax_t; - # define atomic_compare_exchange_weak(object,expected,desired) \ - atomic_compare_exchange(object, expected, desired) - --# define atomic_compare_exchange_weak_explicit(object,expected,desired,order) \ -+# define atomic_compare_exchange_weak_explicit(object,expected,desired,order_equal,order_different) \ - atomic_compare_exchange_weak(object, expected, desired) - - # define atomic_fetch_add(object,operand) \ --- -2.8.1 -
_______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
