summaryrefslogtreecommitdiff
path: root/media-video/vlc
diff options
context:
space:
mode:
Diffstat (limited to 'media-video/vlc')
-rw-r--r--media-video/vlc/Manifest1
-rw-r--r--media-video/vlc/files/vlc-2.2.4-qt57.patch284
2 files changed, 0 insertions, 285 deletions
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 <atomic> 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 <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.7.4
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 04:48:09 +0000