haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

VLC: bump version

Browse Source
This commit is contained in:
Gerasim Troeglazov
2022-03-20 22:22:08 +10:00
parent 105ca1476d
commit 2f169e8c26
2 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
media-video/vlc/patches/vlc-3.0.16.patchset → media-video/vlc/patches/vlc-3.0.17.3.patchset
View File

@@ -1,6 +1,6 @@
From 73662e183cbab1e641c4460b74b0871ce1d94b21 Mon Sep 17 00:00:00 2001
From 5c06cc96787f998a662ef38956a07877499a45ed Mon Sep 17 00:00:00 2001
From: Gerasim Troeglazov <3dEyes@gmail.com>
Date: Wed, 27 Jan 2021 16:32:03 +1000
Date: Sun, 20 Mar 2022 21:19:46 +1000
Subject: Add Haiku support
@@ -52,7 +52,7 @@ index 0f42e78..0ce5aef 100644
#include <limits.h>
#include <stdlib.h>
diff --git a/configure.ac b/configure.ac
index 3fc0954..2dbb94a 100644
index 28a7384..523428e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -46,7 +46,6 @@ dnl
@@ -245,7 +245,7 @@ index 0000000..37af2e8
+
+
diff --git a/include/vlc_fixups.h b/include/vlc_fixups.h
index a83d068..49cfe60 100644
index 2e8a145..5bea57d 100644
--- a/include/vlc_fixups.h
+++ b/include/vlc_fixups.h
@@ -103,7 +103,7 @@ typedef struct
@@ -781,7 +781,7 @@ index 0000000..025c285
+ return size;
+}
diff --git a/modules/codec/avcodec/avcommon_compat.h b/modules/codec/avcodec/avcommon_compat.h
index d386444..5ed96c1 100644
index e3c0663..0731923 100644
--- a/modules/codec/avcodec/avcommon_compat.h
+++ b/modules/codec/avcodec/avcommon_compat.h
@@ -78,6 +78,46 @@
@@ -832,7 +832,7 @@ index d386444..5ed96c1 100644
#ifdef HAVE_LIBAVUTIL_AVUTIL_H
diff --git a/modules/gui/qt/components/controller.cpp b/modules/gui/qt/components/controller.cpp
index f91d748..56918a2 100644
index 1d417f2..876f53a 100644
--- a/modules/gui/qt/components/controller.cpp
+++ b/modules/gui/qt/components/controller.cpp
@@ -229,7 +229,11 @@ void AbstractController::createAndAddWidget( QBoxLayout *controlLayout_,
@@ -861,10 +861,10 @@ index f91d748..56918a2 100644
controlLayout->addLayout( controlLayout1 );
diff --git a/modules/gui/qt/components/controller.hpp b/modules/gui/qt/components/controller.hpp
index 8650029..40be498 100644
index b0d0c82..0f33b4f 100644
--- a/modules/gui/qt/components/controller.hpp
+++ b/modules/gui/qt/components/controller.hpp
@@ -210,17 +210,17 @@ public:
@@ -210,10 +210,10 @@ public:
/* p_intf, advanced control visible or not, blingbling or not */
ControlsWidget( intf_thread_t *_p_i, bool b_advControls,
QWidget *_parent = 0 );
@@ -877,6 +877,7 @@ index 8650029..40be498 100644
protected:
friend class MainInterface;
@@ -221,7 +221,7 @@ protected:
bool b_advancedVisible;
private:
@@ -886,10 +887,10 @@ index 8650029..40be498 100644
protected slots:
void toggleAdvanced();
diff --git a/modules/gui/qt/components/interface_widgets.cpp b/modules/gui/qt/components/interface_widgets.cpp
index bcf65d2..ff2babd 100644
index c1482ac..8c288cb 100644
--- a/modules/gui/qt/components/interface_widgets.cpp
+++ b/modules/gui/qt/components/interface_widgets.cpp
@@ -158,6 +158,9 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
@@ -159,6 +159,9 @@ bool VideoWidget::request( struct vout_window_t *p_wnd )
case VOUT_WINDOW_TYPE_HWND:
p_wnd->handle.hwnd = (void *)stable->winId();
break;
@@ -912,7 +913,7 @@ index 450889b..e389724 100644
#include <QKeyEvent>
#include <QPushButton>
diff --git a/modules/gui/qt/main_interface.cpp b/modules/gui/qt/main_interface.cpp
index bb5dad8..d421f4f 100644
index fb67a08..1557159 100644
--- a/modules/gui/qt/main_interface.cpp
+++ b/modules/gui/qt/main_interface.cpp
@@ -127,7 +127,13 @@ MainInterface::MainInterface( intf_thread_t *_p_intf ) : QVLCMW( _p_intf )
@@ -1020,7 +1021,7 @@ index bb5dad8..d421f4f 100644
// if( fullscreenControls ) fullscreenControls->toggleAdvanced();
}
@@ -1223,7 +1260,11 @@ void MainInterface::setStatusBarVisibility( bool b_visible )
@@ -1232,7 +1269,11 @@ void MainInterface::setStatusBarVisibility( bool b_visible )
{
statusBar()->setVisible( b_visible );
b_statusbarVisible = b_visible;
@@ -1032,7 +1033,7 @@ index bb5dad8..d421f4f 100644
}
@@ -1294,9 +1335,9 @@ void MainInterface::createSystray()
@@ -1303,9 +1344,9 @@ void MainInterface::createSystray()
{
QIcon iconVLC;
if( QDate::currentDate().dayOfYear() >= QT_XMAS_JOKE_DAY && var_InheritBool( p_intf, "qt-icon-change" ) )
@@ -1045,7 +1046,7 @@ index bb5dad8..d421f4f 100644
sysTray->setToolTip( qtr( "VLC media player" ));
diff --git a/modules/gui/qt/menus.cpp b/modules/gui/qt/menus.cpp
index aea98c9..c946f9b 100644
index b3ec20c..fe99d31 100644
--- a/modules/gui/qt/menus.cpp
+++ b/modules/gui/qt/menus.cpp
@@ -486,7 +486,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
@@ -1075,20 +1076,20 @@ index aea98c9..c946f9b 100644
/* Minimal View */
action = menu->addAction( qtr( "Mi&nimal Interface" ) );
action->setShortcut( qtr( "Ctrl+H" ) );
@@ -529,7 +529,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
action->setCheckable( true );
@@ -530,7 +530,7 @@ QMenu *VLCMenuBar::ViewMenu( intf_thread_t *p_intf, QMenu *current, MainInterfac
if( mi->getControlsVisibilityStatus() & MainInterface::CONTROLS_ADVANCED )
action->setChecked( true );
action->setEnabled(mi->isAdvancedWidgetAvailable());
-
+#endif
action = menu->addAction( qtr( "Status Bar" ) );
action->setCheckable( true );
action->setChecked( mi->statusBar()->isVisible() );
diff --git a/modules/gui/qt/qt.cpp b/modules/gui/qt/qt.cpp
index ab912fd..e3c9ed8 100644
index bac56e6..bf207e0 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 )
@@ -605,6 +605,8 @@ static void *ThreadPlatform( void *obj, char *platform_name )
else if( platform == qfu("windows") )
p_sys->voutWindowType = VOUT_WINDOW_TYPE_HWND;
else if( platform == qfu("cocoa" ) )
@@ -1935,7 +1936,7 @@ index 0000000..9f0a2e3
+ }
+}
diff --git a/src/Makefile.am b/src/Makefile.am
index 502990c..f1c1a85 100644
index cdf7172..81f0290 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -411,6 +411,16 @@ libvlccore_la_SOURCES += \
@@ -2292,5 +2293,5 @@ index ff482dc..fe3c06c 100644
w->inhibit = vlc_inhibit_Create(VLC_OBJECT (window));
if (w->inhibit != NULL)
--
2.30.0
2.30.2

