haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

vlc, bump to version 3.0.23 (#13637)

Browse Source
This commit is contained in:
Schrijvers Luc
2026-01-17 11:09:14 +01:00
committed by GitHub
parent 47d410cbf8
commit bda5704bd7
2 changed files with 77 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

201
media-video/vlc/patches/vlc-3.0.21.patchset → media-video/vlc/patches/vlc-3.0.23.patchset
View File

@@ -1,4 +1,4 @@
From f6542ddc8e22bede9588c9a3f88b52efc1c1a8aa Mon Sep 17 00:00:00 2001
From 159a67217bc7c4e7d659c710cfd34b84b4cd2dd6 Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Fri, 13 Dec 2024 15:57:06 +1000
Subject: Add Haiku support
@@ -26,10 +26,10 @@ index fb4608c..9c7c085 100644
{
if (override)
diff --git a/compat/recvmsg.c b/compat/recvmsg.c
index c037ab9..bd8a886 100644
index db5095c..78f2e53 100644
--- a/compat/recvmsg.c
+++ b/compat/recvmsg.c
@@ -83,7 +83,7 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
@@ -123,7 +123,7 @@ ssize_t recvmsg(int fd, struct msghdr *msg, int flags)
return -1;
}
@@ -39,10 +39,10 @@ index c037ab9..bd8a886 100644
#include <limits.h>
#include <stdlib.h>
diff --git a/compat/sendmsg.c b/compat/sendmsg.c
index 0f42e78..0ce5aef 100644
index 3647062..6843604 100644
--- a/compat/sendmsg.c
+++ b/compat/sendmsg.c
@@ -73,7 +73,7 @@ ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
@@ -113,7 +113,7 @@ ssize_t sendmsg(int fd, const struct msghdr *msg, int flags)
return -1;
}
@@ -52,7 +52,7 @@ index 0f42e78..0ce5aef 100644
#include <limits.h>
#include <stdlib.h>
diff --git a/configure.ac b/configure.ac
index 8fa2a87..12973c6 100644
index f4a0a02..459b63a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ dnl
@@ -63,7 +63,7 @@ index 8fa2a87..12973c6 100644
AC_DEFINE([_FILE_OFFSET_BITS], 64, [Define to 64 for large files support.])
AH_TOP([
#ifndef _REENTRANT
@@ -325,6 +324,13 @@ case "${host_os}" in
@@ -358,6 +357,13 @@ case "${host_os}" in
AC_LIBOBJ([recvmsg])
AC_LIBOBJ([sendmsg])
;;
@@ -77,7 +77,7 @@ index 8fa2a87..12973c6 100644
*)
SYS="${host_os}"
;;
@@ -363,6 +369,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
@@ -399,6 +405,7 @@ AS_IF([test "${SYS}" = "mingw32"],[
AM_CONDITIONAL(HAVE_LINUX, test "${SYS}" = "linux")
AM_CONDITIONAL(HAVE_OS2, test "${SYS}" = "os2")
@@ -85,16 +85,16 @@ index 8fa2a87..12973c6 100644
AM_CONDITIONAL(HAVE_DARWIN, test "${SYS}" = "darwin")
AM_CONDITIONAL(HAVE_IOS, test "${HAVE_IOS}" = "1")
@@ -632,7 +639,7 @@ need_libc=false
@@ -668,7 +675,7 @@ need_libc=false
dnl Check for usual libc functions
AC_CHECK_FUNCS([accept4 daemon fcntl flock fstatvfs fork getenv getmntent_r getpwuid_r isatty lstat memalign mkostemp mmap newlocale open_memstream openat pipe2 pread posix_fadvise posix_madvise posix_memalign setlocale stricmp strnicmp strptime uselocale])
-AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
-AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tdestroy tfind timegm timespec_get strverscmp pathconf])
+AC_REPLACE_FUNCS([aligned_alloc atof atoll dirfd fdopendir ffsll flockfile fsync getdelim getpid lfind lldiv memrchr nrand48 poll recvmsg rewind sendmsg setenv strcasecmp strcasestr strdup strlcpy strndup strnlen strnstr strsep strtof strtok_r strtoll swab tfind timegm timespec_get strverscmp pathconf])
AC_REPLACE_FUNCS([gettimeofday])
AC_CHECK_FUNC(fdatasync,,
[AC_DEFINE(fdatasync, fsync, [Alias fdatasync() to fsync() if missing.])
@@ -971,8 +978,10 @@ AC_SEARCH_LIBS(connect, [socket], [
@@ -1019,6 +1026,9 @@ AC_SEARCH_LIBS(connect, [socket], [
AS_IF([test "${SYS}" = "mingw32"], [
SOCKET_LIBS="-lws2_32 -liphlpapi"
])
@@ -102,11 +102,9 @@ index 8fa2a87..12973c6 100644
+ SOCKET_LIBS="-lnetwork"
+ ])
])
-
AC_SEARCH_LIBS([inet_pton], [nsl], [
AS_IF([test "$ac_cv_search_inet_pton" != "none required"], [
SOCKET_LIBS="$ac_cv_search_inet_pton $SOCKET_LIBS"
@@ -1185,9 +1194,12 @@ AH_BOTTOM([
@@ -1233,9 +1243,12 @@ AH_BOTTOM([
AS_IF([test "${ac_cv_c_omit_frame_pointer}" = "no"], [VLC_RESTORE_FLAGS])
])
@@ -114,15 +112,15 @@ index 8fa2a87..12973c6 100644
- AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong], [CXXFLAGS])
- dnl Win32 requires linking to ssp for stack-protection
+ AS_IF([test "${SYS}" != "haiku"], [
+ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong])
+ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong], [CXXFLAGS])
+ dnl Win32 requires linking to ssp for stack-protection
+ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong])
+ AX_APPEND_COMPILE_FLAGS([-fstack-protector-strong], [CXXFLAGS])
+ dnl Win32 requires linking to ssp for stack-protection
+ ])
+
AS_IF([test "${SYS}" = "mingw32"], [
LDFLAGS="${LDFLAGS} -lssp"
AS_IF([test "${vlc_winstore_app}" != 1], [LDFLAGS="${LDFLAGS} -ladvapi32"])
@@ -1704,7 +1716,7 @@ then
@@ -1794,7 +1807,7 @@ then
fi
AC_ARG_VAR([LUAC], [LUA byte compiler])
AS_IF([test -z "$LUAC"], [
@@ -131,7 +129,7 @@ index 8fa2a87..12973c6 100644
])
AS_IF([test "${LUAC}" = "false"], [
AC_MSG_ERROR([Could not find the LUA byte compiler.])
@@ -2642,7 +2654,7 @@ then
@@ -2725,7 +2738,7 @@ then
VLC_SAVE_FLAGS
CPPFLAGS="${CPPFLAGS} ${POSTPROC_CFLAGS}"
CFLAGS="${CFLAGS} ${POSTPROC_CFLAGS}"
@@ -140,7 +138,7 @@ index 8fa2a87..12973c6 100644
VLC_ADD_PLUGIN([postproc])
VLC_RESTORE_FLAGS
],[
@@ -3120,7 +3132,7 @@ dnl X C Bindings modules
@@ -3184,7 +3197,7 @@ dnl X C Bindings modules
dnl
AC_ARG_ENABLE(xcb,
[ --enable-xcb X11 support with XCB (default enabled)],, [
@@ -239,19 +237,20 @@ index 0000000..01be58b
+
+
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index 861cb4c..254e6ae 100644
index 52e2838..cbae146 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -103,7 +103,7 @@ typedef struct
@@ -103,7 +103,8 @@ typedef struct
#if !defined (HAVE_GETDELIM) || \
!defined (HAVE_GETPID) || \
- !defined (HAVE_SWAB)
+ !defined (HAVE_SWAB) || defined(__HAIKU__)
+ !defined (HAVE_SWAB) || \
+ defined(__HAIKU__)
# include <sys/types.h> /* ssize_t, pid_t */
#endif
@@ -381,6 +381,7 @@ void swab (const void *, void *, ssize_t);
@@ -381,6 +382,7 @@ void swab (const void *, void *, ssize_t);
#endif
/* Socket stuff */
@@ -259,7 +258,7 @@ index 861cb4c..254e6ae 100644
#ifndef HAVE_INET_PTON
# ifndef _WIN32
# include <sys/socket.h>
@@ -390,6 +391,7 @@ typedef int socklen_t;
@@ -390,6 +392,7 @@ typedef int socklen_t;
int inet_pton(int, const char *, void *);
const char *inet_ntop(int, const void *, char *, socklen_t);
#endif
@@ -267,7 +266,7 @@ index 861cb4c..254e6ae 100644
/* NaCl has a broken netinet/tcp.h, so TCP_NODELAY is not set */
#if defined(__native_client__) && !defined( HAVE_NETINET_TCP_H )
@@ -423,6 +425,8 @@ struct pollfd;
@@ -423,6 +426,8 @@ struct pollfd;
int poll (struct pollfd *, unsigned, int);
#endif
@@ -276,7 +275,7 @@ index 861cb4c..254e6ae 100644
#ifndef HAVE_IF_NAMEINDEX
#include <errno.h>
# ifndef HAVE_STRUCT_IF_NAMEINDEX
@@ -438,6 +442,7 @@ struct if_nameindex
@@ -438,6 +443,7 @@ struct if_nameindex
# define if_nameindex() (errno = ENOBUFS, NULL)
# define if_freenameindex(list) (void)0
#endif
@@ -358,10 +357,10 @@ index 96b954a..12ee19d 100644
#endif
vlc_rational_t sar;
diff --git a/modules/audio_output/Makefile.am b/modules/audio_output/Makefile.am
index bb4ac65..3907268 100644
index bb2da0d..4f1b121 100644
--- a/modules/audio_output/Makefile.am
+++ b/modules/audio_output/Makefile.am
@@ -93,6 +93,12 @@ if HAVE_SNDIO
@@ -97,6 +97,12 @@ if HAVE_SNDIO
aout_LTLIBRARIES += libsndio_plugin.la
endif
@@ -775,61 +774,24 @@ index 0000000..025c285
+ return size;
+}
diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
index 9d16b3d..6c2f34c 100644
index b3fb167..66fc7d2 100644
--- a/modules/codec/avcodec/avcommon_compat.h
+++ b/modules/codec/avcodec/avcommon_compat.h
@@ -78,6 +78,46 @@
# define FF_MAX_B_FRAMES 16 // FIXME: remove this
@@ -75,6 +75,9 @@
#ifndef AV_CODEC_CAP_SMALL_LAST_FRAME
# define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME
#endif
+#ifndef AV_CODEC_FLAG_OUTPUT_CORRUPT
+# define AV_CODEC_FLAG_OUTPUT_CORRUPT CODEC_FLAG_OUTPUT_CORRUPT
+#endif
+#ifndef AV_CODEC_FLAG_GRAY
+# define AV_CODEC_FLAG_GRAY CODEC_FLAG_GRAY
+#endif
+#ifndef AV_CODEC_FLAG_DR1
+# define AV_CODEC_FLAG_DR1 CODEC_FLAG_DR1
+#endif
+#ifndef AV_CODEC_FLAG_DELAY
+# define AV_CODEC_FLAG_DELAY CODEC_FLAG_DELAY
+#endif
+#ifndef AV_CODEC_FLAG2_FAST
+# define AV_CODEC_FLAG2_FAST CODEC_FLAG2_FAST
+#endif
+#ifndef FF_INPUT_BUFFER_PADDING_SIZE
+# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE
+#endif
+#ifndef AV_CODEC_FLAG_INTERLACED_DCT
+# define AV_CODEC_FLAG_INTERLACED_DCT CODEC_FLAG_INTERLACED_DCT
+#endif
+#ifndef AV_CODEC_FLAG_INTERLACED_ME
+# define AV_CODEC_FLAG_INTERLACED_ME CODEC_FLAG_INTERLACED_ME
+#endif
+#ifndef AV_CODEC_FLAG_GLOBAL_HEADER
+# define AV_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER
+#endif
+#ifndef AV_CODEC_FLAG_LOW_DELAY
+# define AV_CODEC_FLAG_LOW_DELAY CODEC_FLAG_LOW_DELAY
+#endif
+#ifndef AV_CODEC_CAP_SMALL_LAST_FRAME
+# define AV_CODEC_CAP_SMALL_LAST_FRAME CODEC_CAP_SMALL_LAST_FRAME
+#endif
+#ifndef AV_INPUT_BUFFER_MIN_SIZE
+# define AV_INPUT_BUFFER_MIN_SIZE FF_MIN_BUFFER_SIZE
+#endif
+#ifndef FF_MAX_B_FRAMES
+# define FF_MAX_B_FRAMES 16 // FIXME: remove this
+#endif
+
#endif /* HAVE_LIBAVCODEC_AVCODEC_H */
#ifdef HAVE_LIBAVUTIL_AVUTIL_H
#ifndef FF_MAX_B_FRAMES
# define FF_MAX_B_FRAMES 16 // FIXME: remove this
#endif
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index 3adfe67..8003527 100644
index 2e327e5..9b12051 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -229,7 +229,11 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
@@ -238,7 +238,11 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
QWidget *AbstractController::createWidget( buttonType_e button, int options )
{
@@ -841,23 +803,20 @@ index 3adfe67..8003527 100644
bool b_big = options & WIDGET_BIG;
bool b_shiny = options & WIDGET_SHINY;
bool b_special = false;
@@ -731,10 +735,12 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
QString line2 = getSettings()->value( "MainWindow/MainToolbar2", MAIN_TB2_DEFAULT )
@@ -740,7 +744,11 @@ ControlsWidget::ControlsWidget( intf_thread_t *_p_i,
.toString();
parseAndCreate( line2, controlLayout2 );
-
+#ifdef __HAIKU__
+ grip = new QWidget( this );
+#else
grip = new QSizeGrip( this );
+#endif
controlLayout2->addWidget( grip, 0, Qt::AlignBottom|Qt::AlignRight );
-
if( !b_advancedVisible && advControls ) advControls->hide();
controlLayout->addLayout( controlLayout1 );
if( !b_advancedVisible && advControls ) advControls->hide();
diff --git a/modules/gui/qt/components/controller.hpp b/modules/gui/qt/components/controller.hpp
index ab7b29f..ef47762 100644
index 3275108..1d5bb66 100644
--- a/modules/gui/qt/components/controller.hpp
+++ b/modules/gui/qt/components/controller.hpp
@@ -221,7 +221,11 @@ protected:
@@ -873,18 +832,10 @@ index ab7b29f..ef47762 100644
protected slots:
void toggleAdvanced();
diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index 4a0a0da..5f2a7be 100644
index f86327a..ea0538a 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -74,6 +74,7 @@
#include <vlc_vout.h>
#include <vlc_vout_window.h>
+
/**********************************************************************
* Video Widget. A simple frame on which video is drawn
* This class handles resize issues
@@ -125,20 +126,25 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
@@ -127,20 +127,25 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
/* The owner of the video window needs a stable handle (WinId). Reparenting
* in Qt4-X11 changes the WinId of the widget, so we need to create another
* dummy widget that stays within the reparentable widget. */
@@ -896,7 +847,7 @@ index 4a0a0da..5f2a7be 100644
stable->setPalette( plt );
stable->setAutoFillBackground(true);
+#if defined(Q_OS_HAIKU)
+ stable->setMinimumSize( 32, 32 );
+ stable->setMinimumSize( 32, 32 );
+ stable->setAttribute( Qt::WA_TransparentForMouseEvents, true );
+#else
/* Force the widget to be native so that it gets a winId() */
@@ -912,7 +863,7 @@ index 4a0a0da..5f2a7be 100644
stable->setAttribute( Qt::WA_PaintOnScreen, true );
#else
stable->setMouseTracking( true );
@@ -159,6 +165,9 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
@@ -161,6 +166,9 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
case VOUT_WINDOW_TYPE_HWND:
p_wnd->handle.hwnd = (void *)stable->winId();
break;
@@ -922,16 +873,8 @@ index 4a0a0da..5f2a7be 100644
case VOUT_WINDOW_TYPE_NSOBJECT:
p_wnd->handle.nsobject = (void *)stable->winId();
break;
@@ -375,6 +384,7 @@ void VideoWidget::mouseMoveEvent( QMouseEvent *event )
current_pos *= devicePixelRatio();
#endif
vout_window_ReportMouseMoved( p_window, current_pos.x(), current_pos.y() );
+
event->accept();
return;
}
diff --git a/modules/gui/qt/components/interface_widgets.hpp b/modules/gui/qt/components/interface_widgets.hpp
index 583f2d1..37b6f0b 100644
index 995b8e0..bcaabe4 100644
--- a/modules/gui/qt/components/interface_widgets.hpp
+++ b/modules/gui/qt/components/interface_widgets.hpp
@@ -41,6 +41,7 @@
@@ -941,8 +884,8 @@ index 583f2d1..37b6f0b 100644
+#include <QPainter>
#include <QMouseEvent>
#include <QPropertyAnimation>
#include <QLinkedList>
@@ -82,7 +83,7 @@ private:
#include <QAbstractNativeEventFilter>
@@ -86,7 +87,7 @@ private:
intf_thread_t *p_intf;
vout_window_t *p_window;
@@ -952,30 +895,30 @@ index 583f2d1..37b6f0b 100644
bool enable_mouse_events;
diff --git a/modules/gui/qt/dialogs/plugins.cpp b/modules/gui/qt/dialogs/plugins.cpp
index 0ed8313..86c148c 100644
index ba480a6..31b5d8b 100644
--- a/modules/gui/qt/dialogs/plugins.cpp
+++ b/modules/gui/qt/dialogs/plugins.cpp
@@ -53,6 +53,7 @@
@@ -51,6 +51,7 @@
#include <QSpacerItem>
#include <QListView>
#include <QListWidget>
#include <QPainter>
+#include <QPainterPath>
#include <QStyleOptionViewItem>
#include <QKeyEvent>
#include <QPushButton>
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index 095c765..5edd5a3 100644
index e947635..6549623 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -1232,6 +1232,7 @@ void MainInterface::setStatusBarVisibility( bool b_visible )
{
@@ -1264,6 +1264,7 @@ void MainInterface::setStatusBarVisibility( bool b_visible )
#ifndef QT_NO_STATUSBAR
statusBar()->setVisible( b_visible );
b_statusbarVisible = b_visible;
+
if( controls ) controls->setGripVisible( !b_statusbarVisible );
#endif
}
@@ -1303,9 +1304,9 @@ void MainInterface::createSystray()
@@ -1336,9 +1337,9 @@ void MainInterface::createSystray()
{
QIcon iconVLC;
if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
@@ -987,7 +930,7 @@ index 095c765..5edd5a3 100644
sysTray = new QSystemTrayIcon( iconVLC, this );
sysTray->setToolTip( qtr( "VLC media player" ));
@@ -1671,11 +1672,18 @@ void MainInterface::wheelEvent( QWheelEvent *e )
@@ -1704,11 +1705,18 @@ void MainInterface::wheelEvent( QWheelEvent *e )
void MainInterface::closeEvent( QCloseEvent *e )
{
// hide();
@@ -1007,10 +950,10 @@ index 095c765..5edd5a3 100644
e->accept();
}
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index cefc758..f302cfb 100644
index 9da91e5..90b5ae4 100644
--- a/modules/gui/qt/qt.cpp
+++ b/modules/gui/qt/qt.cpp
@@ -604,6 +604,8 @@ static void *ThreadPlatform( void *obj, char *platform_name )
@@ -671,6 +671,8 @@ static void *ThreadPlatform( void *obj, char *platform_name )
p_sys->voutWindowType = VOUT_WINDOW_TYPE_WAYLAND;
else if( platform == qfu("windows") )
p_sys->voutWindowType = VOUT_WINDOW_TYPE_HWND;
@@ -1020,12 +963,12 @@ index cefc758..f302cfb 100644
p_sys->voutWindowType = VOUT_WINDOW_TYPE_NSOBJECT;
else
diff --git a/modules/gui/qt/util/timetooltip.cpp b/modules/gui/qt/util/timetooltip.cpp
index 8cfdab3..fedc90f 100644
index ffa2c09..611a3b9 100644
--- a/modules/gui/qt/util/timetooltip.cpp
+++ b/modules/gui/qt/util/timetooltip.cpp
@@ -27,7 +27,11 @@
#include <QFontMetrics>
#include <QDesktopWidget>
@@ -31,7 +31,11 @@
#include <QScreen>
#endif
+#ifdef __HAIKU__
+#define TIP_HEIGHT 0
@@ -1035,7 +978,7 @@ index 8cfdab3..fedc90f 100644
TimeTooltip::TimeTooltip( QWidget *parent ) :
QWidget( parent )
@@ -43,7 +47,12 @@ TimeTooltip::TimeTooltip( QWidget *parent ) :
@@ -47,7 +51,12 @@ TimeTooltip::TimeTooltip( QWidget *parent ) :
setAttribute( Qt::WA_TransparentForMouseEvents );
// Inherit from the system default font size -5
@@ -1049,10 +992,10 @@ index 8cfdab3..fedc90f 100644
// By default the widget is unintialized and should not be displayed
diff --git a/modules/video_output/Makefile.am b/modules/video_output/Makefile.am
index 8f2cea4..2687109 100644
index 6d75a1d..c49bcbe 100644
--- a/modules/video_output/Makefile.am
+++ b/modules/video_output/Makefile.am
@@ -375,6 +375,14 @@ if HAVE_WIN32
@@ -379,6 +379,14 @@ if HAVE_WIN32
vout_LTLIBRARIES += libdrawable_plugin.la
endif
@@ -1067,7 +1010,7 @@ index 8f2cea4..2687109 100644
### OS/2 ###
if HAVE_OS2
vout_LTLIBRARIES += libdrawable_plugin.la
@@ -441,9 +449,11 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
@@ -445,9 +453,11 @@ libcaca_plugin_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS)
libcaca_plugin_la_LIBADD = libevent_thread.la $(CACA_LIBS)
if !HAVE_WIN32
if !HAVE_DARWIN
@@ -1954,7 +1897,7 @@ index 0000000..7e1ad64
+ }
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index 03f6894..a2d37db 100644
index 869a5eb..d36f425 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -411,6 +411,16 @@ libvlccore_la_SOURCES += \
@@ -1974,7 +1917,7 @@ index 03f6894..a2d37db 100644
if HAVE_DARWIN
libvlccore_la_SOURCES += \
darwin/dirs.c \
@@ -444,6 +454,7 @@ endif
@@ -445,6 +455,7 @@ endif
endif
endif
endif
@@ -2249,7 +2192,7 @@ index 869c575..268dda0 100644
#endif
state->sar = osys->sar_initial;
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index 085067c..e65b9bf 100644
index cd06e80..a78671e 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -570,7 +570,7 @@ void vout_ControlChangeViewpoint(vout_thread_t *vout,
@@ -2311,5 +2254,5 @@ index 36aaa9d..0ac6b4f 100644
w->inhibit = vlc_inhibit_Create(VLC_OBJECT (window));
if (w->inhibit != NULL)
--
2.45.2
2.52.0

10
media-video/vlc/vlc-3.0.21.recipe → media-video/vlc/vlc-3.0.23.recipe
View File

@@ -3,12 +3,12 @@ DESCRIPTION="VLC is a free and open source cross-platform multimedia player \
and framework that plays most multimedia files as well as DVDs, Audio CDs, \
VCDs, and various streaming protocols."
HOMEPAGE="https://www.videolan.org/vlc/"
COPYRIGHT="1998-2024 VideoLAN"
COPYRIGHT="1998-2026 VideoLAN"
LICENSE="GNU GPL v2"
REVISION="5"
REVISION="1"
SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
SOURCE_DIR="vlc-$portVersion"
CHECKSUM_SHA256="24dbbe1d7dfaeea0994d5def0bbde200177347136dbfe573f5b6a4cee25afbb0"
CHECKSUM_SHA256="e891cae6aa3ccda69bf94173d5105cbc55c7a7d9b1d21b9b21666e69eff3e7e0"
PATCHES="vlc-$portVersion.patchset"
ADDITIONAL_FILES="
vlc.rdef.in
@@ -178,8 +178,8 @@ BUILD()
autoreconf
export BUILDCC=gcc
export CFLAGS="-lgnu -lnetwork"
export CXXFLAGS="-lgnu -lnetwork"
export CFLAGS="-lgnu -lnetwork -O2"
export CXXFLAGS="-lgnu -lnetwork -O2"
runConfigure --omit-dirs binDir ./configure \
--bindir="$commandBinDir" \