[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Göktürk Yüksek]

commit:     f6b8f60690b35f4aa1be0448bb8f8529694dc057
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Mon Dec 26 15:05:15 2016 +0000
Commit:     Göktürk Yüksek <gokturk <AT> gentoo <DOT> org>
CommitDate: Tue Dec 27 19:30:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f6b8f606

media-video/vlc: remove unused patch

 media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch b/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
deleted file mode 100644
index db73a4e..00000000
--- a/media-video/vlc/files/vlc-2.1.0-libva-1.2.1-compat.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/modules/codec/avcodec/vaapi.c
-+++ b/modules/codec/avcodec/vaapi.c
-@@ -36,6 +36,9 @@
- #include <libavcodec/vaapi.h>
- #include <X11/Xlib.h>
- #include <va/va_x11.h>
-+#if VA_MINOR_VERSION >= 34
-+# include <va/va_compat.h>
-+#endif
- 
- #include "avcodec.h"
- #include "va.h"
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Andreas Sturmlechner]

commit:     120721ea967521ee4093b6efa8f15eb0e248b1b9
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sat Dec  2 08:49:11 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Dec  3 23:49:14 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=120721ea

media-video/vlc: remove unused patch

 media-video/vlc/files/vlc-2.2.4-qt57.patch | 284 -----------------------------
 1 file changed, 284 deletions(-)

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 97472a64c39..00000000000
--- 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

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Andreas Sturmlechner]

commit:     17ee272a57feea1f9f530c89987d8cd4a60f1749
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 11 14:34:34 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug 11 16:43:55 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ee272a

media-video/vlc: Update vlc-9999-libupnp-slot-1.8.patch

Package-Manager: Portage-2.3.45, Repoman-2.3.10

 media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
index 893f936b729..15ffc6af6fa 100644
--- a/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
+++ b/media-video/vlc/files/vlc-9999-libupnp-slot-1.8.patch
@@ -1,16 +1,16 @@
---- a/modules/services_discovery/upnp.hpp	2017-12-25 18:17:33.358015500 +0100
-+++ b/modules/services_discovery/upnp.hpp	2017-12-25 18:30:45.158167813 +0100
+--- a/modules/services_discovery/upnp-wrapper.hpp	2017-12-25 18:17:33.358015500 +0100
++++ b/modules/services_discovery/upnp-wrapper.hpp	2017-12-25 18:30:45.158167813 +0100
 @@ -35,8 +35,8 @@
- #include <windows.h>
- #include <wincrypt.h>
- #endif
--#include <upnp/upnp.h>
--#include <upnp/upnptools.h>
+ #include <algorithm>
+ #include <assert.h>
+ 
+-#include <upnp.h>
+-#include <upnptools.h>
 +#include <upnp-1.8/upnp.h>
 +#include <upnp-1.8/upnptools.h>
  
- #include <vlc_common.h>
- #include <vlc_url.h>
+ #if UPNP_VERSION < 10800
+ typedef void* UpnpEventPtr;
 
 --- a/configure.ac	2017-12-09 14:09:12.956370304 +0100
 +++ b/configure.ac	2017-12-09 14:13:25.236710362 +0100

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Conrad Kostecki]

commit:     f4cc9af8940ec5d328a6d2bfbf52fcc803cb31f8
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Mon Feb 15 17:03:51 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Mon Feb 15 20:11:25 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4cc9af8

media-video/vlc: remove unused patch

Closes: https://github.com/gentoo/gentoo/pull/19480
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-video/vlc/files/vlc-3.0.8-qt-5.15.patch | 30 ---------------------------
 1 file changed, 30 deletions(-)