14
media-video/vlc/vlc-3.0.16.recipe → media-video/vlc/vlc-3.0.17.3.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-2021 VideoLAN"
COPYRIGHT="1998-2022 VideoLAN"
LICENSE="GNU GPL v2"
REVISION="2"
REVISION="1"
SOURCE_URI="https://download.videolan.org/pub/videolan/vlc/$portVersion/vlc-$portVersion.tar.xz"
SOURCE_DIR="vlc-$portVersion"
CHECKSUM_SHA256="ffae35fc64f625c175571d2346bc5f6207be99762517f15423e74f18399410f6"
CHECKSUM_SHA256="6f7e90ef8973d31d96de64db817173e345150829717a94084b1bb8321cde2014"
PATCHES="vlc-$portVersion.patchset"
ADDITIONAL_FILES="
vlc.rdef.in
@@ -82,9 +82,9 @@ BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:liba52$secondaryArchSuffix
devel:libass$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix
devel:libavformat$secondaryArchSuffix
devel:libavutil$secondaryArchSuffix
devel:libavcodec$secondaryArchSuffix >= 59
devel:libavformat$secondaryArchSuffix >= 59
devel:libavutil$secondaryArchSuffix >= 57
devel:libbluray$secondaryArchSuffix
devel:libcddb$secondaryArchSuffix
devel:libdca$secondaryArchSuffix
@@ -115,7 +115,7 @@ BUILD_REQUIRES="
devel:libschroedinger_1.0$secondaryArchSuffix
devel:libspeex$secondaryArchSuffix
devel:libssl$secondaryArchSuffix
devel:libswscale$secondaryArchSuffix
devel:libswscale$secondaryArchSuffix >= 6
devel:libtag$secondaryArchSuffix
devel:libtheora$secondaryArchSuffix
devel:libtwolame$secondaryArchSuffix