From a833e3f4a431b8eea751b7420e127787f9c92117 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 4 Dec 2017 12:06:33 +0000 Subject: gentoo resync : 04.12.2017 --- media-video/Manifest.gz | Bin 29771 -> 29770 bytes media-video/smplayer/Manifest | 1 - .../files/smplayer-14.9.0.6690-zero-bidi.patch | 13 - media-video/vlc/Manifest | 1 - media-video/vlc/files/vlc-2.2.4-qt57.patch | 284 --------------------- 5 files changed, 299 deletions(-) delete mode 100644 media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch delete mode 100644 media-video/vlc/files/vlc-2.2.4-qt57.patch (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 1c8f6eee66fa..578d96f6fc4d 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/smplayer/Manifest b/media-video/smplayer/Manifest index 9fa29801c098..c18cd64800ef 100644 --- a/media-video/smplayer/Manifest +++ b/media-video/smplayer/Manifest @@ -1,4 +1,3 @@ -AUX smplayer-14.9.0.6690-zero-bidi.patch 410 BLAKE2B a6d5a9460dfd76ab70e7eacd13a89c21ddfab9fed6522fa0ec8d8fa50288f527525a1c1b73702168349ac57a376dca51d9f0359cf33980e86b11be60ed3e14af SHA512 0498e2519fbaf5f217e0ae7b47660f26e5a25a99aa8500c6e82716540d348d679628d061552e75afbf70dbe38e5ce3a433c553119d1ab8180e6fe7d9640433e7 AUX smplayer-14.9.0.6966-unbundle-qtsingleapplication.patch 566 BLAKE2B bc96833566d3d87d0bde532b0b6a6500671d9ec75cc0ee5f9485ea052ad030f8237d01184200f846febc07f4d7195af15d379e589de6772d58d4cfe89bff8ac3 SHA512 9c757a1eaca358c9fb712801c0a17d084ea9dd3be26dd43f9b2c83bf39d2bbe4b458ba9432aba9e76cb83b56fb698a2976951be2074acfaa787cbfbed2a54fa9 AUX smplayer-16.4.0-zero-bidi.patch 489 BLAKE2B 50f535154f771e535c244aff2dbd27b60cdbed36f01b4c3f3bf1bd27dbaceb52d41a061aa4d15501c8ae3d0e4bb3adfc2ecd5e0eaee91aa06207738321e7a89a SHA512 acde9545bc1a0659673f6e747291c837ab36b9894bde6d03e419acf579c2f8f581127424dde786496f37308676754319c4f4402f52b620e97a63cdccd1af80d6 AUX smplayer-17.1.0-advertisement_crap.patch 1982 BLAKE2B 22a5027e9d20dca47fed1176e13cd9f8f5c912f51352d07f8fc0dd1f0850dc241483e22524c9fab2b9e20e67d1527f391a791afa2ac96285c4a199801ab96b65 SHA512 7bc1a3e9fb916d3a7e0c4f9bba8bb2adb7a3822e34694f79501e228f700b27633cac2eba237ab4af221c50f07295ecab3093c2a7033578a3e0a91a1e6449570d diff --git a/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch b/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch deleted file mode 100644 index 650dcd79c4b4..000000000000 --- a/media-video/smplayer/files/smplayer-14.9.0.6690-zero-bidi.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/src/core.cpp -+++ b/src/core.cpp -@@ -1811,10 +1811,6 @@ - - proc->setOption("ass-font-scale", QString::number(mset.sub_scale_ass)); - -- if (!pref->mplayer_is_mplayer2) { -- proc->setOption("flip-hebrew",false); // It seems to be necessary to display arabic subtitles correctly when using -ass -- } -- - if (pref->enable_ass_styles) { - if (!pref->force_ass_styles) { - // Load the styles.ass file diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 9eab6e1be0e0..bf3f6b1658f5 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -7,7 +7,6 @@ AUX vlc-2.2.4-cxx0x.patch 598 BLAKE2B 80771a75c7f0dd8b5c2dda9d7957450a5d1b54a4a2 AUX vlc-2.2.4-decoder-lock-scope.patch 1337 BLAKE2B d1c178a3d7ded6cd3aa377d5064fd83f63ac7c69ad33f1a21399c6ef44c268355428caf29ab7e315455629320ad49252fd54683380cf54ad757d62bb3888c686 SHA512 a81704adf25aa54cc8fa7c2f97117ef6c300af15c5b78b74b0df5ee4eba1d8e0f9d9b3b99e2793f7362d1727de24990fb555222bd5f73cce31df2c49371063a1 AUX vlc-2.2.4-ffmpeg3.patch 6377 BLAKE2B 2cd08b9058914fd899f515f434e0f93d06ae671e114ae2a2d4997fae92f1aa9e2e87eb13583f7a51e005d452547b6a965b87c7a09472723a8005a9ada0b6d5bb SHA512 efede86f7d4c8a475f14c88405d4f9810784b93b8dbee8a21ca2f59b4a62ba008996fbd72ad77300b76a6faa328720a7b99afdd753480f2a17dc25204e52d2ee AUX vlc-2.2.4-libav-11.7.patch 291 BLAKE2B 9ad8bac7897976ba50b98ce1063baab311f0ad8e267cbad751b1378280b2f8238e22096448889b4eb69bbec34d08225269c7d2f653676828dc7a7d755fe676bf SHA512 f216833dc1ad5ddbf6a19b497238e9c850582f16eae452862a4c7c9acd110a0033879b3e3555177ac0ef30663cdd3f72d1a1020999c44e1f577ef665dd658315 -AUX vlc-2.2.4-qt57.patch 8624 BLAKE2B 5b2521dc8d793c9b44dfbb6c0c23ca90e32d45d16c6ebebf07c6f1c357bcb7d8605753e626f502cfaa64cda2f4f0fc0260dcb2eacffe1adf1647bef68099cb0b SHA512 4f7bf09fe6721c7bbaf26761c7f868dfe66b7b63e50892ee9b107a036c743331f14be9820cf0415ac5463b223699c86efe104092d13cda8d436073d0d76dad00 AUX vlc-2.2.4-relax_ffmpeg.patch 1686 BLAKE2B f802c5ae95962036fe3fcfa67e725ac5a5d5466e614e892e7e617b5a972ab9e204bcb4096822412c68a7ad43133ed230f6dcdecc9bf0a1737126ada8b54ccaf7 SHA512 a15862d6ac60575c0c338faff6052e3c28c4bd75f86f37ff8fbe36a64bc1a82689c56b2dc19f05109fc0913b85aab7ba28a94bfdd5fdd0e3c87cb7e6e58d1caa AUX vlc-2.2.6-decoder-lock-scope.patch 973 BLAKE2B 7fb92001311b61d35b4f029da55e308c248d1e052178769eb106739b86a6c4d45a01ca5e111a2d710a5676b5437c81a481fb0125038da33eed43eb9c1d05dc4f SHA512 b6d360f4eb6923332a67605118c5a47ed2e54bedcc68625eb5f78313e971da66ab19998f3037dcc0ce588287da1510c93cf68247c47ae25d0b1305af931794e3 AUX vlc-9999-libva-1.2.1-compat.patch 291 BLAKE2B ed2e146e43ab65474d8e20f87f79b97b6a504a762375347223d759b605e20d210fd62d967160ba43cc10a1730409d7d06d71ad95c0aaf37bb05caa320ad35213 SHA512 47b9d3f7a5e7c90045acac3b3253feb927da26646b6a457655669c1ab18f6a0e027160285695dc06642e6117ed1fcd87db90ae1f409e8fee737a2a41e80e1968 diff --git a/media-video/vlc/files/vlc-2.2.4-qt57.patch b/media-video/vlc/files/vlc-2.2.4-qt57.patch deleted file mode 100644 index 97472a64c398..000000000000 --- a/media-video/vlc/files/vlc-2.2.4-qt57.patch +++ /dev/null @@ -1,284 +0,0 @@ -As the 2.2 headers are still using vlc_atomics (picture) -we cannot have a way to avoid collisions with early -or late inclusion when using GCC >= 4.7 - -Conditionals in vlc_atomic won't work. - -Happens in ProjectM and Qt5. ---- - 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 - #include - -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 - #include -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 /* 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 - #include -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 -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 - --#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 - #include - #include /* 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_MEMBERS for vlc_interface.h */ --#include /* intf_thread_t */ --#include /* playlist_t */ -- --#define QT_NO_CAST_TO_ASCII --#include -+#include - - #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 -+ #if defined(Q_COMPILER_ATOMICS) && \ -+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) ) -+ #define VLC_ATOMIC_H -+ #include -+ 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_MEMBERS for vlc_interface.h */ -+#include /* intf_thread_t */ -+#include /* playlist_t */ -+ -+#define QT_NO_CAST_TO_ASCII -+#include -+ - 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 -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 -+#if defined(__GNUC__) && \ -+ ( __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7 ) ) -+ #define VLC_ATOMIC_H /* Ensure C atomics wont collide with old intrinsics */ -+#endif - - #include - #include --- -2.7.4 -- cgit v1.2.3