diff --git a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch b/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch
deleted file mode 100644
index 7bdc24de4af..00000000000
--- a/media-video/vlc/files/vlc-3.0.8-qt-5.15.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- a/modules/gui/qt/util/timetooltip.hpp	2018-05-03 14:03:21.000000000 +0200
-+++ b/modules/gui/qt/util/timetooltip.hpp	2020-04-21 00:57:48.570508113 +0200
-@@ -24,6 +24,7 @@
- 
- #include "qt.hpp"
- 
-+#include <QPainterPath>
- #include <QWidget>
- 
- class TimeTooltip : public QWidget
---- a/modules/gui/qt/dialogs/plugins.cpp	2017-11-24 16:29:17.000000000 +0100
-+++ b/modules/gui/qt/dialogs/plugins.cpp	2020-04-21 01:10:14.916737405 +0200
-@@ -53,6 +53,7 @@
- #include <QListView>
- #include <QListWidget>
- #include <QPainter>
-+#include <QPainterPath>
- #include <QStyleOptionViewItem>
- #include <QKeyEvent>
- #include <QPushButton>
---- a/modules/gui/qt/components/playlist/views.cpp	2017-11-24 16:29:17.000000000 +0100
-+++ b/modules/gui/qt/components/playlist/views.cpp	2020-04-21 01:12:28.002665729 +0200
-@@ -27,6 +27,7 @@
- #include "input_manager.hpp"                      /* THEMIM */
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QRect>
- #include <QStyleOptionViewItem>
- #include <QFontMetrics>

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Conrad Kostecki]

commit:     6c5218213a469e90cdb76c48ff5ff028f59f094d
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 15 07:59:51 2022 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Sat Oct 15 19:33:44 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c521821

media-video/vlc: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/27789
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch | 25 ----------------------
 media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch   | 11 ----------
 2 files changed, 36 deletions(-)

diff --git a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch b/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
deleted file mode 100644
index d617a8357ff7..000000000000
--- a/media-video/vlc/files/vlc-3.0.11.1-srt-1.4.2.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-net-libs/srt renamed the SRTO_TSBPDDELAY constant to SRTRO_LATENCY.
-https://github.com/Haivision/srt/pull/1364
-https://bugs.gentoo.org/758062
---- b/modules/access/srt.c
-+++ a/modules/access/srt.c
-@@ -165,7 +165,7 @@ static bool srt_schedule_reconnect(strea
- 
-     /* Set latency */
-     i_latency = var_InheritInteger( p_stream, "latency" );
--    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
-+    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
-         &i_latency, sizeof( int ) );
- 
-     psz_passphrase = var_InheritString( p_stream, "passphrase" );
---- a/modules/access_output/srt.c
-+++ b/modules/access_output/srt.c
-@@ -162,7 +162,7 @@ static bool srt_schedule_reconnect(sout_
- 
-     /* Set latency */
-     i_latency = var_InheritInteger( p_access, "latency" );
--    srt_setsockopt( p_sys->sock, 0, SRTO_TSBPDDELAY,
-+    srt_setsockopt( p_sys->sock, 0, SRTO_LATENCY,
-         &i_latency, sizeof( int ) );
- 
-     if ( psz_passphrase != NULL && psz_passphrase[0] != '\0')

diff --git a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch b/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch
deleted file mode 100644
index c255689c1ca0..000000000000
--- a/media-video/vlc/files/vlc-3.0.13-srt-1.3.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -4016,7 +4016,7 @@
- dnl
- dnl  SRT plugin
- dnl
--PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2 srt < 1.3.0], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
-+PKG_ENABLE_MODULES_VLC([SRT], [access_srt access_output_srt], [srt >= 1.2.2], [SRT input/output plugin], [auto], [], [], [-DENABLE_SRT])
- 
- EXTEND_HELP_STRING([Visualisations and Video filter plugins:])
- dnl

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Sam James]

commit:     c79b32b61b3faab133ff22da56b55f7ae6e089bd
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Feb 10 18:46:58 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Feb 17 05:21:07 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c79b32b6

media-video/vlc: remove unused patches

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29537
Signed-off-by: Sam James <sam <AT> gentoo.org>

 .../files/vlc-3.0.14-fix-live-address-api.patch    | 53 ---------------
 .../vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch       | 78 ----------------------
 media-video/vlc/files/vlc-3.0.17.4-gcc13.patch     | 20 ------
 3 files changed, 151 deletions(-)

diff --git a/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch b/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
deleted file mode 100644
index 2d6f86f0aba6..000000000000
--- a/media-video/vlc/files/vlc-3.0.14-fix-live-address-api.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-Needed for https://bugs.gentoo.org/795798 and
-https://code.videolan.org/videolan/vlc/-/issues/25473
-
-From 94845266b705dc9de7921408531b9d7704f4458f Mon Sep 17 00:00:00 2001
-From: Dominic Mayers <dominic.mayers@meditationstudies.org>
-Date: Sun, 28 Mar 2021 04:37:54 -0400
-Subject: [PATCH] Get addr by ref. from getConnectionEndpointAddress.
-
-Fixes issue #25473 in code.videolan.org. The maintainers of live555 changed
-connectionEndpointAddresss to getConnectionEndpointAddress, which now provides
-the address value by reference. Before, connectionEndpointAddresss returned
-the value. So, in modules/access/live555.cpp, we must first get the value and
-then pass it to IsMulticastAddress.  The code will not compile with the recent
-live555 unless we also modify modules/access/Makefile.am - a different patch.
----
- modules/access/live555.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
-index 01c535ca5b..95e15e35d9 100644
---- a/modules/access/live555.cpp
-+++ b/modules/access/live555.cpp
-@@ -60,6 +60,7 @@
- #include <liveMedia.hh>
- #include <liveMedia_version.hh>
- #include <Base64.hh>
-+#include <NetAddress.hh>
- 
- extern "C" {
- #include "../access/mms/asf.h"  /* Who said ugly ? */
-@@ -727,7 +728,8 @@ static int SessionsSetup( demux_t *p_demux )
-     unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */
-     const char     *p_sess_lang = NULL;
-     const char     *p_lang;
--
-+    struct sockaddr_storage addr;
-+    
-     b_rtsp_tcp    = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
-                     var_GetBool( p_demux, "rtsp-http" );
-     i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
-@@ -850,7 +852,8 @@ static int SessionsSetup( demux_t *p_demux )
-             if( !p_sys->b_multicast )
-             {
-                 /* We need different rollover behaviour for multicast */
--                p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
-+                sub->getConnectionEndpointAddress(addr);
-+                p_sys->b_multicast = IsMulticastAddress( addr );
-             }
- 
-             tk = (live_track_t*)malloc( sizeof( live_track_t ) );
--- 
-2.25.1
-

diff --git a/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch b/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch
deleted file mode 100644
index deb748cdba92..000000000000
--- a/media-video/vlc/files/vlc-3.0.17.3-dav1d-1.0.0.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-https://code.videolan.org/videolan/vlc/-/merge_requests/1618.patch
-https://bugs.gentoo.org/835787
-
-From 0efdfe8799b0100f41c5b8d6e1b43451001386cb Mon Sep 17 00:00:00 2001
-From: Steve Lhomme <robux4@ycbcr.xyz>
-Date: Fri, 18 Mar 2022 11:42:49 +0100
-Subject: [PATCH 1/2] dav1d: fix compilation with (upcoming) dav1d 1.0
-
-(cherry picked from commit dbf45cea2a8abdfbef897b8a71f3eb782bb1b712) (edited)
-edited:
-- 3.0 has the 128 pixels padding elsewhere
-- 3.0 has an extra parameter for add_integer_with_range()
-- 3.0 was setting i_extra_picture_buffers further down in the code
-- 3.0 uses 16 threads max
-
-Signed-off-by: Steve Lhomme <robux4@ycbcr.xyz>
---- a/modules/codec/dav1d.c
-+++ b/modules/codec/dav1d.c
-@@ -63,10 +63,16 @@ vlc_module_begin ()
-     set_category(CAT_INPUT)
-     set_subcategory(SUBCAT_INPUT_VCODEC)
- 
-+#if DAV1D_API_VERSION_MAJOR >= 6
-+    add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_THREADS,
-+                THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
-+    add_obsolete_string("dav1d-thread-tiles") // unused with dav1d 1.0
-+#else
-     add_integer_with_range("dav1d-thread-frames", 0, 0, DAV1D_MAX_FRAME_THREADS,
-                 THREAD_FRAMES_TEXT, THREAD_FRAMES_LONGTEXT, false)
-     add_integer_with_range("dav1d-thread-tiles", 0, 0, DAV1D_MAX_TILE_THREADS,
-                 THREAD_TILES_TEXT, THREAD_TILES_LONGTEXT, false)
-+#endif
- vlc_module_end ()
- 
- /*****************************************************************************
-@@ -294,6 +300,11 @@ static int OpenDecoder(vlc_object_t *p_this)
-         return VLC_ENOMEM;
- 
-     dav1d_default_settings(&p_sys->s);
-+#if DAV1D_API_VERSION_MAJOR >= 6
-+    p_sys->s.n_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
-+    if (p_sys->s.n_threads == 0)
-+        p_sys->s.n_threads = (i_core_count < 16) ? i_core_count : 16;
-+#else
-     p_sys->s.n_tile_threads = var_InheritInteger(p_this, "dav1d-thread-tiles");
-     if (p_sys->s.n_tile_threads == 0)
-         p_sys->s.n_tile_threads =
-@@ -303,6 +314,7 @@ static int OpenDecoder(vlc_object_t *p_this)
-     p_sys->s.n_frame_threads = var_InheritInteger(p_this, "dav1d-thread-frames");
-     if (p_sys->s.n_frame_threads == 0)
-         p_sys->s.n_frame_threads = (i_core_count < 16) ? i_core_count : 16;
-+#endif
-     p_sys->s.allocator.cookie = dec;
-     p_sys->s.allocator.alloc_picture_callback = NewPicture;
-     p_sys->s.allocator.release_picture_callback = FreePicture;
-@@ -313,12 +325,20 @@ static int OpenDecoder(vlc_object_t *p_this)
-         return VLC_EGENERIC;
-     }
- 
-+#if DAV1D_API_VERSION_MAJOR >= 6
-+    msg_Dbg(p_this, "Using dav1d version %s with %d threads",
-+            dav1d_version(), p_sys->s.n_threads);
-+
-+    dec->i_extra_picture_buffers = (p_sys->s.n_threads - 1);
-+#else
-     msg_Dbg(p_this, "Using dav1d version %s with %d/%d frame/tile threads",
-             dav1d_version(), p_sys->s.n_frame_threads, p_sys->s.n_tile_threads);
- 
-+    dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
-+#endif
-+
-     dec->pf_decode = Decode;
-     dec->pf_flush = FlushDecoder;
--    dec->i_extra_picture_buffers = (p_sys->s.n_frame_threads - 1);
- 
-     dec->fmt_out.video.i_width = dec->fmt_in.video.i_width;
-     dec->fmt_out.video.i_height = dec->fmt_in.video.i_height;
-GitLab

diff --git a/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch b/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch
deleted file mode 100644
index 374cd5ada0ac..000000000000
--- a/media-video/vlc/files/vlc-3.0.17.4-gcc13.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://code.videolan.org/robUx4/vlc/-/commit/6fca76ebd76bf8fce9b111e31bda64015cdc770f
-https://bugs.gentoo.org/875785
-
-From 6fca76ebd76bf8fce9b111e31bda64015cdc770f Mon Sep 17 00:00:00 2001
-From: Johannes Kauffmann <johanneskauffmann@hotmail.com>
-Date: Mon, 11 Jul 2022 19:35:57 +0000
-Subject: [PATCH] demux: dash: include cstdint, needed for uint64_t
-
-Fixes #27077.
---- a/modules/demux/dash/mpd/TemplatedUri.hpp
-+++ b/modules/demux/dash/mpd/TemplatedUri.hpp
-@@ -21,6 +21,7 @@
- #ifndef TEMPLATEDURI_HPP
- #define TEMPLATEDURI_HPP
- 
-+#include <cstdint>
- #include <string>
- 
- namespace dash
-GitLab

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Sam James]

commit:     59d26c40982765c7a36e7da8c21dec5e3a8b43ef
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 27 02:47:15 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 27 02:47:19 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59d26c40

media-video/vlc: scrub patches

Accidentally left in dummy commit msg, oops.

Bug: https://bugs.gentoo.org/901995
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-video/vlc/files/vlc-9999-configure-lua-version.patch | 9 ---------
 media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch    | 9 ---------
 2 files changed, 18 deletions(-)

diff --git a/media-video/vlc/files/vlc-9999-configure-lua-version.patch b/media-video/vlc/files/vlc-9999-configure-lua-version.patch
index d0ac9493a0fd..223841de8a3c 100644
--- a/media-video/vlc/files/vlc-9999-configure-lua-version.patch
+++ b/media-video/vlc/files/vlc-9999-configure-lua-version.patch
@@ -1,9 +1,3 @@
-From 543ae8e4118dd902e5ec9464caf315213e317089 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 27 May 2023 03:14:49 +0100
-Subject: [PATCH 2/2] foo3
-
-Signed-off-by: Sam James <sam@gentoo.org>
 --- a/configure.ac
 +++ b/configure.ac
 @@ -1847,43 +1847,10 @@ AC_ARG_ENABLE([lua],
@@ -54,6 +48,3 @@ Signed-off-by: Sam James <sam@gentoo.org>
  
    if test "${have_lua}" != "yes" ;  then
        AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
--- 
-2.40.1
-

diff --git a/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch
index 690cb73acfc4..3703cea1f10d 100644
--- a/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch
+++ b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch
@@ -1,9 +1,3 @@
-From 9f8193bd55f7b75c213a60a48a3302f009bdf054 Mon Sep 17 00:00:00 2001
-From: Sam James <sam@gentoo.org>
-Date: Sat, 27 May 2023 03:13:38 +0100
-Subject: [PATCH 1/2] foo1
-
-Signed-off-by: Sam James <sam@gentoo.org>
 --- a/modules/codec/Makefile.am
 +++ b/modules/codec/Makefile.am
 @@ -332,7 +332,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
@@ -15,6 +9,3 @@ Signed-off-by: Sam James <sam@gentoo.org>
  EXTRA_LTLIBRARIES += libtremor_plugin.la
  codec_LTLIBRARIES += $(LTLIBtremor)
  
--- 
-2.40.1
-

[gentoo-commits] repo/gentoo:master commit in: media-video/vlc/files/

[Arthur Zamarin]

commit:     2d1c1da2fc83c41d0760766e77cd8cec1343c593
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Mar 19 19:20:10 2024 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 06:05:05 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d1c1da2

media-video/vlc: remove unused patch

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-video/vlc/files/vlc-3.0.18-flac-crc.patch | 90 -------------------------
 1 file changed, 90 deletions(-)

diff --git a/media-video/vlc/files/vlc-3.0.18-flac-crc.patch b/media-video/vlc/files/vlc-3.0.18-flac-crc.patch
deleted file mode 100644
index 5e4d896bc7e7..000000000000
--- a/media-video/vlc/files/vlc-3.0.18-flac-crc.patch
+++ /dev/null
@@ -1,90 +0,0 @@
-https://bugs.gentoo.org/903665
-https://code.videolan.org/videolan/vlc/-/commit/c2dd4bfefe079e49db1789eb76be3885e4fc31b4
-
-(changed VLC_TICKS_INVALID -> VLC_TS_INVALID to avoid needing https://code.videolan.org/videolan/vlc/-/commit/0b4dff80ac381dd7de75125c70145a206a01eed8 too.)
-
-From c2dd4bfefe079e49db1789eb76be3885e4fc31b4 Mon Sep 17 00:00:00 2001
-From: Francois Cartegnie <fcvlcdev@free.fr>
-Date: Mon, 7 Nov 2022 15:02:57 +0100
-Subject: [PATCH] packetizer: flac: fix CRC from emulated sync
-
-also skips some memcpy
-
-refs #27454 #27477
-
-(cherry picked from commit c14b5aa6a7bd3aa25fa951e2b4136aff70f5702a)
---- a/modules/packetizer/flac.c
-+++ b/modules/packetizer/flac.c
-@@ -78,6 +78,7 @@ struct decoder_sys_t
- 
-     size_t i_last_frame_size;
-     uint16_t crc;
-+    size_t i_buf_offset; /* in final buffer before crc check / validation / retry */
-     size_t i_buf;
-     uint8_t *p_buf;
- 
-@@ -386,6 +387,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-         p_sys->headerinfo = headerinfo;
-         p_sys->i_state = STATE_NEXT_SYNC;
-         p_sys->i_offset = FLAC_FRAME_SIZE_MIN;
-+        p_sys->i_buf_offset = 0;
-         p_sys->crc = 0;
- 
-         /* We have to read until next frame sync code to compute current frame size
-@@ -461,6 +463,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-             block_SkipBytes( &p_sys->bytestream, FLAC_HEADER_SIZE_MAX + 2 );
-             block_BytestreamFlush( &p_sys->bytestream );
-             p_sys->crc = 0;
-+            p_sys->i_buf_offset = 0;
-             p_sys->i_offset = 0;
-             p_sys->i_state = STATE_NOSYNC;
-             p_sys->i_next_block_flags |= BLOCK_FLAG_DISCONTINUITY;
-@@ -484,10 +487,12 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-             }
- 
-             /* Copy from previous sync point up to to current (offset) */
--            block_PeekOffsetBytes( &p_sys->bytestream, 0, p_sys->p_buf, p_sys->i_offset );
-+            block_PeekOffsetBytes( &p_sys->bytestream, p_sys->i_buf_offset,
-+                                   &p_sys->p_buf[p_sys->i_buf_offset],
-+                                    p_sys->i_offset - p_sys->i_buf_offset );
- 
-             /* update crc to include this data chunk */
--            for( size_t i = 0; i < p_sys->i_offset - 2; i++ )
-+            for( size_t i = p_sys->i_buf_offset; i < p_sys->i_offset - 2; i++ )
-                 p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[i] );
- 
-             uint16_t stream_crc = GetWBE(&p_sys->p_buf[p_sys->i_offset - 2]);
-@@ -497,6 +502,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-                 /* Add the 2 last bytes which were not the CRC sum, and go for next sync point */
-                 p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[p_sys->i_offset - 2] );
-                 p_sys->crc = flac_crc16( p_sys->crc, p_sys->p_buf[p_sys->i_offset - 1] );
-+                p_sys->i_buf_offset = p_sys->i_offset;
-                 p_sys->i_offset += 1;
-                 p_sys->i_state = !pp_block ? STATE_NOSYNC : STATE_NEXT_SYNC;
-                 break; /* continue */
-@@ -513,6 +519,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-             block_BytestreamFlush( &p_sys->bytestream );
-             p_sys->i_offset = 0;
-             p_sys->crc = 0;
-+            p_sys->i_buf_offset = 0;
- 
-             if( block_BytestreamRemaining(&p_sys->bytestream) > 0 || pp_block == NULL /* drain */)
-                 p_sys->i_state = STATE_SEND_DATA;
-@@ -553,6 +560,7 @@ static block_t *Packetize(decoder_t *p_dec, block_t **pp_block)
-         else
-             free( p_sys->p_buf );
- 
-+        p_sys->i_buf_offset = 0;
-         p_sys->i_buf = 0;
-         p_sys->p_buf = NULL;
-         p_sys->i_offset = 0;
-@@ -587,6 +595,7 @@ static int Open(vlc_object_t *p_this)
-     p_sys->b_stream_info = false;
-     p_sys->i_last_frame_size = FLAC_FRAME_SIZE_MIN;
-     p_sys->headerinfo.i_pts  = VLC_TS_INVALID;
-+    p_sys->i_buf_offset  = 0;
-     p_sys->i_buf         = 0;
-     p_sys->p_buf         = NULL;
-     p_sys->i_next_block_flags = 0;
--- 
-GitLab